From 5b65fc51bc2d2b9971ab39ed81415aaae1bd7878 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 8 Jul 2024 11:08:54 -0700 Subject: [PATCH 1/3] add disable flag --- builder/imports/awslc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/imports/awslc.py b/builder/imports/awslc.py index 6c0737a71..60407687a 100644 --- a/builder/imports/awslc.py +++ b/builder/imports/awslc.py @@ -57,6 +57,6 @@ def cmake_args(self, env): if env.spec.compiler == 'gcc' and env.spec.compiler_version.startswith('4.'): # Disable AVX512 on old GCC for aws-lc # Not disable PERL for old GCC to avoid the pre-compiled binary with AVX512 - return super().cmake_args(env) + ['-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=ON'] + return super().cmake_args(env) + ['-DDISABLE_PERL=ON', '-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=ON'] else: return super().cmake_args(env) + ['-DDISABLE_PERL=ON'] From df215cdddf229e44a7db261967505202eab296ad Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 8 Jul 2024 11:29:29 -0700 Subject: [PATCH 2/3] minor cleanup --- builder/imports/awslc.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/builder/imports/awslc.py b/builder/imports/awslc.py index 60407687a..914e70fc9 100644 --- a/builder/imports/awslc.py +++ b/builder/imports/awslc.py @@ -54,9 +54,11 @@ def __init__(self, **kwargs): **kwargs) def cmake_args(self, env): + # always disable perl to skip codegen and instead rely on pre-generated code + args = super().cmake_args(env) + ['-DDISABLE_PERL=ON'] + if env.spec.compiler == 'gcc' and env.spec.compiler_version.startswith('4.'): - # Disable AVX512 on old GCC for aws-lc - # Not disable PERL for old GCC to avoid the pre-compiled binary with AVX512 - return super().cmake_args(env) + ['-DDISABLE_PERL=ON', '-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=ON'] - else: - return super().cmake_args(env) + ['-DDISABLE_PERL=ON'] + # Disable AVX512 on old GCC versions for aws-lc as they dont support AVX512 instructions used by aws-lc + args += ['-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=ON'] + + return args From ef17e91eea71f610705eb0c5a3cca6555ce72b89 Mon Sep 17 00:00:00 2001 From: DmitriyMusatkin Date: Mon, 8 Jul 2024 15:53:31 -0700 Subject: [PATCH 3/3] pull into const --- builder/imports/awslc.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/builder/imports/awslc.py b/builder/imports/awslc.py index 914e70fc9..75b329ff8 100644 --- a/builder/imports/awslc.py +++ b/builder/imports/awslc.py @@ -11,7 +11,7 @@ 'targets': ['linux', 'android'], 'test_steps': [], 'build_tests': False, - 'cmake_args': ['-DDISABLE_GO=ON', '-DBUILD_LIBSSL=OFF'] + 'cmake_args': ['-DDISABLE_GO=ON', '-DBUILD_LIBSSL=OFF', '-DDISABLE_PERL=ON'] } @@ -54,11 +54,8 @@ def __init__(self, **kwargs): **kwargs) def cmake_args(self, env): - # always disable perl to skip codegen and instead rely on pre-generated code - args = super().cmake_args(env) + ['-DDISABLE_PERL=ON'] - if env.spec.compiler == 'gcc' and env.spec.compiler_version.startswith('4.'): # Disable AVX512 on old GCC versions for aws-lc as they dont support AVX512 instructions used by aws-lc - args += ['-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=ON'] + return super().cmake_args(env) + ['-DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=ON'] - return args + return super().cmake_args(env)