Skip to content

Commit e3382de

Browse files
zeme-wanazeme-wana
committed
Wip
1 parent bca5e92 commit e3382de

File tree

24 files changed

+441
-166
lines changed

24 files changed

+441
-166
lines changed

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

Lines changed: 15 additions & 3 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 (goldenBundle')
16+
import PlutusTx.Test (goldenBudget, goldenEvalCekCatch, goldenPirReadable)
1717
import Test.Tasty (TestTree, defaultMain, testGroup)
1818
import Test.Tasty.Extras (TestNested, runTestNested, testNestedGhc)
1919
import Test.Tasty.HUnit (assertEqual, testCase)
@@ -24,14 +24,26 @@ 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 [goldenBundle' "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData]
27+
runTestGhc [
28+
goldenPirReadable "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData,
29+
goldenBudget "8 queens" $ nqueensCompiled `unsafeApplyCode` dimAsData,
30+
goldenEvalCekCatch "8 queens" [nqueensCompiled `unsafeApplyCode` dimAsData]
31+
]
2832
],
2933
testGroup "Ed25519" [
3034
testCase "SHA512 works" sha512Case,
3135
testCase "Ed25519 works" ed25519Case,
32-
runTestGhc [goldenBundle' "Ed25519" $ checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData]
36+
runTestGhc [
37+
goldenPirReadable "Ed25519" $
38+
checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData,
39+
goldenBudget "Ed25519" $
40+
checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData,
41+
goldenEvalCekCatch "Ed25519" [
42+
checkValidCompiled `unsafeApplyCode` signatureAsData `unsafeApplyCode` msgAsData `unsafeApplyCode` pkAsData
43+
]
3344
]
3445
]
46+
]
3547

3648
-- Cases
3749

‎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.goldenBudgetAndSize ("match-scott-list-" ++ show sz) $
19+
[ Tx.goldenBudget ("match-scott-list-" ++ show sz) $
2020
Compiled.mkMatchWithListsCode (Compiled.workloadOfSize sz)
21-
, Tx.goldenBudgetAndSize ("match-builtin-list-" ++ show sz) $
21+
, Tx.goldenBudget ("match-builtin-list-" ++ show sz) $
2222
Compiled.mkMatchWithBuiltinListsCode (Compiled.workloadOfSize sz)
2323
]
2424
where

‎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.goldenBudgetAndSize "right-fold-scott" $ Compiled.mkSumRightScottCode input
42-
, Tx.goldenBudgetAndSize "right-fold-built-in" $ Compiled.mkSumRightBuiltinCode input
43-
, Tx.goldenBudgetAndSize "right-fold-data" $ Compiled.mkSumRightDataCode input
44-
, Tx.goldenBudgetAndSize "left-fold-scott" $ Compiled.mkSumLeftScottCode input
45-
, Tx.goldenBudgetAndSize "left-fold-built-in" $ Compiled.mkSumLeftBuiltinCode input
46-
, Tx.goldenBudgetAndSize "left-fold-data" $ Compiled.mkSumLeftDataCode input
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
4747
]
4848
]
4949
where input = [1..100]

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

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ testClausify = testGroup "clausify"
4747
, testCase "formula3" $ mkClausifyTest Clausify.F3
4848
, testCase "formula4" $ mkClausifyTest Clausify.F4
4949
, testCase "formula5" $ mkClausifyTest Clausify.F5
50-
, runTestGhc [Tx.goldenBundle' "clausify-F5" formula5example]
50+
, runTestGhc
51+
[ Tx.goldenPirReadable "clausify-F5" formula5example
52+
, Tx.goldenBudget "clausify-F5" formula5example
53+
, Tx.goldenEvalCekCatch "clausify-F5" [formula5example]
54+
]
5155
]
5256
where formula5example = Clausify.mkClausifyCode Clausify.F5
5357

@@ -65,7 +69,11 @@ testKnights = testGroup "knights" -- Odd sizes call "error" because there are n
6569
, testCase "depth 100, 4x4" $ mkKnightsTest 100 4
6670
, testCase "depth 100, 6x6" $ mkKnightsTest 100 6
6771
, testCase "depth 100, 8x8" $ mkKnightsTest 100 8
68-
, runTestGhc [Tx.goldenBundle' "knights10-4x4" knightsExample]
72+
, runTestGhc
73+
[ Tx.goldenPirReadable "knights10-4x4" knightsExample
74+
, Tx.goldenBudget "knights10-4x4" knightsExample
75+
, Tx.goldenEvalCekCatch "knights10-4x4" [knightsExample]
76+
]
6977
]
7078
where knightsExample = Knights.mkKnightsCode 10 4
7179

