Skip to content

Commit ffdcada

Browse files
SeungheonOhSeungheonOh
authored
Add goldenEvalCekCatchBudget and change existing cases to use it (#7093)
1 parent 2ac740d commit ffdcada

File tree

341 files changed

+852
-851
lines changed

Some content is hidden

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

341 files changed

+852
-851
lines changed

‎plutus-benchmark/bitwise/test/9.6/8 queens.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/bitwise/test/9.6/8 queens.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
cpu: 381725318016
2+
mem: 1403857547
3+
size: 380
4+
15
(constr
26
1
37
(constr 0 (con integer 0) (con integer 0))

‎plutus-benchmark/bitwise/test/9.6/Ed25519.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/bitwise/test/9.6/Ed25519.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
cpu: 2025744495066
2+
mem: 6392763186
3+
size: 3415
4+
15
(constr 1)

‎plutus-benchmark/bitwise/test/Main.hs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import PlutusBenchmark.NQueens.Compiled (dimAsData, nqueensCompiled)
1313
import PlutusBenchmark.SHA512 (sha512)
1414
import PlutusTx.Builtins (fromBuiltin, toBuiltin)
1515
import PlutusTx.Code (unsafeApplyCode)
16-
import PlutusTx.Test (goldenBudget, goldenEvalCekCatch, goldenPirReadable)
16+
import PlutusTx.Test (goldenEvalCekCatchBudget, goldenPirReadable)
1717
import Test.Tasty (TestTree, defaultMain, testGroup)
1818
import Test.Tasty.Extras (TestNested, runTestNested, testNestedGhc)
1919
import Test.Tasty.HUnit (assertEqual, testCase)
@@ -24,10 +24,9 @@ main = defaultMain . testGroup "bitwise" $ [
2424
testCase "solves for 8 queens" $ assertEqual ""
2525
[(0,0), (1,4), (2,7), (3,5), (4,2), (5,6), (6,1), (7,3)]
2626
(nqueens 8),
27-
runTestGhc [
28-
goldenPirReadable "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData,
29-
goldenBudget "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData,
30-
goldenEvalCekCatch "8 queens" [nqueensCompiled `unsafeApplyCode` dimAsData]
27+
runTestGhc
28+
[ goldenPirReadable "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData
29+
, goldenEvalCekCatchBudget "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData
3130
]
3231
],
3332
testGroup "Ed25519" [
@@ -36,11 +35,8 @@ main = defaultMain . testGroup "bitwise" $ [
3635
runTestGhc [
3736
goldenPirReadable "Ed25519" $
3837
checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData,
39-
goldenBudget "Ed25519" $
40-
checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData,
41-
goldenEvalCekCatch "Ed25519" [
38+
goldenEvalCekCatchBudget "Ed25519" $
4239
checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData
43-
]
4440
]
4541
]
4642
]

‎plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-10.eval.golden

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cpu: 182838904
2+
mem: 755152
3+
size: 151
4+
5+
(con integer 155)

‎plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.budget.golden renamed to ‎plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-100.eval.golden

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
cpu: 15206420194
22
mem: 62404432
3-
size: 151
3+
size: 151
4+
5+
(con integer 15050)

‎plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-5.eval.golden

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cpu: 54709074
2+
mem: 227692
3+
size: 151
4+
5+
(con integer 40)

‎plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.budget.golden renamed to ‎plutus-benchmark/lists/test/Lookup/9.6/match-builtin-list-50.eval.golden

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
cpu: 3885192144
22
mem: 15954832
3-
size: 151
3+
size: 151
4+
5+
(con integer 3775)

‎plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-10.eval.golden

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cpu: 101489780
2+
mem: 461880
3+
size: 234
4+
5+
(con integer 155)

‎plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.budget.golden renamed to ‎plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-100.eval.golden

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
cpu: 8116454900
22
mem: 36124200
3-
size: 954
3+
size: 954
4+
5+
(con integer 15050)

‎plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-5.eval.golden

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cpu: 31269190
2+
mem: 145040
3+
size: 194
4+
5+
(con integer 40)

‎plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.budget.golden renamed to ‎plutus-benchmark/lists/test/Lookup/9.6/match-scott-list-50.eval.golden

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
cpu: 2084516500
22
mem: 9303800
3-
size: 554
3+
size: 554
4+
5+
(con integer 3775)

‎plutus-benchmark/lists/test/Lookup/Spec.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ tests :: TestTree
1616
tests =
1717
runTestGhc ["Lookup"] $
1818
flip concatMap sizes $ \sz ->
19-
[ Tx.goldenBudget ("match-scott-list-" ++ show sz) $
19+
[ Tx.goldenEvalCekCatchBudget ("match-scott-list-" ++ show sz) $
2020
Compiled.mkMatchWithListsCode (Compiled.workloadOfSize sz)
21-
, Tx.goldenBudget ("match-builtin-list-" ++ show sz) $
21+
, Tx.goldenEvalCekCatchBudget ("match-builtin-list-" ++ show sz) $
2222
Compiled.mkMatchWithBuiltinListsCode (Compiled.workloadOfSize sz)
2323
]
2424
where

‎plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/lists/test/Sum/9.6/left-fold-built-in.eval.golden

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cpu: 122258594
2+
mem: 523832
3+
size: 78
4+
5+
(con integer 5050)

‎plutus-benchmark/lists/test/Sum/9.6/left-fold-data.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/lists/test/Sum/9.6/left-fold-data.eval.golden

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cpu: 309967632
2+
mem: 1237030
3+
size: 173
4+
5+
(con integer 5050)

‎plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/lists/test/Sum/9.6/left-fold-scott.eval.golden

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cpu: 69848900
2+
mem: 373600
3+
size: 263
4+
5+
(con integer 5050)

‎plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/lists/test/Sum/9.6/right-fold-built-in.eval.golden

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cpu: 127058594
2+
mem: 553832
3+
size: 81
4+
5+
(con integer 5050)

‎plutus-benchmark/lists/test/Sum/9.6/right-fold-data.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/lists/test/Sum/9.6/right-fold-data.eval.golden

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cpu: 314767632
2+
mem: 1267030
3+
size: 176
4+
5+
(con integer 5050)

‎plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/lists/test/Sum/9.6/right-fold-scott.eval.golden

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cpu: 74648900
2+
mem: 403600
3+
size: 266
4+
5+
(con integer 5050)

‎plutus-benchmark/lists/test/Sum/Spec.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ tests =
3838
, testProperty "Compiled left fold (data lists)" $ prop_sum Compiled.mkSumLeftDataTerm
3939
]
4040
, runTestGhc ["Sum"]
41-
[ Tx.goldenBudget "right-fold-scott" $ Compiled.mkSumRightScottCode input
42-
, Tx.goldenBudget "right-fold-built-in" $ Compiled.mkSumRightBuiltinCode input
43-
, Tx.goldenBudget "right-fold-data" $ Compiled.mkSumRightDataCode input
44-
, Tx.goldenBudget "left-fold-scott" $ Compiled.mkSumLeftScottCode input
45-
, Tx.goldenBudget "left-fold-built-in" $ Compiled.mkSumLeftBuiltinCode input
46-
, Tx.goldenBudget "left-fold-data" $ Compiled.mkSumLeftDataCode input
41+
[ Tx.goldenEvalCekCatchBudget "right-fold-scott" $ Compiled.mkSumRightScottCode input
42+
, Tx.goldenEvalCekCatchBudget "right-fold-built-in" $ Compiled.mkSumRightBuiltinCode input
43+
, Tx.goldenEvalCekCatchBudget "right-fold-data" $ Compiled.mkSumRightDataCode input
44+
, Tx.goldenEvalCekCatchBudget "left-fold-scott" $ Compiled.mkSumLeftScottCode input
45+
, Tx.goldenEvalCekCatchBudget "left-fold-built-in" $ Compiled.mkSumLeftBuiltinCode input
46+
, Tx.goldenEvalCekCatchBudget "left-fold-data" $ Compiled.mkSumLeftDataCode input
4747
]
4848
]
4949
where input = [1..100]

‎plutus-benchmark/nofib/test/9.6/clausify-F5.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/nofib/test/9.6/clausify-F5.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
cpu: 50150307160
2+
mem: 293209180
3+
size: 1615
4+
15
(constr 0)

‎plutus-benchmark/nofib/test/9.6/knights10-4x4.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/nofib/test/9.6/knights10-4x4.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
cpu: 1395086000
2+
mem: 7028012
3+
size: 2021
4+
15
(constr 0)

‎plutus-benchmark/nofib/test/9.6/queens4-bt.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/nofib/test/9.6/queens4-bt.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
cpu: 4302046267
2+
mem: 22978130
3+
size: 2067
4+
15
(constr
26
1
37
(constr

‎plutus-benchmark/nofib/test/9.6/queens5-fc.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/nofib/test/9.6/queens5-fc.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
cpu: 153231070621
2+
mem: 860817866
3+
size: 2067
4+
15
(constr
26
1
37
(constr

‎plutus-benchmark/nofib/test/Spec.hs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ testClausify = testGroup "clausify"
4949
, testCase "formula5" $ mkClausifyTest Clausify.F5
5050
, runTestGhc
5151
[ Tx.goldenPirReadable "clausify-F5" formula5example
52-
, Tx.goldenBudget "clausify-F5" formula5example
53-
, Tx.goldenEvalCekCatch "clausify-F5" [formula5example]
52+
, Tx.goldenEvalCekCatchBudget "clausify-F5" formula5example
5453
]
5554
]
5655
where formula5example = Clausify.mkClausifyCode Clausify.F5
@@ -71,8 +70,7 @@ testKnights = testGroup "knights" -- Odd sizes call "error" because there are n
7170
, testCase "depth 100, 8x8" $ mkKnightsTest 100 8
7271
, runTestGhc
7372
[ Tx.goldenPirReadable "knights10-4x4" knightsExample
74-
, Tx.goldenBudget "knights10-4x4" knightsExample
75-
, Tx.goldenEvalCekCatch "knights10-4x4" [knightsExample]
73+
, Tx.goldenEvalCekCatchBudget "knights10-4x4" knightsExample
7674
]
7775
]
7876
where knightsExample = Knights.mkKnightsCode 10 4
@@ -93,8 +91,7 @@ testQueens = testGroup "queens"
9391
, testCase "Fc" $ mkQueensTest 4 Queens.Fc
9492
, runTestGhc
9593
[ Tx.goldenPirReadable "queens4-bt" queens4btExample
96-
, Tx.goldenBudget "queens4-bt" queens4btExample
97-
, Tx.goldenEvalCekCatch "queens4-bt" [queens4btExample]
94+
, Tx.goldenEvalCekCatchBudget "queens4-bt" queens4btExample
9895
]
9996
]
10097
, testGroup "5x5"
@@ -105,8 +102,7 @@ testQueens = testGroup "queens"
105102
, testCase "Fc" $ mkQueensTest 5 Queens.Fc
106103
, runTestGhc
107104
[ Tx.goldenPirReadable "queens5-fc" queens5fcExample
108-
, Tx.goldenBudget "queens5-fc" queens5fcExample
109-
, Tx.goldenEvalCekCatch "queens5-fc" [queens5fcExample]
105+
, Tx.goldenEvalCekCatchBudget "queens5-fc" queens5fcExample
110106
]
111107
]
112108
]

‎plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-20.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
cpu: 261922639
2+
mem: 989819
3+
size: 1626
4+
15
(constr 0)

‎plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext1-4.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
cpu: 74418943
2+
mem: 283387
3+
size: 1626
4+
15
(constr 0)

‎plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-20.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
cpu: 253542167
2+
mem: 951676
3+
size: 1562
4+
15
(constr 0)

‎plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContext2-4.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
cpu: 72009799
2+
mem: 272476
3+
size: 1562
4+
15
(constr 0)

‎plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.budget.golden

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎plutus-benchmark/script-contexts/test/V1/9.6/checkScriptContextEqualityData-20.eval.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
cpu: 34774758
2+
mem: 30802
3+
size: 316
4+
15
(constr 0)

0 commit comments

Comments
 (0)