diff options
| author | Sebastian Ramacher <sramacher@debian.org> | 2024-12-29 12:50:37 +0000 |
|---|---|---|
| committer | Sebastian Ramacher <sramacher@debian.org> | 2024-12-29 12:50:37 +0000 |
| commit | 873c687c09e0a1a78a8f3601d31330ad1897e484 (patch) | |
| tree | ff2fa2e2d27b55c002a6d46d50aab2c66e0bf21a /src/dsp/convolve_test.cc | |
| parent | 395b1f6877fbc2666383f3428f17400c35aa52a4 (diff) | |
| parent | b9ae809f200982119d16ec9613f3db95eca923b9 (diff) | |
| download | libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.tar.gz libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.tar.bz2 libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.zip | |
Merge branch 'master' into 'scrub-obsolete'
# Conflicts:
# debian/changelog
Diffstat (limited to 'src/dsp/convolve_test.cc')
| -rw-r--r-- | src/dsp/convolve_test.cc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/dsp/convolve_test.cc b/src/dsp/convolve_test.cc index 42cdeb7..b8c1f1d 100644 --- a/src/dsp/convolve_test.cc +++ b/src/dsp/convolve_test.cc @@ -624,13 +624,11 @@ class ConvolveTest : public testing::TestWithParam< if (absl::StartsWith(test_case, "C/")) { base_convolve_func_ = nullptr; } else if (absl::StartsWith(test_case, "SSE41/")) { - if ((GetCpuInfo() & kSSE4_1) != 0) { - ConvolveInit_SSE4_1(); - } + if ((GetCpuInfo() & kSSE4_1) == 0) GTEST_SKIP() << "No SSE4.1 support!"; + ConvolveInit_SSE4_1(); } else if (absl::StartsWith(test_case, "AVX2/")) { - if ((GetCpuInfo() & kAVX2) != 0) { - ConvolveInit_AVX2(); - } + if ((GetCpuInfo() & kAVX2) == 0) GTEST_SKIP() << "No AVX2 support!"; + ConvolveInit_AVX2(); } else if (absl::StartsWith(test_case, "NEON/")) { ConvolveInit_NEON(); #if LIBGAV1_MAX_BITDEPTH >= 10 @@ -1084,13 +1082,11 @@ class ConvolveScaleTest if (absl::StartsWith(test_case, "C/")) { base_convolve_scale_func_ = nullptr; } else if (absl::StartsWith(test_case, "SSE41/")) { - if ((GetCpuInfo() & kSSE4_1) != 0) { - ConvolveInit_SSE4_1(); - } + if ((GetCpuInfo() & kSSE4_1) == 0) GTEST_SKIP() << "No SSE4.1 support!"; + ConvolveInit_SSE4_1(); } else if (absl::StartsWith(test_case, "AVX2/")) { - if ((GetCpuInfo() & kAVX2) != 0) { - ConvolveInit_AVX2(); - } + if ((GetCpuInfo() & kAVX2) == 0) GTEST_SKIP() << "No AVX2 support!"; + ConvolveInit_AVX2(); } else if (absl::StartsWith(test_case, "NEON/")) { ConvolveInit_NEON(); #if LIBGAV1_MAX_BITDEPTH >= 10 |