From bed1b32974fa76044c66162a671e023c966bc73c Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Fri, 9 Apr 2021 12:14:23 +0800
Subject: [PATCH] cmake: introduce WITH_EC_ISA_PLUGIN

instead of checking "HAVE_NASM_X64_AVX2 OR HAVE_ARMV8_SIMD" everywhere,
use a single cached variable of WITH_EC_ISA_PLUGIN. so it's more
consistent when checking the availability of ec_isa plugin.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 src/common/options.cc                              | 2 +-
 src/erasure-code/CMakeLists.txt                    | 4 ++++
 src/include/config-h.in.cmake                      | 7 ++-----
 src/test/erasure-code/CMakeLists.txt               | 4 ++--
 src/test/erasure-code/TestErasureCodePluginClay.cc | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/common/options.cc b/src/common/options.cc
index 8d6175d41a2..15911cbe820 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2753,7 +2753,7 @@ std::vector<Option> get_global_options() {
 
     Option("osd_erasure_code_plugins", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("jerasure lrc"
-  #if defined(HAVE_NASM_X64_AVX2) || defined(HAVE_ARMV8_SIMD)
+  #if defined(WITH_EC_ISA_PLUGIN)
          " isa"
   #endif
         )
diff --git a/src/erasure-code/CMakeLists.txt b/src/erasure-code/CMakeLists.txt
index ec091f584a9..18291f64b5c 100644
--- a/src/erasure-code/CMakeLists.txt
+++ b/src/erasure-code/CMakeLists.txt
@@ -23,6 +23,10 @@ add_subdirectory(shec)
 add_subdirectory(clay)
 
 if(HAVE_NASM_X64_AVX2 OR HAVE_ARMV8_SIMD)
+  set(WITH_EC_ISA_PLUGIN TRUE CACHE BOOL "")
+endif()
+
+if(WITH_EC_ISA_PLUGIN)
   add_subdirectory(isa)
   set(EC_ISA_LIB ec_isa)
 endif()
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 338f7a48390..1cdc77e65be 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -250,14 +250,11 @@
 /* we have a recent nasm and are x86_64 */
 #cmakedefine HAVE_NASM_X64
 
-/* nasm can also build the isa-l:avx2 */
-#cmakedefine HAVE_NASM_X64_AVX2
-
 /* nasm can also build the isa-l:avx512 */
 #cmakedefine HAVE_NASM_X64_AVX512
 
-/* Define if isa-l is compiled for arm64 */
-#cmakedefine HAVE_ARMV8_SIMD
+/* Define if the erasure code isa-l plugin is compiled */
+#cmakedefine WITH_EC_ISA_PLUGIN
 
 /* Define to 1 if strerror_r returns char *. */
 #cmakedefine STRERROR_R_CHAR_P 1
diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
index ff3ba4dc012..ab7328eae0e 100644
--- a/src/test/erasure-code/CMakeLists.txt
+++ b/src/test/erasure-code/CMakeLists.txt
@@ -74,7 +74,7 @@ target_link_libraries(unittest_erasure_code_plugin_jerasure
 add_dependencies(unittest_erasure_code_plugin_jerasure
   ec_jerasure)
 
-if(HAVE_NASM_X64_AVX2 OR HAVE_ARMV8_SIMD)
+if(WITH_EC_ISA_PLUGIN)
 
 #unittest_erasure_code_isa
 add_executable(unittest_erasure_code_isa
@@ -105,7 +105,7 @@ target_link_libraries(unittest_erasure_code_plugin_isa
   )
 add_dependencies(unittest_erasure_code_plugin_isa
   ec_isa)
-endif(HAVE_NASM_X64_AVX2 OR HAVE_ARMV8_SIMD)
+endif(WITH_EC_ISA_PLUGIN)
 
 # unittest_erasure_code_lrc
 add_executable(unittest_erasure_code_lrc
diff --git a/src/test/erasure-code/TestErasureCodePluginClay.cc b/src/test/erasure-code/TestErasureCodePluginClay.cc
index 3469d027281..c9297a49fc8 100644
--- a/src/test/erasure-code/TestErasureCodePluginClay.cc
+++ b/src/test/erasure-code/TestErasureCodePluginClay.cc
@@ -58,7 +58,7 @@ TEST(ErasureCodePlugin, factory)
       EXPECT_TRUE(erasure_code.get());
     }
   }
-#ifdef HAVE_NASM_X64_AVX2
+#ifdef WITH_EC_ISA_PLUGIN
   //check clay plugin with scalar_mds=isa
   {
     const char *techniques[] = {
-- 
2.39.5