Merge pull request IntersectMBO#5535 from input-output-hk/bench-master

workbench: various improvements + future proofing

Author: mgmeier

Makefile

@@ -87,7 +87,7 @@ PROFILES_MODEL		       	+= model-value-test
 PROFILES_10               := 10 10-p2p 10-plutus 10-notracer
 PROFILES_FORGE_STRESS     := forge-stress forge-stress-p2p forge-stress-plutus forge-stress-plutus-solo forge-stress-notracer forge-stress-large forge-stress-solo forge-stress-light
 PROFILES_FORGE_STRESS_PRE := forge-stress-pre forge-stress-pre-plutus forge-stress-pre-notracer forge-stress-pre-solo
-PROFILES_FORGE_STRESS_RTS := forge-stress-pre-rtsA4m forge-stress-pre-rtsA64m forge-stress-pre-rtsN3 forge-stress-pre-rtsA4mN3 forge-stress-pre-rtsA64mN3
+PROFILES_FORGE_STRESS_RTS := forge-stress-pre-rtsA4m forge-stress-pre-rtsA64m forge-stress-pre-rtsN3 forge-stress-pre-rtsA4mN3 forge-stress-pre-rtsA64mN3 forge-stress-pre-rtsxn
 PROFILES_CHAINSYNC        := chainsync-early-byron  chainsync-early-byron-notracer  chainsync-early-byron-oldtracing
 PROFILES_CHAINSYNC        += chainsync-early-alonzo chainsync-early-alonzo-notracer chainsync-early-alonzo-oldtracing chainsync-early-alonzo-p2p
 PROFILES_VENDOR           := dish dish-plutus dish-10M dish-10M-plutus

bench/locli/src/Cardano/Analysis/API/Context.hs

@@ -197,34 +197,36 @@ manifestPackages =
 
 data Metadata
   = Metadata
