Skip to content

Commit 5945253

Browse files
committed
hol_light: Unify asm and proof filenames with exported symbols
Signed-off-by: Matthias J. Kannwischer <matthias@zerorisc.com>
1 parent 90a3ce6 commit 5945253

80 files changed

Lines changed: 271 additions & 308 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/hol_light.yml

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -70,44 +70,44 @@ jobs:
7070
gh_token: ${{ secrets.GITHUB_TOKEN }}
7171
nix-shell: 'hol_light'
7272
script: |
73-
make -C proofs/hol_light/aarch64 mlkem/mlkem_poly_tobytes.o
74-
echo 'needs "aarch64/proofs/mlkem_poly_tobytes.ml";;' | hol.sh
73+
make -C proofs/hol_light/aarch64 mlkem/poly_tobytes_aarch64_asm.o
74+
echo 'needs "aarch64/proofs/poly_tobytes_aarch64_asm.ml";;' | hol.sh
7575
hol_light_proofs:
7676
needs: [ hol_light_bytecode ]
7777
strategy:
7878
fail-fast: false
7979
matrix:
8080
proof:
8181
# Dependencies on {name}.{S,ml} are implicit
82-
- name: mlkem_ntt
82+
- name: ntt_aarch64_asm
8383
needs: ["mlkem_specs.ml", "mlkem_utils.ml", "mlkem_zetas.ml"]
84-
- name: mlkem_intt
84+
- name: intt_aarch64_asm
8585
needs: ["mlkem_specs.ml", "mlkem_utils.ml", "mlkem_zetas.ml"]
86-
- name: mlkem_poly_tomont
86+
- name: poly_tomont_aarch64_asm
8787
needs: ["mlkem_specs.ml", "mlkem_utils.ml"]
88-
- name: mlkem_poly_mulcache_compute
88+
- name: poly_mulcache_compute_aarch64_asm
8989
needs: ["mlkem_specs.ml", "mlkem_utils.ml", "mlkem_zetas.ml"]
90-
- name: mlkem_poly_reduce
90+
- name: poly_reduce_aarch64_asm
9191
needs: ["mlkem_specs.ml", "mlkem_utils.ml"]
92-
- name: mlkem_poly_basemul_acc_montgomery_cached_k2
92+
- name: polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm
9393
needs: ["mlkem_specs.ml", "mlkem_utils.ml"]
94-
- name: mlkem_poly_basemul_acc_montgomery_cached_k3
94+
- name: polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm
9595
needs: ["mlkem_specs.ml", "mlkem_utils.ml"]
96-
- name: mlkem_poly_basemul_acc_montgomery_cached_k4
96+
- name: polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm
9797
needs: ["mlkem_specs.ml", "mlkem_utils.ml"]
98-
- name: mlkem_poly_tobytes
98+
- name: poly_tobytes_aarch64_asm
9999
needs: ["mlkem_specs.ml", "mlkem_utils.ml" ]
100-
- name: mlkem_rej_uniform
100+
- name: rej_uniform_aarch64_asm
101101
needs: ["mlkem_specs.ml", "mlkem_utils.ml", "mlkem_rej_uniform_table.ml"]
102-
- name: keccak_f1600_x1_scalar
102+
- name: keccak_f1600_x1_scalar_aarch64_asm
103103
needs: ["keccak_specs.ml"]
104-
- name: keccak_f1600_x1_v84a
104+
- name: keccak_f1600_x1_v84a_aarch64_asm
105105
needs: ["keccak_specs.ml"]
106-
- name: keccak_f1600_x2_v84a
106+
- name: keccak_f1600_x2_v84a_aarch64_asm
107107
needs: ["keccak_specs.ml"]
108-
- name: keccak_f1600_x4_v8a_v84a_scalar
108+
- name: keccak_f1600_x4_v8a_v84a_scalar_hybrid_aarch64_asm
109109
needs: ["keccak_specs.ml"]
110-
- name: keccak_f1600_x4_v8a_scalar
110+
- name: keccak_f1600_x4_v8a_scalar_hybrid_aarch64_asm
111111
needs: ["keccak_specs.ml"]
112112
name: AArch64 HOL Light proof for ${{ matrix.proof.name }}.S
113113
runs-on: pqcp-arm64
@@ -178,56 +178,56 @@ jobs:
178178
gh_token: ${{ secrets.GITHUB_TOKEN }}
179179
nix-shell: 'hol_light'
180180
script: |
181-
make -C proofs/hol_light/x86_64 mlkem/mlkem_poly_basemul_acc_montgomery_cached_k2.o
182-
echo 'needs "x86_64/proofs/mlkem_poly_basemul_acc_montgomery_cached_k2.ml";;' | hol.sh
181+
make -C proofs/hol_light/x86_64 mlkem/polyvec_basemul_acc_montgomery_cached_k2_avx2_asm.o
182+
echo 'needs "x86_64/proofs/polyvec_basemul_acc_montgomery_cached_k2_avx2_asm.ml";;' | hol.sh
183183
hol_light_proofs_x86_64:
184184
needs: [ hol_light_bytecode_x86_64 ]
185185
strategy:
186186
fail-fast: false
187187
matrix:
188188
proof:
189189
# Dependencies on {name}.{S,ml} are implicit
190-
- name: mlkem_ntt
190+
- name: ntt_avx2_asm
191191
needs: ["mlkem_specs.ml", "mlkem_zetas.ml"]
192-
- name: mlkem_intt
192+
- name: intt_avx2_asm
193193
needs: ["mlkem_specs.ml", "mlkem_zetas.ml"]
194-
- name: mlkem_poly_basemul_acc_montgomery_cached_k2
194+
- name: polyvec_basemul_acc_montgomery_cached_k2_avx2_asm
195195
needs: ["mlkem_specs.ml"]
196-
- name: mlkem_poly_basemul_acc_montgomery_cached_k3
196+
- name: polyvec_basemul_acc_montgomery_cached_k3_avx2_asm
197197
needs: ["mlkem_specs.ml"]
198-
- name: mlkem_poly_basemul_acc_montgomery_cached_k4
198+
- name: polyvec_basemul_acc_montgomery_cached_k4_avx2_asm
199199
needs: ["mlkem_specs.ml"]
200-
- name: mlkem_reduce
200+
- name: reduce_avx2_asm
201201
needs: ["mlkem_specs.ml"]
202-
- name: mlkem_tobytes
202+
- name: ntttobytes_avx2_asm
203203
needs: ["mlkem_specs.ml"]
204-
- name: mlkem_rej_uniform
204+
- name: rej_uniform_avx2_asm
205205
needs: ["mlkem_specs.ml", "mlkem_rej_uniform_table.ml"]
206-
- name: mlkem_frombytes
206+
- name: nttfrombytes_avx2_asm
207207
needs: ["mlkem_specs.ml"]
208-
- name: mlkem_tomont
208+
- name: tomont_avx2_asm
209209
needs: ["mlkem_specs.ml"]
210-
- name: mlkem_unpack
210+
- name: nttunpack_avx2_asm
211211
needs: ["mlkem_specs.ml"]
212-
- name: mlkem_mulcache_compute
212+
- name: poly_mulcache_compute_avx2_asm
213213
needs: ["mlkem_specs.ml", "mlkem_zetas.ml"]
214-
- name: mlkem_poly_compress_d4
214+
- name: poly_compress_d4_avx2_asm
215215
needs: ["mlkem_specs.ml", "mlkem_compress_consts.ml"]
216-
- name: mlkem_poly_decompress_d4
216+
- name: poly_decompress_d4_avx2_asm
217217
needs: ["mlkem_specs.ml", "mlkem_compress_consts.ml"]
218-
- name: mlkem_poly_compress_d5
218+
- name: poly_compress_d5_avx2_asm
219219
needs: ["mlkem_specs.ml", "mlkem_compress_consts.ml"]
220-
- name: mlkem_poly_decompress_d5
220+
- name: poly_decompress_d5_avx2_asm
221221
needs: ["mlkem_specs.ml", "mlkem_compress_consts.ml"]
222-
- name: mlkem_poly_compress_d10
222+
- name: poly_compress_d10_avx2_asm
223223
needs: ["mlkem_specs.ml", "mlkem_compress_consts.ml"]
224-
- name: mlkem_poly_decompress_d10
224+
- name: poly_decompress_d10_avx2_asm
225225
needs: ["mlkem_specs.ml", "mlkem_compress_consts.ml"]
226-
- name: mlkem_poly_compress_d11
226+
- name: poly_compress_d11_avx2_asm
227227
needs: ["mlkem_specs.ml", "mlkem_compress_consts.ml"]
228-
- name: mlkem_poly_decompress_d11
228+
- name: poly_decompress_d11_avx2_asm
229229
needs: ["mlkem_specs.ml", "mlkem_compress_consts.ml"]
230-
- name: keccak_f1600_x4_avx2
230+
- name: keccak_f1600_x4_avx2_asm
231231
needs: ["keccak_utils.ml", "keccak_spec.ml", "keccak_f1600_x4_avx2_constants.ml", "keccak_constants.ml"]
232232
name: x86_64 HOL Light proof for ${{ matrix.proof.name }}.S
233233
runs-on: pqcp-x64

