diff --git a/.github/workflows/aws_tfhe_integer_tests.yml b/.github/workflows/aws_tfhe_integer_tests.yml index 54df464b07..2dae928443 100644 --- a/.github/workflows/aws_tfhe_integer_tests.yml +++ b/.github/workflows/aws_tfhe_integer_tests.yml @@ -4,6 +4,7 @@ env: CARGO_TERM_COLOR: always ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} RUSTFLAGS: "-C target-cpu=native" + AVX512_SUPPORT: "ON" on: # Allows you to run this workflow manually from the Actions tab as an alternative. diff --git a/.github/workflows/aws_tfhe_multi_bit_tests.yml b/.github/workflows/aws_tfhe_multi_bit_tests.yml index 3f08e88baa..5dd7e840e9 100644 --- a/.github/workflows/aws_tfhe_multi_bit_tests.yml +++ b/.github/workflows/aws_tfhe_multi_bit_tests.yml @@ -4,6 +4,7 @@ env: CARGO_TERM_COLOR: always ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} RUSTFLAGS: "-C target-cpu=native" + AVX512_SUPPORT: "ON" on: # Allows you to run this workflow manually from the Actions tab as an alternative. diff --git a/Makefile b/Makefile index bb380276c3..8ded5bcf23 100644 --- a/Makefile +++ b/Makefile @@ -363,17 +363,17 @@ test_shortint_cov: install_rs_check_toolchain install_tarpaulin -p tfhe -- shortint:: .PHONY: test_integer_ci # Run the tests for integer ci -test_integer_ci: install_rs_build_toolchain install_cargo_nextest +test_integer_ci: install_rs_check_toolchain install_cargo_nextest BIG_TESTS_INSTANCE="$(BIG_TESTS_INSTANCE)" \ FAST_TESTS="$(FAST_TESTS)" \ - ./scripts/integer-tests.sh --rust-toolchain $(CARGO_RS_BUILD_TOOLCHAIN) \ + ./scripts/integer-tests.sh --rust-toolchain $(CARGO_RS_CHECK_TOOLCHAIN) \ --cargo-profile "$(CARGO_PROFILE)" .PHONY: test_integer_multi_bit_ci # Run the tests for integer ci running only multibit tests -test_integer_multi_bit_ci: install_rs_build_toolchain install_cargo_nextest +test_integer_multi_bit_ci: install_rs_check_toolchain install_cargo_nextest BIG_TESTS_INSTANCE="$(BIG_TESTS_INSTANCE)" \ FAST_TESTS="$(FAST_TESTS)" \ - ./scripts/integer-tests.sh --rust-toolchain $(CARGO_RS_BUILD_TOOLCHAIN) \ + ./scripts/integer-tests.sh --rust-toolchain $(CARGO_RS_CHECK_TOOLCHAIN) \ --cargo-profile "$(CARGO_PROFILE)" --multi-bit .PHONY: test_integer # Run all the tests for integer diff --git a/scripts/integer-tests.sh b/scripts/integer-tests.sh index 74144c80ce..3bba126a37 100755 --- a/scripts/integer-tests.sh +++ b/scripts/integer-tests.sh @@ -16,6 +16,8 @@ RUST_TOOLCHAIN="+stable" multi_bit="" not_multi_bit="_multi_bit" cargo_profile="release" +# Normalize if it's set by the Makefile +AVX512_FEATURE="${AVX512_FEATURE:+${AVX512_FEATURE}}" while [ -n "$1" ] do @@ -104,7 +106,7 @@ and not test(/.*default_add_sequence_multi_thread_param_message_3_carry_3_ks_pbs --cargo-profile "${cargo_profile}" \ --package tfhe \ --profile ci \ - --features="${ARCH_FEATURE}",integer,internal-keycache \ + --features="${ARCH_FEATURE}",integer,internal-keycache,"${AVX512_FEATURE}" \ --test-threads "${n_threads}" \ -E "$filter_expression" @@ -112,7 +114,7 @@ and not test(/.*default_add_sequence_multi_thread_param_message_3_carry_3_ks_pbs cargo "${RUST_TOOLCHAIN}" test \ --profile "${cargo_profile}" \ --package tfhe \ - --features="${ARCH_FEATURE}",integer,internal-keycache \ + --features="${ARCH_FEATURE}",integer,internal-keycache,"${AVX512_FEATURE}" \ --doc \ -- integer:: fi @@ -148,7 +150,7 @@ and not test(/.*default_add_sequence_multi_thread_param_message_3_carry_3_ks_pbs --cargo-profile "${cargo_profile}" \ --package tfhe \ --profile ci \ - --features="${ARCH_FEATURE}",integer,internal-keycache \ + --features="${ARCH_FEATURE}",integer,internal-keycache,"${AVX512_FEATURE}" \ --test-threads $num_threads \ -E "$filter_expression" @@ -156,7 +158,7 @@ and not test(/.*default_add_sequence_multi_thread_param_message_3_carry_3_ks_pbs cargo "${RUST_TOOLCHAIN}" test \ --profile "${cargo_profile}" \ --package tfhe \ - --features="${ARCH_FEATURE}",integer,internal-keycache \ + --features="${ARCH_FEATURE}",integer,internal-keycache,"${AVX512_FEATURE}" \ --doc \ -- --test-threads="$(${nproc_bin})" integer:: fi