-  { tag             :: Text
-  , batch           :: Text
-  , ident           :: Text
-  , profile         :: Text
-  , era             :: Text
-  , manifest        :: Manifest
-  , profile_content :: AE.KeyMap Value
+  { tag               :: Text
+  , batch             :: Text
+  , ident             :: Text
+  , node_ghc_version  :: Text
+  , profile           :: Text
+  , era               :: Text
+  , manifest          :: Manifest
+  , profile_content   :: AE.KeyMap Value
   }
   deriving (Generic, NFData, Show, ToJSON)
 
 instance FromJSON Metadata where
   parseJSON =
     withObject "Metadata" $ \v -> do
 
-      tag             <- v .: "tag"
-      batch           <- v .: "batch"
-      manifest        <- (v .: "manifest")
+      tag              <- v .: "tag"
+      batch            <- v .: "batch"
+      manifest         <- (v .: "manifest")
                          <|> compatParseManifest v
-      profile         <- v .: "profile"
-      profile_content <- v .: "profile_content"
-      generator       <- profile_content .: "generator"
+      profile          <- v .: "profile"
+      profile_content  <- v .: "profile_content"
+      generator        <- profile_content .: "generator"
 
-      ident           <- (v .:? "ident")
-                          <&> fromMaybe (unVersion . ciVersion $
+      ident            <- (v .:? "ident")
+                         <&> fromMaybe (unVersion . ciVersion $
                                          getComponent "cardano-node" manifest)
-      eraDirect       <- v .:?  "era"
-      eraProfile      <- profile_content .:? "era"
-      eraGenerator    <- generator .:? "era"
+      node_ghc_version <- v .:?  "node_ghc_version" .!= "unknown"
+      eraDirect        <- v .:?  "era"
+      eraProfile       <- profile_content .:? "era"
+      eraGenerator     <- generator .:? "era"
       era <- case eraDirect <|> eraProfile <|> eraGenerator of
         Just x -> pure x
         Nothing -> fail "While parsing run metafile:  missing era specification"

bench/locli/src/Cardano/Analysis/API/Metrics.hs

@@ -40,6 +40,7 @@ sumFieldsReport =
   [ "date.systemStart", "time.systemStart", "sumAnalysisTime"
   , "ident"
   , "batch"
+  , "ghc_version"
   ] ++ (FieldName <$> manifestPackages) ++
   [ "era"
   , "delegators", "utxo"
@@ -79,6 +80,10 @@ instance (KnownCDF f) => TimelineFields (Summary f)  where
       "Run batch"
       ""
 
+   <> fScalar   "ghc_version"          Wno Id  (IText $ node_ghc_version.sumMeta)
+      "GHC version"
+      "GHC version used to build cardano-node"
+
    <> manifestFields
 
    <> fScalar "era"                    Wno Era (IText $                     era.sumMeta)

bench/locli/src/Cardano/Analysis/Summary.hs

@@ -30,6 +30,7 @@ data SummaryError
   | SEIncoherentRunEras          [Text]
   | SEIncoherentRunVersions      [Manifest]
   | SEIncoherentRunFilters       [([FilterName], [ChainFilter])]
+  | SEIncoherentCompilerVersions [Text]
   | SECDFError                   CDFError
   deriving Show
 
@@ -96,10 +97,11 @@ summariseMultiSummary sumAnalysisTime centiles xs@(headline:xss) = do
    summariseMetadata :: [Metadata] -> Either SummaryError Metadata
    summariseMetadata [] = Left SEEmptyDataset
    summariseMetadata xs@(headline:_) = do
-     profile         <- allEqOrElse (xs <&> profile)         SEIncoherentRunProfileNames
-     era             <- allEqOrElse (xs <&> era)             SEIncoherentRunEras
-     manifest        <- allEqOrElse (xs <&> manifest)        SEIncoherentRunVersions
-     profile_content <- allEqOrElse (xs <&> profile_content) SEIncoherentRunProfiles
+     profile          <- allEqOrElse (xs <&> profile)          SEIncoherentRunProfileNames
+     era              <- allEqOrElse (xs <&> era)              SEIncoherentRunEras
+     manifest         <- allEqOrElse (xs <&> manifest)         SEIncoherentRunVersions
+     profile_content  <- allEqOrElse (xs <&> profile_content)  SEIncoherentRunProfiles
+     node_ghc_version <- allEqOrElse (xs <&> node_ghc_version) SEIncoherentCompilerVersions
      -- XXX: magic transformation that happens to match
      --      the logic in 'analyse.sh multi-call' on line with "local run="
      pure Metadata { tag   = multiRunTag (Just "variance") xs

bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/CustomCall.hs

@@ -7,6 +7,9 @@
 
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
+-- PlutusV2 must be compiled using plc 1.0
+{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-}
+
 module Cardano.Benchmarking.PlutusScripts.CustomCall (script) where
 
 import           Language.Haskell.TH

bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/EcdsaSecp256k1Loop.hs

@@ -4,6 +4,9 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
+-- PlutusV2 must be compiled using plc 1.0
+{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-}
+
 module Cardano.Benchmarking.PlutusScripts.EcdsaSecp256k1Loop (script) where
 
 import           Language.Haskell.TH

bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/Loop.hs

@@ -4,6 +4,9 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
+-- PlutusV1 must be compiled using plc 1.0
+{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-}
+
 module Cardano.Benchmarking.PlutusScripts.Loop (script) where
 
 import           Language.Haskell.TH
@@ -14,7 +17,7 @@ import           Cardano.Api.Shelley (PlutusScript (..), PlutusScriptV1, Script(
 import           Cardano.Benchmarking.ScriptAPI
 import qualified Data.ByteString.Short as SBS
 
-import qualified PlutusLedgerApi.V2 as PlutusV2
+import qualified PlutusLedgerApi.V1 as PlutusV1
 import           PlutusTx
 import           PlutusTx.Builtins (unsafeDataAsI)
 import           PlutusTx.Prelude hiding (Semigroup (..), unless, (.), (<$>))
@@ -39,7 +42,7 @@ mkValidator _datum redeemer _txContext
     loop i = if i == 1000000 then () else loop $ pred i
 
 loopScriptShortBs :: SBS.ShortByteString
-loopScriptShortBs = PlutusV2.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
+loopScriptShortBs = PlutusV1.serialiseCompiledCode $$(PlutusTx.compile [|| mkValidator ||])
 
 scriptSerialized :: PlutusScript PlutusScriptV1
 scriptSerialized = PlutusScriptSerialised loopScriptShortBs

bench/plutus-scripts-bench/src/Cardano/Benchmarking/PlutusScripts/SchnorrSecp256k1Loop.hs

@@ -4,6 +4,9 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
+-- PlutusV2 must be compiled using plc 1.0
+{-# OPTIONS_GHC -fplugin-opt PlutusTx.Plugin:target-version=1.0.0 #-}
+
 module Cardano.Benchmarking.PlutusScripts.SchnorrSecp256k1Loop (script) where
 
 import           Language.Haskell.TH