commit 1dadbf71d9e2468dad817bcb66e0b6bd7279b980
author Marat Dukhan <maratek@google.com> Tue Oct 01 10:46:20 2019 -0700
committer XNNPACK Team <xnnpack-github-robot@google.com> Tue Oct 01 10:46:41 2019 -0700
tree 89d71950b3a0eb6920da8a317afd39b96ea7aa32
parent 629a33eef8ef2fa86764a16da85a4770f3898953

Limit direct dependencies on cpuinfo

PiperOrigin-RevId: 272245408

bench/f32-igemm.cc

diff --git a/bench/f32-igemm.cc b/bench/f32-igemm.cc
index cd87bb7..0e371a6 100644
--- a/bench/f32-igemm.cc
+++ b/bench/f32-igemm.cc
@@ -16,6 +16,7 @@
 #include "bench/conv.h"
 #include "bench/utils.h"
 #include <xnnpack/AlignedAllocator.h>
+#include <xnnpack/common.h>
 #include <xnnpack/igemm.h>
 #include <xnnpack/indirection.h>
 #include <xnnpack/operator.h>
@@ -149,7 +150,7 @@
     benchmark::Counter::kIsRate);
 }
 
-#if CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64
+#if XNN_ARCH_ARM || XNN_ARCH_ARM64
   static void f32_igemm_4x2__neon_ld64(benchmark::State& state, const char* net) {
     IGEMMBenchmark(state, xnn_f32_igemm_ukernel_4x2__neon_ld64, 4, 2, 1, 1);
   }
@@ -212,7 +213,7 @@
   BENCHMARK_CONV(f32_igemm_6x8__neonfma_ld64)
 #endif
 
-#if CPUINFO_ARCH_ARM64
+#if XNN_ARCH_ARM64
   static void f32_igemm_1x12__aarch64_neonfma_cortex_a53(benchmark::State& state, const char* net) {
     IGEMMBenchmark(state, xnn_f32_igemm_ukernel_1x12__aarch64_neonfma_cortex_a53, 1, 12, 1, 1);
   }
@@ -258,9 +259,9 @@
   BENCHMARK_CONV(f32_igemm_6x8__aarch64_neonfma_cortex_a57)
   BENCHMARK_CONV(f32_igemm_6x8__aarch64_neonfma_cortex_a73)
   BENCHMARK_CONV(f32_igemm_6x8__aarch64_neonfma_cortex_a75)
-#endif  /* CPUINFO_ARCH_ARM64 */
+#endif  /* XNN_ARCH_ARM64 */
 
-#if CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64
+#if XNN_ARCH_X86 || XNN_ARCH_X86_64
   static void f32_igemm_1x8__sse_load1(benchmark::State& state, const char* net) {
     IGEMMBenchmark(state, xnn_f32_igemm_ukernel_1x8__sse_load1, 1, 8, 1, 1);
   }
@@ -291,9 +292,9 @@
   BENCHMARK_CONV(f32_igemm_4x8__sse_dup)
   BENCHMARK_CONV(f32_igemm_1x8s4__sse)
   BENCHMARK_CONV(f32_igemm_4x8s4__sse)
-#endif  /* CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64 */
+#endif  /* XNN_ARCH_X86 || XNN_ARCH_X86_64 */
 
-#if !CPUINFO_ARCH_WASM && !CPUINFO_ARCH_ASMJS
+#if !XNN_ARCH_WASM && !XNN_ARCH_ASMJS
   static void f32_igemm_1x8__psimd_loadsplat(benchmark::State& state, const char* net) {
     IGEMMBenchmark(state, xnn_f32_igemm_ukernel_1x8__psimd_loadsplat, 1, 8, 1, 1);
   }
@@ -341,7 +342,7 @@
   BENCHMARK_CONV(f32_igemm_1x8s4__psimd)
   BENCHMARK_CONV(f32_igemm_4x8s4__psimd)
   BENCHMARK_CONV(f32_igemm_6x8s4__psimd)
-#endif /* !CPUINFO_ARCH_WASM && !CPUINFO_ARCH_ASMJS */
+#endif /* !XNN_ARCH_WASM && !XNN_ARCH_ASMJS */
 
 static void f32_igemm_1x4__scalar(benchmark::State& state, const char* net) {
   IGEMMBenchmark(state, xnn_f32_igemm_ukernel_1x4__scalar, 1, 4, 1, 1);