Revert "feat: disable parallel when txs count is low (bnb-chain#226)"

This reverts commit 70107bf
welkin22 · Dec 12, 2024 · 1bb27e9 · 1bb27e9
1 parent ea0cf3f
commit 1bb27e9
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 26 deletions.
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -174,7 +174,6 @@ var (
 		utils.ParallelTxUnorderedMergeFlag,
 		utils.ParallelTxParallelMergeFlag,
 		utils.ParallelTxNumFlag,
-		utils.ParallelThresholdFlag,
 		utils.ParallelTxDAGFlag,
 		utils.ParallelTxDAGFileFlag,
 		utils.ParallelTxDAGSenderPrivFlag,

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -1123,12 +1123,6 @@ Please note that --` + MetricsHTTPFlag.Name + ` must be set to start the server.
 		Category: flags.VMCategory,
 	}
 
-	ParallelThresholdFlag = &cli.IntFlag{
-		Name:     "parallel.threshold",
-		Usage:    "Threshold of transaction count to trigger parallel execution, only valid in parallel mode (runtime calculated, no fixed default value)",
-		Category: flags.VMCategory,
-	}
-
 	ParallelTxDAGFlag = &cli.BoolFlag{
 		Name:     "parallel.txdag",
 		Usage:    "Enable the experimental parallel TxDAG generation, only valid in full sync mode (default = false)",
@@ -2055,10 +2049,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 		cfg.ParallelTxNum = ctx.Int(ParallelTxNumFlag.Name)
 	}
 
-	if ctx.IsSet(ParallelThresholdFlag.Name) {
-		cfg.ParallelThreshold = ctx.Int(ParallelThresholdFlag.Name)
-	}
-
 	if ctx.IsSet(ParallelTxDAGFlag.Name) {
 		cfg.EnableParallelTxDAG = ctx.Bool(ParallelTxDAGFlag.Name)
 	}

diff --git a/core/blockchain.go b/core/blockchain.go
@@ -570,7 +570,6 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, genesis *Genesis
 		log.Info("Parallel V2 enabled", "parallelNum", ParallelNum())
 	} else {
 		bc.processor = NewStateProcessor(chainConfig, bc, engine)
-		bc.serialProcessor = bc.processor
 	}
 	// Start future block processor.
 	bc.wg.Add(1)
@@ -2015,14 +2014,9 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error)
 
 			statedb.SetExpectedStateRoot(block.Root())
 
-			// Decide the enabling of parallelExec
-			invalidParallelConfig := bc.vmConfig.TxDAG == nil && (bc.vmConfig.EnableParallelUnorderedMerge || bc.vmConfig.EnableTxParallelMerge)
-			useSerialProcessor := invalidParallelConfig || lowTxsNum || !bc.vmConfig.EnableParallelExec
-
 			// Process block using the parent state as reference point
 			pstart = time.Now()
-
-			if useSerialProcessor {
+			if bc.vmConfig.TxDAG == nil && (bc.vmConfig.EnableParallelUnorderedMerge || bc.vmConfig.EnableTxParallelMerge) {
 				receipts, logs, usedGas, err = bc.serialProcessor.Process(block, statedb, bc.vmConfig)
 				blockProcessedInParallel = false
 			} else {

diff --git a/core/pevm_processor.go b/core/pevm_processor.go
@@ -37,12 +37,8 @@ func newPEVMProcessor(config *params.ChainConfig, bc *BlockChain, engine consens
 		parallelMerge:  bc.vmConfig.EnableTxParallelMerge,
 	}
 	initParallelRunner(bc.vmConfig.ParallelTxNum)
-	if bc.vmConfig.ParallelThreshold == 0 {
-		bc.vmConfig.ParallelThreshold = ParallelNum()
-	}
 	log.Info("Parallel execution mode is enabled", "Parallel Num", ParallelNum(),
-		"CPUNum", runtime.GOMAXPROCS(0), "unorderedMerge", processor.unorderedMerge,
-		"parallel threshold", bc.vmConfig.ParallelThreshold)
+		"CPUNum", runtime.GOMAXPROCS(0), "unorderedMerge", processor.unorderedMerge)
 	return processor
 }
 

diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
@@ -36,7 +36,6 @@ type Config struct {
 	ExtraEips                    []int               // Additional EIPS that are to be enabled
 	EnableParallelExec           bool                // Whether to execute transaction in parallel mode when do full sync
 	ParallelTxNum                int                 // Number of slot for transaction execution
-	ParallelThreshold            int                 // Threshold of transactions number to trigger parallel process
 	OptimismPrecompileOverrides  PrecompileOverrides // Precompile overrides for Optimism
 	EnableOpcodeOptimizations    bool                // Enable opcode optimization
 	TxDAG                        types.TxDAG

diff --git a/eth/backend.go b/eth/backend.go
@@ -241,7 +241,6 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 			EnableParallelUnorderedMerge: config.ParallelTxUnorderedMerge,
 			EnableTxParallelMerge:        config.ParallelTxParallelMerge,
 			ParallelTxNum:                config.ParallelTxNum,
-			ParallelThreshold:            config.ParallelThreshold,
 			EnableOpcodeOptimizations:    config.EnableOpcodeOptimizing,
 		}
 		cacheConfig = &core.CacheConfig{

diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go
@@ -221,12 +221,12 @@ type Config struct {
 
 	ParallelTxMode           bool // Whether to execute transaction in parallel mode when do full sync
 	ParallelTxNum            int  // Number of slot for transaction execution
-	ParallelThreshold        int  // threshold to trigger parallel execution
 	EnableOpcodeOptimizing   bool
 	EnableParallelTxDAG      bool
 	ParallelTxDAGFile        string
 	ParallelTxUnorderedMerge bool // Whether to enable unordered merge in parallel mode
 	ParallelTxParallelMerge  bool
+
 }
 
 // CreateConsensusEngine creates a consensus engine for the given chain config.