From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Wed, 3 Dec 2025 05:23:20 +0000 (-0800)
Subject: Wrap support_flag for cpu features in benchmark and test macros.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5e20300e30ac57e9590d95a24ef7b6331db8ceb;p=thirdparty%2Fzlib-ng.git

Wrap support_flag for cpu features in benchmark and test macros.
---

diff --git a/test/benchmarks/benchmark_adler32.cc b/test/benchmarks/benchmark_adler32.cc
index 6c307098d..c8309ce11 100644
--- a/test/benchmarks/benchmark_adler32.cc
+++ b/test/benchmarks/benchmark_adler32.cc
@@ -56,7 +56,7 @@ public:
 
 #define BENCHMARK_ADLER32(name, fptr, support_flag) \
     BENCHMARK_DEFINE_F(adler32, name)(benchmark::State& state) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             state.SkipWithError("CPU does not support " #name); \
         } \
         Bench(state, fptr); \
diff --git a/test/benchmarks/benchmark_adler32_copy.cc b/test/benchmarks/benchmark_adler32_copy.cc
index 2be1d39fd..54a2bc7ea 100644
--- a/test/benchmarks/benchmark_adler32_copy.cc
+++ b/test/benchmarks/benchmark_adler32_copy.cc
@@ -64,7 +64,7 @@ public:
 
 #define BENCHMARK_ADLER32_COPY(name, fptr, support_flag) \
     BENCHMARK_DEFINE_F(adler32_copy, name)(benchmark::State& state) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             state.SkipWithError("CPU does not support " #name); \
         } \
         Bench(state, fptr); \
