revert change to AttributorAttributes

Author: wenju-he

llvm/include/llvm/Transforms/IPO/Attributor.h

@@ -115,7 +115,6 @@
 #include "llvm/Analysis/OptimizationRemarkEmitter.h"
 #include "llvm/Analysis/PostDominators.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
-#include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/IR/AbstractCallSite.h"
 #include "llvm/IR/Attributes.h"
 #include "llvm/IR/ConstantRange.h"
@@ -1295,11 +1294,6 @@ struct InformationCache {
     return AG.getAnalysis<TargetLibraryAnalysis>(F);
   }
 
-  /// Return TargetLibraryInfo for function \p F.
-  TargetTransformInfo *getTargetTransformInfoForFunction(const Function &F) {
-    return AG.getAnalysis<TargetIRAnalysis>(F);
-  }
-
   /// Return true if \p F has the "kernel" function attribute
   bool isKernel(const Function &F) {
     FunctionInfo &FI = getFunctionInfo(F);

llvm/lib/Transforms/IPO/AttributorAttributes.cpp

@@ -7350,7 +7350,8 @@ struct AAPrivatizablePtrArgument final : public AAPrivatizablePtrImpl {
     // Verify callee and caller agree on how the promoted argument would be
     // passed.
     Function &Fn = *getIRPosition().getAnchorScope();
-    const auto *TTI = A.getInfoCache().getTargetTransformInfoForFunction(Fn);
+    const auto *TTI =
+        A.getInfoCache().getAnalysisResultForFunction<TargetIRAnalysis>(Fn);
     if (!TTI) {
       LLVM_DEBUG(dbgs() << "[AAPrivatizablePtr] Missing TTI for function "
                         << Fn.getName() << "\n");
@@ -10210,18 +10211,8 @@ bool AANoUndef::isImpliedByIR(Attributor &A, const IRPosition &IRP,
     return true;
 
   Value &Val = IRP.getAssociatedValue();
-  auto IsTargetGuaranteedNotPoison = [&](Value &V) {
-    if (auto *ASC = dyn_cast<AddrSpaceCastInst>(&V)) {
-      const auto *TTI = A.getInfoCache().getTargetTransformInfoForFunction(
-          *ASC->getFunction());
-      return ASC && TTI->isValidAddrSpaceCast(ASC->getSrcAddressSpace(),
-                                              ASC->getDestAddressSpace());
-    }
-    return false;
-  };
   if (IRP.getPositionKind() != IRPosition::IRP_RETURNED &&
-      (isGuaranteedNotToBeUndefOrPoison(&Val) ||
-       IsTargetGuaranteedNotPoison(Val))) {
+      isGuaranteedNotToBeUndefOrPoison(&Val)) {
     LLVMContext &Ctx = Val.getContext();
     A.manifestAttrs(IRP, Attribute::get(Ctx, Attribute::NoUndef));
     return true;
@@ -12961,7 +12952,8 @@ struct AAAddressSpaceImpl : public AAAddressSpace {
 
       // Use getAssumedAddrSpace if the associated function exists.
       if (F) {
-        auto *TTI = A.getInfoCache().getTargetTransformInfoForFunction(*F);
+        auto *TTI =
+            A.getInfoCache().getAnalysisResultForFunction<TargetIRAnalysis>(*F);
         unsigned AssumedAS = TTI->getAssumedAddrSpace(&Obj);
         if (AssumedAS != ~0U)
           return takeAddressSpace(AssumedAS);

llvm/test/Transforms/Attributor/reduced/aapointer_info_map_invalidation.ll

@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes --check-attributes
-; RUN: opt -mtriple=amdgcn-amd-amdhsa -passes=attributor -S < %s | FileCheck %s --check-prefixes=CHECK
+; RUN: opt -passes=attributor -S < %s | FileCheck %s --check-prefixes=CHECK
 
 define amdgpu_kernel void @__omp_offloading_fd00_2c00523__ZN11qmcplusplus7ompBLAS9gemv_implIfEEiRiciiT_PKS3_iS5_iS3_PS3_i_l383() {
 ; CHECK: Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn
@@ -8,7 +8,7 @@ define amdgpu_kernel void @__omp_offloading_fd00_2c00523__ZN11qmcplusplus7ompBLA
 ; CHECK-NEXT:    [[TMP1:%.*]] = alloca [0 x [0 x float]], i32 0, align 8, addrspace(5)
 ; CHECK-NEXT:    [[TMP2:%.*]] = addrspacecast ptr addrspace(5) [[TMP1]] to ptr
 ; CHECK-NEXT:    store ptr [[TMP2]], ptr addrspace(5) [[TMP1]], align 8
-; CHECK-NEXT:    [[TMP3:%.*]] = call fastcc i32 @__kmpc_nvptx_parallel_reduce_nowait_v2(ptr nofree noundef readonly align 8 captures(none) dereferenceable_or_null(8) [[TMP2]], i1 noundef false)
+; CHECK-NEXT:    [[TMP3:%.*]] = call fastcc i32 @__kmpc_nvptx_parallel_reduce_nowait_v2(ptr nofree readonly align 8 captures(none) dereferenceable_or_null(8) [[TMP2]], i1 noundef false)
 ; CHECK-NEXT:    ret void
 ;
   %1 = alloca [0 x [0 x float]], i32 0, align 8, addrspace(5)