[EVM] Place EVMAA at the start of the AAs chain

Author: PavelKopyl

llvm/lib/Target/EVM/EVMAliasAnalysis.h

@@ -71,11 +71,17 @@ class EVMExternalAAWrapper : public ExternalAAWrapperPass {
 public:
   static char ID;
 
+  bool runEarly() override { return true; }
+
   EVMExternalAAWrapper()
       : ExternalAAWrapperPass([](Pass &P, Function &, AAResults &AAR) {
           if (auto *WrapperPass = P.getAnalysisIfAvailable<EVMAAWrapperPass>())
             AAR.addAAResult(WrapperPass->getResult());
         }) {}
+
+  StringRef getPassName() const override {
+    return "EVM Address space based Alias Analysis Wrapper";
+  }
 };
 
 } // end namespace llvm

llvm/lib/Target/EVM/EVMTargetMachine.cpp

@@ -125,7 +125,7 @@ bool EVMTargetMachine::parseMachineFunctionInfo(
   return false;
 }
 
-void EVMTargetMachine::registerDefaultAliasAnalyses(AAManager &AAM) {
+void EVMTargetMachine::registerEarlyDefaultAliasAnalyses(AAManager &AAM) {
   AAM.registerFunctionAnalysis<EVMAA>();
 }
 
@@ -221,11 +221,7 @@ void EVMPassConfig::addIRPasses() {
   addPass(createEVMLowerIntrinsicsPass());
   if (TM->getOptLevel() != CodeGenOptLevel::None) {
     addPass(createEVMAAWrapperPass());
-    addPass(
-        createExternalAAWrapperPass([](Pass &P, Function &, AAResults &AAR) {
-          if (auto *WrapperPass = P.getAnalysisIfAvailable<EVMAAWrapperPass>())
-            AAR.addAAResult(WrapperPass->getResult());
-        }));
+    addPass(createEVMExternalAAWrapperPass());
   }
   TargetPassConfig::addIRPasses();
 }

llvm/lib/Target/EVM/EVMTargetMachine.h

@@ -61,7 +61,8 @@ class EVMTargetMachine final : public LLVMTargetMachine {
   bool usesPhysRegsForValues() const override { return false; }
 
   void registerPassBuilderCallbacks(PassBuilder &PB) override;
-  void registerDefaultAliasAnalyses(AAManager &AAM) override;
+
+  void registerEarlyDefaultAliasAnalyses(AAManager &AAM) override;
 }; // EVMTargetMachine.
 
 } // end namespace llvm

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

@@ -10,7 +10,7 @@ target triple = "evm"
 ; CHECK-NEXT: Machine Module Information
 ; CHECK-NEXT: Target Transform Information
 ; CHECK-NEXT: EVM Address space based Alias Analysis
-; CHECK-NEXT: External Alias Analysis
+; CHECK-NEXT: EVM Address space based Alias Analysis Wrapper
 ; CHECK-NEXT: Type-Based Alias Analysis
 ; CHECK-NEXT: Scoped NoAlias Alias Analysis
 ; CHECK-NEXT: Assumption Cache Tracker

llvm/test/CodeGen/EVM/evmaa-before-basicaa.ll

@@ -0,0 +1,17 @@
+; REQUIRES: asserts
+; RUN: opt -aa-pipeline=default -passes='require<aa>' -debug-pass-manager -disable-output -S < %s 2>&1 | FileCheck %s
+; RUN: llc --debug-only='aa' -o /dev/null %s 2>&1 | FileCheck %s -check-prefix=LEGACY
+
+; In default AA pipeline, EVMAA should run before BasicAA to reduce compile time for EVM backend
+target triple = "evm"
+
+; CHECK: Running analysis: EVMAA on foo
+; CHECK-NEXT: Running analysis: BasicAA on foo
+
+; LEGACY: AAResults register Early ExternalAA: EVM Address space based Alias Analysis Wrapper
+; LEGACY-NEXT: AAResults register BasicAA
+define void @foo(){
+entry:
+  ret void
+}
+