From 80a1f21474096f6b54698a483ffe9b024ee43a3c Mon Sep 17 00:00:00 2001 From: Dengke Tang Date: Wed, 19 Apr 2023 10:48:50 -0700 Subject: [PATCH] Disable AVX512 for aws-lc on old GCC (#468) --- .github/workflows/ci.yml | 18 ++++++++++++++++++ crt/CMakeLists.txt | 9 ++++++++- crt/aws-lc | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fe952eba..ca643d08f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,24 @@ env: AWS_REGION: us-east-1 jobs: + manylinux1: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + image: + - x64 + - x86 + python: + - cp37-cp37m + - cp38-cp38 + - cp39-cp39 + steps: + - name: Build ${{ env.PACKAGE_NAME }} + run: | + aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh + ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-manylinux1-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} --python /opt/python/${{ matrix.python }}/bin/python + manylinux2014: runs-on: ubuntu-20.04 # latest strategy: diff --git a/crt/CMakeLists.txt b/crt/CMakeLists.txt index 2484781db..05c1df8a6 100644 --- a/crt/CMakeLists.txt +++ b/crt/CMakeLists.txt @@ -33,8 +33,15 @@ if(UNIX AND NOT APPLE) if(NOT USE_OPENSSL) set(DISABLE_GO ON CACHE BOOL "Build without using Go, we don't want the extra dependency") - set(DISABLE_PERL ON CACHE BOOL "Build without using Perl, we don't want the extra dependency") set(BUILD_LIBSSL OFF CACHE BOOL "Don't need libssl, only need libcrypto") + + if(CMAKE_C_COMPILER_ID MATCHES "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5.0") + set(DISABLE_PERL OFF CACHE BOOL "Build with Perl to avoid using pre-compiled binary with AVX512") + set(MY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX ON CACHE BOOL "Disable AVX512 on old GCC that not supports it") + else() + set(DISABLE_PERL ON CACHE BOOL "Build without using Perl, we don't want the extra dependency") + endif() + add_subdirectory(aws-lc) endif() diff --git a/crt/aws-lc b/crt/aws-lc index 161e74706..44a1c471f 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 161e747063dcb16e71d299190f072a26c0a56294 +Subproject commit 44a1c471faf65cbfd57e62b8a5357ca6330c7c56