[EVM] Improvements

llvm/include/llvm/Analysis/VMAliasAnalysis.h

@@ -0,0 +1,50 @@
+//===-- VMAliasAnalysis.h - VM alias analysis -------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This is the address space based alias analysis pass, that is shared between
+// EraVM and EVM backends.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_ANALYSIS_VM_VMALIASANALYSIS_H
+#define LLVM_ANALYSIS_VM_VMALIASANALYSIS_H
+
+#include "llvm/Analysis/AliasAnalysis.h"
+
+namespace llvm {
+
+class DataLayout;
+class MemoryLocation;
+
+/// A simple AA result that uses address space info to answer queries.
+class VMAAResult : public AAResultBase {
+  const DataLayout &DL;
+  SmallDenseSet<unsigned> StorageAS;
+  SmallDenseSet<unsigned> HeapAS;
+  unsigned MaxAS;
+
+public:
+  explicit VMAAResult(const DataLayout &DL,
+                      const SmallDenseSet<unsigned> &StorageAS,
+                      const SmallDenseSet<unsigned> &HeapAS, unsigned MaxAS)
+      : DL(DL), StorageAS(StorageAS), HeapAS(HeapAS), MaxAS(MaxAS) {}
+
+  /// Handle invalidation events from the new pass manager.
+  ///
+  /// By definition, this result is stateless and so remains valid.
+  bool invalidate(Function &, const PreservedAnalyses &,
+                  FunctionAnalysisManager::Invalidator &) {
+    return false;
+  }
+
+  AliasResult alias(const MemoryLocation &LocA, const MemoryLocation &LocB,
+                    AAQueryInfo &AAQI, const Instruction *I);
+};
+} // end namespace llvm
+
+#endif // LLVM_ANALYSIS_VM_ERAVMALIASANALYSIS_H

llvm/include/llvm/CodeGen/TargetInstrInfo.h

@@ -144,6 +144,12 @@ class TargetInstrInfo : public MCInstrInfo {
     return false;
   }
 
+  /// For a "cheap" instruction which doesn't enable additional sinking,
+  /// should MachineSink break a critical edge to sink it anyways?
+  virtual bool shouldBreakCriticalEdgeToSink(MachineInstr &MI) const {
+    return false;
+  }
+
 protected:
   /// For instructions with opcodes for which the M_REMATERIALIZABLE flag is
   /// set, this hook lets the target specify whether the instruction is actually

llvm/include/llvm/IR/IntrinsicsEVM.td

@@ -25,134 +25,134 @@ let TargetPrefix = "evm" in {
 
 // Arithmetical operations.
 def int_evm_div
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_sdiv
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_mod
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_smod
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_shl
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_shr
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_sar
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_addmod
   : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty, llvm_i256_ty],
-              [IntrNoMem]>;
+              [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_mulmod
   : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty, llvm_i256_ty],
