* [FFmpeg-devel] [PATCH 2/2] libswscale: Test AV_CPU_FLAG_SLOW_GATHER for hscale functions.
@ 2021-12-20 13:57 Alan Kelly
2021-12-20 14:21 ` James Almer
0 siblings, 1 reply; 3+ messages in thread
From: Alan Kelly @ 2021-12-20 13:57 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Alan Kelly
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) {
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)) {
--
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".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH 2/2] libswscale: Test AV_CPU_FLAG_SLOW_GATHER for hscale functions.
2021-12-20 13:57 [FFmpeg-devel] [PATCH 2/2] libswscale: Test AV_CPU_FLAG_SLOW_GATHER for hscale functions Alan Kelly
@ 2021-12-20 14:21 ` James Almer
2021-12-20 14:45 ` Alan Kelly
0 siblings, 1 reply; 3+ messages in thread
From: James Almer @ 2021-12-20 14:21 UTC (permalink / raw)
To: ffmpeg-devel
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".
^ permalink raw reply [flat|nested] 3+ messages in thread* [FFmpeg-devel] [PATCH 2/2] libswscale: Test AV_CPU_FLAG_SLOW_GATHER for hscale functions.
2021-12-20 14:21 ` James Almer
@ 2021-12-20 14:45 ` Alan Kelly
0 siblings, 0 replies; 3+ messages in thread
From: Alan Kelly @ 2021-12-20 14:45 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Alan Kelly
This is instead of EXTERNAL_AVX2_FAST so that the avx2 hscale functions
are only used where they are faster.
---
Whoops! Corrects check so that this flag is only enabled where fast
avx2 and fast gathers are available.
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..7158384f0b 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 (EXTERNAL_AVX2_FAST(cpu_flags) && !(cpu_flags & AV_CPU_FLAG_SLOW_GATHER)) {
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..ffc7691c12 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 (EXTERNAL_AVX2_FAST(cpu_flags) && !(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..3c0a083b42 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_AVX2) && !(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)) {
--
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-20 14:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-20 13:57 [FFmpeg-devel] [PATCH 2/2] libswscale: Test AV_CPU_FLAG_SLOW_GATHER for hscale functions Alan Kelly
2021-12-20 14:21 ` James Almer
2021-12-20 14:45 ` Alan Kelly
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git