Merge pull request #744 from pq-code-package/valgrind-caching

CI: Only cache one valgrind per arch
pq-code-package · Feb 5, 2025 · 16c34ff · 16c34ff · oqs-bot · Feb 5, 2025
2 parents 7739a8f + fd396fe
commit 16c34ff
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/.github/actions/ct-test/action.yml b/.github/actions/ct-test/action.yml
@@ -14,6 +14,28 @@ inputs:
 runs:
   using: composite
   steps:
+      - name: System info
+        shell: ${{ env.SHELL }}
+        run: |
+          ARCH=$(uname -m)
+          echo <<-EOF
+            ## Setup
+            Architecture: $ARCH
+            - $(uname -a)
+            - $(nix --version || echo 'nix not present')
+            - $(bash --version | grep -m1 "")
+            - $(python3 --version)
+            - $(${{ inputs.cross_prefix }}${CC} --version | grep -m1 "")
+          EOF
+          cat >> $GITHUB_STEP_SUMMARY <<-EOF
+            ## Setup
+            Architecture: $ARCH
+            - $(uname -a)
+            - $(nix --version || echo 'nix not present')
+            - $(bash --version | grep -m1 "")
+            - $(python3 --version)
+            - $(${{ inputs.cross_prefix }}${CC} --version | grep -m1 "")
+          EOF
       - shell: ${{ env.SHELL }}
         run: |
           make clean

diff --git a/.github/actions/setup-shell/action.yml b/.github/actions/setup-shell/action.yml
@@ -10,6 +10,9 @@ inputs:
   nix-cache:
     description: Determine whether to enable nix cache
     default: 'false'
+  nix-cache-prefix:
+    description: Fixed prefix of ID of Github cache entries that should be removed.
+    required: false
   nix-verbose:
     description: Determine wether to suppress nix log or not
     default: 'false'
@@ -35,6 +38,7 @@ runs:
         verbose: ${{ inputs.nix-verbose }}
         cache: ${{ inputs.nix-cache }}
         script: ${{ inputs.script }}
+        cache_prefix: ${{ inputs.nix-cache-prefix }}
     - name: Set custom shell
       shell: bash
       if: ${{ inputs.nix-shell == '' }}

diff --git a/.github/workflows/ct-tests.yml b/.github/workflows/ct-tests.yml
@@ -44,6 +44,7 @@ jobs:
           gh_token: ${{ secrets.GITHUB_TOKEN }}
           nix-shell: ${{ matrix.nix-shell }}
           nix-cache: true
+          nix-cache-prefix: valgrind-${{ runner.os }}-${{ runner.arch }}
       - name:  Build and run test (-Oz)
         # -Oz got introduced in gcc12
         if: ${{ matrix.nix-shell !=  'ci_valgrind-varlat_gcc48' && matrix.nix-shell !=  'ci_valgrind-varlat_gcc49' && matrix.nix-shell !=  'ci_valgrind-varlat_gcc7' && matrix.nix-shell !=  'ci_valgrind-varlat_gcc11'}}
