From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D16E940347 for ; Mon, 20 Dec 2021 14:43:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C52468AE77; Mon, 20 Dec 2021 16:43:23 +0200 (EET) Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1515668AB71 for ; Mon, 20 Dec 2021 16:43:17 +0200 (EET) Received: by mail-wm1-f74.google.com with SMTP id 85-20020a1c0158000000b003459d5d4867so1503721wmb.0 for ; Mon, 20 Dec 2021 06:43:17 -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=/Xq0HeS19EhUXMYpsSjK5RVWupaND+ZvALr+xEDlhNY=; b=SClSBDsaZexZM4vaZ26AAJKwiV/fWtB7jgxvM8tMm5INVa/z/My71Mx9zZpeDi7qsC rFi5q7j57Lxf0AkN6gs6gfPpFjx3vSECQzyzP48HDm9Y/IK9qp7Jl/aQGb7v9osSzquN vU6iGIwDQ7CW6kM/H8beeUWXLP2I7fHttyxmiMi0WMy0E7J4b6N69sWO5mHt9KIzX2TP HgNsXSN/SMzZce1C53ciGd8jRNunN9r21w4j5X0wiPMRZryufG9JAPyC/rhwSlGOg6om qgR9Bmv+d0eoAClUgM4RTpv+1cdiPnAt2qv7h5XISLUcvBS0NYn3oQ+4QpP+TKHKqXJF LpWA== 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=/Xq0HeS19EhUXMYpsSjK5RVWupaND+ZvALr+xEDlhNY=; b=Zkp/HGwNDMw6FYil4h2u6nX9S7wbsjIqaW08rxfYbiYANgXZvJNY/DzF+2mOgouw8+ CxL928Scfxk185Az0h5PLOCzocqhubNQVIIE3TT2BqNEUWC79YSjrR9M+0eFDAgU1Nm2 EIwW3mfl+zcNUbPVrCzmI0ychKpS5vKCOKqmwZb+/52xa81fAGLlIMgfcLxYoA8KhxWT dAl9TMb4+Ojv0eVGYM/ot/lROaFNYcEQZ5qE+0o2lYzwgn/MqIwIeO8WEJ1ujza9hr4I VeeFu355KYrI/VTJyIWhWDGdp88hw/0nOs6X12f6Vcz2u3QMqUSUOWUOJ3jrWrXnmpwr KYmw== X-Gm-Message-State: AOAM530hFHHb/FPE/JMLIeV75/GGliHSFszY6adKan6vENNbtUjV4Da/ aRSeGThugYwHwyvJQVng3MQFGU+FNFGkXS/E25etA8Bgw7KFjRysAjB5MTX6tRdSF37srvoNtwD g8SBH+pltWuekXmZd7gXXEdByMf9UM1WrKcObp55JUp3Q4EgzQAFZ67CGrXRe+xgVK/ubk0A= X-Google-Smtp-Source: ABdhPJxTV7LlRvdugQxV4naJA/DfaW6MDiI2E9vAtJyy7Th+6djV44iNRWh9i7QZy3xVtuVj6mxjtim4oC88bZ4= X-Received: from alankelly0.zrh.corp.google.com ([2a00:79e0:61:301:922d:7ddd:85f5:5a25]) (user=alankelly job=sendgmr) by 2002:a7b:c219:: with SMTP id x25mr10223wmi.1.1640011396131; Mon, 20 Dec 2021 06:43:16 -0800 (PST) Date: Mon, 20 Dec 2021 15:43:12 +0100 In-Reply-To: <8424d6a1-df63-954e-6823-740bf1fcb891@gmail.com> Message-Id: <20211220144312.738559-1-alankelly@google.com> Mime-Version: 1.0 References: <8424d6a1-df63-954e-6823-740bf1fcb891@gmail.com> 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This flag is set on Haswell and earlier and all AMD cpus. --- Removes unnecessary indentation, clarifies comment and only sets flag on AMD cpus with AVX2. 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..563984f234 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; + + /* AMD cpus have slow gather */ + if(rval & AV_CPU_FLAG_AVX2) + rval |= AV_CPU_FLAG_SLOW_GATHER; } /* XOP and FMA4 use the AVX instruction coding scheme, so they can't be -- 2.34.1.173.g76aa8bc2d0-goog _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".