From 97acb3eb30022f6ed2d4e8c057506e54aaf2ff7b Mon Sep 17 00:00:00 2001
From: Changcheng Liu <changcheng.liu@aliyun.com>
Date: Thu, 22 Oct 2020 10:42:29 +0800
Subject: [PATCH] common: rename YASM MACRO to hint support SIMD

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
---
 src/CMakeLists.txt                                 | 4 ++--
 src/common/CMakeLists.txt                          | 4 ++--
 src/common/crc32c_intel_fast.c                     | 2 +-
 src/common/options.cc                              | 2 +-
 src/compressor/zlib/CMakeLists.txt                 | 6 +++---
 src/compressor/zlib/ZlibCompressor.cc              | 4 ++--
 src/crypto/CMakeLists.txt                          | 2 +-
 src/crypto/isa-l/CMakeLists.txt                    | 4 ++--
 src/erasure-code/CMakeLists.txt                    | 2 +-
 src/erasure-code/isa/CMakeLists.txt                | 2 +-
 src/include/config-h.in.cmake                      | 6 +++---
 src/test/erasure-code/CMakeLists.txt               | 4 ++--
 src/test/erasure-code/TestErasureCodePluginClay.cc | 2 +-
 13 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5526e469c4a..3a66b350542 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -151,8 +151,8 @@ if(HAVE_INTEL)
     # might not work in this case (especially when targeting Windows).
     include(CheckYasm)
     check_yasm_support(${object_format}
-      HAVE_GOOD_YASM_ELF64
-      HAVE_BETTER_YASM_ELF64)
+      HAVE_YASM_X64
+      HAVE_YASM_X64_AVX2)
   endif()
 endif()
 
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 39bc50d41fd..4cb5b333f45 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -170,11 +170,11 @@ set(crc32_srcs
 if(HAVE_INTEL)
   list(APPEND crc32_srcs
     crc32c_intel_fast.c)
-  if(HAVE_GOOD_YASM_ELF64)
+  if(HAVE_YASM_X64)
     list(APPEND crc32_srcs
       crc32c_intel_fast_asm.s
       crc32c_intel_fast_zero_asm.s)
-  endif(HAVE_GOOD_YASM_ELF64)
+  endif(HAVE_YASM_X64)
 elseif(HAVE_POWER8)
   list(APPEND crc32_srcs
     crc32c_ppc.c)
diff --git a/src/common/crc32c_intel_fast.c b/src/common/crc32c_intel_fast.c
index 188ff95ff5a..654eb81e2e6 100644
--- a/src/common/crc32c_intel_fast.c
+++ b/src/common/crc32c_intel_fast.c
@@ -4,7 +4,7 @@
 extern unsigned int crc32_iscsi_00(unsigned char const *buffer, uint64_t len, uint64_t crc) asm("crc32_iscsi_00");
 extern unsigned int crc32_iscsi_zero_00(unsigned char const *buffer, uint64_t len, uint64_t crc) asm("crc32_iscsi_zero_00");
 
-#ifdef HAVE_GOOD_YASM_ELF64
+#ifdef HAVE_YASM_X64
 
 uint32_t ceph_crc32c_intel_fast(uint32_t crc, unsigned char const *buffer, unsigned len)
 {
diff --git a/src/common/options.cc b/src/common/options.cc
index 0f5b646f9c4..dde32185d8d 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2708,7 +2708,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_BETTER_YASM_ELF64) || defined(HAVE_ARMV8_SIMD)
+  #if defined(HAVE_YASM_X64_AVX2) || defined(HAVE_ARMV8_SIMD)
          " isa"
   #endif
         )
diff --git a/src/compressor/zlib/CMakeLists.txt b/src/compressor/zlib/CMakeLists.txt
index c1c8413949c..22543c620c3 100644
--- a/src/compressor/zlib/CMakeLists.txt
+++ b/src/compressor/zlib/CMakeLists.txt
@@ -1,6 +1,6 @@
 # zlib
 
