From patchwork Thu Jun 8 23:05:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3876 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp3081903vsk; Thu, 8 Jun 2017 16:06:27 -0700 (PDT) X-Received: by 10.223.160.172 with SMTP id m41mr11451321wrm.176.1496963187340; Thu, 08 Jun 2017 16:06:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496963187; cv=none; d=google.com; s=arc-20160816; b=nMSUXxSd16//E4xnolfZLDIDd3Esgv4RSnefq/CL409KyjfSDllZ3bV9N8h/8t7dsc SGDu47L3O1OS4T3xC8sXprJI3ycYlqFy683HpfS8TrpZjeXrC0EWBBDL/dH/J7kutcOS QfJBOyQdjT7kcz1+ckn+xYm2NGhyYUlmxu21E2Q14tKBh63KKg9uDrH6SfpYrJhg/Wbe g0GzKPSeEwpnpXJTFc2CEvf4NnFZNQcBZciwr5wL1y27ZBlms9Yv1ICh7wjE9wmJJRLx uQP6kdNHM7DF4OUzGZh4c0mrB34LLVMSiRZGC3G3Oi08s9r+VVBObmOz/eOxwP6Q3TRv cp3Q== 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:cc: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=yWZzqRlP8aIz7CqKhqDEPJ/qnsDPLXfdWAIDHfrrRs8=; b=C9UYcHU4vpd+aWj4spQ+EQ3szfjMeENkmvvhNuCjW+KrAKoqPEqk8kl6Jor1SSCXcx crASN/n/0FBUOdUL9O24Jl+yt0zZ//Kv2HqGS8Zk3ZjjaL26GGypKEylrHh1VNa1OXYZ DY+Cys0hQyZZGYAR5h4Pmu0P6fM80/E7cRdHkN6A1Pj37kLyikqT22lH7wf75cxOsyhK 6N0BTWlDZ75p8OVSsMuJCbdi+hAiRX3vEmzKwu9pbWl/B2hYRvIoHkf4hLpO8c9dO1Sr YbmKM+aOLxHmJTyxBXYtbLSwT7w9LOuX4Z5Nt5yCRBCA8c05tjNBxQJMFZ45gif2LYvv SvLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com; 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 j67si81816wmg.92.2017.06.08.16.06.26; Thu, 08 Jun 2017 16:06:27 -0700 (PDT) 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; 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 ED8D1689D6C; Fri, 9 Jun 2017 02:06:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 054D5688300 for ; Fri, 9 Jun 2017 02:06:06 +0300 (EEST) Received: by mail-wr0-f180.google.com with SMTP id v104so23932660wrb.0 for ; Thu, 08 Jun 2017 16:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uk3pTurXgNtjP0hjDoBYQb0US2/b0U4JYCU/fGtnFsI=; b=qmdsU5hEmVTs6wUeEOJw6ViPJFtIqDOk15Iizikp1nsSXgChHn2PdNNq/R5Yvl3JIh ebdlfQbWHnFTiu1yDxcaG1a8+iPRt1D/dKIfDfue9dKKXY85JOWQOmz8YKSn10oebdWz ec204jROW3v3TR9StZ3rt62Mvxu5GPrX/c6/VLUAWXm/P4O2k2pMaFOgcQG22LlbD7Yc m7l+efj0Zx6b9G22Xw0AuwhWDx/8FqgAteUW1ZzBZyV2IURTF+synEYMUMVq4dbtrZ7u RdJdPNj3SZFVAXW/wBMFWBXAnwVt4xvyDSFRzaXVrAYAhrAdwGeyc3F0/d898VMGlri1 4WQQ== 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:cc:subject:date:message-id :in-reply-to:references; bh=uk3pTurXgNtjP0hjDoBYQb0US2/b0U4JYCU/fGtnFsI=; b=EwSutqFcfTIHFQpmke7MSk/ttl4iKWhZBp0cw7Uyl7Bk8CcJRXxgJ2BDZq5CI+uG1A B7zaLw9cuVq2EnJQa/iYe0YsLDNqvvB1AwkNDZTdAT04I44qU6IRJoSzJd9ZSGqgJhNL FlMzZRIPrc5jNLlccWe2FJDSFZiGm3zoLMfRU546m5tPtnKpXxQ2RfZkDOmCHoUM4Ydw tlSuVcC/CkXrKgi81ZqJQmvLNgcyKAPqsxHN2U9bKdS9R+IV5idzyqjbgCLdyn8SEO2f DHwZ7KDAEcZR9hU+zAV6Oavvyq8qzRM9fBOmVLRnLBRSe+B9eANek3/MOzwQWMDJZ1tp I34Q== X-Gm-Message-State: AODbwcA/5dOtwrPVMA2AIorpaa84jMgu8tf2l/ycr35y271tLkxks8Ew RSyewdkNi3ySNiNGYMg= X-Received: by 10.223.136.131 with SMTP id f3mr31433211wrf.151.1496963165986; Thu, 08 Jun 2017 16:06:05 -0700 (PDT) Received: from Highwind.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id v62sm82057wmv.15.2017.06.08.16.06.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jun 2017 16:06:05 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Fri, 9 Jun 2017 01:05:02 +0200 Message-Id: <20170608230502.29258-6-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170608230502.29258-1-jdarnley@obe.tv> References: <20170608230502.29258-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 5/5] x86: Add some additional cpuflag relations 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 Cc: Henrik Gramner MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Henrik Gramner Simplifies writing assembly code that depends on available instructions. LZCNT implies SSE2 BMI1 implies AVX+LZCNT AVX2 implies BMI2 --- This is the patch I was talking about. Where should I put the aesni define? x264 doesn't have it but I will try to get it upstreamed. libavutil/x86/x86inc.asm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 2a13ca957e..acda0e0b4e 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -788,25 +788,25 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, %assign cpuflags_sse (1<<4) | cpuflags_mmx2 %assign cpuflags_sse2 (1<<5) | cpuflags_sse %assign cpuflags_sse2slow (1<<6) | cpuflags_sse2 -%assign cpuflags_sse3 (1<<7) | cpuflags_sse2 -%assign cpuflags_ssse3 (1<<8) | cpuflags_sse3 -%assign cpuflags_sse4 (1<<9) | cpuflags_ssse3 -%assign cpuflags_sse42 (1<<10)| cpuflags_sse4 -%assign cpuflags_avx (1<<11)| cpuflags_sse42 -%assign cpuflags_xop (1<<12)| cpuflags_avx -%assign cpuflags_fma4 (1<<13)| cpuflags_avx -%assign cpuflags_fma3 (1<<14)| cpuflags_avx -%assign cpuflags_avx2 (1<<15)| cpuflags_fma3 - -%assign cpuflags_cache32 (1<<16) -%assign cpuflags_cache64 (1<<17) -%assign cpuflags_slowctz (1<<18) -%assign cpuflags_lzcnt (1<<19) -%assign cpuflags_aligned (1<<20) ; not a cpu feature, but a function variant -%assign cpuflags_atom (1<<21) -%assign cpuflags_bmi1 (1<<22)|cpuflags_lzcnt -%assign cpuflags_bmi2 (1<<23)|cpuflags_bmi1 -%assign cpuflags_aesni (1<<24)|cpuflags_sse42 +%assign cpuflags_lzcnt (1<<7) | cpuflags_sse2 +%assign cpuflags_sse3 (1<<8) | cpuflags_sse2 +%assign cpuflags_ssse3 (1<<9) | cpuflags_sse3 +%assign cpuflags_sse4 (1<<10)| cpuflags_ssse3 +%assign cpuflags_sse42 (1<<11)| cpuflags_sse4 +%assign cpuflags_avx (1<<12)| cpuflags_sse42 +%assign cpuflags_xop (1<<13)| cpuflags_avx +%assign cpuflags_fma4 (1<<14)| cpuflags_avx +%assign cpuflags_fma3 (1<<15)| cpuflags_avx +%assign cpuflags_bmi1 (1<<16)| cpuflags_avx|cpuflags_lzcnt +%assign cpuflags_bmi2 (1<<17)| cpuflags_bmi1 +%assign cpuflags_avx2 (1<<18)| cpuflags_fma3|cpuflags_bmi2 + +%assign cpuflags_cache32 (1<<19) +%assign cpuflags_cache64 (1<<20) +%assign cpuflags_slowctz (1<<21) +%assign cpuflags_aligned (1<<22) ; not a cpu feature, but a function variant +%assign cpuflags_atom (1<<23) +%assign cpuflags_aesni (1<<24)| cpuflags_sse42 ; Returns a boolean value expressing whether or not the specified cpuflag is enabled. %define cpuflag(x) (((((cpuflags & (cpuflags_ %+ x)) ^ (cpuflags_ %+ x)) - 1) >> 31) & 1)