@@ -73,7 +73,7 @@ public:
 
 #define BENCHMARK_ADLER32_BASELINE_COPY(name, fptr, support_flag) \
     BENCHMARK_DEFINE_F(adler32_copy, name)(benchmark::State& state) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             state.SkipWithError("CPU does not support " #name); \
         } \
         Bench(state, [](uint32_t init_sum, unsigned char *dst, \
diff --git a/test/benchmarks/benchmark_compare256.cc b/test/benchmarks/benchmark_compare256.cc
index 689aa6e93..85efeabb1 100644
--- a/test/benchmarks/benchmark_compare256.cc
+++ b/test/benchmarks/benchmark_compare256.cc
@@ -54,7 +54,7 @@ public:
 
 #define BENCHMARK_COMPARE256(name, fptr, support_flag) \
     BENCHMARK_DEFINE_F(compare256, name)(benchmark::State& state) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             state.SkipWithError("CPU does not support " #name); \
         } \
         Bench(state, fptr); \
diff --git a/test/benchmarks/benchmark_compare256_rle.cc b/test/benchmarks/benchmark_compare256_rle.cc
index 5e6bb643c..f254524cb 100644
--- a/test/benchmarks/benchmark_compare256_rle.cc
+++ b/test/benchmarks/benchmark_compare256_rle.cc
@@ -52,7 +52,7 @@ public:
 
 #define BENCHMARK_COMPARE256_RLE(name, fptr, support_flag) \
     BENCHMARK_DEFINE_F(compare256_rle, name)(benchmark::State& state) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             state.SkipWithError("CPU does not support " #name); \
         } \
         Bench(state, fptr); \
diff --git a/test/benchmarks/benchmark_crc32.cc b/test/benchmarks/benchmark_crc32.cc
index 3b00f87d7..6e067d26e 100644
--- a/test/benchmarks/benchmark_crc32.cc
+++ b/test/benchmarks/benchmark_crc32.cc
@@ -49,7 +49,7 @@ public:
 
 #define BENCHMARK_CRC32(name, fptr, support_flag) \
     BENCHMARK_DEFINE_F(crc32, name)(benchmark::State& state) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             state.SkipWithError("CPU does not support " #name); \
         } \
         Bench(state, fptr); \
diff --git a/test/benchmarks/benchmark_crc32_fold_copy.cc b/test/benchmarks/benchmark_crc32_fold_copy.cc
index eb6b93ba9..53bf8e2df 100644
--- a/test/benchmarks/benchmark_crc32_fold_copy.cc
+++ b/test/benchmarks/benchmark_crc32_fold_copy.cc
@@ -88,7 +88,7 @@ public:
 
 #define BENCHMARK_CRC32_FOLD(name, resfunc, copyfunc, finfunc, support_flag) \
     BENCHMARK_DEFINE_F(crc32_fc, name)(benchmark::State& state) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             state.SkipWithError("CPU does not support " #name); \
         } \
         Bench(state, resfunc, copyfunc, finfunc); \
diff --git a/test/benchmarks/benchmark_insert_string.cc b/test/benchmarks/benchmark_insert_string.cc
index bc8c37c70..1ff6e694a 100644
--- a/test/benchmarks/benchmark_insert_string.cc
+++ b/test/benchmarks/benchmark_insert_string.cc
@@ -94,7 +94,7 @@ public:
 
 #define BENCHMARK_INSERT_STRING(name, fptr, support_flag) \
     BENCHMARK_DEFINE_F(insert_string_bench, name)(benchmark::State& state) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             state.SkipWithError("Function " #name " not supported"); \
         } \
         Bench(state, fptr); \
@@ -149,7 +149,7 @@ public:
 
 #define BENCHMARK_QUICK_INSERT_STRING(name, fptr, support_flag) \
     BENCHMARK_DEFINE_F(quick_insert_string_bench, name)(benchmark::State& state) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             state.SkipWithError("Function " #name " not supported"); \
         } \
         Bench(state, fptr); \
diff --git a/test/benchmarks/benchmark_slidehash.cc b/test/benchmarks/benchmark_slidehash.cc
index 935d7c00c..eaa9a2d7d 100644
--- a/test/benchmarks/benchmark_slidehash.cc
+++ b/test/benchmarks/benchmark_slidehash.cc
@@ -70,7 +70,7 @@ public:
 
 #define BENCHMARK_SLIDEHASH(name, fptr, support_flag) \
     BENCHMARK_DEFINE_F(slide_hash, name)(benchmark::State& state) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             state.SkipWithError("CPU does not support " #name); \
         } \
         Bench(state, fptr); \
diff --git a/test/test_adler32.cc b/test/test_adler32.cc
index c52122c43..2fb947919 100644
--- a/test/test_adler32.cc
+++ b/test/test_adler32.cc
@@ -356,7 +356,7 @@ INSTANTIATE_TEST_SUITE_P(adler32, adler32_variant, testing::ValuesIn(tests));
 
 #define TEST_ADLER32(name, func, support_flag) \
     TEST_P(adler32_variant, name) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             GTEST_SKIP(); \
             return; \
         } \
diff --git a/test/test_compare256.cc b/test/test_compare256.cc
index 1b52082ed..c689023a6 100644
--- a/test/test_compare256.cc
+++ b/test/test_compare256.cc
@@ -53,7 +53,7 @@ static inline void compare256_match_check(compare256_func compare256) {
 
 #define TEST_COMPARE256(name, func, support_flag) \
     TEST(compare256, name) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             GTEST_SKIP(); \
             return; \
         } \
diff --git a/test/test_compare256_rle.cc b/test/test_compare256_rle.cc
index dc531195d..2ed85083f 100644
--- a/test/test_compare256_rle.cc
+++ b/test/test_compare256_rle.cc
@@ -43,7 +43,7 @@ static inline void compare256_rle_match_check(compare256_rle_func compare256_rle
 
 #define TEST_COMPARE256_RLE(name, func, support_flag) \
     TEST(compare256_rle, name) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             GTEST_SKIP(); \
             return; \
         } \
diff --git a/test/test_crc32_fold_copy.cc b/test/test_crc32_fold_copy.cc
index 8330a4a6d..81881d8e8 100644
--- a/test/test_crc32_fold_copy.cc
+++ b/test/test_crc32_fold_copy.cc
@@ -48,7 +48,7 @@ INSTANTIATE_TEST_SUITE_P(crc32_fc, crc32_fc_variant, testing::ValuesIn(crc32_tes
 
 #define TEST_CRC32_FOLD(name, minlen, onlyzero, resfunc, copyfunc, finfunc, support_flag) \
     TEST_P(crc32_fc_variant, name) { \
-        if (!support_flag) { \
+        if (!(support_flag)) { \
             GTEST_SKIP(); \
             return; \
         } \