-if(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
+if(HAVE_INTEL_SSE4_1 AND HAVE_YASM_X64_AVX2 AND (NOT APPLE))
 	set(zlib_sources
 	  CompressionPluginZlib.cc
 	  ZlibCompressor.cc
@@ -41,12 +41,12 @@ if(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
 	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_set_long_icf_fg_04.asm
 	  ${CMAKE_SOURCE_DIR}/src/isa-l/igzip/igzip_set_long_icf_fg_06.asm
 	)
-else(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
+else(HAVE_INTEL_SSE4_1 AND HAVE_YASM_X64_AVX2 AND (NOT APPLE))
 	set(zlib_sources
 	  CompressionPluginZlib.cc
 	  ZlibCompressor.cc
 	)
-endif(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
+endif(HAVE_INTEL_SSE4_1 AND HAVE_YASM_X64_AVX2 AND (NOT APPLE))
 
 add_library(ceph_zlib SHARED ${zlib_sources})
 target_link_libraries(ceph_zlib ZLIB::ZLIB compressor $<$<PLATFORM_ID:Windows>:ceph-common>)
diff --git a/src/compressor/zlib/ZlibCompressor.cc b/src/compressor/zlib/ZlibCompressor.cc
index 5edaba67242..e8fe7dfadb3 100644
--- a/src/compressor/zlib/ZlibCompressor.cc
+++ b/src/compressor/zlib/ZlibCompressor.cc
@@ -113,7 +113,7 @@ int ZlibCompressor::zlib_compress(const bufferlist &in, bufferlist &out, boost::
   return 0;
 }
 
-#if __x86_64__ && defined(HAVE_BETTER_YASM_ELF64)
+#if __x86_64__ && defined(HAVE_YASM_X64_AVX2)
 int ZlibCompressor::isal_compress(const bufferlist &in, bufferlist &out, boost::optional<int32_t> &compressor_message)
 {
   int ret;
@@ -174,7 +174,7 @@ int ZlibCompressor::compress(const bufferlist &in, bufferlist &out, boost::optio
   if (qat_enabled)
     return qat_accel.compress(in, out, compressor_message);
 #endif
-#if __x86_64__ && defined(HAVE_BETTER_YASM_ELF64)
+#if __x86_64__ && defined(HAVE_YASM_X64_AVX2)
   if (isal_enabled)
     return isal_compress(in, out, compressor_message);
   else
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index eee534435d6..c9d76ac3bba 100644
--- a/src/crypto/CMakeLists.txt
+++ b/src/crypto/CMakeLists.txt
@@ -3,7 +3,7 @@ set(crypto_plugin_dir ${CEPH_INSTALL_PKGLIBDIR}/crypto)
 
 add_subdirectory(openssl)
 
-if(HAVE_INTEL AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
+if(HAVE_INTEL AND HAVE_YASM_X64_AVX2 AND (NOT APPLE))
   add_subdirectory(isa-l)
 endif()
 
diff --git a/src/crypto/isa-l/CMakeLists.txt b/src/crypto/isa-l/CMakeLists.txt
index b6eece7039c..78cd48dd585 100644
--- a/src/crypto/isa-l/CMakeLists.txt
+++ b/src/crypto/isa-l/CMakeLists.txt
@@ -22,9 +22,9 @@ set(isal_crypto_plugin_srcs
   ${isal_dir}/aes/cbc_enc_256_x4_sb.asm
   ${isal_dir}/aes/cbc_enc_256_x8_sb.asm)
 
-if(HAVE_GOOD_YASM_ELF64)
+if(HAVE_YASM_X64)
 add_dependencies(crypto_plugins ceph_crypto_isal)
-endif(HAVE_GOOD_YASM_ELF64)
+endif(HAVE_YASM_X64)
 
 add_library(ceph_crypto_isal SHARED ${isal_crypto_plugin_srcs})
 target_include_directories(ceph_crypto_isal PRIVATE ${isal_dir}/include)
diff --git a/src/erasure-code/CMakeLists.txt b/src/erasure-code/CMakeLists.txt
index 59e77815948..26f545daae1 100644
--- a/src/erasure-code/CMakeLists.txt
+++ b/src/erasure-code/CMakeLists.txt
@@ -22,7 +22,7 @@ add_subdirectory(lrc)
 add_subdirectory(shec)
 add_subdirectory(clay)
 
-if(HAVE_BETTER_YASM_ELF64 OR HAVE_ARMV8_SIMD)
+if(HAVE_YASM_X64_AVX2 OR HAVE_ARMV8_SIMD)
   add_subdirectory(isa)
   set(EC_ISA_LIB ec_isa)
 endif()
diff --git a/src/erasure-code/isa/CMakeLists.txt b/src/erasure-code/isa/CMakeLists.txt
index 5043ac225dc..3fb91df73e9 100644
--- a/src/erasure-code/isa/CMakeLists.txt
+++ b/src/erasure-code/isa/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(isal_src_dir ${CMAKE_SOURCE_DIR}/src/isa-l)
 include_directories(${isal_src_dir}/include)
 
-if(HAVE_BETTER_YASM_ELF64)
+if(HAVE_YASM_X64_AVX2)
   set(isa_srcs
     ${isal_src_dir}/erasure_code/ec_base.c
     ${isal_src_dir}/erasure_code/gf_2vect_dot_prod_sse.asm
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index cdf9cc909ad..f9629dc2e9b 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -242,10 +242,10 @@
 #cmakedefine HAVE_NAME_TO_HANDLE_AT
 
 /* we have a recent yasm and are x86_64 */
-#cmakedefine HAVE_GOOD_YASM_ELF64 
+#cmakedefine HAVE_YASM_X64
 
-/* yasm can also build the isa-l */
-#cmakedefine HAVE_BETTER_YASM_ELF64
+/* yasm can also build the isa-l:avx2 */
+#cmakedefine HAVE_YASM_X64_AVX2
 
 /* Define if isa-l is compiled for arm64 */
 #cmakedefine HAVE_ARMV8_SIMD
diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
index 640de24bd5f..e6fc327ff08 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_BETTER_YASM_ELF64 OR HAVE_ARMV8_SIMD)
+if(HAVE_YASM_X64_AVX2 OR HAVE_ARMV8_SIMD)
 
 #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_BETTER_YASM_ELF64 OR HAVE_ARMV8_SIMD)
+endif(HAVE_YASM_X64_AVX2 OR HAVE_ARMV8_SIMD)
 
 # 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 0491ba89814..7d44ad7a36a 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_BETTER_YASM_ELF64
+#ifdef HAVE_YASM_X64_AVX2
   //check clay plugin with scalar_mds=isa
   {
     const char *techniques[] = {
-- 
2.39.5