BIBLIOGRAPHY.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ source code and documentation.
2727
- [dev/x86_64/src/ntt_avx2_asm.S](dev/x86_64/src/ntt_avx2_asm.S)
2828
- [mlkem/src/native/x86_64/src/intt_avx2_asm.S](mlkem/src/native/x86_64/src/intt_avx2_asm.S)
2929
- [mlkem/src/native/x86_64/src/ntt_avx2_asm.S](mlkem/src/native/x86_64/src/ntt_avx2_asm.S)
30-
- [proofs/hol_light/x86_64/mlkem/mlkem_intt.S](proofs/hol_light/x86_64/mlkem/mlkem_intt.S)
31-
- [proofs/hol_light/x86_64/mlkem/mlkem_ntt.S](proofs/hol_light/x86_64/mlkem/mlkem_ntt.S)
30+
- [proofs/hol_light/x86_64/mlkem/intt_avx2_asm.S](proofs/hol_light/x86_64/mlkem/intt_avx2_asm.S)
31+
- [proofs/hol_light/x86_64/mlkem/ntt_avx2_asm.S](proofs/hol_light/x86_64/mlkem/ntt_avx2_asm.S)
3232

3333
### `CBMC`
3434

@@ -188,8 +188,8 @@ source code and documentation.
188188
- [mlkem/src/fips202/native/aarch64/src/keccak_f1600_x1_v84a_aarch64_asm.S](mlkem/src/fips202/native/aarch64/src/keccak_f1600_x1_v84a_aarch64_asm.S)
189189
- [mlkem/src/fips202/native/aarch64/src/keccak_f1600_x2_v84a_aarch64_asm.S](mlkem/src/fips202/native/aarch64/src/keccak_f1600_x2_v84a_aarch64_asm.S)
190190
- [proofs/hol_light/README.md](proofs/hol_light/README.md)
191-
- [proofs/hol_light/aarch64/mlkem/keccak_f1600_x1_v84a.S](proofs/hol_light/aarch64/mlkem/keccak_f1600_x1_v84a.S)
192-
- [proofs/hol_light/aarch64/mlkem/keccak_f1600_x2_v84a.S](proofs/hol_light/aarch64/mlkem/keccak_f1600_x2_v84a.S)
191+
- [proofs/hol_light/aarch64/mlkem/keccak_f1600_x1_v84a_aarch64_asm.S](proofs/hol_light/aarch64/mlkem/keccak_f1600_x1_v84a_aarch64_asm.S)
192+
- [proofs/hol_light/aarch64/mlkem/keccak_f1600_x2_v84a_aarch64_asm.S](proofs/hol_light/aarch64/mlkem/keccak_f1600_x2_v84a_aarch64_asm.S)
193193