@@ -83,15 +91,23 @@ testQueens = testGroup "queens"
8391
, testCase "Bjbt1" $ mkQueensTest 4 Queens.Bjbt1
8492
, testCase "Bjbt2" $ mkQueensTest 4 Queens.Bjbt2
8593
, testCase "Fc" $ mkQueensTest 4 Queens.Fc
86-
, runTestGhc [Tx.goldenBundle' "queens4-bt" queens4btExample]
94+
, runTestGhc
95+
[ Tx.goldenPirReadable "queens4-bt" queens4btExample
96+
, Tx.goldenBudget "queens4-bt" queens4btExample
97+
, Tx.goldenEvalCekCatch "queens4-bt" [queens4btExample]
98+
]
8799
]
88100
, testGroup "5x5"
89101
[ testCase "Bt" $ mkQueensTest 5 Queens.Bt
90102
, testCase "Bm" $ mkQueensTest 5 Queens.Bm
91103
, testCase "Bjbt1" $ mkQueensTest 5 Queens.Bjbt1
92104
, testCase "Bjbt2" $ mkQueensTest 5 Queens.Bjbt2
93105
, testCase "Fc" $ mkQueensTest 5 Queens.Fc
94-
, runTestGhc [Tx.goldenBundle' "queens5-fc" queens5fcExample]
106+
, runTestGhc
107+
[ Tx.goldenPirReadable "queens5-fc" queens5fcExample
108+
, Tx.goldenBudget "queens5-fc" queens5fcExample
109+
, Tx.goldenEvalCekCatch "queens5-fc" [queens5fcExample]
110+
]
95111
]
96112
]
97113
where queens4btExample = Queens.mkQueensCode 4 Queens.Bt
@@ -154,4 +170,3 @@ allTests =
154170

155171
main :: IO ()
156172
main = defaultMain allTests
157-

‎plutus-benchmark/script-contexts/test/V1/Spec.hs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ testCheckSOPSc1 = testGroup "checkScriptContext1"
4747
compiledCodeToTerm $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4)
4848
, testCase "fails on 5" . assertFailed $
4949
compiledCodeToTerm $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 5)
50-
, runTestGhcSOP [ Tx.goldenBudgetAndSize "checkScriptContext1" $
50+
, runTestGhcSOP [ Tx.goldenSize "checkScriptContext1" $
5151
SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 1)
5252
, Tx.goldenPirReadable "checkScriptContext1" $
5353
SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 1)
54-
, Tx.goldenBudgetAndSize "checkScriptContext1-4" $
54+
, Tx.goldenBudget "checkScriptContext1-4" $
5555
SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4)
5656
, Tx.goldenEvalCekCatch "checkScriptContext1-4" $
5757
[SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4)]
58-
, Tx.goldenBudgetAndSize "checkScriptContext1-20" $
58+
, Tx.goldenBudget "checkScriptContext1-20" $
5959
SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 20)
6060
, Tx.goldenEvalCekCatch "checkScriptContext1-20" $
6161
[SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 20)]
@@ -72,11 +72,11 @@ testCheckDataSc1 = testGroup "checkScriptContext1"
7272
Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 1)
7373
, Tx.goldenPirReadable "checkScriptContext1" $
7474
Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 1)
75-
, Tx.goldenBudgetAndSize "checkScriptContext1-4" $
75+
, Tx.goldenBudget "checkScriptContext1-4" $
7676
Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 4)
7777
, Tx.goldenEvalCekCatch "checkScriptContext1-4" $
7878
[Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 4)]
79-
, Tx.goldenBudgetAndSize "checkScriptContext1-20" $
79+
, Tx.goldenBudget "checkScriptContext1-20" $
8080
Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 20)
8181
, Tx.goldenEvalCekCatch "checkScriptContext1-20" $
8282
[Data.SC.mkCheckScriptContext1Code (Data.SC.mkScriptContext 20)]
@@ -93,11 +93,11 @@ testCheckSOPSc2 = testGroup "checkScriptContext2"
9393
SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 1)
9494
, Tx.goldenPirReadable "checkScriptContext2" $
9595
SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 1)
96-
, Tx.goldenBudgetAndSize "checkScriptContext2-4" $
96+
, Tx.goldenBudget "checkScriptContext2-4" $
9797
SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4)
9898
, Tx.goldenEvalCekCatch "checkScriptContext2-4" $
9999
[SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4)]
100-
, Tx.goldenBudgetAndSize "checkScriptContext2-20" $
100+
, Tx.goldenBudget "checkScriptContext2-20" $
101101
SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 20)
102102
, Tx.goldenEvalCekCatch "checkScriptContext2-20" $
103103
[SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 20)]
@@ -114,11 +114,11 @@ testCheckDataSc2 = testGroup "checkScriptContext2"
114114
Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 1)
115115
, Tx.goldenPirReadable "checkScriptContext2" $
116116
Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 1)
117-
, Tx.goldenBudgetAndSize "checkScriptContext2-4" $
117+
, Tx.goldenBudget "checkScriptContext2-4" $
118118
Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 4)
119119
, Tx.goldenEvalCekCatch "checkScriptContext2-4" $
120120
[Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 4)]
121-
, Tx.goldenBudgetAndSize "checkScriptContext2-20" $
121+
, Tx.goldenBudget "checkScriptContext2-20" $
122122
Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 20)
123123
, Tx.goldenEvalCekCatch "checkScriptContext2-20" $
124124
[Data.SC.mkCheckScriptContext2Code (Data.SC.mkScriptContext 20)]
@@ -127,11 +127,11 @@ testCheckDataSc2 = testGroup "checkScriptContext2"
127127