-              [IntrNoMem]>;
+              [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_exp
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_sha3
   : Intrinsic<[llvm_i256_ty],
-              [LLVMQualPointerType<AS.HEAP>, llvm_i256_ty], [IntrReadMem]>;
+              [LLVMQualPointerType<AS.HEAP>, llvm_i256_ty], [IntrReadMem, IntrWillReturn]>;
 
 def int_evm_signextend
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_byte
   : Intrinsic<[llvm_i256_ty], [llvm_i256_ty, llvm_i256_ty],
-              [IntrNoMem]>;
+              [IntrNoMem, IntrWillReturn]>;
 
 // Memory operations.
 def int_evm_mstore8
   : Intrinsic<[], [LLVMQualPointerType<AS.HEAP>, llvm_i256_ty], [IntrWriteMem]>;
 
 // TODO: CPR-1555.
 //       Review system intrinsics attributes taking into account EraVM.
-def int_evm_msize : Intrinsic<[llvm_i256_ty], [], []>;
+def int_evm_msize : Intrinsic<[llvm_i256_ty], [], [IntrInaccessibleMemOnly, IntrWillReturn]>;
 
-def int_evm_pc : Intrinsic<[llvm_i256_ty], [], []>;
+def int_evm_pc : Intrinsic<[llvm_i256_ty], [], [IntrInaccessibleMemOnly, IntrWillReturn]>;
 
-def int_evm_gas : Intrinsic<[llvm_i256_ty], [], []>;
+def int_evm_gas : Intrinsic<[llvm_i256_ty], [], [IntrInaccessibleMemOnly, IntrWillReturn]>;
 
 
 // Getting values from the context.
-def int_evm_address : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_address : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_origin : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_origin : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_caller : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_caller : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_balance : Intrinsic<[llvm_i256_ty], [llvm_i256_ty], []>;
+def int_evm_balance : Intrinsic<[llvm_i256_ty], [llvm_i256_ty], [IntrInaccessibleMemOnly, IntrWillReturn]>;
 
-def int_evm_callvalue : Intrinsic<[llvm_i256_ty], [], []>;
+def int_evm_callvalue : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_calldatasize : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_calldatasize : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_calldataload
   : Intrinsic<[llvm_i256_ty], [LLVMQualPointerType<AS.CALL_DATA>], []>;
 
-def int_evm_codesize : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_codesize : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
 // TODO: Ensure the gasprice is fixed while a function execution.
-def int_evm_gasprice : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_gasprice : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_extcodesize
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
 def int_evm_extcodecopy
   : Intrinsic<[], [llvm_i256_ty, LLVMQualPointerType<AS.HEAP>,
                    LLVMQualPointerType<AS.CODE>, llvm_i256_ty], [IntrWriteMem]>;
 
-def int_evm_returndatasize : Intrinsic<[llvm_i256_ty], [], []>;
+def int_evm_returndatasize : Intrinsic<[llvm_i256_ty], [], [IntrInaccessibleMemOnly, IntrWillReturn]>;
 
 def int_evm_extcodehash
-  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty], [IntrNoMem]>;
+  : Intrinsic<[llvm_i256_ty], [llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_blockhash : Intrinsic<[llvm_i256_ty], [llvm_i256_ty], [IntrNoMem]>;
+def int_evm_blockhash : Intrinsic<[llvm_i256_ty], [llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_blobhash : Intrinsic<[llvm_i256_ty], [llvm_i256_ty], [IntrNoMem]>;
+def int_evm_blobhash : Intrinsic<[llvm_i256_ty], [llvm_i256_ty], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_coinbase : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_coinbase : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_timestamp : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_timestamp : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_number : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_number : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_difficulty : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_difficulty : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_gaslimit : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_gaslimit : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_chainid : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_chainid : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_selfbalance : Intrinsic<[llvm_i256_ty], [], []>;
+def int_evm_selfbalance : Intrinsic<[llvm_i256_ty], [], [IntrInaccessibleMemOnly]>;
 
-def int_evm_basefee : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_basefee : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
-def int_evm_blobbasefee : Intrinsic<[llvm_i256_ty], [], [IntrNoMem]>;
+def int_evm_blobbasefee : Intrinsic<[llvm_i256_ty], [], [IntrNoMem, IntrWillReturn]>;
 
 // Logging.
 def int_evm_log0
-  : Intrinsic<[], [LLVMQualPointerType<AS.HEAP>, llvm_i256_ty], []>;
+  : Intrinsic<[], [LLVMQualPointerType<AS.HEAP>, llvm_i256_ty], [IntrReadMem]>;
 
 def int_evm_log1
-  : Intrinsic<[], [LLVMQualPointerType<AS.HEAP>, llvm_i256_ty, llvm_i256_ty], []>;
+  : Intrinsic<[], [LLVMQualPointerType<AS.HEAP>, llvm_i256_ty, llvm_i256_ty], [IntrReadMem]>;
 
 def int_evm_log2
   : Intrinsic<[], [LLVMQualPointerType<AS.HEAP>, llvm_i256_ty, llvm_i256_ty,
-                   llvm_i256_ty], []>;
+                   llvm_i256_ty], [IntrReadMem]>;
 
 def int_evm_log3
   : Intrinsic<[], [LLVMQualPointerType<AS.HEAP>, llvm_i256_ty, llvm_i256_ty,
-                   llvm_i256_ty, llvm_i256_ty], []>;
+                   llvm_i256_ty, llvm_i256_ty], [IntrReadMem]>;
 
 def int_evm_log4
   : Intrinsic<[], [LLVMQualPointerType<AS.HEAP>, llvm_i256_ty, llvm_i256_ty,
-                   llvm_i256_ty, llvm_i256_ty, llvm_i256_ty], []>;
+                   llvm_i256_ty, llvm_i256_ty, llvm_i256_ty], [IntrReadMem]>;
 
 // System calls
 def int_evm_create