194194
### `KyberSlash`
195195

@@ -241,11 +241,11 @@ source code and documentation.
241241
- [mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S](mlkem/src/native/aarch64/src/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S)
242242
- [mlkem/src/poly.c](mlkem/src/poly.c)
243243
- [mlkem/src/poly_k.c](mlkem/src/poly_k.c)
244-
- [proofs/hol_light/aarch64/mlkem/mlkem_intt.S](proofs/hol_light/aarch64/mlkem/mlkem_intt.S)
245-
- [proofs/hol_light/aarch64/mlkem/mlkem_ntt.S](proofs/hol_light/aarch64/mlkem/mlkem_ntt.S)
246-
- [proofs/hol_light/aarch64/mlkem/mlkem_poly_basemul_acc_montgomery_cached_k2.S](proofs/hol_light/aarch64/mlkem/mlkem_poly_basemul_acc_montgomery_cached_k2.S)
247-
- [proofs/hol_light/aarch64/mlkem/mlkem_poly_basemul_acc_montgomery_cached_k3.S](proofs/hol_light/aarch64/mlkem/mlkem_poly_basemul_acc_montgomery_cached_k3.S)
248-
- [proofs/hol_light/aarch64/mlkem/mlkem_poly_basemul_acc_montgomery_cached_k4.S](proofs/hol_light/aarch64/mlkem/mlkem_poly_basemul_acc_montgomery_cached_k4.S)
244+
- [proofs/hol_light/aarch64/mlkem/intt_aarch64_asm.S](proofs/hol_light/aarch64/mlkem/intt_aarch64_asm.S)
245+
- [proofs/hol_light/aarch64/mlkem/ntt_aarch64_asm.S](proofs/hol_light/aarch64/mlkem/ntt_aarch64_asm.S)
246+
- [proofs/hol_light/aarch64/mlkem/polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm.S](proofs/hol_light/aarch64/mlkem/polyvec_basemul_acc_montgomery_cached_k2_aarch64_asm.S)
247+
- [proofs/hol_light/aarch64/mlkem/polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm.S](proofs/hol_light/aarch64/mlkem/polyvec_basemul_acc_montgomery_cached_k3_aarch64_asm.S)
248+
- [proofs/hol_light/aarch64/mlkem/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S](proofs/hol_light/aarch64/mlkem/polyvec_basemul_acc_montgomery_cached_k4_aarch64_asm.S)
249249

