Kwxm/multi cost model benchmark test

plutus-benchmark/common/PlutusBenchmark/Common.hs

@@ -118,7 +118,7 @@ unsafeRunTermCek :: Term -> EvaluationResult Term
 unsafeRunTermCek =
     unsafeExtractEvaluationResult
         . (\(res, _, _) -> res)
-        . runCekDeBruijn PLC.defaultCekParameters Cek.restrictingEnormous Cek.noEmitter
+        . runCekDeBruijn PLC.defaultCekParametersForTesting Cek.restrictingEnormous Cek.noEmitter
 
 -- | Just run a term.
 runTermCek ::
@@ -128,12 +128,12 @@ runTermCek ::
     )
 runTermCek =
     (\(res, _, logs) -> (res, logs))
-        . runCekDeBruijn PLC.defaultCekParameters Cek.restrictingEnormous Cek.logEmitter
+        . runCekDeBruijn PLC.defaultCekParametersForTesting Cek.restrictingEnormous Cek.logEmitter
 
 -- | Evaluate a script and return the CPU and memory costs (according to the cost model)
 getCostsCek :: UPLC.Program UPLC.NamedDeBruijn DefaultUni DefaultFun () -> (Integer, Integer)
 getCostsCek (UPLC.Program _ _ prog) =
-    case Cek.runCekDeBruijn PLC.defaultCekParameters Cek.tallying Cek.noEmitter prog of
+    case Cek.runCekDeBruijn PLC.defaultCekParametersForTesting Cek.tallying Cek.noEmitter prog of
       (_res, Cek.TallyingSt _ budget, _logs) ->
           let ExBudget (ExCPU cpu)(ExMemory mem) = budget
           in (fromSatInt cpu, fromSatInt mem)
@@ -158,14 +158,14 @@ cekResultMatchesHaskellValue term matches value =
 -- deliberately not including it in the benchmarks.
 mkEvalCtx :: LedgerApi.EvaluationContext
 mkEvalCtx =
-    case PLC.defaultCostModelParams of
+    case PLC.defaultCostModelParamsForTesting of
         Just p ->
             let errOrCtx =
                     -- The validation benchmarks were all created from PlutusV1 scripts
                     LedgerApi.mkDynEvaluationContext
                         LedgerApi.PlutusV1
-                        [DefaultFunSemanticsVariant1]
-                        (const DefaultFunSemanticsVariant1)
+                        [DefaultFunSemanticsVariantC]
+                        (const DefaultFunSemanticsVariantC)
                         p
             in case errOrCtx of
                 Right ec -> ec

plutus-benchmark/lists/exe/Main.hs

@@ -21,7 +21,7 @@ import UntypedPlutusCore.Evaluation.Machine.Cek qualified as Cek
 getBudgetUsage :: Term -> Maybe Integer
 getBudgetUsage term =
     case (\ (fstT,sndT,_) -> (fstT,sndT) ) $
-      Cek.runCekDeBruijn PLC.defaultCekParameters Cek.counting Cek.noEmitter term
+      Cek.runCekDeBruijn PLC.defaultCekParametersForTesting Cek.counting Cek.noEmitter term
     of
       (Left _, _)                 -> Nothing
       (Right _, Cek.CountingSt c) ->

plutus-benchmark/nofib/exe/Main.hs

@@ -202,7 +202,10 @@ options = hsubparser
 ---------------- Evaluation ----------------
 
 evaluateWithCek :: UPLC.Term UPLC.NamedDeBruijn DefaultUni DefaultFun () -> UPLC.EvaluationResult (UPLC.Term UPLC.NamedDeBruijn DefaultUni DefaultFun ())
-evaluateWithCek = UPLC.unsafeExtractEvaluationResult . (\(fstT,_,_) -> fstT) . UPLC.runCekDeBruijn PLC.defaultCekParameters UPLC.restrictingEnormous UPLC.noEmitter
+evaluateWithCek =
+  UPLC.unsafeExtractEvaluationResult
+  . (\(fstT,_,_) -> fstT)
+  . UPLC.runCekDeBruijn PLC.defaultCekParametersForTesting UPLC.restrictingEnormous UPLC.noEmitter
 
 writeFlatNamed :: UPLC.Program UPLC.NamedDeBruijn DefaultUni DefaultFun () -> IO ()
 writeFlatNamed prog = BS.putStr . Flat.flat . UPLC.UnrestrictedProgram $ prog
