perf: inline step and step_end dispatchers

Author: DaniPopes

crates/evm/evm/src/inspectors/stack.rs

@@ -299,19 +299,21 @@ pub struct InspectorStack {
 /// See [`InspectorStack`].
 #[derive(Default, Clone, Debug)]
 pub struct InspectorStackInner {
+    // Inspectors.
     pub chisel_state: Option<ChiselState>,
-    pub line_coverage: Option<LineCoverageCollector>,
     pub edge_coverage: Option<EdgeCovInspector>,
     pub fuzzer: Option<Fuzzer>,
+    pub line_coverage: Option<LineCoverageCollector>,
     pub log_collector: Option<LogCollector>,
     pub printer: Option<CustomPrintTracer>,
-    pub tracer: Option<TracingInspector>,
+    pub revert_diag: Option<RevertDiagnostic>,
     pub script_execution_inspector: Option<ScriptExecutionInspector>,
+    pub tracer: Option<TracingInspector>,
+
+    // InspectorExt and other internal data.
     pub enable_isolation: bool,
     pub odyssey: bool,
     pub create2_deployer: Address,
-    pub revert_diag: Option<RevertDiagnostic>,
-
     /// Flag marking if we are in the inner EVM context.
     pub in_inner_context: bool,
     pub inner_context_data: Option<InnerContextData>,
@@ -788,63 +790,83 @@ impl InspectorStackRefMut<'_> {
             ecx.journaled_state.state = std::mem::take(&mut self.top_frame_journal);
         }
     }
-}
 
-impl Inspector<EthEvmContext<&mut dyn DatabaseExt>> for InspectorStackRefMut<'_> {
-    fn initialize_interp(
+    #[inline(always)]
+    fn step_inlined(
         &mut self,
         interpreter: &mut Interpreter,
         ecx: &mut EthEvmContext<&mut dyn DatabaseExt>,
     ) {
         call_inspectors!(
             [
-                &mut self.line_coverage,
+                &mut self.fuzzer,
                 &mut self.tracer,
-                &mut self.cheatcodes,
+                &mut self.line_coverage,
+                &mut self.edge_coverage,
                 &mut self.script_execution_inspector,
-                &mut self.printer
+                &mut self.printer,
+                &mut self.revert_diag,
+                // Keep `cheatcodes` last to make use of the tail call.
+                &mut self.cheatcodes,
             ],
-            |inspector| inspector.initialize_interp(interpreter, ecx),
+            |inspector| (*inspector).step(interpreter, ecx),
         );
     }
 
-    fn step(
+    #[inline(always)]
+    fn step_end_inlined(
         &mut self,
         interpreter: &mut Interpreter,
         ecx: &mut EthEvmContext<&mut dyn DatabaseExt>,
     ) {
         call_inspectors!(
             [
-                &mut self.fuzzer,
                 &mut self.tracer,
-                &mut self.line_coverage,
-                &mut self.edge_coverage,
-                &mut self.cheatcodes,
-                &mut self.script_execution_inspector,
+                &mut self.chisel_state,
                 &mut self.printer,
-                &mut self.revert_diag
+                &mut self.revert_diag,
+                // Keep `cheatcodes` last to make use of the tail call.
+                &mut self.cheatcodes,
             ],
-            |inspector| inspector.step(interpreter, ecx),
+            |inspector| (*inspector).step_end(interpreter, ecx),
         );
     }
+}
 
-    fn step_end(
+impl Inspector<EthEvmContext<&mut dyn DatabaseExt>> for InspectorStackRefMut<'_> {
+    fn initialize_interp(
         &mut self,
         interpreter: &mut Interpreter,
         ecx: &mut EthEvmContext<&mut dyn DatabaseExt>,
     ) {
         call_inspectors!(
             [
+                &mut self.line_coverage,
                 &mut self.tracer,
                 &mut self.cheatcodes,
-                &mut self.chisel_state,
-                &mut self.printer,
-                &mut self.revert_diag
+                &mut self.script_execution_inspector,
+                &mut self.printer
             ],
-            |inspector| inspector.step_end(interpreter, ecx),
+            |inspector| inspector.initialize_interp(interpreter, ecx),
         );
     }
 
+    fn step(
+        &mut self,
+        interpreter: &mut Interpreter,
+        ecx: &mut EthEvmContext<&mut dyn DatabaseExt>,
+    ) {
+        self.step_inlined(interpreter, ecx);
+    }
+
+    fn step_end(
+        &mut self,
+        interpreter: &mut Interpreter,
+        ecx: &mut EthEvmContext<&mut dyn DatabaseExt>,
+    ) {
+        self.step_end_inlined(interpreter, ecx);
+    }
+
     #[allow(clippy::redundant_clone)]
     fn log(
         &mut self,
@@ -1063,22 +1085,20 @@ impl InspectorExt for InspectorStackRefMut<'_> {
 }
 
 impl Inspector<EthEvmContext<&mut dyn DatabaseExt>> for InspectorStack {
-    #[inline]
     fn step(
         &mut self,
         interpreter: &mut Interpreter,
         ecx: &mut EthEvmContext<&mut dyn DatabaseExt>,
     ) {
-        self.as_mut().step(interpreter, ecx)
+        self.as_mut().step_inlined(interpreter, ecx)
     }
 
-    #[inline]
     fn step_end(
         &mut self,
         interpreter: &mut Interpreter,
         ecx: &mut EthEvmContext<&mut dyn DatabaseExt>,
     ) {
-        self.as_mut().step_end(interpreter, ecx)
+        self.as_mut().step_end_inlined(interpreter, ecx)
     }
 
     fn call(