128128
testCheckSOPScEquality :: TestTree
129129
testCheckSOPScEquality = testGroup "checkScriptContextEquality"
130-
[ runTestGhcSOP [ Tx.goldenBudgetAndSize "checkScriptContextEqualityData-20" $
130+
[ runTestGhcSOP [ Tx.goldenBudget "checkScriptContextEqualityData-20" $
131131
SOP.SC.mkScriptContextEqualityDataCode (SOP.SC.mkScriptContext 20)
132132
, Tx.goldenEvalCekCatch "checkScriptContextEqualityData-20" $
133133
[SOP.SC.mkScriptContextEqualityDataCode (SOP.SC.mkScriptContext 20)]
134-
, Tx.goldenBudgetAndSize "checkScriptContextEqualityOverhead-20" $
134+
, Tx.goldenBudget "checkScriptContextEqualityOverhead-20" $
135135
SOP.SC.mkScriptContextEqualityOverheadCode (SOP.SC.mkScriptContext 20)
136136
, Tx.goldenEvalCekCatch "checkScriptContextEqualityOverhead-20" $
137137
[SOP.SC.mkScriptContextEqualityOverheadCode (SOP.SC.mkScriptContext 20)]
@@ -140,11 +140,11 @@ testCheckSOPScEquality = testGroup "checkScriptContextEquality"
140140

141141
testCheckDataScEquality :: TestTree
142142
testCheckDataScEquality = testGroup "checkScriptContextEquality"
143-
[ runTestGhcData [ Tx.goldenBudgetAndSize "checkScriptContextEqualityData-20" $
143+
[ runTestGhcData [ Tx.goldenBudget "checkScriptContextEqualityData-20" $
144144
Data.SC.mkScriptContextEqualityDataCode (Data.SC.mkScriptContext 20)
145145
, Tx.goldenEvalCekCatch "checkScriptContextEqualityData-20" $
146146
[Data.SC.mkScriptContextEqualityDataCode (Data.SC.mkScriptContext 20)]
147-
, Tx.goldenBudgetAndSize "checkScriptContextEqualityOverhead-20" $
147+
, Tx.goldenBudget "checkScriptContextEqualityOverhead-20" $
148148
Data.SC.mkScriptContextEqualityOverheadCode (Data.SC.mkScriptContext 20)
149149
, Tx.goldenEvalCekCatch "checkScriptContextEqualityOverhead-20" $
150150
[Data.SC.mkScriptContextEqualityOverheadCode (Data.SC.mkScriptContext 20)]

0 commit comments

Comments
 (0)