diff --git a/.github/actions/bench/action.yml b/.github/actions/bench/action.yml index ba6a6c65b..938147bc0 100644 --- a/.github/actions/bench/action.yml +++ b/.github/actions/bench/action.yml @@ -66,6 +66,7 @@ runs: - $(nix --version) - $(${{ matrix.target.cross_prefix }}gcc --version | grep -m1 "") - $(bash --version | grep -m1 "") + - CFLAGS: ${{ inputs.cflags }} ## CPU Info $(cat /proc/cpuinfo) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index f4acfc493..4dd9c7b12 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -43,7 +43,7 @@ jobs: name: Arm Cortex-A55 (Snapdragon 888) benchmarks bench_pmu: PERF archflags: "-mcpu=cortex-a55 -march=armv8.2-a" - cflags: "-flto -static -DFORCE_AARCH64 -DMLKEM_NATIVE_FIPS202_BACKEND=\"'aarch64/cortex_a55.h'\"" + cflags: "-flto -static -DFORCE_AARCH64 -DMLKEM_NATIVE_FIPS202_BACKEND=\\\\\\\"aarch64/cortex_a55.h\\\\\\\"" bench_extra_args: -w exec-on-a55 - system: bpi name: Bananapi bpi-f3 benchmarks diff --git a/scripts/lib/mlkem_test.py b/scripts/lib/mlkem_test.py index 796c4953a..16cd7a27a 100644 --- a/scripts/lib/mlkem_test.py +++ b/scripts/lib/mlkem_test.py @@ -28,6 +28,7 @@ class CompileOptions(object): def __init__( self, cross_prefix: str, cflags: str, arch_flags: str, auto: bool, verbose: bool ): + print(f"CFLAGS: <{cflags}>") self.cross_prefix = cross_prefix self.cflags = cflags self.arch_flags = arch_flags @@ -99,7 +100,7 @@ def dict2str(dict): ] + extra_make_args make_envs = ( - {"CFLAGS": f"{self.cflags}"} if self.cflags is not None else {} + {"CFLAGS": self.cflags} if self.cflags is not None else {} ) | ( {"ARCH_FLAGS": f"{self.arch_flags}"} if self.arch_flags is not None else {} )