Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for latest eurydice #621

Closed
wants to merge 4 commits into from
Closed

Fix for latest eurydice #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe4523d
Update to the latest version of the tools
msprotz Sep 26, 2024
b4f39a8
Also fix cg.yaml
msprotz Sep 26, 2024
3d92d93
Also fix other renamings
msprotz Sep 27, 2024
6d703d9
Merge branch 'main' into protz_fix_c_yaml
franziskuskiefer Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libcrux-ml-kem/c.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ echo " */" >> header.txt
echo "Running eurydice ..."
echo $EURYDICE_HOME/eurydice --config ../$config -funroll-loops $unrolling \
--header header.txt \
--debug hashes \
../../libcrux_ml_kem.llbc ../../libcrux_sha3.llbc
$EURYDICE_HOME/eurydice --config ../$config -funroll-loops $unrolling \
--header header.txt \
Expand Down
8 changes: 4 additions & 4 deletions libcrux-ml-kem/c.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ files:
- [libcrux_sha3, neon, "*"]
- [libcrux_sha3, simd, arm64, "*"]
monomorphizations_exact:
- [libcrux_sha3, generic_keccak, "KeccakState_fc"]
- [libcrux_sha3, generic_keccak, "KeccakState_fc"] # FIXME grep for "old hash: fc" in hash_map on neon machine
include_in_h:
- '"intrinsics/libcrux_intrinsics_arm64.h"'

Expand All @@ -43,8 +43,8 @@ files:
# the behavior applies.
internal:
monomorphizations_exact:
- [libcrux_sha3, generic_keccak, absorb_final_7f ]
- [libcrux_sha3, generic_keccak, squeeze_first_three_blocks_ed ]
- [libcrux_sha3, generic_keccak, absorb_final_fb ]
- [libcrux_sha3, generic_keccak, squeeze_first_three_blocks_97 ]
api:
- [libcrux_sha3, avx2, "*"]
private:
Expand All @@ -59,7 +59,7 @@ files:
- [libcrux_sha3, avx2, "*"]
- [libcrux_sha3, simd, avx2, "*"]
monomorphizations_exact:
- [libcrux_sha3, generic_keccak, KeccakState_29]
- [libcrux_sha3, generic_keccak, KeccakState_55]
include_in_h:
- '"intrinsics/libcrux_intrinsics_avx2.h"'

Expand Down
8 changes: 4 additions & 4 deletions libcrux-ml-kem/c/benches/sha3.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ shake128_34_504(benchmark::State &state)
Eurydice_slice last[4] = {EURYDICE_SLICE(input, 0, 34), EURYDICE_SLICE(input, 0, 34), EURYDICE_SLICE(input, 0, 34), EURYDICE_SLICE(input, 0, 34)};
Eurydice_slice out[4] = {EURYDICE_SLICE(digest0, 0, 504), EURYDICE_SLICE(digest1, 0, 504), EURYDICE_SLICE(digest2, 0, 504), EURYDICE_SLICE(digest3, 0, 504)};
auto st = libcrux_sha3_avx2_x4_incremental_init();
libcrux_sha3_generic_keccak_absorb_final_7f(&st, last);
libcrux_sha3_generic_keccak_squeeze_first_three_blocks_ed(&st, out);
libcrux_sha3_generic_keccak_absorb_final_fb(&st, last);
libcrux_sha3_generic_keccak_squeeze_first_three_blocks_97(&st, out);

for (auto _ : state)
{
auto st = libcrux_sha3_avx2_x4_incremental_init();
libcrux_sha3_generic_keccak_absorb_final_7f(&st, last);
libcrux_sha3_generic_keccak_squeeze_first_three_blocks_ed(&st, out);
libcrux_sha3_generic_keccak_absorb_final_fb(&st, last);
libcrux_sha3_generic_keccak_squeeze_first_three_blocks_97(&st, out);
}
}

Expand Down
10 changes: 5 additions & 5 deletions libcrux-ml-kem/c/code_gen.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This code was generated with the following revisions:
Charon: 28d543bfacc902ba9cc2a734b76baae9583892a4
Eurydice: 1a65dbf3758fe310833718c645a64266294a29ac
Karamel: 15d4bce74a2d43e34a64f48f8311b7d9bcb0e152
F*: 5643e656b989aca7629723653a2570c7df6252b9-dirty
Libcrux: 97f7cefe14dabf275e4671ffea87e032d7779b71
Charon: 1bd0af95285033fec42133810440d56977c17ade
Eurydice: ddc85907bc75d00e61ada9fae3ee6f784b08df70
Karamel: 8c3612018c25889288da6857771be3ad03b75bcd
F*: e5cef6f266ece8a8b55ef4cd9b61cdf103520d38
Libcrux: 8c057443a69fbbb7d010dd1552a4ca4b8a622682
Loading
Loading