Armv8.1-M: Add MVE Keccak-f1600 x4 implementation

.github/actions/bench/action.yml

@@ -36,7 +36,7 @@ inputs:
     required: true
   nix-shell:
     description: Run in the specified Nix environment if exists
-    default: "ci-bench"
+    default: "bench"
   nix-cache:
     description: Determine whether to enable nix cache
     default: 'false'

.github/actions/cbmc/action.yml

@@ -8,7 +8,7 @@ description: Run CBMC proofs for mldsa-native
 inputs:
   nix-shell:
     description: Run in the specified Nix environment if exists
-    default: "ci-cbmc"
+    default: "cbmc"
   nix-cache:
     description: Determine whether to enable nix cache
     default: 'true'

.github/actions/lint/action.yml

@@ -8,7 +8,7 @@ description: Lint
 inputs:
   nix-shell:
     description: Run in the specified Nix environment if exists
-    default: "ci-linter"
+    default: "linter"
   nix-cache:
     description: Determine whether to enable nix cache
     default: "false"

.github/workflows/baremetal.yml

@@ -18,13 +18,13 @@ jobs:
          - runner: ubuntu-latest
            name: 'M55-AN547'
            makefile: test/baremetal/platform/m55-an547/platform.mk
-           nix-shell: arm-embedded
+           nix-shell: cross-arm-embedded
            func: true
            kat: true
            acvp: true
            alloc: true
            bench: true
-           opt: no_opt
+           opt: all
     runs-on: ${{ matrix.target.runner }}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -53,6 +53,6 @@ jobs:
           nix-shell: ${{ matrix.target.nix-shell }}
           gh_token: ${{ secrets.GITHUB_TOKEN }}
           perf: PMU
-          opt: false
+          opt: true
           store_results: false
 

.github/workflows/base.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - uses: ./.github/actions/lint
         with:
-          nix-shell: ci-linter
+          nix-shell: linter
           gh_token: ${{ secrets.GITHUB_TOKEN }}
           cross-prefix: "aarch64-unknown-linux-gnu-"
   quickcheck:

.github/workflows/bench.yml

@@ -36,7 +36,7 @@ jobs:
           cflags: "-flto -DMLD_FORCE_AARCH64"
           ldflags: "-flto"
           bench_extra_args: ""
-          nix_shell: ci-bench
+          nix_shell: bench
           only_no_opt: false
         - system: rpi5
           name: Arm Cortex-A76 (Raspberry Pi 5) benchmarks
@@ -45,7 +45,7 @@ jobs:
           cflags: "-flto -DMLD_FORCE_AARCH64"
           ldflags: "-flto"
           bench_extra_args: ""
-          nix_shell: ci-bench
+          nix_shell: bench
           only_no_opt: false
         - system: a55
           name: Arm Cortex-A55 (Snapdragon 888) benchmarks
@@ -54,7 +54,7 @@ jobs:
           cflags: "-flto -DMLD_FORCE_AARCH64"
           ldflags: "-flto -static"
           bench_extra_args: -w exec-on-a55
-          nix_shell: ci-bench
+          nix_shell: bench
           only_no_opt: false
         - system: bpi
           name: SpacemiT K1 8 (Banana Pi F3) benchmarks
@@ -64,7 +64,7 @@ jobs:
           ldflags: "-static"
           bench_extra_args: -w exec-on-bpi
           cross_prefix: riscv64-unknown-linux-gnu-
-          nix_shell: ci-cross-riscv64
+          nix_shell: cross-riscv64
           only_no_opt: true
         - system: m1-mac-mini
           name: Mac Mini (M1, 2020) benchmarks
@@ -73,7 +73,7 @@ jobs:
           cflags: "-flto"
           ldflags: "-flto"
           bench_extra_args: "-r"
-          nix_shell: ci-bench
+          nix_shell: bench
           only_no_opt: false
     if: github.repository_owner == 'pq-code-package' && (github.event.label.name == 'benchmark' || github.ref == 'refs/heads/main')
     runs-on: self-hosted-${{ matrix.target.system }}

.github/workflows/bench_ec2_reusable.yml

@@ -176,7 +176,7 @@ jobs:
       - uses: ./.github/actions/bench
         if: ${{ inputs.opt == 'all' || inputs.opt == 'opt' }}
         with:
