[EVM] Remove EVMModuleLayout pass

After FE changes, entry function has to be the
first in the module, so this pass is not needed
anymore. Instead, add assert in EVMAsmPrinter that
function with "evm-entry-function" attribute has to
be the first function in the module.

Signed-off-by: Vladimir Radosavljevic <[email protected]>

Author: vladimirradosavljevic

llvm/lib/Target/EVM/CMakeLists.txt

@@ -37,7 +37,6 @@ add_llvm_target(EVMCodeGen
   EVMMarkRecursiveFunctions.cpp
   EVMMCInstLower.cpp
   EVMMachineFunctionInfo.cpp
-  EVMModuleLayout.cpp
   EVMOptimizeLiveIntervals.cpp
   EVMRegColoring.cpp
   EVMRegisterInfo.cpp

llvm/lib/Target/EVM/EVM.h

@@ -57,7 +57,6 @@ FunctionPass *createEVMCodegenPreparePass();
 ImmutablePass *createEVMAAWrapperPass();
 ImmutablePass *createEVMExternalAAWrapperPass();
 ModulePass *createEVMAlwaysInlinePass();
-ModulePass *createEVMModuleLayoutPass();
 
 // ISel and immediate followup passes.
 FunctionPass *createEVMISelDag(EVMTargetMachine &TM,
@@ -93,7 +92,6 @@ void initializeEVMBPStackificationPass(PassRegistry &);
 void initializeEVMAAWrapperPassPass(PassRegistry &);
 void initializeEVMExternalAAWrapperPass(PassRegistry &);
 void initializeEVMAlwaysInlinePass(PassRegistry &);
-void initializeEVMModuleLayoutPass(PassRegistry &);
 void initializeEVMLowerJumpUnlessPass(PassRegistry &);
 void initializeEVMFinalizeStackFramesPass(PassRegistry &);
 void initializeEVMMarkRecursiveFunctionsPass(PassRegistry &);

llvm/lib/Target/EVM/EVMAsmPrinter.cpp

@@ -102,6 +102,11 @@ void EVMAsmPrinter::emitFunctionEntryLabel() {
 }
 
 void EVMAsmPrinter::emitFunctionBodyStart() {
+  if (MF->getFunction().hasFnAttribute("evm-entry-function") &&
+      FirstFunctIsHandled)
+    report_fatal_error("Entry function '" + MF->getName() +
+                       "' isn't the first function in the module.");
+
   if (const auto *MFI = MF->getInfo<EVMMachineFunctionInfo>();
       MFI->getHasPushDeployAddress()) {
     // TODO: #778. Move the function with PUSHDEPLOYADDRESS to the

llvm/lib/Target/EVM/EVMModuleLayout.cpp

@@ -65,7 +65,6 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeEVMTarget() {
   initializeEVMAAWrapperPassPass(PR);
   initializeEVMExternalAAWrapperPass(PR);
   initializeEVMAlwaysInlinePass(PR);
-  initializeEVMModuleLayoutPass(PR);
   initializeEVMLowerJumpUnlessPass(PR);
   initializeEVMFinalizeStackFramesPass(PR);
   initializeEVMMarkRecursiveFunctionsPass(PR);
@@ -238,7 +237,6 @@ bool EVMPassConfig::addPreISel() {
 }
 
 void EVMPassConfig::addCodeGenPrepare() {
-  addPass(createEVMModuleLayoutPass());
   addPass(createEVMCodegenPreparePass());
   TargetPassConfig::addCodeGenPrepare();
 }

llvm/lib/Target/EVM/EVMTargetMachine.cpp

@@ -55,8 +55,6 @@ target triple = "evm"
 ; CHECK-NEXT:       Expand reduction intrinsics
 ; CHECK-NEXT:       Natural Loop Information
 ; CHECK-NEXT:       TLS Variable Hoist
-; CHECK-NEXT:     EVM module layout
-; CHECK-NEXT:     FunctionPass Manager
 ; CHECK-NEXT:       Final transformations before code generation
 ; CHECK-NEXT:       Dominator Tree Construction
 ; CHECK-NEXT:       Natural Loop Information

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

@@ -1,19 +1,18 @@
-; RUN: llc -O3 < %s | FileCheck %s
+; RUN: not --crash llc -O3 < %s 2>&1 | FileCheck %s
 target datalayout = "E-p:256:256-i256:256:256-S256-a:256:256"
 target triple = "evm"
 
 declare void @llvm.evm.return(ptr addrspace(1), i256)
 
-; CHECK-LABEL: __entry:
-; CHECK-LABEL: fun_fib:
+; CHECK: LLVM ERROR: Entry function '__entry' isn't the first function in the module.
 
 define private fastcc i256 @fun_fib(i256 %0) noinline {
 entry:
   %res = add i256 %0, 1
   ret i256 %res
 }
 
-define void @__entry() noreturn {
+define void @__entry() noreturn "evm-entry-function" {
 entry:
   %fun_res = tail call fastcc i256 @fun_fib(i256 7)
   tail call void @llvm.evm.return(ptr addrspace(1) null, i256 %fun_res)