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 A9EDE4032D for ; Mon, 20 Dec 2021 14:22:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 836C268AF05; Mon, 20 Dec 2021 16:22:02 +0200 (EET) Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B16BB68AEEA for ; Mon, 20 Dec 2021 16:21:56 +0200 (EET) Received: by mail-qk1-f180.google.com with SMTP id l25so9442139qkl.5 for ; Mon, 20 Dec 2021 06:21:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=o69C1RI/elQ1sFMWyWe/bho8Swv6jKPVptjU0xzRAzY=; b=mF0Bh9idHWLcN4b69cajlTYHSBqiynxMmlgtFpcfPgiqNOQ3ND24gBGL3ih4Qsx+Ps vshekUJCcOAE5rOSNbbV7bUdFtgINQh+yLNcU43WglXilWQ6U8CeT/9xl96RpUvU+7U+ c5h3S+m7B+tpx+j7+w3EyN8IT0DpQNQjJ8goNXZmcDdlU9VjrGOExLaavpAdT8mBeGf2 Pi9FQqqn8ysqSKLfFzIXcyFyO8YcYIXvD+ApxkkCF8UEnYasULvrr6Gsu8vjvpNet0lH HNVCi2HIg/qi9nTFIYY7YL0rMToEb2Gmb9D5dTVbTM76aVKzi7lQlrkgbvUaNAkVMZlQ cRWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=o69C1RI/elQ1sFMWyWe/bho8Swv6jKPVptjU0xzRAzY=; b=ZoEPl+dFgkb8LzHsCQSce+rEw88BvAc9+OR1xKr7aT3v1y2rjMCq6PL3F872CVUHKc j2Tvb+74QrBr2K3jK09uJC4Ssyaz+dmknDji56otwx4Pp6CFdDQrxZeMRnBFeEg0/xyo 0eP88BpmnwmYJVpQKToNIlzDyx3DriMeZbl4U32WhaRhV2uetnPtj76CGm0Kt2zfZ4XY pH9nfdKQDp8V140UTRxOgQ6XiOdXH8z/GIgHGH6pvQuQDK3tgbFcH/x9VBkgM/mcnM/5 xo7FlgMzMN2dOgPtxjYzCmVWkaEzmNHKo1fGTumX9wHZo+RAYr3NUA74lLgbaZZoURYm dyUg== X-Gm-Message-State: AOAM532riHwR64XHk7vJJwxycQ/jVVBsBWHIxBlMJXdh+iFgM/q0vcpc tpzo2x+LpaCzx3Ww66bFJpIXJoXHqWXH0Q== X-Google-Smtp-Source: ABdhPJzVO+Xv7nQYAscrll4SqOa7RrExSY/AIaj4VbLG9tF5nm4LzgrNi0iDj+kK8Iphbu4gTKDH+w== X-Received: by 2002:a05:620a:2441:: with SMTP id h1mr7697077qkn.618.1640010115153; Mon, 20 Dec 2021 06:21:55 -0800 (PST) Received: from [192.168.0.13] ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id o4sm11081861qkh.107.2021.12.20.06.21.53 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Dec 2021 06:21:54 -0800 (PST) Message-ID: <166a93ba-7f15-f473-5889-1a0a879a75a4@gmail.com> Date: Mon, 20 Dec 2021 11:21:52 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20211220135700.615644-1-alankelly@google.com> From: James Almer In-Reply-To: <20211220135700.615644-1-alankelly@google.com> Subject: Re: [FFmpeg-devel] [PATCH 2/2] libswscale: Test AV_CPU_FLAG_SLOW_GATHER for hscale functions. 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 12/20/2021 10:57 AM, Alan Kelly wrote: > This is instead of EXTERNAL_AVX2_FAST so that the avx2 hscale functions > are only used where they are faster. > --- > libswscale/utils.c | 2 +- > libswscale/x86/swscale.c | 2 +- > tests/checkasm/sw_scale.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libswscale/utils.c b/libswscale/utils.c > index d4a72d3ce1..9a69b45afe 100644 > --- a/libswscale/utils.c > +++ b/libswscale/utils.c > @@ -282,7 +282,7 @@ void ff_shuffle_filter_coefficients(SwsContext *c, int *filterPos, int filterSiz > #if ARCH_X86_64 > int i, j, k, l; > int cpu_flags = av_get_cpu_flags(); > - if (EXTERNAL_AVX2_FAST(cpu_flags)){ > + if (cpu_flags & AV_CPU_FLAG_SLOW_GATHER) { The other way around. Like this you're enabling these functions only on CPUs with slow gather. The check needs to be if (EXTERNAL_AVX2_FAST(cpu_flags) && !(cpu_flags & AV_CPU_FLAG_SLOW_GATHER)) To ensure it's run on AVX2 enabled CPUs with both fast 256bits ops and fast gather. Same below. > if ((c->srcBpc == 8) && (c->dstBpc <= 14)){ > if (dstW % 16 == 0){ > if (filter != NULL){ > diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c > index c49a05c37b..eb5334a2be 100644 > --- a/libswscale/x86/swscale.c > +++ b/libswscale/x86/swscale.c > @@ -578,7 +578,7 @@ switch(c->dstBpc){ \ > break; \ > } > > - if (EXTERNAL_AVX2_FAST(cpu_flags)) { > + if (cpu_flags & AV_CPU_FLAG_SLOW_GATHER) { > if ((c->srcBpc == 8) && (c->dstBpc <= 14)) { > if (c->chrDstW % 16 == 0) > ASSIGN_AVX2_SCALE_FUNC(c->hcScale, c->hChrFilterSize); > diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c > index f4912e6c2c..680562af08 100644 > --- a/tests/checkasm/sw_scale.c > +++ b/tests/checkasm/sw_scale.c > @@ -217,7 +217,7 @@ static void check_hscale(void) > } > ff_sws_init_scale(ctx); > memcpy(filterAvx2, filter, sizeof(uint16_t) * (SRC_PIXELS * MAX_FILTER_WIDTH + MAX_FILTER_WIDTH)); > - if (cpu_flags & AV_CPU_FLAG_AVX2) > + if (cpu_flags & AV_CPU_FLAG_SLOW_GATHER) > ff_shuffle_filter_coefficients(ctx, filterPosAvx, width, filterAvx2, SRC_PIXELS); > > if (check_func(ctx->hcScale, "hscale_%d_to_%d_width%d", ctx->srcBpc, ctx->dstBpc + 1, width)) { _______________________________________________ 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".