[EVM] Add an option to pass metadata size

Author: PavelKopyl

llvm/lib/Target/EVM/EVMConstantUnfolding.cpp

@@ -71,6 +71,10 @@ static cl::opt<unsigned>
     CodeSizeLimit("evm-bytecode-sizelimit", cl::Hidden, cl::init(24576),
                   cl::desc("EVM contract bytecode size limit"));
 
+static cl::opt<unsigned> MetadataSize("evm-metadata-size", cl::Hidden,
+                                      cl::init(0),
+                                      cl::desc("EVM metadata size"));
+
 namespace {
 using InstrsPerLoopDepthTy = SmallVector<SmallVector<MachineInstr *>>;
 
@@ -626,7 +630,9 @@ static bool runImpl(Module &M, MachineModuleInfo &MMI) {
   bool Changed = false;
   ConstantUnfolder Unfolder(&M.getContext());
 
-  const unsigned ModuleCodeSize = EVM::calculateModuleCodeSize(M, MMI);
+  // Metadata size is included into the bytecode size.
+  const unsigned ModuleCodeSize =
+      EVM::calculateModuleCodeSize(M, MMI) + MetadataSize;
 
   // Collect PUSH instructions to process.
   DenseMap<MachineFunction *, std::unique_ptr<LoopDepthInstrCache>>

llvm/test/CodeGen/EVM/constant-unfolding-Oz-fallback.ll

@@ -1,28 +1,28 @@
-; RUN: llc -O3 --debug-only=evm-constant-unfolding -evm-bytecode-sizelimit=80 < %s 2>&1 | FileCheck %s
+; RUN: llc -O3 --debug-only=evm-constant-unfolding -evm-metadata-size=16 -evm-bytecode-sizelimit=96 < %s 2>&1 | FileCheck %s
 ; REQUIRES: asserts
 target datalayout = "E-p:256:256-i256:256:256-S256-a:256:256"
 target triple = "evm"
 
 ; CHECK: *** Running constant unfolding in the default mode ***
-; CHECK-NEXT: *** Initial module size: 136 ***
+; CHECK-NEXT: *** Initial module size: 152 ***
 ; CHECK: Checking PUSH32_S i256 35408467139433450592217433187231851964531694900788300625387963629091585785856
 ; CHECK: Checking PUSH27_S i256 52656145834278593348959013841835216134069776894924259991723442175
 ; CHECK: Skipping identity transformation
 ; CHECK: Checking PUSH27_S i256 52656145834278593348959013841835216132831836855638879716824317951
 ; CHECK: Skipping identity transformation
 
-; CHECK: *** Current module size is 111, which still exceeds the limit, falling back to size-minimization mode ***
+; CHECK: *** Current module size is 127, which still exceeds the limit, falling back to size-minimization mode ***
 ; CHECK-NEXT: *** Running constant unfolding in size-minimization mode at loop depth 0 ***
 
-; CHECK: *** Current module size is 111 ***
+; CHECK: *** Current module size is 127 ***
 ; CHECK-NEXT: *** Running constant unfolding in size-minimization mode at loop depth 1 ***
 ; CHECK:  Checking PUSH27_S i256 52656145834278593348959013841835216134069776894924259991723442175
 
-; CHECK: *** Current module size is 103 ***
+; CHECK: *** Current module size is 119 ***
 ; CHECK-NEXT: *** Running constant unfolding in size-minimization mode at loop depth 2 ***
 ; CHECK: Checking PUSH27_S i256 52656145834278593348959013841835216132831836855638879716824317951
 
-; CHECK: *** Current module size is 95 ***
+; CHECK: *** Current module size is 111 ***
 
 define i256 @test(i256 %p) {