LinearLeios: new parameters for LinearEB generation and validation CPU costs

Author: nfrisby

leios-trace-hs/src/LeiosConfig.hs

@@ -135,6 +135,8 @@ data Config = Config
   , ebSizeBytesConstant :: SizeBytes
   , ebSizeBytesPerIb :: SizeBytes
   , ebBodyAvgSizeBytes :: SizeBytes
+  , ebBodyValidationCpuTimeMsConstant :: DurationMs
+  , ebBodyValidationCpuTimeMsPerByte :: DurationMs
   , ebDiffusionStrategy :: DiffusionStrategy
   , ebDiffusionMaxWindowSize :: Word16
   , ebDiffusionMaxHeadersToRequest :: Word16
@@ -211,7 +213,9 @@ instance Default Config where
       , ebValidationCpuTimeMs = 1.0
       , ebSizeBytesConstant = 240
       , ebSizeBytesPerIb = 32
-      , ebBodyAvgSizeBytes = 5000000
+      , ebBodyAvgSizeBytes = 2500000
+      , ebBodyValidationCpuTimeMsConstant = 50.0
+      , ebBodyValidationCpuTimeMsPerByte = 0.0005
       , ebDiffusionStrategy = PeerOrder
       , ebDiffusionMaxWindowSize = 100
       , ebDiffusionMaxHeadersToRequest = 100
@@ -291,6 +295,8 @@ configToKVsWith getter cfg =
     , get @"ebSizeBytesConstant" getter cfg
     , get @"ebSizeBytesPerIb" getter cfg
     , get @"ebBodyAvgSizeBytes" getter cfg
+    , get @"ebBodyValidationCpuTimeMsConstant" getter cfg
+    , get @"ebBodyValidationCpuTimeMsPerByte" getter cfg
     , get @"ebDiffusionStrategy" getter cfg
     , get @"ebDiffusionMaxWindowSize" getter cfg
     , get @"ebDiffusionMaxHeadersToRequest" getter cfg
@@ -382,6 +388,8 @@ instance FromJSON Config where
     ebSizeBytesConstant <- parseFieldOrDefault @Config @"ebSizeBytesConstant" obj
     ebSizeBytesPerIb <- parseFieldOrDefault @Config @"ebSizeBytesPerIb" obj
     ebBodyAvgSizeBytes <- parseFieldOrDefault @Config @"ebBodyAvgSizeBytes" obj
+    ebBodyValidationCpuTimeMsConstant <- parseFieldOrDefault @Config @"ebBodyValidationCpuTimeMsConstant" obj
+    ebBodyValidationCpuTimeMsPerByte <- parseFieldOrDefault @Config @"ebBodyValidationCpuTimeMsPerByte" obj
     ebDiffusionStrategy <- parseFieldOrDefault @Config @"ebDiffusionStrategy" obj
     ebDiffusionMaxWindowSize <- parseFieldOrDefault @Config @"ebDiffusionMaxWindowSize" obj
     ebDiffusionMaxHeadersToRequest <- parseFieldOrDefault @Config @"ebDiffusionMaxHeadersToRequest" obj

simulation/src/LeiosProtocol/Short.hs

@@ -64,6 +64,8 @@ data LeiosDelays = LeiosDelays
   -- ^ hash matching and payload validation (incl. tx scripts)
   , endorseBlockGeneration :: !(EndorseBlock -> DiffTime)
   , endorseBlockValidation :: !(EndorseBlock -> DiffTime)
+  , linearEndorseBlockGeneration :: !(InputBlock -> DiffTime)
+  , linearEndorseBlockValidation :: !(InputBlock -> DiffTime)
   , voteMsgGeneration :: !(VoteMsg -> [EndorseBlock] -> DiffTime)
   , linearVoteMsgGeneration :: !(VoteMsg -> [InputBlock] -> DiffTime)
   , voteMsgValidation :: !(VoteMsg -> DiffTime)