-          nix-shell: 'ci-bench'
+          nix-shell: 'bench'
           custom-shell: 'bash'
           nix-cache: false
           nix-verbose: ${{ inputs.verbose }}
@@ -192,7 +192,7 @@ jobs:
       - uses: ./.github/actions/bench
         if: ${{ inputs.opt == 'all' || inputs.opt == 'no_opt' }}
         with:
-          nix-shell: 'ci-bench'
+          nix-shell: 'bench'
           custom-shell: 'bash'
           nix-cache: false
           nix-verbose: ${{ inputs.verbose }}

.github/workflows/ci.yml

@@ -36,22 +36,22 @@ jobs:
            name: 'ubuntu-latest (aarch64)'
            arch: x86_64
            mode: cross-x86_64
-           nix_shell: ci-cross-x86_64
+           nix_shell: cross-x86_64
          - runner: ubuntu-24.04-arm
            name: 'ubuntu-latest (aarch64)'
            arch: riscv64
            mode: cross-riscv64
-           nix_shell: ci-cross-riscv64
+           nix_shell: cross-riscv64
          - runner: ubuntu-24.04-arm
            name: 'ubuntu-latest (aarch64)'
            arch: riscv32
            mode: cross-riscv32
-           nix_shell: ci-cross-riscv32
+           nix_shell: cross-riscv32
          - runner: ubuntu-24.04-arm
            name: 'ubuntu-latest (ppc64le)'
            arch: ppc64le
            mode: cross-ppc64le
-           nix_shell: ci-cross-ppc64le
+           nix_shell: cross-ppc64le
          - runner: ubuntu-latest
            name: 'ubuntu-latest (x86_64)'
            arch: x86_64
@@ -61,12 +61,12 @@ jobs:
            name: 'ubuntu-latest (x86_64)'
            arch: aarch64
            mode: cross-aarch64
-           nix_shell: ci-cross-aarch64
+           nix_shell: cross-aarch64
          - runner: ubuntu-latest
            name: 'ubuntu-latest (x86_64)'
            arch: aarch64_be
            mode: cross-aarch64_be
-           nix_shell: ci-cross-aarch64_be
+           nix_shell: cross-aarch64_be
         exclude:
           - {external: true,
              target: {
@@ -82,31 +82,31 @@ jobs:
                name: 'ubuntu-latest (aarch64)',
                arch: x86_64,
                mode: cross-x86_64,
-               nix_shell: ci-cross-x86_64
+               nix_shell: cross-x86_64
              }}
           - {external: true,
              target: {
                runner: ubuntu-24.04-arm,
                name: 'ubuntu-latest (aarch64)',
                arch: riscv64,
                mode: cross-riscv64,
-               nix_shell: ci-cross-riscv64
+               nix_shell: cross-riscv64
              }}
           - {external: true,
              target: {
                runner: ubuntu-24.04-arm,
                name: 'ubuntu-latest (aarch64)',
                arch: riscv32,
                mode: cross-riscv32,
-               nix_shell: ci-cross-riscv32
+               nix_shell: cross-riscv32
              }}
           - {external: true,
              target: {
                runner: ubuntu-24.04-arm,
                name: 'ubuntu-latest (ppc64le)',
                arch: ppc64le,
                mode: cross-ppc64le,
-               nix_shell: ci-cross-ppc64le
+               nix_shell: cross-ppc64le
              }}
           - {external: true,
              target: {
@@ -122,15 +122,15 @@ jobs:
                name: 'ubuntu-latest (x86_64)',
                arch: aarch64,
                mode: cross-aarch64,
-               nix_shell: ci-cross-aarch64
+               nix_shell: cross-aarch64
              }}
           - {external: true,
              target: {
                runner: ubuntu-latest,
                name: 'ubuntu-latest (x86_64)',
                arch: aarch64_be,
                mode: cross-aarch64_be,
-               nix_shell: ci-cross-aarch64_be
+               nix_shell: cross-aarch64_be
              }}
     name: Functional tests (${{ matrix.target.arch }}${{ matrix.target.mode != 'native' && ', cross' || ''}})
     runs-on: ${{ matrix.target.runner }}
@@ -211,77 +211,77 @@ jobs:
            name: 'macos'
         compiler:
          - name: gcc-4.8
