Update external build system generation utility

* [cmake] Hierarchical add_subdirectroy structure
* [cmake] Support for same file compilation multiple times with different flags

5 files changed, 194 insertions, 0 deletions

diff --git a/contrib/restricted/aws/CMakeLists.txt b/contrib/restricted/aws/CMakeLists.txt
new file mode 100644
index 0000000000..d9e752ac46
--- /dev/null
+++ b/contrib/restricted/aws/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(aws-c-cal)
+add_subdirectory(aws-c-common)
+add_subdirectory(aws-c-event-stream)
+add_subdirectory(aws-c-io)
+add_subdirectory(aws-checksums)
+add_subdirectory(s2n)
diff --git a/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
index 114443e668..53563bd504 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.darwin.txt
@@ -82,3 +82,13 @@ 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
 )
+target_sources_custom(restricted-aws-aws-c-common
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/encoding_avx2.c
+  CUSTOM_FLAGS
+  -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 f0bf855b3f..ce39ff5ab6 100644
--- a/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/aws-c-common/CMakeLists.linux.txt
@@ -78,3 +78,13 @@ 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
 )
+target_sources_custom(restricted-aws-aws-c-common
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-common/source/arch/intel/encoding_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
diff --git a/contrib/restricted/aws/s2n/CMakeLists.darwin.txt b/contrib/restricted/aws/s2n/CMakeLists.darwin.txt
index 94fffb19ab..01ab97e6c8 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.darwin.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.darwin.txt
@@ -205,3 +205,83 @@ 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
 )
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/KeccakP-1600-times4-SIMD256_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_cbd_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_consts_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_fips202x4_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_indcpa_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_poly_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_polyvec_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_rejsample_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
diff --git a/contrib/restricted/aws/s2n/CMakeLists.linux.txt b/contrib/restricted/aws/s2n/CMakeLists.linux.txt
index 30a2d11de2..2403724ef1 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.linux.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.linux.txt
@@ -206,3 +206,83 @@ 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
 )
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/KeccakP-1600-times4-SIMD256_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_cbd_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_consts_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_fips202x4_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_indcpa_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_poly_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_polyvec_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)
+target_sources_custom(restricted-aws-s2n
+  .avx2
+  SRCS
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/kyber_r3/kyber512r3_rejsample_avx2.c
+  CUSTOM_FLAGS
+  -mavx2
+  -mfma
+  -mbmi
+  -mbmi2
+)