250250
### `REF`
251251

@@ -320,21 +320,21 @@ source code and documentation.
320320
- [mlkem/src/native/x86_64/src/poly_decompress_d5_avx2_asm.S](mlkem/src/native/x86_64/src/poly_decompress_d5_avx2_asm.S)
321321
- [mlkem/src/native/x86_64/src/reduce_avx2_asm.S](mlkem/src/native/x86_64/src/reduce_avx2_asm.S)
322322
- [mlkem/src/native/x86_64/src/tomont_avx2_asm.S](mlkem/src/native/x86_64/src/tomont_avx2_asm.S)
323-
- [proofs/hol_light/x86_64/mlkem/mlkem_frombytes.S](proofs/hol_light/x86_64/mlkem/mlkem_frombytes.S)
324-
- [proofs/hol_light/x86_64/mlkem/mlkem_intt.S](proofs/hol_light/x86_64/mlkem/mlkem_intt.S)
325-
- [proofs/hol_light/x86_64/mlkem/mlkem_ntt.S](proofs/hol_light/x86_64/mlkem/mlkem_ntt.S)
326-
- [proofs/hol_light/x86_64/mlkem/mlkem_poly_compress_d10.S](proofs/hol_light/x86_64/mlkem/mlkem_poly_compress_d10.S)
327-
- [proofs/hol_light/x86_64/mlkem/mlkem_poly_compress_d11.S](proofs/hol_light/x86_64/mlkem/mlkem_poly_compress_d11.S)
328-
- [proofs/hol_light/x86_64/mlkem/mlkem_poly_compress_d4.S](proofs/hol_light/x86_64/mlkem/mlkem_poly_compress_d4.S)
329-
- [proofs/hol_light/x86_64/mlkem/mlkem_poly_compress_d5.S](proofs/hol_light/x86_64/mlkem/mlkem_poly_compress_d5.S)
330-
- [proofs/hol_light/x86_64/mlkem/mlkem_poly_decompress_d10.S](proofs/hol_light/x86_64/mlkem/mlkem_poly_decompress_d10.S)
331-
- [proofs/hol_light/x86_64/mlkem/mlkem_poly_decompress_d11.S](proofs/hol_light/x86_64/mlkem/mlkem_poly_decompress_d11.S)
332-
- [proofs/hol_light/x86_64/mlkem/mlkem_poly_decompress_d4.S](proofs/hol_light/x86_64/mlkem/mlkem_poly_decompress_d4.S)
333-
- [proofs/hol_light/x86_64/mlkem/mlkem_poly_decompress_d5.S](proofs/hol_light/x86_64/mlkem/mlkem_poly_decompress_d5.S)
334-
- [proofs/hol_light/x86_64/mlkem/mlkem_reduce.S](proofs/hol_light/x86_64/mlkem/mlkem_reduce.S)
335-
- [proofs/hol_light/x86_64/mlkem/mlkem_tobytes.S](proofs/hol_light/x86_64/mlkem/mlkem_tobytes.S)
336-
- [proofs/hol_light/x86_64/mlkem/mlkem_tomont.S](proofs/hol_light/x86_64/mlkem/mlkem_tomont.S)
337-
- [proofs/hol_light/x86_64/mlkem/mlkem_unpack.S](proofs/hol_light/x86_64/mlkem/mlkem_unpack.S)
323+
- [proofs/hol_light/x86_64/mlkem/intt_avx2_asm.S](proofs/hol_light/x86_64/mlkem/intt_avx2_asm.S)
324+
- [proofs/hol_light/x86_64/mlkem/ntt_avx2_asm.S](proofs/hol_light/x86_64/mlkem/ntt_avx2_asm.S)
325+
- [proofs/hol_light/x86_64/mlkem/nttfrombytes_avx2_asm.S](proofs/hol_light/x86_64/mlkem/nttfrombytes_avx2_asm.S)
326+
- [proofs/hol_light/x86_64/mlkem/ntttobytes_avx2_asm.S](proofs/hol_light/x86_64/mlkem/ntttobytes_avx2_asm.S)
327+
- [proofs/hol_light/x86_64/mlkem/nttunpack_avx2_asm.S](proofs/hol_light/x86_64/mlkem/nttunpack_avx2_asm.S)
328+
- [proofs/hol_light/x86_64/mlkem/poly_compress_d10_avx2_asm.S](proofs/hol_light/x86_64/mlkem/poly_compress_d10_avx2_asm.S)
329+
- [proofs/hol_light/x86_64/mlkem/poly_compress_d11_avx2_asm.S](proofs/hol_light/x86_64/mlkem/poly_compress_d11_avx2_asm.S)
330+
- [proofs/hol_light/x86_64/mlkem/poly_compress_d4_avx2_asm.S](proofs/hol_light/x86_64/mlkem/poly_compress_d4_avx2_asm.S)
331+
- [proofs/hol_light/x86_64/mlkem/poly_compress_d5_avx2_asm.S](proofs/hol_light/x86_64/mlkem/poly_compress_d5_avx2_asm.S)
332+
- [proofs/hol_light/x86_64/mlkem/poly_decompress_d10_avx2_asm.S](proofs/hol_light/x86_64/mlkem/poly_decompress_d10_avx2_asm.S)
333+
- [proofs/hol_light/x86_64/mlkem/poly_decompress_d11_avx2_asm.S](proofs/hol_light/x86_64/mlkem/poly_decompress_d11_avx2_asm.S)
334+
- [proofs/hol_light/x86_64/mlkem/poly_decompress_d4_avx2_asm.S](proofs/hol_light/x86_64/mlkem/poly_decompress_d4_avx2_asm.S)
335+
- [proofs/hol_light/x86_64/mlkem/poly_decompress_d5_avx2_asm.S](proofs/hol_light/x86_64/mlkem/poly_decompress_d5_avx2_asm.S)
336+
- [proofs/hol_light/x86_64/mlkem/reduce_avx2_asm.S](proofs/hol_light/x86_64/mlkem/reduce_avx2_asm.S)
337+
- [proofs/hol_light/x86_64/mlkem/tomont_avx2_asm.S](proofs/hol_light/x86_64/mlkem/tomont_avx2_asm.S)
338338

