diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/benchmarks/benchmark_compare256.cc | 10 | ||||
| -rw-r--r-- | test/benchmarks/benchmark_compare256_rle.cc | 10 | ||||
| -rw-r--r-- | test/test_compare256.cc | 11 | ||||
| -rw-r--r-- | test/test_compare256_rle.cc | 10 |
4 files changed, 21 insertions, 20 deletions
diff --git a/test/benchmarks/benchmark_compare256.cc b/test/benchmarks/benchmark_compare256.cc index efdbbacc9f..a9aa0fca65 100644 --- a/test/benchmarks/benchmark_compare256.cc +++ b/test/benchmarks/benchmark_compare256.cc @@ -66,14 +66,14 @@ BENCHMARK_COMPARE256(c, compare256_c, 1); BENCHMARK_COMPARE256(native, native_compare256, 1); #else -#if defined(UNALIGNED_OK) && BYTE_ORDER == LITTLE_ENDIAN +#if BYTE_ORDER == LITTLE_ENDIAN && OPTIMAL_CMP >= 32 BENCHMARK_COMPARE256(unaligned_16, compare256_unaligned_16, 1); -#ifdef HAVE_BUILTIN_CTZ +# if defined(HAVE_BUILTIN_CTZ) BENCHMARK_COMPARE256(unaligned_32, compare256_unaligned_32, 1); -#endif -#if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL) +# endif +# if defined(HAVE_BUILTIN_CTZLL) && OPTIMAL_CMP >= 64 BENCHMARK_COMPARE256(unaligned_64, compare256_unaligned_64, 1); -#endif +# endif #endif #if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ) BENCHMARK_COMPARE256(sse2, compare256_sse2, test_cpu_features.x86.has_sse2); diff --git a/test/benchmarks/benchmark_compare256_rle.cc b/test/benchmarks/benchmark_compare256_rle.cc index 3b1eced453..9eb299f3b4 100644 --- a/test/benchmarks/benchmark_compare256_rle.cc +++ b/test/benchmarks/benchmark_compare256_rle.cc @@ -61,12 +61,12 @@ public: BENCHMARK_COMPARE256_RLE(c, compare256_rle_c, 1); -#ifdef UNALIGNED_OK +#if BYTE_ORDER == LITTLE_ENDIAN && OPTIMAL_CMP >= 32 BENCHMARK_COMPARE256_RLE(unaligned_16, compare256_rle_unaligned_16, 1); -#ifdef HAVE_BUILTIN_CTZ +# if defined(HAVE_BUILTIN_CTZ) BENCHMARK_COMPARE256_RLE(unaligned_32, compare256_rle_unaligned_32, 1); -#endif -#if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL) +# endif +# if defined(HAVE_BUILTIN_CTZLL) && OPTIMAL_CMP >= 64 BENCHMARK_COMPARE256_RLE(unaligned_64, compare256_rle_unaligned_64, 1); -#endif +# endif #endif diff --git a/test/test_compare256.cc b/test/test_compare256.cc index e1662cdf04..97e2847037 100644 --- a/test/test_compare256.cc +++ b/test/test_compare256.cc @@ -65,15 +65,16 @@ TEST_COMPARE256(c, compare256_c, 1) TEST_COMPARE256(native, native_compare256, 1) #else -#if defined(UNALIGNED_OK) && BYTE_ORDER == LITTLE_ENDIAN +#if BYTE_ORDER == LITTLE_ENDIAN && OPTIMAL_CMP >= 32 TEST_COMPARE256(unaligned_16, compare256_unaligned_16, 1) -#ifdef HAVE_BUILTIN_CTZ +# if defined(HAVE_BUILTIN_CTZ) TEST_COMPARE256(unaligned_32, compare256_unaligned_32, 1) -#endif -#if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL) +# endif +# if defined(HAVE_BUILTIN_CTZLL) && OPTIMAL_CMP >= 64 TEST_COMPARE256(unaligned_64, compare256_unaligned_64, 1) +# endif #endif -#endif + #if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ) TEST_COMPARE256(sse2, compare256_sse2, test_cpu_features.x86.has_sse2) #endif diff --git a/test/test_compare256_rle.cc b/test/test_compare256_rle.cc index 5333ce7689..6c5d9d4f8f 100644 --- a/test/test_compare256_rle.cc +++ b/test/test_compare256_rle.cc @@ -52,12 +52,12 @@ static inline void compare256_rle_match_check(compare256_rle_func compare256_rle TEST_COMPARE256_RLE(c, compare256_rle_c, 1) -#ifdef UNALIGNED_OK +#if BYTE_ORDER == LITTLE_ENDIAN && OPTIMAL_CMP >= 32 TEST_COMPARE256_RLE(unaligned_16, compare256_rle_unaligned_16, 1) -#ifdef HAVE_BUILTIN_CTZ +# if defined(HAVE_BUILTIN_CTZ) TEST_COMPARE256_RLE(unaligned_32, compare256_rle_unaligned_32, 1) -#endif -#if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL) +# endif +# if defined(HAVE_BUILTIN_CTZLL) && OPTIMAL_CMP >= 64 TEST_COMPARE256_RLE(unaligned_64, compare256_rle_unaligned_64, 1) -#endif +# endif #endif |