@@ -249,7 +252,7 @@ measureBudget compiledCode =
    in case programE of
         Left _ -> (-1,-1) -- Something has gone wrong but I don't care.
         Right program ->
-          let (_, UPLC.TallyingSt _ budget) = UPLC.runCekNoEmit PLC.defaultCekParameters UPLC.tallying $ program ^. UPLC.progTerm
+          let (_, UPLC.TallyingSt _ budget) = UPLC.runCekNoEmit PLC.defaultCekParametersForTesting UPLC.tallying $ program ^. UPLC.progTerm
               ExCPU cpu = exBudgetCPU budget
               ExMemory mem = exBudgetMemory budget
           in (fromSatInt cpu, fromSatInt mem)

plutus-conformance/agda/Spec.hs

@@ -13,7 +13,7 @@ import PlutusCore.Default (DefaultFun, DefaultUni)
 import PlutusCore.Evaluation.Machine.CostModelInterface (CekMachineCosts, CostModelParams,
                                                          applyCostModelParams)
 import PlutusCore.Evaluation.Machine.ExBudget (ExBudget (..))
-import PlutusCore.Evaluation.Machine.ExBudgetingDefaults (defaultCekCostModel)
+import PlutusCore.Evaluation.Machine.ExBudgetingDefaults (defaultCekCostModelForTesting)
 import PlutusCore.Evaluation.Machine.ExMemory (ExCPU (..), ExMemory (..))
 import PlutusCore.Evaluation.Machine.MachineParameters (CostModel (..))
 import PlutusCore.Evaluation.Machine.SimpleBuiltinCostModel (BuiltinCostKeyMap, BuiltinCostMap,
@@ -42,7 +42,7 @@ type RawCostModel = (CekMachineCosts, BuiltinCostMap)
 toRawCostModel :: CostModelParams -> RawCostModel
 toRawCostModel params =
     let CostModel machineCosts builtinCosts =
-            case applyCostModelParams defaultCekCostModel params of
+            case applyCostModelParams defaultCekCostModelForTesting params of
               Left e  -> error $ show e
               Right r -> r
 

plutus-conformance/haskell-steppable/Spec.hs

@@ -3,7 +3,7 @@
 module Main (main) where
 
 import PlutusConformance.Common
-import PlutusCore.Evaluation.Machine.ExBudgetingDefaults (defaultCekParameters)
+import PlutusCore.Evaluation.Machine.ExBudgetingDefaults (defaultCekParametersForTesting)
 import UntypedPlutusCore as UPLC
 import UntypedPlutusCore.Evaluation.Machine.SteppableCek qualified as SCek
 
@@ -20,7 +20,7 @@ evalSteppableUplcProg = UplcEvaluatorWithoutCosting $ traverseOf UPLC.progTerm $
     case UPLC.deBruijnTerm t of
         Left (_ :: UPLC.FreeVariableError) -> Nothing
         Right _                            -> Just ()
-    case SCek.evaluateCekNoEmit defaultCekParameters t of
+    case SCek.evaluateCekNoEmit defaultCekParametersForTesting t of
         Left _     -> Nothing
         Right prog -> Just prog
 

plutus-conformance/src/PlutusConformance/Common.hs

@@ -10,7 +10,7 @@ import PlutusCore.Default (DefaultFun, DefaultUni)
 import PlutusCore.Error (ParserErrorBundle)
 import PlutusCore.Evaluation.Machine.CostModelInterface
 import PlutusCore.Evaluation.Machine.ExBudget
-import PlutusCore.Evaluation.Machine.ExBudgetingDefaults (defaultCostModelParams)
+import PlutusCore.Evaluation.Machine.ExBudgetingDefaults (defaultCostModelParamsForTesting)
 import PlutusCore.Name.Unique (Name)
 import PlutusCore.Quote (runQuoteT)
 import PlutusPrelude (Pretty (pretty), display, void)
@@ -219,7 +219,7 @@ runUplcEvalTests ::
     -- whether it should labelled as `ExpectedFailure`.
     -> IO ()
 runUplcEvalTests eval expectedFailTests = do
-    let params = fromJust defaultCostModelParams
+    let params = fromJust defaultCostModelParamsForTesting
     tests <-
         discoverTests
             eval

plutus-core/cost-model/budgeting-bench/Benchmarks/Nops.hs

@@ -123,7 +123,7 @@ nopCostModel =
 nopCostParameters :: MachineParameters CekMachineCosts NopFun (CekValue DefaultUni NopFun ())
 nopCostParameters =
     mkMachineParameters def $
-        CostModel defaultCekMachineCosts nopCostModel
+        CostModel defaultCekMachineCostsForTesting nopCostModel
 
 -- This is just to avoid some deeply nested case expressions for the NopNc
 -- functions below.  There is a Monad instance for EvaluationResult, but that
@@ -153,7 +153,7 @@ n >: k =
 instance uni ~ DefaultUni => ToBuiltinMeaning uni NopFun where
     type CostingPart uni NopFun = NopCostModel
 
-    data BuiltinSemanticsVariant NopFun = NopFunSemanticsVariant1
+    data BuiltinSemanticsVariant NopFun = NopFunSemanticsVariantX
 
     -- Built-in Bools
     toBuiltinMeaning
@@ -287,7 +287,7 @@ instance uni ~ DefaultUni => ToBuiltinMeaning uni NopFun where
              (runCostingFunSixArguments . paramNop6)
 
 instance Default (BuiltinSemanticsVariant NopFun) where
-    def = NopFunSemanticsVariant1
+    def = NopFunSemanticsVariantX
 
 ---------------- Benchmarks ----------------
 

plutus-core/cost-model/budgeting-bench/Common.hs

@@ -86,8 +86,9 @@ benchWith params name term = bench name $ whnf (unsafeEvaluateCekNoEmit params)
    back a 'Data' value it'll traverse all of it.
 -}
 
