Skip to content

perf/inline blake3 round #557

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

Draft
gabriel-barrett wants to merge 1 commit into
base: main
Choose a base branch
from
+11,794 −1,952
Draft

perf/inline blake3 round #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions Ix/IxVM/Blake3.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,19 +438,19 @@ def blake3 := ⟦
];

-- Round 0
let state = blake3_compress_inner_j(state);
let state = @blake3_compress_inner_j(state);
-- Round 1
let state = blake3_compress_inner_j(state);
let state = @blake3_compress_inner_j(state);
-- Round 2
let state = blake3_compress_inner_j(state);
let state = @blake3_compress_inner_j(state);
-- Round 3
let state = blake3_compress_inner_j(state);
let state = @blake3_compress_inner_j(state);
-- Round 4
let state = blake3_compress_inner_j(state);
let state = @blake3_compress_inner_j(state);
-- Round 5
let state = blake3_compress_inner_j(state);
let state = @blake3_compress_inner_j(state);
-- Round 6
let state = blake3_compress_inner_j(state);
let state = @blake3_compress_inner_j(state);

let output0 = @u32_xor(state[0], state[8]);
let output1 = @u32_xor(state[1], state[9]);
Expand Down
142 changes: 71 additions & 71 deletions Tests/Ix/IxVM.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,77 +276,77 @@ private def nameOfString (str : String) : Lean.Name :=
listed constant fails the suite, so a regression cannot land quietly
and an improvement has to be acknowledged by re-pinning. -/
private def kernelCheckEntries : List (String × Nat) := [
("HEq", 129_239_352),
("HEq.rec", 132_223_727),
("Eq.rec", 131_796_529),
("Nat", 129_236_482),
("Nat.add", 159_622_648),
("Nat.add_comm", 268_281_415),
("Nat.decEq", 314_555_983),
("Nat.decLe", 652_460_137),
("Nat.sub_le_of_le_add", 1_577_107_099),
("Nat.shiftRight_succ", 1_172_558_269),
("Trans.mk", 134_045_879),
("Array.append_assoc", 7_717_816_042),
("Vector.append", 7_895_919_380),
("IxVMPrim.nat_add_lit", 193_045_591),
("IxVMPrim.nat_sub_lit", 206_429_542),
("IxVMPrim.nat_mul_lit", 185_748_803),
("IxVMPrim.nat_mul_big", 184_484_961),
("IxVMPrim.nat_div_lit", 1_145_177_643),
("IxVMPrim.nat_mod_lit", 1_166_515_024),
("IxVMPrim.nat_succ_lit", 140_893_385),
("IxVMPrim.nat_pred_lit", 158_099_686),
("IxVMPrim.nat_gcd_lit", 1_819_307_333),
("IxVMPrim.nat_land_lit", 2_945_733_257),
("IxVMPrim.nat_lor_lit", 2_947_607_339),
("IxVMPrim.nat_xor_lit", 2_963_279_952),
("IxVMPrim.nat_shl_lit", 208_443_817),
("IxVMPrim.nat_shr_lit", 1_157_079_133),
("IxVMPrim.nat_pow_big", 361_995_186),
("IxVMPrim.nat_beq_lit", 184_481_296),
("IxVMPrim.nat_ble_lit", 180_137_392),
("IxVMPrim.nat_cases_big", 157_983_733),
("IxVMPrim.nat_dec_le", 667_624_988),
("IxVMPrim.nat_dec_lt", 676_831_686),
("IxVMPrim.nat_dec_eq", 346_845_775),
("IxVMPrim.str_size_lit", 2_070_772_915),
("IxVMPrim.bv_to_nat_lit", 1_729_888_453),
("IxVMInd.Even", 187_829_482),
("IxVMInd.Odd", 187_832_098),
("IxVMInd.Even.rec", 202_546_550),
("IxVMInd.Odd.rec", 202_547_473),
("IxVMInd.Tree", 130_412_124),
("IxVMInd.Tree.rec", 137_998_975),
("IxVMInd.DedupM", 132_977_133),
("IxVMInd.DedupM.rec", 143_220_708),
("IxVMInd.DepthM", 131_760_815),
("IxVMInd.DepthM.rec", 140_372_714),
("String.Internal.append", 2_047_628_926),
("_private.Init.Prelude.0.Lean.extractMainModule._unsafe_rec", 3_025_111_266),
("Lean.Syntax.rec", 2_092_588_961),
("IxVMInd.AuxTie", 280_526_725),
("IxVMInd.AuxTie.rec", 313_017_899),
("IxVMInd.HiddenIdx", 129_716_432),
("IxVMInd.HiddenIdx.rec", 131_861_631),
("IxVMInd.thmMajorUse", 441_019_720),
("IxVMInd.partialKRec", 146_209_750),
("IxVMInd.deepRebase", 195_377_539),
("String.Slice.Pattern.Model.NoPrefixForwardPatternModel.rec", 2_880_537_174),
("Lean.Widget.TaggedText.rec", 2_068_700_986),
("Lean.Doc.Part.rec", 2_103_559_929),
("Lean.Doc.Block.rec", 2_240_484_783),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedup1.A", 131_437_903),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedup1.A.rec", 133_877_688),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedup1.A.rec_1", 133_270_605),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedup1.A.rec_2", 133_270_605),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedup2.A.rec_1", 133_270_605),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedupMixed.M", 131_636_225),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedupMixed.M.rec", 140_194_821),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedupMixed.M.rec_1", 140_194_035),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedupMixed.M.rec_2", 133_270_605),
("strOfListFoldSize", 2_311_060_373),
("strOfListFoldSizeAscii", 2_311_728_414),
("HEq", 128_989_357),
("HEq.rec", 131_561_083),
("Eq.rec", 131_133_885),
("Nat", 128_986_487),
("Nat.add", 155_034_889),
("Nat.add_comm", 249_567_602),
("Nat.decEq", 293_462_213),
("Nat.decLe", 592_466_477),
("Nat.sub_le_of_le_add", 1_420_092_650),
("Nat.shiftRight_succ", 1_056_381_915),
("Trans.mk", 133_383_235),
("Array.append_assoc", 7_082_592_486),
("Vector.append", 7_238_659_461),
("IxVMPrim.nat_add_lit", 182_866_115),
("IxVMPrim.nat_sub_lit", 193_836_968),
("IxVMPrim.nat_mul_lit", 176_409_944),
("IxVMPrim.nat_mul_big", 175_424_887),
("IxVMPrim.nat_div_lit", 1_031_384_671),
("IxVMPrim.nat_mod_lit", 1_049_827_483),
("IxVMPrim.nat_succ_lit", 138_225_983),
("IxVMPrim.nat_pred_lit", 152_319_922),
("IxVMPrim.nat_gcd_lit", 1_632_335_038),
("IxVMPrim.nat_land_lit", 2_626_957_196),
("IxVMPrim.nat_lor_lit", 2_628_465_573),
("IxVMPrim.nat_xor_lit", 2_641_211_526),
("IxVMPrim.nat_shl_lit", 195_277_378),
("IxVMPrim.nat_shr_lit", 1_041_073_139),
("IxVMPrim.nat_pow_big", 342_540_157),
("IxVMPrim.nat_beq_lit", 175_560_336),
("IxVMPrim.nat_ble_lit", 171_909_126),
("IxVMPrim.nat_cases_big", 152_470_974),
("IxVMPrim.nat_dec_le", 605_356_733),
("IxVMPrim.nat_dec_lt", 613_097_858),
("IxVMPrim.nat_dec_eq", 320_927_785),
("IxVMPrim.str_size_lit", 1_841_903_368),
("IxVMPrim.bv_to_nat_lit", 1_550_132_155),
("IxVMInd.Even", 178_071_097),
("IxVMInd.Odd", 178_073_712),
("IxVMInd.Even.rec", 190_810_606),
("IxVMInd.Odd.rec", 190_811_528),
("IxVMInd.Tree", 129_961_307),
("IxVMInd.Tree.rec", 136_307_468),
("IxVMInd.DedupM", 131_869_344),
("IxVMInd.DedupM.rec", 140_553_306),
("IxVMInd.DepthM", 130_989_222),
("IxVMInd.DepthM.rec", 138_320_382),
("String.Internal.append", 1_822_332_277),
("_private.Init.Prelude.0.Lean.extractMainModule._unsafe_rec", 2_687_465_087),
("Lean.Syntax.rec", 1_860_500_501),
("IxVMInd.AuxTie", 253_847_985),
("IxVMInd.AuxTie.rec", 281_739_564),
("IxVMInd.HiddenIdx", 129_367_715),
("IxVMInd.HiddenIdx.rec", 131_198_988),
("IxVMInd.thmMajorUse", 404_619_280),
("IxVMInd.partialKRec", 143_040_056),
("IxVMInd.deepRebase", 184_916_498),
("String.Slice.Pattern.Model.NoPrefixForwardPatternModel.rec", 2_576_912_421),
("Lean.Widget.TaggedText.rec", 1_841_439_725),
("Lean.Doc.Part.rec", 1_872_008_170),
("Lean.Doc.Block.rec", 1_995_130_959),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedup1.A", 130_666_310),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedup1.A.rec", 132_655_226),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedup1.A.rec_1", 132_388_386),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedup1.A.rec_2", 132_388_386),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedup2.A.rec_1", 132_388_386),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedupMixed.M", 130_864_632),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedupMixed.M.rec", 138_020_753),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedupMixed.M.rec_1", 138_019_966),
("_private.Tests.Ix.Compile.Mutual.0.Tests.Ix.Compile.Mutual.AuxDedupMixed.M.rec_2", 132_388_386),
("strOfListFoldSize", 2_048_604_259),
("strOfListFoldSizeAscii", 2_049_091_860),
]

/-- Variant of `kernelChecks`, pinned to the baseline
Expand Down
4 changes: 2 additions & 2 deletions Tests/Main.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ def ignoredRunners (env : Lean.Environment) : List (String × IO UInt32) := [
let actual :=
(Aiur.computeStats v2Env.compiled qc v2Env.shapes).totalFftCost.round.toUInt64.toNat
pure (LSpec.test
s!"Shard pipeline FFT matches: expected 6079191308, got {actual}"
(actual = 6_079_191_308))
s!"Shard pipeline FFT matches: expected 5205199041, got {actual}"
(actual = 5_205_199_041))
LSpec.lspecIO
(.ofList [("ixvm",
[fullSeq, aiurSeq, arenaSeq, exploitSeq, paritySeq, shardSeq])]) []),
Expand Down
Loading
Loading