@@ -269,6 +271,11 @@ convertConfig disk =
               + disk.ibBodyValidationCpuTimeMsPerByte * fromIntegral ib.body.size
       , endorseBlockGeneration = const $ durationMsToDiffTime disk.ebGenerationCpuTimeMs
       , endorseBlockValidation = const $ durationMsToDiffTime disk.ebValidationCpuTimeMs
+      , linearEndorseBlockGeneration = const $ durationMsToDiffTime disk.ebGenerationCpuTimeMs
+      , linearEndorseBlockValidation = \ib ->
+          durationMsToDiffTime $
+            disk.ebBodyValidationCpuTimeMsConstant
+              + disk.ebBodyValidationCpuTimeMsPerByte * fromIntegral ib.body.size
       , -- TODO: can parallelize?
         voteMsgGeneration = \vm ebs ->
           assert (vm.endorseBlocks == map (.id) ebs) $
@@ -376,6 +383,8 @@ delaysAndSizesAsFull cfg@LeiosConfig{pipeline, voteSendStage} =
       , inputBlockValidation = const @DiffTime $ cfg.delays.inputBlockValidation fullIB
       , endorseBlockGeneration = const @DiffTime $ cfg.delays.endorseBlockGeneration fullEB
       , endorseBlockValidation = const @DiffTime $ cfg.delays.endorseBlockValidation fullEB
+      , linearEndorseBlockGeneration = const @DiffTime $ cfg.delays.linearEndorseBlockGeneration fullIB
+      , linearEndorseBlockValidation = const @DiffTime $ cfg.delays.linearEndorseBlockValidation fullIB
       , voteMsgGeneration =
           const $
             const @DiffTime $

simulation/src/LeiosProtocol/Short/Generate.hs

@@ -92,7 +92,7 @@ leiosBlockGenerator LeiosGeneratorConfig{..} =
         i <- nextBlkId InputBlockId
         let header = mkInputBlockHeader leios i slot (SubSlotNo 0) nodeId (BlockHash $ blockHash rb)
         let !ib = mkInputBlock leios header ibData.txsPayload
-        let !task2 = leios.delays.inputBlockGeneration ib
+        let !task2 = leios.delays.linearEndorseBlockGeneration ib
         return [(task, Left (rbData.prevChain, rb)), (task2, Right ib)]
   execute' slot Propose{ibSlot, delay} wins = do
     ibData <- lift $ atomically buffers.newIBData

simulation/src/LeiosProtocol/Short/Node.hs

@@ -1100,7 +1100,7 @@ dispatchValidationSTM tracer cfg leiosState req =
   valLinearEB x alreadyCertified completion =
     let
       decimate = if alreadyCertified then (/ 10) else id   -- TODO better ratio
-      delay prefix = cpuTask prefix (decimate . cfg.leios.delays.inputBlockValidation) x
+      delay prefix = cpuTask prefix (decimate . cfg.leios.delays.linearEndorseBlockValidation) x
       task = atomically $ do
         completion [(convertLinearId x.id, x)]
         adoptLinearEB cfg leiosState x

simulation/src/LeiosProtocol/Short/Sim.hs

@@ -477,10 +477,13 @@ traceRelayLink1 connectionOptions =
                       inputBlockValidation = const 0.1
                     , -- \^ hash matching and payload validation (incl. tx scripts)
                       endorseBlockValidation = const 0.005
-                    , voteMsgValidation = const 0.005
+                    , linearEndorseBlockValidation = const 1
+                    , -- \^ hash matching and payload validation (incl. tx scripts)
+                      voteMsgValidation = const 0.005
                     , certificateGeneration = const 0.050
                     , inputBlockGeneration = const 0
                     , endorseBlockGeneration = const 0
+                    , linearEndorseBlockGeneration = const 0
                     , voteMsgGeneration = const (const 0)
                     , linearVoteMsgGeneration = const (const 0)
                     , certificateValidation = const 0