+{- Benchmark with the most recent CekParameters -}
 benchDefault :: String -> PlainTerm DefaultUni DefaultFun -> Benchmark
-benchDefault = benchWith defaultCekParameters
+benchDefault = benchWith defaultCekParametersForTesting
 
 
 ---------------- Constructing Polymorphic PLC terms for benchmarking ----------------

plutus-core/cost-model/create-cost-model/BuiltinMemoryModels.hs

@@ -72,8 +72,8 @@ builtinMemoryModels = BuiltinCostModelBase
   , paramMultiplyInteger                 = Id $ ModelTwoArgumentsAddedSizes $ OneVariableLinearFunction 0 1
   , paramDivideInteger                   = Id $ ModelTwoArgumentsSubtractedSizes $ ModelSubtractedSizes 0 1 1
   , paramQuotientInteger                 = Id $ ModelTwoArgumentsSubtractedSizes $ ModelSubtractedSizes 0 1 1
-  , paramRemainderInteger                = Id $ ModelTwoArgumentsSubtractedSizes $ ModelSubtractedSizes 0 1 1
-  , paramModInteger                      = Id $ ModelTwoArgumentsSubtractedSizes $ ModelSubtractedSizes 0 1 1
+  , paramRemainderInteger                = Id $ ModelTwoArgumentsLinearInY $ OneVariableLinearFunction 0 1
+  , paramModInteger                      = Id $ ModelTwoArgumentsLinearInY $ OneVariableLinearFunction 0 1
   , paramEqualsInteger                   = Id $ boolMemModel
   , paramLessThanInteger                 = Id $ boolMemModel
   , paramLessThanEqualsInteger           = Id $ boolMemModel

plutus-core/cost-model/create-cost-model/Main.hs

@@ -52,6 +52,7 @@ benchmarkFile = namedBenchmarkFile <|> pure defaultBenchmarkFile
 namedBenchmarkFile :: Parser BenchmarkFile
 namedBenchmarkFile = BenchmarkFile <$> strOption
   (  long "csv"
+  <> short 'i'
   <> metavar "FILENAME"
   <> help "CSV file containing built-in function benchmark results")