[EVM] Add some opt passes before ISel

Author: PavelKopyl

llvm/lib/Analysis/MemoryLocation.cpp

@@ -190,6 +190,10 @@ MemoryLocation MemoryLocation::getForArgument(const CallBase *Call,
       case Intrinsic::memcpy_inline:
       case Intrinsic::memmove:
       case Intrinsic::memset:
+      case Intrinsic::evm_memmoveas1as1:
+      case Intrinsic::evm_memcpyas1as2:
+      case Intrinsic::evm_memcpyas1as3:
+      case Intrinsic::evm_memcpyas1as4:
         if (ConstantInt *LenCI = dyn_cast<ConstantInt>(II->getArgOperand(2)))
           if (LenCI->getValue().getActiveBits() > 64)
             return MemoryLocation::getAfter(Arg, AATags);

llvm/lib/Analysis/VMAliasAnalysis.cpp

@@ -95,6 +95,10 @@ static std::optional<APInt> getConstStartLoc(const MemoryLocation &Loc,
 AliasResult VMAAResult::alias(const MemoryLocation &LocA,
                               const MemoryLocation &LocB, AAQueryInfo &AAQI,
                               const Instruction *I) {
+  if (!isa<PointerType>(LocA.Ptr->getType()) ||
+      !isa<PointerType>(LocB.Ptr->getType()))
+    return AAResultBase::alias(LocA, LocB, AAQI, I);
+
   const unsigned ASA = LocA.Ptr->getType()->getPointerAddressSpace();
   const unsigned ASB = LocB.Ptr->getType()->getPointerAddressSpace();
 

llvm/lib/Target/EVM/EVMTargetMachine.cpp

@@ -25,8 +25,16 @@
 #include "llvm/InitializePasses.h"
 #include "llvm/MC/TargetRegistry.h"
 #include "llvm/Passes/PassBuilder.h"
+#include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/IPO/GlobalDCE.h"
+#include "llvm/Transforms/InstCombine/InstCombine.h"
+#include "llvm/Transforms/Scalar.h"
+#include "llvm/Transforms/Scalar/DeadStoreElimination.h"
+#include "llvm/Transforms/Scalar/EarlyCSE.h"
+#include "llvm/Transforms/Scalar/GVN.h"
 #include "llvm/Transforms/Scalar/MergeIdenticalBB.h"
+#include "llvm/Transforms/Scalar/NewGVN.h"
+#include "llvm/Transforms/Scalar/SimplifyCFG.h"
 #include "llvm/Transforms/Utils.h"
 
 using namespace llvm;
@@ -147,6 +155,24 @@ void EVMTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
     FAM.registerPass([] { return EVMAA(); });
   });
 
+  PB.registerOptimizerLastEPCallback(
+      [](ModulePassManager &PM, OptimizationLevel Level) {
+        if (Level != OptimizationLevel::O0) {
+          PM.addPass(GlobalDCEPass());
+          FunctionPassManager FPM;
+          FPM.addPass(EarlyCSEPass(true /* Enable mem-ssa. */));
+          FPM.addPass(NewGVNPass());
+          FPM.addPass(DSEPass());
+          FPM.addPass(MergeIdenticalBBPass());
+          FPM.addPass(SimplifyCFGPass(SimplifyCFGOptions()
+                  .convertSwitchRangeToICmp(true)
+                  .hoistCommonInsts(true)
+                  .sinkCommonInsts(true)));
+          FPM.addPass(InstCombinePass());
+          PM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM), true));
+        }
+      });
+
   PB.registerPipelineParsingCallback(
       [](StringRef PassName, ModulePassManager &PM,
          ArrayRef<PassBuilder::PipelineElement>) {

llvm/test/CodeGen/EVM/sha3-constant-folding.ll

@@ -193,7 +193,6 @@ define i256 @sha3_test_9(ptr addrspace(1) %addr) nounwind {
 ; CHECK-LABEL: define noundef i256 @sha3_test_9
 ; CHECK-SAME: (ptr addrspace(1) nocapture writeonly [[ADDR:%.*]]) local_unnamed_addr #[[ATTR2]] {
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    store i256 304594385234, ptr addrspace(1) [[ADDR]], align 1
 ; CHECK-NEXT:    [[NEXT_ADDR:%.*]] = getelementptr i8, ptr addrspace(1) [[ADDR]], i256 32
 ; CHECK-NEXT:    store i256 -53675409633959416604748946233496653964072736789863655143901645101595015023076, ptr addrspace(1) [[NEXT_ADDR]], align 1
 ; CHECK-NEXT:    store i256 111111111111, ptr addrspace(1) [[ADDR]], align 1