Skip to content

Add goldenEvalCekCatchBudget and change existing cases to use it #7093

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.

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

Merged
merged 6 commits into from
May 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions plutus-benchmark/bitwise/test/9.6/8 queens.budget.golden

This file was deleted.

4 changes: 4 additions & 0 deletions plutus-benchmark/bitwise/test/9.6/8 queens.eval.golden
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
cpu: 381725318016
mem: 1403857547
size: 380

(constr
1
(constr 0 (con integer 0) (con integer 0))
Expand Down
3 changes: 0 additions & 3 deletions plutus-benchmark/bitwise/test/9.6/Ed25519.budget.golden

This file was deleted.

4 changes: 4 additions & 0 deletions plutus-benchmark/bitwise/test/9.6/Ed25519.eval.golden
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
cpu: 2025744495066
mem: 6392763186
size: 3415

(constr 1)
14 changes: 5 additions & 9 deletions plutus-benchmark/bitwise/test/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import PlutusBenchmark.NQueens.Compiled (dimAsData, nqueensCompiled)
import PlutusBenchmark.SHA512 (sha512)
import PlutusTx.Builtins (fromBuiltin, toBuiltin)
import PlutusTx.Code (unsafeApplyCode)
import PlutusTx.Test (goldenBudget, goldenEvalCekCatch, goldenPirReadable)
import PlutusTx.Test (goldenEvalCekCatchBudget, goldenPirReadable)
import Test.Tasty (TestTree, defaultMain, testGroup)
import Test.Tasty.Extras (TestNested, runTestNested, testNestedGhc)
import Test.Tasty.HUnit (assertEqual, testCase)
Expand All @@ -24,10 +24,9 @@ main = defaultMain . testGroup "bitwise" $ [
testCase "solves for 8 queens" $ assertEqual ""
[(0,0), (1,4), (2,7), (3,5), (4,2), (5,6), (6,1), (7,3)]
(nqueens 8),
runTestGhc [
goldenPirReadable "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData,
goldenBudget "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData,
goldenEvalCekCatch "8 queens" [nqueensCompiled `unsafeApplyCode` dimAsData]
runTestGhc
[ goldenPirReadable "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData
, goldenEvalCekCatchBudget "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData
]
],
testGroup "Ed25519" [
Expand All @@ -36,11 +35,8 @@ main = defaultMain . testGroup "bitwise" $ [
runTestGhc [
goldenPirReadable "Ed25519" $
checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData,
goldenBudget "Ed25519" $
checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData,
goldenEvalCekCatch "Ed25519" [
goldenEvalCekCatchBudget "Ed25519" $
checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData
]
]
]
]
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cpu: 182838904
mem: 755152
size: 151

(con integer 155)
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cpu: 15206420194
mem: 62404432
size: 151
size: 151

(con integer 15050)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cpu: 54709074
mem: 227692
size: 151

(con integer 40)
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cpu: 3885192144
mem: 15954832
size: 151
size: 151

(con integer 3775)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cpu: 101489780
mem: 461880
size: 234

(con integer 155)
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cpu: 8116454900
mem: 36124200
size: 954
size: 954

(con integer 15050)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cpu: 31269190
mem: 145040
size: 194

(con integer 40)
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cpu: 2084516500
mem: 9303800
size: 554
size: 554

(con integer 3775)
4 changes: 2 additions & 2 deletions plutus-benchmark/lists/test/Lookup/Spec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ tests :: TestTree
tests =
runTestGhc ["Lookup"] $
flip concatMap sizes $ \sz ->
[ Tx.goldenBudget ("match-scott-list-" ++ show sz) $
[ Tx.goldenEvalCekCatchBudget ("match-scott-list-" ++ show sz) $
Compiled.mkMatchWithListsCode (Compiled.workloadOfSize sz)
, Tx.goldenBudget ("match-builtin-list-" ++ show sz) $
, Tx.goldenEvalCekCatchBudget ("match-builtin-list-" ++ show sz) $
Compiled.mkMatchWithBuiltinListsCode (Compiled.workloadOfSize sz)
]
where
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cpu: 122258594
mem: 523832
size: 78

(con integer 5050)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cpu: 309967632
mem: 1237030
size: 173

(con integer 5050)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cpu: 69848900
mem: 373600
size: 263

(con integer 5050)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cpu: 127058594
mem: 553832
size: 81

(con integer 5050)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cpu: 314767632
mem: 1267030
size: 176

(con integer 5050)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cpu: 74648900
mem: 403600
size: 266

(con integer 5050)
12 changes: 6 additions & 6 deletions plutus-benchmark/lists/test/Sum/Spec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ tests =
, testProperty "Compiled left fold (data lists)" $ prop_sum Compiled.mkSumLeftDataTerm
]
, runTestGhc ["Sum"]
[ Tx.goldenBudget "right-fold-scott" $ Compiled.mkSumRightScottCode input
, Tx.goldenBudget "right-fold-built-in" $ Compiled.mkSumRightBuiltinCode input
, Tx.goldenBudget "right-fold-data" $ Compiled.mkSumRightDataCode input
, Tx.goldenBudget "left-fold-scott" $ Compiled.mkSumLeftScottCode input
, Tx.goldenBudget "left-fold-built-in" $ Compiled.mkSumLeftBuiltinCode input
, Tx.goldenBudget "left-fold-data" $ Compiled.mkSumLeftDataCode input
[ Tx.goldenEvalCekCatchBudget "right-fold-scott" $ Compiled.mkSumRightScottCode input
, Tx.goldenEvalCekCatchBudget "right-fold-built-in" $ Compiled.mkSumRightBuiltinCode input
, Tx.goldenEvalCekCatchBudget "right-fold-data" $ Compiled.mkSumRightDataCode input
, Tx.goldenEvalCekCatchBudget "left-fold-scott" $ Compiled.mkSumLeftScottCode input
, Tx.goldenEvalCekCatchBudget "left-fold-built-in" $ Compiled.mkSumLeftBuiltinCode input
, Tx.goldenEvalCekCatchBudget "left-fold-data" $ Compiled.mkSumLeftDataCode input
]
]
where input = [1..100]
3 changes: 0 additions & 3 deletions plutus-benchmark/nofib/test/9.6/clausify-F5.budget.golden

This file was deleted.

4 changes: 4 additions & 0 deletions plutus-benchmark/nofib/test/9.6/clausify-F5.eval.golden
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
cpu: 50150307160
mem: 293209180
size: 1615

(constr 0)
3 changes: 0 additions & 3 deletions plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden

This file was deleted.

4 changes: 4 additions & 0 deletions plutus-benchmark/nofib/test/9.6/knights10-4x4.eval.golden
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
cpu: 1395086000
mem: 7028012
size: 2021

(constr 0)
3 changes: 0 additions & 3 deletions plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden

This file was deleted.

4 changes: 4 additions & 0 deletions plutus-benchmark/nofib/test/9.6/queens4-bt.eval.golden
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
cpu: 4302046267
mem: 22978130
size: 2067

(constr
1
(constr
Expand Down
3 changes: 0 additions & 3 deletions plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden

This file was deleted.

4 changes: 4 additions & 0 deletions plutus-benchmark/nofib/test/9.6/queens5-fc.eval.golden
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
cpu: 153231070621
mem: 860817866
size: 2067

(constr
1
(constr
Expand Down
12 changes: 4 additions & 8 deletions plutus-benchmark/nofib/test/Spec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ testClausify = testGroup "clausify"
, testCase "formula5" $ mkClausifyTest Clausify.F5
, runTestGhc
[ Tx.goldenPirReadable "clausify-F5" formula5example
, Tx.goldenBudget "clausify-F5" formula5example
, Tx.goldenEvalCekCatch "clausify-F5" [formula5example]
, Tx.goldenEvalCekCatchBudget "clausify-F5" formula5example
]
]
where formula5example = Clausify.mkClausifyCode Clausify.F5
Expand All @@ -71,8 +70,7 @@ testKnights = testGroup "knights" -- Odd sizes call "error" because there are n
, testCase "depth 100, 8x8" $ mkKnightsTest 100 8
, runTestGhc
[ Tx.goldenPirReadable "knights10-4x4" knightsExample
, Tx.goldenBudget "knights10-4x4" knightsExample
, Tx.goldenEvalCekCatch "knights10-4x4" [knightsExample]
, Tx.goldenEvalCekCatchBudget "knights10-4x4" knightsExample
]
]
where knightsExample = Knights.mkKnightsCode 10 4
Expand All @@ -93,8 +91,7 @@ testQueens = testGroup "queens"
, testCase "Fc" $ mkQueensTest 4 Queens.Fc
, runTestGhc
[ Tx.goldenPirReadable "queens4-bt" queens4btExample
, Tx.goldenBudget "queens4-bt" queens4btExample
, Tx.goldenEvalCekCatch "queens4-bt" [queens4btExample]
, Tx.goldenEvalCekCatchBudget "queens4-bt" queens4btExample
]
]
, testGroup "5x5"
Expand All @@ -105,8 +102,7 @@ testQueens = testGroup "queens"
, testCase "Fc" $ mkQueensTest 5 Queens.Fc
, runTestGhc
[ Tx.goldenPirReadable "queens5-fc" queens5fcExample
, Tx.goldenBudget "queens5-fc" queens5fcExample
, Tx.goldenEvalCekCatch "queens5-fc" [queens5fcExample]
, Tx.goldenEvalCekCatchBudget "queens5-fc" queens5fcExample
]
]
]
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
cpu: 261922639
mem: 989819
size: 1626

(constr 0)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
cpu: 74418943
mem: 283387
size: 1626

(constr 0)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
cpu: 253542167
mem: 951676
size: 1562

(constr 0)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
cpu: 72009799
mem: 272476
size: 1562

(constr 0)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
cpu: 34774758
mem: 30802
size: 316

(constr 0)
Loading