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 6c307098ddcce1bcc3178031dd4ab33cc7bb902e..c8309ce11248687e5ff746d574bda8d238946a6f 100644 (file)
--- 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 2be1d39fd06b62b773d917a8770df397fc82d845..54a2bc7eafdee0e07c25f4888873a2eb44228a3b 100644 (file)
--- 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 689aa6e934f9692f08dfef432cc4e9904208eecb..85efeabb1ce9ca3e31f01deba979f8959ba55550 100644 (file)
--- 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 5e6bb643c8077896f00109c95d8865ed5be8a56f..f254524cb301c194d649d87048a233976affaef0 100644 (file)
--- 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 3b00f87d72f9783c835e0e82ebe9acd93a4c1fd6..6e067d26e836437e6e09167e0054d1fe8abd4f61 100644 (file)
--- 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 eb6b93ba90ef771f500aab70cbe5bef8d3cd35a5..53bf8e2dfe5227fa1c64bf82ce705048e74d75a5 100644 (file)
--- 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 bc8c37c7000d5c403a16aa33d167a19e2a6daae9..1ff6e694aa9f9234bb26d514b2b57d2dce3e7bb7 100644 (file)
--- 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 935d7c00c488313e83db566c194840386c071ebc..eaa9a2d7db90dcd4a9945f39b295363707261e0a 100644 (file)
--- 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 c52122c43d702efe75f5e4f59b4d01deeabfd305..2fb947919a23ebe14e1f91f3445cf0c47493dc98 100644 (file)
--- 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 1b52082ed032817d1cf132312b6834f1c25e6b33..c689023a645dbffdf053e93c95bb9f0973020480 100644 (file)
--- 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 dc531195d9e369736d6b2e125d786b3ae1578603..2ed85083fe7469e8b6269725170790b44c389063 100644 (file)
--- 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 8330a4a6df804c74ae3e2fd871fda372c2d75e7c..81881d8e82800ad086825d298e7847cd5300f27c 100644 (file)
--- 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; \
         } \