[EVM] Move the EVMFinalizeStackFrames pass to the end of the codegen pipeline

This allows other passes to modify or adjust frame indexes before finalization.

Author: PavelKopyl

llvm/lib/Target/EVM/EVMCalculateModuleSize.cpp

@@ -89,6 +89,10 @@ static unsigned getInstSize(const MachineInstr &MI,
     // already exceeds the cap, so the push width is moot.
     Size += TII->get(EVM::PUSH2_S).getSize() + TII->get(EVM::JUMP_S).getSize();
     break;
+  case EVM::PUSH_FRAME:
+    // Typical frame index offsets can be encoded in a single byte, but to
+    // be conservative, let’s assume 2 bytes per offset.
+    LLVM_FALLTHROUGH;
   case EVM::PUSH_LABEL:
     // We emit PUSH4_S here. The linker usually relaxes it to PUSH2_S,
     // since a 16-bit immediate covers the 24,576-byte EVM runtime code cap

llvm/lib/Target/EVM/EVMTargetMachine.cpp

@@ -274,8 +274,6 @@ void EVMPassConfig::addPreEmitPass() {
     addPass(createEVMOptimizeLiveIntervals());
     addPass(createEVMSingleUseExpression());
     addPass(createEVMBPStackification());
-    addPass(&StackSlotColoringID);
-    addPass(createEVMFinalizeStackFrames());
 
     // Optimize branch instructions after stackification. This is done again
     // here, since EVMSplitCriticalEdges may introduce new BBs that could
@@ -289,9 +287,12 @@ void EVMPassConfig::addPreEmitPass() {
 
 void EVMPassConfig::addPreEmitPass2() {
   addPass(createEVMLowerJumpUnless());
-  addPass(createEVMConstantUnfolding());
-  if (getOptLevel() != CodeGenOptLevel::None)
+  addPass(&StackSlotColoringID);
+  if (getOptLevel() != CodeGenOptLevel::None) {
+    addPass(createEVMConstantUnfolding());
     addPass(createEVMPeepholePass());
+  }
+  addPass(createEVMFinalizeStackFrames());
 }
 
 TargetPassConfig *EVMTargetMachine::createPassConfig(PassManagerBase &PM) {

llvm/test/CodeGen/EVM/O0-pipeline.ll

@@ -64,15 +64,18 @@ target triple = "evm"
 ; CHECK-NEXT:       Live Stack Slot Analysis
 ; CHECK-NEXT:       Machine Block Frequency Analysis
 ; CHECK-NEXT:       EVM backward propagation stackification
-; CHECK-NEXT:       Stack Slot Coloring
-; CHECK-NEXT:     EVM finalize stack frames
-; CHECK-NEXT:     FunctionPass Manager
 ; CHECK-NEXT:       Machine Sanitizer Binary Metadata
 ; CHECK-NEXT:       Lazy Machine Block Frequency Analysis
 ; CHECK-NEXT:       Machine Optimization Remark Emitter
 ; CHECK-NEXT:       Stack Frame Layout Analysis
 ; CHECK-NEXT:       EVM Lower jump_unless
-; CHECK-NEXT:     EVM constant unfolding
+; CHECK-NEXT:       Slot index numbering
+; CHECK-NEXT:       Live Stack Slot Analysis
+; CHECK-NEXT:       MachineDominator Tree Construction
+; CHECK-NEXT:       Machine Natural Loop Construction
+; CHECK-NEXT:       Machine Block Frequency Analysis
+; CHECK-NEXT:       Stack Slot Coloring
+; CHECK-NEXT:     EVM finalize stack frames
 ; CHECK-NEXT:     FunctionPass Manager
 ; CHECK-NEXT:       Lazy Machine Block Frequency Analysis
 ; CHECK-NEXT:       Machine Optimization Remark Emitter

llvm/test/CodeGen/EVM/O3-pipeline.ll

@@ -133,12 +133,6 @@ target triple = "evm"
 ; CHECK-NEXT:       Live Stack Slot Analysis
 ; CHECK-NEXT:       Machine Block Frequency Analysis
 ; CHECK-NEXT:       EVM backward propagation stackification
-; CHECK-NEXT:       Stack Slot Coloring
-; CHECK-NEXT:     EVM finalize stack frames
-; CHECK-NEXT:     FunctionPass Manager
-; CHECK-NEXT:       MachineDominator Tree Construction
-; CHECK-NEXT:       Machine Natural Loop Construction
-; CHECK-NEXT:       Machine Block Frequency Analysis
 ; CHECK-NEXT:       Control Flow Optimizer
 ; CHECK-NEXT:       Lazy Machine Block Frequency Analysis
 ; CHECK-NEXT:       Tail Duplication
@@ -147,9 +141,17 @@ target triple = "evm"
 ; CHECK-NEXT:       Machine Optimization Remark Emitter
 ; CHECK-NEXT:       Stack Frame Layout Analysis
 ; CHECK-NEXT:       EVM Lower jump_unless
+; CHECK-NEXT:       Slot index numbering
+; CHECK-NEXT:       Live Stack Slot Analysis
+; CHECK-NEXT:       MachineDominator Tree Construction
+; CHECK-NEXT:       Machine Natural Loop Construction
+; CHECK-NEXT:       Machine Block Frequency Analysis
+; CHECK-NEXT:       Stack Slot Coloring
 ; CHECK-NEXT:     EVM constant unfolding
 ; CHECK-NEXT:     FunctionPass Manager
 ; CHECK-NEXT:       EVM Peephole
+; CHECK-NEXT:     EVM finalize stack frames
+; CHECK-NEXT:     FunctionPass Manager
 ; CHECK-NEXT:       Lazy Machine Block Frequency Analysis
 ; CHECK-NEXT:       Machine Optimization Remark Emitter
 ; CHECK-NEXT:       EVM Assembly

llvm/test/CodeGen/EVM/branch-folding-clear-condition.mir

@@ -1,5 +1,5 @@
 # RUN: llc -x mir -run-pass=branch-folder < %s | FileCheck %s
-# RUN: llc -x mir -start-after=evm-finalize-stack-frames < %s | FileCheck --check-prefix=ASM %s
+# RUN: llc -x mir -start-after=evm-backward-propagation-stackification < %s | FileCheck --check-prefix=ASM %s
 
 # Test that after branch folding, the condition at the top of
 # the stack is correctly cleared when a conditional branch is removed.