From 497b4d6f72add5420b13df0d26ec48be37472adc Mon Sep 17 00:00:00 2001 From: Changcheng Liu Date: Wed, 28 Oct 2020 15:26:41 +0800 Subject: [PATCH] cmake: remove yasm since it's been replaced by nasm Signed-off-by: Changcheng Liu --- ceph.spec.in | 1 - cmake/modules/CheckYasm.cmake | 58 ------------------------- debian/control | 1 - install-deps.sh | 1 - src/CMakeLists.txt | 10 ----- src/common/CMakeLists.txt | 1 - src/compressor/zlib/CMakeLists.txt | 1 - src/crypto/isa-l/CMakeLists.txt | 1 - src/erasure-code/isa/CMakeLists.txt | 1 - src/include/config-h.in.cmake | 9 ---- src/yasm-wrapper | 66 ----------------------------- 11 files changed, 150 deletions(-) delete mode 100644 cmake/modules/CheckYasm.cmake delete mode 100755 src/yasm-wrapper diff --git a/ceph.spec.in b/ceph.spec.in index c0fcfb5edff..151da808d08 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -178,7 +178,6 @@ BuildRequires: which BuildRequires: xfsprogs BuildRequires: xfsprogs-devel BuildRequires: xmlstarlet -BuildRequires: yasm BuildRequires: nasm %if 0%{with amqp_endpoint} BuildRequires: librabbitmq-devel diff --git a/cmake/modules/CheckYasm.cmake b/cmake/modules/CheckYasm.cmake deleted file mode 100644 index 8adea67b0d8..00000000000 --- a/cmake/modules/CheckYasm.cmake +++ /dev/null @@ -1,58 +0,0 @@ -macro(check_yasm_support _object_format _support_x64 _support_avx2 _support_avx512) - execute_process( - COMMAND yasm -f "${_object_format}" ${CMAKE_SOURCE_DIR}/src/common/crc32c_intel_fast_asm.s -o /dev/null - RESULT_VARIABLE no_yasm - OUTPUT_QUIET - ERROR_QUIET) - if(NOT no_yasm) - if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64") - set(save_quiet ${CMAKE_REQUIRED_QUIET}) - set(CMAKE_REQUIRED_QUIET true) - include(CheckCXXSourceCompiles) - check_cxx_source_compiles(" - #if defined(__x86_64__) && defined(__ILP32__) - #error x32 - #endif - int main() {} - " not_arch_x32) - set(CMAKE_REQUIRED_QUIET ${save_quiet}) - if(not_arch_x32) - set(${_support_x64} TRUE) - execute_process(COMMAND yasm -f ${object_format} -i - ${CMAKE_SOURCE_DIR}/src/isa-l/include/ - ${CMAKE_SOURCE_DIR}/src/isa-l/erasure_code/gf_vect_dot_prod_avx2.asm - -o /dev/null - RESULT_VARIABLE rc - OUTPUT_QUIET - ERROR_QUIET) - if(NOT rc) - set(${_support_avx2} TRUE) - endif(NOT rc) - execute_process(COMMAND yasm -D HAVE_AS_KNOWS_AVX512 -f ${object_format} - -i ${CMAKE_SOURCE_DIR}/src/isa-l/include/ - ${CMAKE_SOURCE_DIR}/src/isa-l/erasure_code/gf_vect_dot_prod_avx512.asm - -o /dev/null - RESULT_VARIABLE not_support_avx512 - OUTPUT_QUIET - ERROR_QUIET) - if(NOT not_support_avx512) - set(${_support_avx512} TRUE) - endif(NOT not_support_avx512) - endif(not_arch_x32) - endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64") - endif(NOT no_yasm) - if(no_yasm) - message(STATUS "Could NOT find Yasm") - elseif(NOT not_arch_x32) - message(STATUS "Found Yasm: but x86_64 with x32 ABI is not supported") - endif() - if(${_support_avx512}) - message(STATUS "Found Yasm: best -- capable of assembling AVX512") - endif() - if(${_support_avx2}) - message(STATUS "Foudd Yasm: better -- capable of assembling AVX2") - endif() - if(${_support_x64}) - message(STATUS "Found Yasm: good -- capable of assembling x86_64") - endif() -endmacro() diff --git a/debian/control b/debian/control index 37633e9016c..b0014c54e21 100644 --- a/debian/control +++ b/debian/control @@ -96,7 +96,6 @@ Build-Depends: cmake (>= 3.10.2), xfslibs-dev, # Make-Check xfsprogs, # Make-Check xmlstarlet, - yasm [amd64], nasm [amd64], zlib1g-dev, Standards-Version: 4.4.0 diff --git a/install-deps.sh b/install-deps.sh index c3a1b6a6b87..146ae7189c6 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -221,7 +221,6 @@ if [ x$(uname)x = xFreeBSDx ]; then devel/gperf \ devel/gmake \ devel/cmake \ - devel/yasm \ devel/nasm \ devel/boost-all \ devel/boost-python-libs \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff64052c95c..54722eea022 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -155,16 +155,6 @@ if(HAVE_INTEL) HAVE_NASM_X64_AVX2 HAVE_NASM_X64_AVX512) endif() - set(CMAKE_ASM_COMPILER ${PROJECT_SOURCE_DIR}/src/yasm-wrapper) - if(NOT WIN32) - # The native tools might be located even when cross compiling, which - # might not work in this case (especially when targeting Windows). - include(CheckYasm) - check_yasm_support(${object_format} - HAVE_YASM_X64 - HAVE_YASM_X64_AVX2 - HAVE_YASM_X64_AVX512) - endif() endif() # require c++17 diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 3b45967ece3..e7d4e659201 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -170,7 +170,6 @@ if(HAVE_INTEL) list(APPEND crc32_srcs crc32c_intel_fast.c) if(HAVE_NASM_X64) - set(CMAKE_ASM_COMPILER ${PROJECT_SOURCE_DIR}/src/nasm-wrapper) set(CMAKE_ASM_FLAGS "-i ${PROJECT_SOURCE_DIR}/src/isa-l/include/ ${CMAKE_ASM_FLAGS}") list(APPEND crc32_srcs ${PROJECT_SOURCE_DIR}/src/isa-l/crc/crc32_iscsi_00.asm diff --git a/src/compressor/zlib/CMakeLists.txt b/src/compressor/zlib/CMakeLists.txt index 3d37cf40f26..ade57cb08ee 100644 --- a/src/compressor/zlib/CMakeLists.txt +++ b/src/compressor/zlib/CMakeLists.txt @@ -1,7 +1,6 @@ # zlib if(HAVE_INTEL_SSE4_1 AND HAVE_NASM_X64_AVX2 AND (NOT APPLE)) - set(CMAKE_ASM_COMPILER ${PROJECT_SOURCE_DIR}/src/nasm-wrapper) set(CMAKE_ASM_FLAGS "-i ${PROJECT_SOURCE_DIR}/src/isa-l/igzip/ -i ${PROJECT_SOURCE_DIR}/src/isa-l/include/ ${CMAKE_ASM_FLAGS}") set(zlib_sources CompressionPluginZlib.cc diff --git a/src/crypto/isa-l/CMakeLists.txt b/src/crypto/isa-l/CMakeLists.txt index 31b6ea7ea56..2a2ec0bc0cb 100644 --- a/src/crypto/isa-l/CMakeLists.txt +++ b/src/crypto/isa-l/CMakeLists.txt @@ -1,5 +1,4 @@ set(isal_dir ${CMAKE_SOURCE_DIR}/src/crypto/isa-l/isa-l_crypto) -set(CMAKE_ASM_COMPILER ${PROJECT_SOURCE_DIR}/src/nasm-wrapper) set(CMAKE_ASM_FLAGS "-i ${isal_dir}/aes/ -i ${isal_dir}/include/ ${CMAKE_ASM_FLAGS}") set(isal_crypto_plugin_srcs diff --git a/src/erasure-code/isa/CMakeLists.txt b/src/erasure-code/isa/CMakeLists.txt index 531b0124104..2486692b843 100644 --- a/src/erasure-code/isa/CMakeLists.txt +++ b/src/erasure-code/isa/CMakeLists.txt @@ -1,7 +1,6 @@ # ISA set(isal_src_dir ${CMAKE_SOURCE_DIR}/src/isa-l) include_directories(${isal_src_dir}/include) -set(CMAKE_ASM_COMPILER ${PROJECT_SOURCE_DIR}/src/nasm-wrapper) if(HAVE_NASM_X64_AVX2) set(CMAKE_ASM_FLAGS "-i ${isal_src_dir}/include/ ${CMAKE_ASM_FLAGS}") diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake index afc2449d808..f3931951322 100644 --- a/src/include/config-h.in.cmake +++ b/src/include/config-h.in.cmake @@ -241,15 +241,6 @@ /* name_to_handle_at exists */ #cmakedefine HAVE_NAME_TO_HANDLE_AT -/* we have a recent yasm and are x86_64 */ -#cmakedefine HAVE_YASM_X64 - -/* yasm can also build the isa-l:avx2 */ -#cmakedefine HAVE_YASM_X64_AVX2 - -/* yasm can also build the isa-l:avx512 */ -#cmakedefine HAVE_YASM_X64_AVX512 - /* we have a recent nasm and are x86_64 */ #cmakedefine HAVE_NASM_X64 diff --git a/src/yasm-wrapper b/src/yasm-wrapper deleted file mode 100755 index a140092e425..00000000000 --- a/src/yasm-wrapper +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -e - -# libtool and yasm do not get along. -# filter out any crap that libtool feeds us that yasm does not understand. -#echo $0: got $* -new="" -touch="" -while [ -n "$*" ]; do - case "$1" in - -f ) - shift - new="$new -f $1" - shift - ;; - -c | --param* | -m* | -pipe | -thread ) - # unknown options under both yasm & nasm - shift - ;; - -D* ) - # ignore define Macro option - shift - ;; - -g* ) - # ignore debug format - shift - ;; - -W* ) - # Warning/error option - shift - ;; - -MD | -MP | -E | -O* ) - # ignore option: nasm support, yasm not support - shift - ;; - -MT ) - # ignore option: nasm support, yasm not support - shift - shift - ;; - -MF ) - shift - touch="$1" - shift - ;; - -f* ) - shift - ;; - -I | -isystem ) - shift - new="$new -i $1" - shift - ;; - * ) - # Keep other options - new="$new $1" - shift - ;; - esac -done - -#echo $0: yasm $new -yasm $new - -[ -n "$touch" ] && touch $touch - -true -- 2.39.5