Benchmark suite	Current: `16c34ff`	Previous: `7739a8f`	Ratio
`ML-KEM-512 keypair`	`9302` cycles	`9329` cycles	`1.00`
`ML-KEM-512 encaps`	`10793` cycles	`10800` cycles	`1.00`
`ML-KEM-512 decaps`	`14790` cycles	`14753` cycles	`1.00`
`ML-KEM-768 keypair`	`16019` cycles	`16020` cycles	`1.00`
`ML-KEM-768 encaps`	`17347` cycles	`17340` cycles	`1.00`
`ML-KEM-768 decaps`	`23056` cycles	`23047` cycles	`1.00`
`ML-KEM-1024 keypair`	`21353` cycles	`21393` cycles	`1.00`
`ML-KEM-1024 encaps`	`23291` cycles	`23296` cycles	`1.00`
`ML-KEM-1024 decaps`	`30778` cycles	`30816` cycles	`1.00`
Benchmark suite	Current: `16c34ff`	Previous: `7739a8f`	Ratio
`ML-KEM-512 keypair`	`28940` cycles	`28941` cycles	`1.00`
`ML-KEM-512 encaps`	`34271` cycles	`34290` cycles	`1.00`
`ML-KEM-512 decaps`	`44768` cycles	`44768` cycles	`1`
`ML-KEM-768 keypair`	`49280` cycles	`49279` cycles	`1.00`
`ML-KEM-768 encaps`	`54590` cycles	`54585` cycles	`1.00`
`ML-KEM-768 decaps`	`69411` cycles	`69409` cycles	`1.00`
`ML-KEM-1024 keypair`	`71914` cycles	`71916` cycles	`1.00`
`ML-KEM-1024 encaps`	`80618` cycles	`80620` cycles	`1.00`
`ML-KEM-1024 decaps`	`100364` cycles	`100363` cycles	`1.00`
Benchmark suite	Current: `16c34ff`	Previous: `7739a8f`	Ratio
`ML-KEM-512 keypair`	`29585` cycles	`29695` cycles	`1.00`
`ML-KEM-512 encaps`	`35325` cycles	`35318` cycles	`1.00`
`ML-KEM-512 decaps`	`45880` cycles	`46014` cycles	`1.00`
`ML-KEM-768 keypair`	`47194` cycles	`47099` cycles	`1.00`
`ML-KEM-768 encaps`	`55605` cycles	`55493` cycles	`1.00`
`ML-KEM-768 decaps`	`67598` cycles	`67507` cycles	`1.00`
`ML-KEM-1024 keypair`	`71793` cycles	`71522` cycles	`1.00`
`ML-KEM-1024 encaps`	`82081` cycles	`81812` cycles	`1.00`
`ML-KEM-1024 decaps`	`99401` cycles	`99029` cycles	`1.00`
Benchmark suite	Current: `16c34ff`	Previous: `7739a8f`	Ratio
`ML-KEM-512 keypair`	`15936` cycles	`15921` cycles	`1.00`
`ML-KEM-512 encaps`	`18004` cycles	`18001` cycles	`1.00`
`ML-KEM-512 decaps`	`24507` cycles	`24511` cycles	`1.00`
`ML-KEM-768 keypair`	`27361` cycles	`27346` cycles	`1.00`
`ML-KEM-768 encaps`	`28968` cycles	`28907` cycles	`1.00`
`ML-KEM-768 decaps`	`38339` cycles	`38327` cycles	`1.00`
`ML-KEM-1024 keypair`	`36957` cycles	`36940` cycles	`1.00`
`ML-KEM-1024 encaps`	`39879` cycles	`39863` cycles	`1.00`
`ML-KEM-1024 decaps`	`52388` cycles	`52384` cycles	`1.00`
Benchmark suite	Current: `16c34ff`	Previous: `7739a8f`	Ratio
`ML-KEM-512 keypair`	`16972` cycles	`16960` cycles	`1.00`
`ML-KEM-512 encaps`	`18660` cycles	`18637` cycles	`1.00`
`ML-KEM-512 decaps`	`24037` cycles	`24033` cycles	`1.00`
`ML-KEM-768 keypair`	`28690` cycles	`28742` cycles	`1.00`
`ML-KEM-768 encaps`	`29785` cycles	`29858` cycles	`1.00`
`ML-KEM-768 decaps`	`37564` cycles	`37608` cycles	`1.00`
`ML-KEM-1024 keypair`	`41717` cycles	`41700` cycles	`1.00`
`ML-KEM-1024 encaps`	`43928` cycles	`43972` cycles	`1.00`
`ML-KEM-1024 decaps`	`54300` cycles	`54341` cycles	`1.00`
Benchmark suite	Current: `16c34ff`	Previous: `7739a8f`	Ratio
`ML-KEM-512 keypair`	`11299` cycles	`11277` cycles	`1.00`
`ML-KEM-512 encaps`	`12847` cycles	`12813` cycles	`1.00`
`ML-KEM-512 decaps`	`17700` cycles	`17858` cycles	`0.99`
`ML-KEM-768 keypair`	`19640` cycles	`19643` cycles	`1.00`
`ML-KEM-768 encaps`	`20583` cycles	`20644` cycles	`1.00`
`ML-KEM-768 decaps`	`27640` cycles	`27664` cycles	`1.00`
`ML-KEM-1024 keypair`	`26310` cycles	`26304` cycles	`1.00`
`ML-KEM-1024 encaps`	`28185` cycles	`28191` cycles	`1.00`
`ML-KEM-1024 decaps`	`37611` cycles	`37741` cycles	`1.00`
Benchmark suite	Current: `16c34ff`	Previous: `7739a8f`	Ratio
`ML-KEM-512 keypair`	`28945` cycles	`28946` cycles	`1.00`
`ML-KEM-512 encaps`	`34279` cycles	`34280` cycles	`1.00`
`ML-KEM-512 decaps`	`44783` cycles	`44784` cycles	`1.00`
`ML-KEM-768 keypair`	`49253` cycles	`49260` cycles	`1.00`
`ML-KEM-768 encaps`	`54608` cycles	`54614` cycles	`1.00`
`ML-KEM-768 decaps`	`69446` cycles	`69456` cycles	`1.00`
`ML-KEM-1024 keypair`	`71944` cycles	`71913` cycles	`1.00`
`ML-KEM-1024 encaps`	`80617` cycles	`80593` cycles	`1.00`
`ML-KEM-1024 decaps`	`100416` cycles	`100442` cycles	`1.00`
Benchmark suite	Current: `16c34ff`	Previous: `7739a8f`	Ratio
`ML-KEM-512 keypair`	`46428` cycles	`46486` cycles	`1.00`
`ML-KEM-512 encaps`	`54595` cycles	`54638` cycles	`1.00`
`ML-KEM-512 decaps`	`70305` cycles	`70348` cycles	`1.00`
`ML-KEM-768 keypair`	`76698` cycles	`76751` cycles	`1.00`
`ML-KEM-768 encaps`	`87403` cycles	`87404` cycles	`1.00`
`ML-KEM-768 decaps`	`107881` cycles	`107888` cycles	`1.00`
`ML-KEM-1024 keypair`	`112202` cycles	`112194` cycles	`1.00`
`ML-KEM-1024 encaps`	`126301` cycles	`126358` cycles	`1.00`
`ML-KEM-1024 decaps`	`152605` cycles	`152471` cycles	`1.00`
Benchmark suite	Current: `16c34ff`	Previous: `7739a8f`	Ratio
`ML-KEM-512 keypair`	`39478` cycles	`39458` cycles	`1.00`
`ML-KEM-512 encaps`	`47505` cycles	`47510` cycles	`1.00`
`ML-KEM-512 decaps`	`61784` cycles	`61739` cycles	`1.00`
`ML-KEM-768 keypair`	`63904` cycles	`63935` cycles	`1.00`
`ML-KEM-768 encaps`	`75312` cycles	`75320` cycles	`1.00`
`ML-KEM-768 decaps`	`93788` cycles	`93753` cycles	`1.00`
`ML-KEM-1024 keypair`	`95458` cycles	`95434` cycles	`1.00`
`ML-KEM-1024 encaps`	`108971` cycles	`108954` cycles	`1.00`
`ML-KEM-1024 decaps`	`132466` cycles	`132407` cycles	`1.00`
Benchmark suite	Current: `16c34ff`	Previous: `7739a8f`	Ratio
`ML-KEM-512 keypair`	`36081` cycles	`36089` cycles	`1.00`
`ML-KEM-512 encaps`	`42363` cycles	`42320` cycles	`1.00`
`ML-KEM-512 decaps`	`55454` cycles	`55450` cycles	`1.00`
`ML-KEM-768 keypair`	`58505` cycles	`58499` cycles	`1.00`
`ML-KEM-768 encaps`	`67171` cycles	`66968` cycles	`1.00`
`ML-KEM-768 decaps`	`84087` cycles	`84137` cycles	`1.00`
`ML-KEM-1024 keypair`	`86563` cycles	`86607` cycles	`1.00`
`ML-KEM-1024 encaps`	`97221` cycles	`97235` cycles	`1.00`
`ML-KEM-1024 decaps`	`118839` cycles	`118872` cycles	`1.00`