From patchwork Mon Dec 20 14:59:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Kelly X-Patchwork-Id: 32758 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4440131iog; Mon, 20 Dec 2021 06:59:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJyagodx5q9Ps8ZQIziDWstgcmsXiu3z/H+6D7EK0KB0kXpRwrhmjlc00ZsjOsrvaCnA9Nty X-Received: by 2002:a05:6402:490:: with SMTP id k16mr15980086edv.99.1640012361511; Mon, 20 Dec 2021 06:59:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640012361; cv=none; d=google.com; s=arc-20160816; b=Wvv6Py2dzqTgjdbxsbmO8oGCqIk9geiuObj9TMVgDR7cg76BTVfe90o6BykkalU1iO v1fPPc0s+QcUIdm5uyTq/FhTFSCNeR34bwWPWXLaRbMmQfPR1W2niZUDzDj2KlvJZU0Z wyRIamxW7ZwPIsgG8pBQF1bzLOLAvrxmPzzzwRh8Slox49aqTQaGyOBhsRAa1NN6/fNX 4QzeQLug7y4PAIyUGswwf7N7TTiZFmqjpoHILANl1a6/bwMUUiEy2qvUdLNCVjsvUIv7 DNN5rKUgG38hSJBJzQjrCaZipuaERemyeGJUoGCPwu5RUnMSiRxAf9U23mkQSO1nFQ12 zFhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:from:references:mime-version :message-id:in-reply-to:date:dkim-signature:delivered-to; bh=w726TzrudIAgNTJpyeN10FmqH61guuk0de7OGOzChOo=; b=D/IZiw4+dmDTX+2OdZfSUmLv4JzbZpVRbxkiU1NVYvyv8fflP0Vb2p0kxdnrFmvsp3 hDC2tXexwmK9JaazG7IikcMxU7bE4AeIwRWQHUQBn3OQaguzM0PoY2W3LdNbX8Tim60R kMhhB18m8DvlN420ZLNNj2yujpdfhj+Fh9J5iV2aw84Ccl5Yk7jfK7AD9tqXFkPnHv2e EVHamF5cok7Il6xWzuzxq7FqFwDKYdf+/3fLeAp/w2ozfMiV1ibUT/inckl1MMaNeI+X JJz87YOKL065lYh99z5epFaS/8XWt5FBM3qK2Q+eh5AvxnSpfPjzVCABSTUcxlcV8OBO 7khw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=qD+6BZoj; 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 c18si5237226edv.163.2021.12.20.06.59.17; Mon, 20 Dec 2021 06:59:21 -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=@google.com header.s=20210112 header.b=qD+6BZoj; 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 7702568AE9B; Mon, 20 Dec 2021 16:59:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F67F680BA5 for ; Mon, 20 Dec 2021 16:59:08 +0200 (EET) Received: by mail-wr1-f73.google.com with SMTP id d6-20020adfa346000000b001a262748c6fso2884049wrb.12 for ; Mon, 20 Dec 2021 06:59:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=IJAkdyr9Rv9vBlCFNAguF/ed4/ueO+PQqp8XSCGQrZA=; b=qD+6BZoj0Y5APqHJvrXphsbAt2O6FM1T6ka6bWhW/whRYJGbmdQC3JjDXFjnVN0fkP Wz2EXRZdi2SIIeTdWghFMqT5Xt5JfNxadQUO9p490RXi03WgXm2H72/d0sbITRDw0JMf IaUQsIo36A6j8rWzhRbri2Dby5pAWeqp4KAP8sszPaIHeeJz7jYDRwGfqgy5Oeirp/x8 WHrLhdEZ3UhmzMvvGxFGEzu8iq6jNsVOMB3n77QE5rvdoPssRw4oQiYZNJu1aOhw/8NQ /+5/kalxg1xYhexRgP4O2pnc5UqGEqFieTck2RAvwTLhzKkLXMyRtSE8NDS3vT/80kJs Grww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=IJAkdyr9Rv9vBlCFNAguF/ed4/ueO+PQqp8XSCGQrZA=; b=FWjnTQ9Hfw1d5E+U5W0dkS2Px0auxp1Swk1tD0EvPbsdADoQzJlbA/sSNyH6xy44Nh EHbYv4BRw81IZ9ZaOLspeJ1kU8aIC/NGWIaHMawl2Cu0dYcIUW4IiepQDHBiADQe5R/D ozCPmuD8e6FUsPGNDsclgdhqEwUv6BgIOITuD3r7D9/Ufjlb7R7dLHDiZuvfZZVPMl3H UERGbD3Z6hjWIetKSfyOWRYvlGcWE8s9mOeZ1+KWYmIzNuBrCNaFMuaJrfYTNDSlRqHF S1dLl9ShTYDoaiB8+JcjaN473V+Lh6tF8m9QXmqTWmHTXDOvEZKs1SLMkhq7ZJjVcTmg B9Lw== X-Gm-Message-State: AOAM532NkAQswGXrC45bJQOPPJCuFRugZgJznWaq8YG2CBDeMqLUs5+p y7NO0X3XSAjJ5Yq8xTpGOZOx18Y3dz9AlwnwsGVRx2nFmYeN94zyN+eiqUU+XsLJj47qnvEtjym hLSsDrJDqanBrQrgfmHkPPwY+Kifi3SsxqxBQ5Jptu7RMlUwyDiZ9WL37ddsxxZAgv9Yg/tM= X-Received: from alankelly0.zrh.corp.google.com ([2a00:79e0:61:301:922d:7ddd:85f5:5a25]) (user=alankelly job=sendgmr) by 2002:a1c:c915:: with SMTP id f21mr14315993wmb.39.1640012347545; Mon, 20 Dec 2021 06:59:07 -0800 (PST) Date: Mon, 20 Dec 2021 15:59:03 +0100 In-Reply-To: Message-Id: <20211220145903.838398-1-alankelly@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.34.1.173.g76aa8bc2d0-goog From: Alan Kelly To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/2] libavutil/cpu: Add AV_CPU_FLAG_SLOW_GATHER. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Alan Kelly Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0eO99NfpeJQO This flag is set on Haswell and earlier and all AMD cpus. --- Sets this flag on Zen 3 and earlier. libavutil/cpu.h | 1 + libavutil/x86/cpu.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libavutil/cpu.h b/libavutil/cpu.h index ae443eccad..ce9bf14bf7 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -54,6 +54,7 @@ #define AV_CPU_FLAG_BMI1 0x20000 ///< Bit Manipulation Instruction Set 1 #define AV_CPU_FLAG_BMI2 0x40000 ///< Bit Manipulation Instruction Set 2 #define AV_CPU_FLAG_AVX512 0x100000 ///< AVX-512 functions: requires OS support even if YMM/ZMM registers aren't used +#define AV_CPU_FLAG_SLOW_GATHER 0x2000000 ///< CPU has slow gathers. #define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard #define AV_CPU_FLAG_VSX 0x0002 ///< ISA 2.06 diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index bcd41a50a2..11467ba99d 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -146,8 +146,16 @@ int ff_get_cpu_flags_x86(void) if (max_std_level >= 7) { cpuid(7, eax, ebx, ecx, edx); #if HAVE_AVX2 - if ((rval & AV_CPU_FLAG_AVX) && (ebx & 0x00000020)) + if ((rval & AV_CPU_FLAG_AVX) && (ebx & 0x00000020)) { rval |= AV_CPU_FLAG_AVX2; + cpuid(1, eax, ebx, ecx, std_caps); + family = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff); + model = ((eax >> 4) & 0xf) + ((eax >> 12) & 0xf0); + /* Haswell has slow gather */ + if(family == 6 && model < 70) + rval |= AV_CPU_FLAG_SLOW_GATHER; + } + #if HAVE_AVX512 /* F, CD, BW, DQ, VL */ if ((xcr0_lo & 0xe0) == 0xe0) { /* OPMASK/ZMM state */ if ((rval & AV_CPU_FLAG_AVX2) && (ebx & 0xd0030000) == 0xd0030000) @@ -196,6 +204,10 @@ int ff_get_cpu_flags_x86(void) used unless explicitly disabled by checking AV_CPU_FLAG_AVXSLOW. */ if ((family == 0x15 || family == 0x16) && (rval & AV_CPU_FLAG_AVX)) rval |= AV_CPU_FLAG_AVXSLOW; + + /* Zen 3 and earlier have slow gather */ + if((rval & AV_CPU_FLAG_AVX2) & family <= 25) + rval |= AV_CPU_FLAG_SLOW_GATHER; } /* XOP and FMA4 use the AVX instruction coding scheme, so they can't be