Added BENCHMARK_ARCH

Author: dor-forer

tests/benchmark/CMakeLists.txt

@@ -28,11 +28,11 @@ endforeach()
 if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
 	message(STATUS "Enabling Arm Performance Libraries integration")
 	include(${root}/cmake/aarch64InstructionFlags.cmake)
-	add_compile_definitions(BENCHMARK=arm64)
+	add_compile_definitions(BENCHMARK_ARCH=arm64)
 
 else()
 	include(${root}/cmake/x86_64InstructionFlags.cmake)
-	add_compile_definitions(BENCHMARK=x86_64)
+	add_compile_definitions(BENCHMARK_ARCH=x86_64)
 endif()
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

tests/benchmark/bm_macros.h

@@ -28,17 +28,5 @@
 #define CONCAT_WITH_UNDERSCORE(...)                                                                \
     EXPAND2(CONCAT(BM_FUNC_NAME_HELPER, EXPAND2(COUNT_ARGS(__VA_ARGS__)))(__VA_ARGS__))
 
-#if defined(CPU_FEATURES_ARCH_X86_64)
-#define BENCHMARK_ARCH x86_64
-#elif defined(CPU_FEATURES_ARCH_AARCH64)
-#if defined(OPT_ARMV9)
-#define BENCHMARK_ARCH arm_v9
-#else
-#define BENCHMARK_ARCH arm_v8
-#endif
-#else
-#define BENCHMARK_ARCH arm
-#endif
-
 // Modify this macro to account for the extra BENCHMARK_ARCH parameter
 #define CONCAT_WITH_UNDERSCORE_ARCH(...) CONCAT_WITH_UNDERSCORE(__VA_ARGS__, BENCHMARK_ARCH)