339339
### `SLOTHY`
340340

@@ -370,8 +370,8 @@ source code and documentation.
370370
- [mlkem/src/native/aarch64/README.md](mlkem/src/native/aarch64/README.md)
371371
- [mlkem/src/native/aarch64/src/intt_aarch64_asm.S](mlkem/src/native/aarch64/src/intt_aarch64_asm.S)
372372
- [mlkem/src/native/aarch64/src/ntt_aarch64_asm.S](mlkem/src/native/aarch64/src/ntt_aarch64_asm.S)
373-
- [proofs/hol_light/aarch64/mlkem/mlkem_intt.S](proofs/hol_light/aarch64/mlkem/mlkem_intt.S)
374-
- [proofs/hol_light/aarch64/mlkem/mlkem_ntt.S](proofs/hol_light/aarch64/mlkem/mlkem_ntt.S)
373+
- [proofs/hol_light/aarch64/mlkem/intt_aarch64_asm.S](proofs/hol_light/aarch64/mlkem/intt_aarch64_asm.S)
374+
- [proofs/hol_light/aarch64/mlkem/ntt_aarch64_asm.S](proofs/hol_light/aarch64/mlkem/ntt_aarch64_asm.S)
375375

376376
### `clangover`
377377

0 commit comments

Comments
 (0)