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

@@ -5,7 +5,7 @@ module Benchmarks.Arrays (makeBenchmarks) where
 
 import Prelude
 
-import Common (createOneTermBuiltinBench, createTwoTermBuiltinBench)
+import Common (createOneTermBuiltinBench, createTwoTermBuiltinBenchElementwise)
 import Control.Monad (replicateM)
 import Criterion.Main (Benchmark)
 import Data.Vector.Strict (Vector)
@@ -46,7 +46,10 @@ benchListToArray gen =
 
 benchIndexArray :: StdGen -> Benchmark
 benchIndexArray gen =
-  createTwoTermBuiltinBench IndexArray [tyArrayOfInteger] arrays idxs
+  createTwoTermBuiltinBenchElementwise
+    IndexArray
+    [tyArrayOfInteger]
+    (zip arrays idxs)
  where
   (arrays :: [Vector Integer], idxs :: [Integer]) =
     unzip $ runStateGen_ gen \g -> replicateM 100 do

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

@@ -173,8 +173,8 @@ builtinMemoryModels = BuiltinCostModelBase
   -- paramCaseList
   -- paramCaseData
   , paramDropList                        = Id $ ModelTwoArgumentsConstantCost 4
-  , paramLengthOfArray                   = Id $ ModelOneArgumentConstantCost    99
-  , paramListToArray                     = Id $ ModelOneArgumentConstantCost    99
-  , paramIndexArray                      = Id $ ModelTwoArgumentsConstantCost   99
+  , paramLengthOfArray                   = Id $ ModelOneArgumentConstantCost 10
+  , paramListToArray                     = Id $ ModelOneArgumentLinearInX identityFunction
+  , paramIndexArray                      = Id $ ModelTwoArgumentsConstantCost 32
   }
   where identityFunction = OneVariableLinearFunction 0 1

plutus-core/cost-model/data/models.R

@@ -785,7 +785,7 @@ modelFun <- function(path) {
 
     dropListModel   <- linearInX     ("DropList")
 
-    ## Arrays - TEMPORARY, but probably right
+    ## Arrays 
     lengthOfArrayModel        <- constantModel ("LengthOfArray")
     listToArrayModel          <- linearInX ("ListToArray")
     indexArrayModel           <- constantModel ("IndexArray")

plutus-core/plutus-core/src/PlutusCore/Default/Builtins.hs

@@ -23,7 +23,8 @@ import PlutusCore.Data (Data (..))
 import PlutusCore.Default.Universe
 import PlutusCore.Evaluation.Machine.BuiltinCostModel
 import PlutusCore.Evaluation.Machine.ExBudgetStream (ExBudgetStream)
-import PlutusCore.Evaluation.Machine.ExMemoryUsage (ExMemoryUsage, IntegerCostedLiterally (..),
+import PlutusCore.Evaluation.Machine.ExMemoryUsage (ArrayCostedByLength, ExMemoryUsage,
+                                                    IntegerCostedLiterally (..),
                                                     ListCostedByLength (..),
                                                     NumBytesCostedAsNumWords (..), memoryUsage,
                                                     singletonRose)
@@ -2107,7 +2108,7 @@ instance uni ~ DefaultUni => ToBuiltinMeaning uni DefaultFun where
             (runCostingFunTwoArguments . paramDropList)
 
     toBuiltinMeaning _semvar LengthOfArray =
-      let lengthOfArrayDenotation :: SomeConstant uni (Vector a) -> BuiltinResult Int
+      let lengthOfArrayDenotation :: SomeConstant uni (ArrayCostedByLength a) -> BuiltinResult Int
           lengthOfArrayDenotation (SomeConstant (Some (ValueOf uni vec))) =
             case uni of
               DefaultUniArray _uniA -> pure $ Vector.length vec
@@ -2116,7 +2117,9 @@ instance uni ~ DefaultUni => ToBuiltinMeaning uni DefaultFun where
         in makeBuiltinMeaning lengthOfArrayDenotation (runCostingFunOneArgument . paramLengthOfArray)
 
     toBuiltinMeaning _semvar ListToArray =
-      let listToArrayDenotation :: SomeConstant uni [a] -> BuiltinResult (Opaque val (Vector a))
+      let listToArrayDenotation
+            :: SomeConstant uni (ListCostedByLength a)
+            -> BuiltinResult (Opaque val (Vector a))
           listToArrayDenotation (SomeConstant (Some (ValueOf uniListA xs))) =
             case uniListA of
               DefaultUniList uniA -> pure $ fromValueOf (DefaultUniArray uniA) $ Vector.fromList xs
@@ -2125,7 +2128,10 @@ instance uni ~ DefaultUni => ToBuiltinMeaning uni DefaultFun where
         in makeBuiltinMeaning listToArrayDenotation (runCostingFunOneArgument . paramListToArray)
 
     toBuiltinMeaning _semvar IndexArray =
-      let indexArrayDenotation :: SomeConstant uni (Vector a) -> Int -> BuiltinResult (Opaque val a)
+      let indexArrayDenotation
+            :: SomeConstant uni (ArrayCostedByLength a)
+            -> Int
+            -> BuiltinResult (Opaque val a)
           indexArrayDenotation (SomeConstant (Some (ValueOf uni vec))) n =
             case uni of
               DefaultUniArray arg -> do