-           shell: ci_gcc48
+           shell: gcc48
            darwin: False
            c17: False
            c23: False
            opt: all
            examples: true
          - name: gcc-4.9
-           shell: ci_gcc49
+           shell: gcc49
            darwin: False
            c17: False
            c23: False
            opt: all
            examples: true
          - name: gcc-7
-           shell: ci_gcc7
+           shell: gcc7
            darwin: False
            c17: False
            c23: False
            opt: all
            examples: true
          - name: gcc-11
-           shell: ci_gcc11
+           shell: gcc11
            darwin: True
            c17: True
            c23: False
            opt: all
            examples: true
          - name: gcc-13
-           shell: ci_gcc13
+           shell: gcc13
            darwin: True
            c17: True
            c23: False
            opt: all
            examples: true
          - name: gcc-14
-           shell: ci_gcc14
+           shell: gcc14
            darwin: True
            c17: True
            c23: True
            opt: all
            examples: true
          - name: gcc-15
-           shell: ci_gcc15
+           shell: gcc15
            darwin: True
            c17: True
            c23: True
            opt: all
            examples: true
          - name: clang-18
-           shell: ci_clang18
+           shell: clang18
            darwin: True
            c17: True
            c23: True
            opt: all
            examples: true
          - name: clang-19
-           shell: ci_clang19
+           shell: clang19
            darwin: True
            c17: True
            c23: True
            opt: all
            examples: true
          - name: clang-20
-           shell: ci_clang20
+           shell: clang20
            darwin: True
            c17: True
            c23: True
            opt: all
            examples: true
          - name: clang-21
-           shell: ci_clang21
+           shell: clang21
            darwin: True
            c17: True
            c23: True
@@ -294,28 +294,28 @@ jobs:
          # We omit all examples since there is currently no way to run
          # only those examples not involving native code.
          - name: zig-0.12
-           shell: ci_zig0_12
+           shell: zig0_12
            darwin: True
            c17: True
            c23: False
            examples: False
            opt: no_opt
          - name: zig-0.13
-           shell: ci_zig0_13
+           shell: zig0_13
            darwin: True
            c17: True
            c23: False
            examples: False
            opt: no_opt
          - name: zig-0.14
-           shell: ci_zig0_14
+           shell: zig0_14
            darwin: True
            c17: True
            c23: True
            examples: False
            opt: no_opt
          - name: zig-0.15
-           shell: ci_zig0_15
+           shell: zig0_15
            darwin: True
            c17: True
            c23: True
@@ -431,7 +431,7 @@ jobs:
         with:
           gh_token: ${{ secrets.GITHUB_TOKEN }}
           compile_mode: native
-          nix-shell: ci_valgrind-varlat_gcc15
+          nix-shell: valgrind-varlat_gcc15
           nix-cache: false
           opt: all
           cflags: "${{ matrix.cflags }}"
@@ -478,11 +478,11 @@ jobs:
       matrix:
         compiler:
          - name: gcc-14
-           shell: ci_gcc14
+           shell: gcc14
          - name: gcc-15
-           shell: ci_gcc15
+           shell: gcc15
          - name: clang-19
-           shell: ci_clang19
+           shell: clang19
     # On AArch64 -fcf-protection is not supported anyway
     runs-on: ubuntu-latest
     steps:
@@ -727,19 +727,19 @@ jobs:
       matrix:
         target:
           - system: macos-latest
-            nix_shell: 'ci-cross-x86_64'
+            nix_shell: 'cross-autogen'
             nix_cache: 'true'
             extra_args: '--force-cross'
           # TODO: This does not yet work (#1304) <- MLKEM ISSUE, Port when fixed
           # - system: macos-15-intel
           #   nix_cache: 'false'
           #   nix_shell: 'ci'
           - system: ubuntu-latest
-            nix_shell: 'ci-cross-aarch64'
+            nix_shell: 'cross-autogen'
             nix_cache: 'true'
             extra_args: '--force-cross'
           - system: ubuntu-24.04-arm
-            nix_shell: 'ci-cross-x86_64'
+            nix_shell: 'cross-autogen'
             nix_cache: 'true'
             extra_args: '--force-cross'
     runs-on: ${{ matrix.target.system }}