New cmake semantics for compiling with AVX and other specific flags

10 files changed, 0 insertions, 286 deletions

diff --git a/contrib/libs/crcutil/CMakeLists.txt b/contrib/libs/crcutil/CMakeLists.txt
index acd1e019608..2c59342155b 100644
--- a/contrib/libs/crcutil/CMakeLists.txt
+++ b/contrib/libs/crcutil/CMakeLists.txt
@@ -16,21 +16,9 @@ target_link_libraries(contrib-libs-crcutil PUBLIC
   contrib-libs-cxxsupp
 )
 target_sources(contrib-libs-crcutil PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/crcutil/crc32c_sse4.cc
   ${CMAKE_SOURCE_DIR}/contrib/libs/crcutil/multiword_64_64_gcc_i386_mmx.cc
   ${CMAKE_SOURCE_DIR}/contrib/libs/crcutil/multiword_128_64_gcc_amd64_sse2.cc
   ${CMAKE_SOURCE_DIR}/contrib/libs/crcutil/multiword_64_64_gcc_amd64_asm.cc
   ${CMAKE_SOURCE_DIR}/contrib/libs/crcutil/interface.cc
   ${CMAKE_SOURCE_DIR}/contrib/libs/crcutil/multiword_64_64_intrinsic_i386_mmx.cc
 )
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/crcutil/crc32c_sse4.cc
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -msse4.1
-  -msse4.2
-  -mpopcnt
-  -mcx16
-)
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
index 4e62f1b1461..114443e6685 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
@@ -27,7 +27,6 @@ target_link_options(restricted-aws-aws-c-common INTERFACE
   CoreFoundation
 )
 target_sources(restricted-aws-aws-c-common PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/encoding_avx2.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/allocator.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/allocator_sba.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/array_list.c
@@ -83,14 +82,3 @@ target_sources(restricted-aws-aws-c-common PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/asm/cpuid.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/cpuid.c
 )
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/encoding_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt
index e42dea73f59..f0bf855b3fc 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt
@@ -23,7 +23,6 @@ target_include_directories(restricted-aws-aws-c-common PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/include
 )
 target_sources(restricted-aws-aws-c-common PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/encoding_avx2.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/allocator.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/allocator_sba.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/array_list.c
@@ -79,14 +78,3 @@ target_sources(restricted-aws-aws-c-common PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/asm/cpuid.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/cpuid.c
 )
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/encoding_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
diff --git a/contrib/restricted/aws/s2n/CMakeLists.darwin.txt b/contrib/restricted/aws/s2n/CMakeLists.darwin.txt
index 42a21ce0ff8..94fffb19abf 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.darwin.txt
@@ -30,14 +30,6 @@ target_link_libraries(restricted-aws-s2n PUBLIC
   OpenSSL::OpenSSL
 )
 target_sources(restricted-aws-s2n PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/KeccakP-1600-times4-SIMD256_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_cbd_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_consts_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_fips202x4_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_indcpa_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_poly_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_polyvec_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_rejsample_avx2.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_basemul_avx2.S
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_fq_avx2.S
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_invntt_avx2.S
@@ -213,91 +205,3 @@ target_sources(restricted-aws-s2n PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/utils/s2n_socket.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/utils/s2n_timer.c
 )
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/KeccakP-1600-times4-SIMD256_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_cbd_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_consts_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_fips202x4_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_indcpa_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_poly_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_polyvec_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_rejsample_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
diff --git a/contrib/restricted/aws/s2n/CMakeLists.linux.txt b/contrib/restricted/aws/s2n/CMakeLists.linux.txt
index b10cb01d541..30a2d11de28 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.linux.txt
@@ -31,14 +31,6 @@ target_link_libraries(restricted-aws-s2n PUBLIC
   OpenSSL::OpenSSL
 )
 target_sources(restricted-aws-s2n PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/KeccakP-1600-times4-SIMD256_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_cbd_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_consts_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_fips202x4_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_indcpa_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_poly_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_polyvec_avx2.c
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_rejsample_avx2.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_basemul_avx2.S
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_fq_avx2.S
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_invntt_avx2.S
@@ -214,91 +206,3 @@ target_sources(restricted-aws-s2n PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/utils/s2n_socket.c
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/utils/s2n_timer.c
 )
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/KeccakP-1600-times4-SIMD256_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_cbd_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_consts_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_fips202x4_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_indcpa_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_poly_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_polyvec_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_rejsample_avx2.c
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
diff --git a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt
index d6eddc43d95..bf72fc385b4 100644
--- a/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/avx2/CMakeLists.txt
@@ -14,17 +14,3 @@ target_link_libraries(internal-proxies-avx2 PUBLIC
   argonish-internal-argon2
   argonish-internal-blake2b
 )
-target_sources(internal-proxies-avx2 PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/avx2/proxy_avx2.cpp
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mavx2
-  -mfma
-  -mbmi
-  -mbmi2
-)
diff --git a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt
index 185c2e89e22..3ef0a60661c 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse2/CMakeLists.txt
@@ -14,14 +14,3 @@ target_link_libraries(internal-proxies-sse2 PUBLIC
   argonish-internal-argon2
   argonish-internal-blake2b
 )
-target_sources(internal-proxies-sse2 PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/sse2/proxy_sse2.cpp
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -msse2
-)
diff --git a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt
index ef920193f88..398f5a6b400 100644
--- a/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/sse41/CMakeLists.txt
@@ -14,14 +14,3 @@ target_link_libraries(internal-proxies-sse41 PUBLIC
   argonish-internal-argon2
   argonish-internal-blake2b
 )
-target_sources(internal-proxies-sse41 PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/sse41/proxy_sse41.cpp
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -msse4.1
-)
diff --git a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt
index da0de6d8d0f..adcf9d00859 100644
--- a/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt
+++ b/library/cpp/digest/argonish/internal/proxies/ssse3/CMakeLists.txt
@@ -14,14 +14,3 @@ target_link_libraries(internal-proxies-ssse3 PUBLIC
   argonish-internal-argon2
   argonish-internal-blake2b
 )
-target_sources(internal-proxies-ssse3 PRIVATE
-  ${CMAKE_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/library/cpp/digest/argonish/internal/proxies/ssse3/proxy_ssse3.cpp
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -mssse3
-)
diff --git a/util/charset/CMakeLists.txt b/util/charset/CMakeLists.txt
index 6048e1d3757..6aaff21b09f 100644
--- a/util/charset/CMakeLists.txt
+++ b/util/charset/CMakeLists.txt
@@ -11,17 +11,6 @@ add_library(util-charset)
 target_link_libraries(util-charset PUBLIC
   contrib-libs-cxxsupp
 )
-target_sources(util-charset PRIVATE
-  ${CMAKE_SOURCE_DIR}/util/charset/wide_sse41.cpp
-)
-set_property(
-  SOURCE
-  ${CMAKE_SOURCE_DIR}/util/charset/wide_sse41.cpp
-  APPEND
-  PROPERTY
-  COMPILE_OPTIONS
-  -msse4.1
-)
 target_joined_source(util-charset
   all_charset.cpp
   ${CMAKE_SOURCE_DIR}/util/charset/generated/unidata.cpp