From patchwork Thu Dec 21 13:40:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 6890 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp939425jad; Thu, 21 Dec 2017 05:49:40 -0800 (PST) X-Google-Smtp-Source: ACJfBos1AtYsGBkZxLutnk3LO2/5kF0g1N33TK0MWrYCPCVDpLNzHZhedQOzhO3KmkFfk52w6sIK X-Received: by 10.223.171.15 with SMTP id q15mr11579148wrc.112.1513864180016; Thu, 21 Dec 2017 05:49:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513864179; cv=none; d=google.com; s=arc-20160816; b=DBRlelAKqVPntaOC/pazVCnwiJ22jZGyeGBjovYJNNrQGJHGoFM77zPTn486Act3M7 2VsfKSTluOc9/NsN/USical8BgHBkk5SkQUvzKqer1dqbWIxuh15csqqcTv9KLP/sOMt erTZ9E7u469yWpafz6ahdD6Cj9yuE2oCeqdxF8nrwEByVcAHZJ933/qT0ZyEVaOEmyGi 6WQf+HyZHkMGwKMpf1SEQHGs5URwqo4PuU8oeFBtIDUQ1QJRpdk2tgj6NjmFbjJ9syXJ tDexANu4ySc8SSmzKFOM4469biYezcE1edPt7QMkw54qIvN7fCxDUsEBm9auphQWfLqU zyZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=x0Cx6eWxOB+SSLHW9tQbnbRHwoWFYUw5U2eCyHISmn0=; b=QD+WOboNqwZWRy71Vbi035MnkHnzqJHVOJs2h8+q2nkwKdxZA1o2ZbleBAMBlMvnWU 9reXlyrBOzRLLcdPIXTe+B12hcCn370uK8icUnqwjB+j8FMnrBQ8yIMRLXFeCkboQ55M +uk8SDJ+drRypEcgXuv7olYqQPloGYodg2OVUN1YCv2Vb2oFZqFbalo4tORZL0ZmgCMd kpb1PPnKIGZVyC1ZQ1mZot/bvxN4MQu6rKO1bdecoUnd44fXY0vhLtkMZQX+sYVixVfp U0bdyEC5xmv6KwsTgx06oFZYjXz1+7Kr98xFL1MNk+kgtN2diIJbgKPcUNcKpJ7p9eVy EGfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=ncteq1Cd; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w17si1593413wra.345.2017.12.21.05.49.39; Thu, 21 Dec 2017 05:49:39 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=ncteq1Cd; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7C0268836F; Thu, 21 Dec 2017 15:49:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDB0D68831F for ; Thu, 21 Dec 2017 15:49:21 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id b76so16030529wmg.1 for ; Thu, 21 Dec 2017 05:49:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=XKjEf1XAkVqPIbbw5sT2iVniITdpx7YH+hLlOXhMOT8=; b=ncteq1CdMD6IGkCz5+q5IQ4G1MgTjgpRjExug7+ht4oF/Zh2gu7JOt+sL1+gmjM/Pa e+oRPeDA0KFncPmEUDamN/hQLnTGLLwWbFjxP1bcFq8nFR0u64IljJsYmZZkNjfcSQb5 QYMuxlFnJypsAqyNGldYkvWJqGD9NRmK49XsuOb2P2WeBbNgwoldxKLdxgTdAX5n1d7D 5lUInw40OT7kbu3YcdPHWZUYdZxVZkN99F2/KMqhJEMP8qu3GwoKS2ahDpNtueaCOHGg wZO9YejMVgVqg5HS7hI/kVrrwscuxmttelGNsw1obX6QOQlHxsO3a1gFUkIs7WFfD0K8 KtXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=XKjEf1XAkVqPIbbw5sT2iVniITdpx7YH+hLlOXhMOT8=; b=L0dg/YXa1StxviIUbHUSLthQQGcq+pRwbPYOHNGHpqLkOFSVrv6rBPY5mFgnnDoIan zofnpBRQgM/9128VVET9xBg5p8VCoviyCC98bCWmTyvl0Aski50J9CICJi/fNtrK/Mpw aP7kORxBH4QFuAurUB9DmJO+mZnNdCQGEHotgA376yFEyExm/NTMmb7+JCgZ3b/PQreN xuCKIdLKuEzv3y/70hrfOnxmTsGFn59fjQXg3huaSKuR5yTKkU9kjvTww8RxCDPhIO60 henffaFRPD087BAbU0O5yqy1bmQTap+e7dJnNNq/wvfTsr6MxxrxqHXMidf+4v8YLtsL zksw== X-Gm-Message-State: AKGB3mK+f0W7dMWquKshapUqVkLxqz7FIRwfbwr2Uc48s8odTchhvBS5 1rhZP0QX/K8FqXLwhEX+TUWFZ4lM X-Received: by 10.80.184.23 with SMTP id j23mr10311192ede.115.1513863679023; Thu, 21 Dec 2017 05:41:19 -0800 (PST) Received: from Highwind.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id h56sm16517188ede.45.2017.12.21.05.41.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Dec 2017 05:41:18 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Dec 2017 14:40:59 +0100 Message-Id: <20171221134102.3959-5-jdarnley@obe.tv> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171221134102.3959-1-jdarnley@obe.tv> References: <20171221134102.3959-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 4/7] avutil: add alignment needed for AVX-512 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavutil/mem.c | 2 +- libavutil/x86/cpu.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/mem.c b/libavutil/mem.c index 6ad409daf4..79e8b597f1 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -61,7 +61,7 @@ void free(void *ptr); #include "mem_internal.h" -#define ALIGN (HAVE_AVX ? 32 : 16) +#define ALIGN (HAVE_AVX512 ? 64 : (HAVE_AVX ? 32 : 16)) /* NOTE: if you want to override these functions with your own * implementations (not recommended) you have to link libav* as diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index 696f47b3bf..7cf673a7d7 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -246,6 +246,8 @@ size_t ff_get_cpu_max_align_x86(void) { int flags = av_get_cpu_flags(); + if (flags & AV_CPU_FLAG_AVX512) + return 64; if (flags & (AV_CPU_FLAG_AVX2 | AV_CPU_FLAG_AVX | AV_CPU_FLAG_XOP |