Revert "[TTI][ASan][RISCV] Move InterestingMemoryOperand to Analysis and embed in MemIntrinsicInfo" (#159700)

Reverts llvm/llvm-project#157863

Author: fmayer

llvm/include/llvm/Analysis/InterestingMemoryOperand.h

@@ -25,7 +25,6 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/BitmaskEnum.h"
 #include "llvm/Analysis/IVDescriptors.h"
-#include "llvm/Analysis/InterestingMemoryOperand.h"
 #include "llvm/IR/FMF.h"
 #include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/PassManager.h"
@@ -89,8 +88,6 @@ struct MemIntrinsicInfo {
   bool WriteMem = false;
   bool IsVolatile = false;
 
-  SmallVector<InterestingMemoryOperand, 1> InterestingOperands;
-
   bool isUnordered() const {
     return (Ordering == AtomicOrdering::NotAtomic ||
             Ordering == AtomicOrdering::Unordered) &&

llvm/include/llvm/Analysis/TargetTransformInfo.h

@@ -14,14 +14,45 @@
 #define LLVM_TRANSFORMS_INSTRUMENTATION_ADDRESSSANITIZERCOMMON_H
 
 #include "llvm/Analysis/CFG.h"
-#include "llvm/Analysis/InterestingMemoryOperand.h"
 #include "llvm/Analysis/PostDominators.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Module.h"
 
 namespace llvm {
+
+class InterestingMemoryOperand {
+public:
+  Use *PtrUse;
+  bool IsWrite;
+  Type *OpType;
+  TypeSize TypeStoreSize = TypeSize::getFixed(0);
+  MaybeAlign Alignment;
+  // The mask Value, if we're looking at a masked load/store.
+  Value *MaybeMask;
+  // The EVL Value, if we're looking at a vp intrinsic.
+  Value *MaybeEVL;
+  // The Stride Value, if we're looking at a strided load/store.
+  Value *MaybeStride;
+
+  InterestingMemoryOperand(Instruction *I, unsigned OperandNo, bool IsWrite,
+                           class Type *OpType, MaybeAlign Alignment,
+                           Value *MaybeMask = nullptr,
+                           Value *MaybeEVL = nullptr,
+                           Value *MaybeStride = nullptr)
+      : IsWrite(IsWrite), OpType(OpType), Alignment(Alignment),
+        MaybeMask(MaybeMask), MaybeEVL(MaybeEVL), MaybeStride(MaybeStride) {
+    const DataLayout &DL = I->getDataLayout();
+    TypeStoreSize = DL.getTypeStoreSizeInBits(OpType);
+    PtrUse = &I->getOperandUse(OperandNo);
+  }
+
+  Instruction *getInsn() { return cast<Instruction>(PtrUse->getUser()); }
+
+  Value *getPtr() { return PtrUse->get(); }
+};
+
 // Get AddressSanitizer parameters.
 void getAddressSanitizerParams(const Triple &TargetTriple, int LongSize,
                                bool IsKasan, uint64_t *ShadowBase,

llvm/include/llvm/Transforms/Instrumentation/AddressSanitizerCommon.h

@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/TargetTransformInfo.h"
-#include "llvm/ADT/SmallVector.h"
 #include "llvm/Analysis/CFG.h"
 #include "llvm/Analysis/LoopIterator.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"

llvm/lib/Analysis/TargetTransformInfo.cpp

@@ -15,7 +15,6 @@
 #include "llvm/CodeGen/TargetLowering.h"
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/IR/Instructions.h"
-#include "llvm/IR/IntrinsicsRISCV.h"
 #include "llvm/IR/PatternMatch.h"
 #include <cmath>
 #include <optional>
@@ -2702,82 +2701,6 @@ void RISCVTTIImpl::getPeelingPreferences(Loop *L, ScalarEvolution &SE,
   BaseT::getPeelingPreferences(L, SE, PP);
 }
 
-bool RISCVTTIImpl::getTgtMemIntrinsic(IntrinsicInst *Inst,
-                                      MemIntrinsicInfo &Info) const {
-  const DataLayout &DL = getDataLayout();
-  Intrinsic::ID IID = Inst->getIntrinsicID();
-  LLVMContext &C = Inst->getContext();
-  bool HasMask = false;
-  switch (IID) {
-  case Intrinsic::riscv_vle_mask:
-  case Intrinsic::riscv_vse_mask:
-    HasMask = true;
-    [[fallthrough]];
-  case Intrinsic::riscv_vle:
-  case Intrinsic::riscv_vse: {
-    // Intrinsic interface:
-    // riscv_vle(merge, ptr, vl)
-    // riscv_vle_mask(merge, ptr, mask, vl, policy)
-    // riscv_vse(val, ptr, vl)
-    // riscv_vse_mask(val, ptr, mask, vl, policy)
-    bool IsWrite = Inst->getType()->isVoidTy();
-    Type *Ty = IsWrite ? Inst->getArgOperand(0)->getType() : Inst->getType();
-    const auto *RVVIInfo = RISCVVIntrinsicsTable::getRISCVVIntrinsicInfo(IID);
-    unsigned VLIndex = RVVIInfo->VLOperand;
-    unsigned PtrOperandNo = VLIndex - 1 - HasMask;
-    MaybeAlign Alignment =
-        Inst->getArgOperand(PtrOperandNo)->getPointerAlignment(DL);
-    Type *MaskType = Ty->getWithNewType(Type::getInt1Ty(C));
-    Value *Mask = ConstantInt::getTrue(MaskType);
-    if (HasMask)
-      Mask = Inst->getArgOperand(VLIndex - 1);
-    Value *EVL = Inst->getArgOperand(VLIndex);
-    Info.InterestingOperands.emplace_back(Inst, PtrOperandNo, IsWrite, Ty,
-                                          Alignment, Mask, EVL);
-    return true;
-  }
-  case Intrinsic::riscv_vlse_mask:
-  case Intrinsic::riscv_vsse_mask:
-    HasMask = true;
-    [[fallthrough]];
-  case Intrinsic::riscv_vlse:
-  case Intrinsic::riscv_vsse: {
-    // Intrinsic interface:
-    // riscv_vlse(merge, ptr, stride, vl)
-    // riscv_vlse_mask(merge, ptr, stride, mask, vl, policy)
-    // riscv_vsse(val, ptr, stride, vl)
-    // riscv_vsse_mask(val, ptr, stride, mask, vl, policy)
-    bool IsWrite = Inst->getType()->isVoidTy();
-    Type *Ty = IsWrite ? Inst->getArgOperand(0)->getType() : Inst->getType();
-    const auto *RVVIInfo = RISCVVIntrinsicsTable::getRISCVVIntrinsicInfo(IID);
-    unsigned VLIndex = RVVIInfo->VLOperand;
-    unsigned PtrOperandNo = VLIndex - 2 - HasMask;
-    MaybeAlign Alignment =
-        Inst->getArgOperand(PtrOperandNo)->getPointerAlignment(DL);
-
-    Value *Stride = Inst->getArgOperand(PtrOperandNo + 1);
-    // Use the pointer alignment as the element alignment if the stride is a
-    // multiple of the pointer alignment. Otherwise, the element alignment
-    // should be the greatest common divisor of pointer alignment and stride.
-    // For simplicity, just consider unalignment for elements.
-    unsigned PointerAlign = Alignment.valueOrOne().value();
-    if (!isa<ConstantInt>(Stride) ||
-        cast<ConstantInt>(Stride)->getZExtValue() % PointerAlign != 0)
-      Alignment = Align(1);
-
-    Type *MaskType = Ty->getWithNewType(Type::getInt1Ty(C));
-    Value *Mask = ConstantInt::getTrue(MaskType);
-    if (HasMask)
-      Mask = Inst->getArgOperand(VLIndex - 1);
-    Value *EVL = Inst->getArgOperand(VLIndex);
-    Info.InterestingOperands.emplace_back(Inst, PtrOperandNo, IsWrite, Ty,
-                                          Alignment, Mask, EVL, Stride);
-    return true;
-  }
-  }
-  return false;
-}
-
 unsigned RISCVTTIImpl::getRegUsageForType(Type *Ty) const {
   if (Ty->isVectorTy()) {
     // f16 with only zvfhmin and bf16 will be promoted to f32

llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp

@@ -160,9 +160,6 @@ class RISCVTTIImpl final : public BasicTTIImplBase<RISCVTTIImpl> {
   void getPeelingPreferences(Loop *L, ScalarEvolution &SE,
                              TTI::PeelingPreferences &PP) const override;
 
-  bool getTgtMemIntrinsic(IntrinsicInst *Inst,
-                          MemIntrinsicInfo &Info) const override;
-
   unsigned getMinVectorRegisterBitWidth() const override {
     return ST->useRVVForFixedLengthVectors() ? 16 : 0;
   }

llvm/lib/Target/RISCV/RISCVTargetTransformInfo.h

@@ -29,7 +29,6 @@
 #include "llvm/Analysis/MemoryBuiltins.h"
 #include "llvm/Analysis/StackSafetyAnalysis.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/BinaryFormat/MachO.h"
 #include "llvm/Demangle/Demangle.h"
@@ -804,8 +803,7 @@ struct AddressSanitizer {
 
   bool ignoreAccess(Instruction *Inst, Value *Ptr);
   void getInterestingMemoryOperands(
-      Instruction *I, SmallVectorImpl<InterestingMemoryOperand> &Interesting,
-      const TargetTransformInfo *TTI);
+      Instruction *I, SmallVectorImpl<InterestingMemoryOperand> &Interesting);
 
   void instrumentMop(ObjectSizeOffsetVisitor &ObjSizeVis,
                      InterestingMemoryOperand &O, bool UseCalls,
@@ -845,8 +843,7 @@ struct AddressSanitizer {
   void instrumentMemIntrinsic(MemIntrinsic *MI, RuntimeCallInserter &RTCI);
   Value *memToShadow(Value *Shadow, IRBuilder<> &IRB);
   bool suppressInstrumentationSiteForDebug(int &Instrumented);
-  bool instrumentFunction(Function &F, const TargetLibraryInfo *TLI,
-                          const TargetTransformInfo *TTI);
+  bool instrumentFunction(Function &F, const TargetLibraryInfo *TLI);
   bool maybeInsertAsanInitAtFunctionEntry(Function &F);
   bool maybeInsertDynamicShadowAtFunctionEntry(Function &F);
   void markEscapedLocalAllocas(Function &F);
@@ -1317,8 +1314,7 @@ PreservedAnalyses AddressSanitizerPass::run(Module &M,
         Options.MaxInlinePoisoningSize, Options.CompileKernel, Options.Recover,
         Options.UseAfterScope, Options.UseAfterReturn);
     const TargetLibraryInfo &TLI = FAM.getResult<TargetLibraryAnalysis>(F);
-    const TargetTransformInfo &TTI = FAM.getResult<TargetIRAnalysis>(F);
-    Modified |= FunctionSanitizer.instrumentFunction(F, &TLI, &TTI);
+    Modified |= FunctionSanitizer.instrumentFunction(F, &TLI);
   }
   Modified |= ModuleSanitizer.instrumentModule();
   if (!Modified)
@@ -1456,8 +1452,7 @@ bool AddressSanitizer::ignoreAccess(Instruction *Inst, Value *Ptr) {
 }
 
 void AddressSanitizer::getInterestingMemoryOperands(
-    Instruction *I, SmallVectorImpl<InterestingMemoryOperand> &Interesting,
-    const TargetTransformInfo *TTI) {
+    Instruction *I, SmallVectorImpl<InterestingMemoryOperand> &Interesting) {
   // Do not instrument the load fetching the dynamic shadow address.
   if (LocalDynamicShadow == I)
     return;
@@ -1575,12 +1570,6 @@ void AddressSanitizer::getInterestingMemoryOperands(
       break;
     }
     default:
-      if (auto *II = dyn_cast<IntrinsicInst>(I)) {
-        MemIntrinsicInfo IntrInfo;
-        if (TTI->getTgtMemIntrinsic(II, IntrInfo))
-          Interesting = IntrInfo.InterestingOperands;
-        return;
-      }
       for (unsigned ArgNo = 0; ArgNo < CI->arg_size(); ArgNo++) {
         if (!ClInstrumentByval || !CI->isByValArgument(ArgNo) ||
             ignoreAccess(I, CI->getArgOperand(ArgNo)))
@@ -2996,8 +2985,7 @@ bool AddressSanitizer::suppressInstrumentationSiteForDebug(int &Instrumented) {
 }
 
 bool AddressSanitizer::instrumentFunction(Function &F,
-                                          const TargetLibraryInfo *TLI,
-                                          const TargetTransformInfo *TTI) {
+                                          const TargetLibraryInfo *TLI) {
   bool FunctionModified = false;
 
   // Do not apply any instrumentation for naked functions.
@@ -3050,7 +3038,7 @@ bool AddressSanitizer::instrumentFunction(Function &F,
       if (Inst.hasMetadata(LLVMContext::MD_nosanitize))
         continue;
       SmallVector<InterestingMemoryOperand, 1> InterestingOperands;
-      getInterestingMemoryOperands(&Inst, InterestingOperands, TTI);
+      getInterestingMemoryOperands(&Inst, InterestingOperands);
 
       if (!InterestingOperands.empty()) {
         for (auto &Operand : InterestingOperands) {