@@ -252,14 +252,14 @@ def int_evm_memcpyas1as4
 // passed in the metadata.
 def int_evm_datasize : DefaultAttrsIntrinsic<
   [llvm_i256_ty], [llvm_metadata_ty],
-  [IntrNoMem, IntrSpeculatable]
+  [IntrNoMem, IntrWillReturn, IntrSpeculatable]
 >;
 
 // Returns a code offset of the Yul object with the name
 // passed in the metadata.
 def int_evm_dataoffset : DefaultAttrsIntrinsic<
   [llvm_i256_ty], [llvm_metadata_ty],
-  [IntrNoMem, IntrSpeculatable]
+  [IntrNoMem, IntrWillReturn, IntrSpeculatable]
 >;
 
 

llvm/include/llvm/Transforms/Scalar/SHA3ConstFolding.h

@@ -0,0 +1,36 @@
+//===-- SHA3ConstFolding.h - Const fold calls to sha3 -----------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides the interface for the SHA3 const folding pass.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_TRANSFORMS_SCALAR_SHA3CONSTFOLDING_H
+#define LLVM_TRANSFORMS_SCALAR_SHA3CONSTFOLDING_H
+
+#include "llvm/Analysis/AliasAnalysis.h"
+
+namespace llvm {
+
+class Function;
+class AssumptionCache;
+class MemorySSA;
+class DominatorTree;
+class TargetLibraryInfo;
+class LoopInfo;
+class Instruction;
+
+bool runSHA3ConstFolding(
+    Function &F, AliasAnalysis &AA, AssumptionCache &AC, MemorySSA &MSSA,
+    DominatorTree &DT, const TargetLibraryInfo &TLI, const LoopInfo &LI,
+    const std::function<bool(const Instruction *)> &IsSha3Call,
+    unsigned HeapAS);
+
+} // end namespace llvm
+
+#endif // LLVM_TRANSFORMS_SCALAR_SHA3CONSTFOLDING_H

llvm/lib/Analysis/CMakeLists.txt

@@ -140,6 +140,9 @@ add_llvm_component_library(LLVMAnalysis
   ValueTracking.cpp
   VectorUtils.cpp
   VFABIDemangling.cpp
+  # EraVM local begin
+  VMAliasAnalysis.cpp
+  # EraVM local end
   ${GeneratedMLSources}
 
   ADDITIONAL_HEADER_DIRS

llvm/lib/Analysis/MemoryLocation.cpp

@@ -15,6 +15,7 @@
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Type.h"
 // EraVM local begin
+#include "llvm/IR/IntrinsicsEVM.h"
 #include "llvm/TargetParser/Triple.h"
 // EraVM local end
 #include <optional>
@@ -190,6 +191,14 @@ MemoryLocation MemoryLocation::getForArgument(const CallBase *Call,
       case Intrinsic::lifetime_end:
         // it is okay to have lifetime intrinsic
         break;
+      case Intrinsic::evm_sha3: {
+        assert((ArgIdx == 0) && "Invalid argument index for sha3");
+        const auto *LenCI = dyn_cast<ConstantInt>(Call->getArgOperand(1));
+        if (LenCI && LenCI->getValue().getActiveBits() <= 64)
+          return MemoryLocation(
+              Arg, LocationSize::precise(LenCI->getZExtValue()), AATags);
+        return MemoryLocation::getAfter(Arg, AATags);
+      }
       default:
         llvm_unreachable("Unexpected intrinsic for EraVM/EVM target");
         break;