[Lint] Switch check to Linter

llvm/lib/Analysis/Lint.cpp

@@ -67,6 +67,7 @@
 #include "llvm/IR/PassManager.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/Value.h"
+#include "llvm/Support/AMDGPUAddrSpace.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/KnownBits.h"
 #include "llvm/Support/raw_ostream.h"
@@ -122,8 +123,10 @@ class Lint : public InstVisitor<Lint> {
   Value *findValueImpl(Value *V, bool OffsetOk,
                        SmallPtrSetImpl<Value *> &Visited) const;
 
+  bool isConstantAddressSpace(unsigned AS) const;
 public:
   Module *Mod;
+  Triple TT;
   const DataLayout *DL;
   AliasAnalysis *AA;
   AssumptionCache *AC;
@@ -135,7 +138,8 @@ class Lint : public InstVisitor<Lint> {
 
   Lint(Module *Mod, const DataLayout *DL, AliasAnalysis *AA,
        AssumptionCache *AC, DominatorTree *DT, TargetLibraryInfo *TLI)
-      : Mod(Mod), DL(DL), AA(AA), AC(AC), DT(DT), TLI(TLI),
+      : Mod(Mod), TT(Triple::normalize(Mod->getTargetTriple())),
+	DL(DL), AA(AA), AC(AC), DT(DT), TLI(TLI),
         MessagesStr(Messages) {}
 
   void WriteValues(ArrayRef<const Value *> Vs) {
@@ -378,6 +382,36 @@ void Lint::visitReturnInst(ReturnInst &I) {
   }
 }
 
+bool Lint::isConstantAddressSpace(unsigned AS) const {
+  if (TT.isAMDGPU()) {
+    switch(AS) {
+      using namespace AMDGPUAS;
+    case CONSTANT_ADDRESS:
+    case CONSTANT_ADDRESS_32BIT:
+    case CONSTANT_BUFFER_0:
+    case CONSTANT_BUFFER_1:
+    case CONSTANT_BUFFER_2:
+    case CONSTANT_BUFFER_3:
+    case CONSTANT_BUFFER_4:
+    case CONSTANT_BUFFER_5:
+    case CONSTANT_BUFFER_6:
+    case CONSTANT_BUFFER_7:
+    case CONSTANT_BUFFER_8:
+    case CONSTANT_BUFFER_9:
+    case CONSTANT_BUFFER_10:
+    case CONSTANT_BUFFER_11:
+    case CONSTANT_BUFFER_12:
+    case CONSTANT_BUFFER_13:
+    case CONSTANT_BUFFER_14:
+    case CONSTANT_BUFFER_15:
+      return true;
+    default:
+      return false;
+    }
+  }
+  return false;
+}
+
 // TODO: Check that the reference is in bounds.
 // TODO: Check readnone/readonly function attributes.
 void Lint::visitMemoryReference(Instruction &I, const MemoryLocation &Loc,
@@ -401,6 +435,9 @@ void Lint::visitMemoryReference(Instruction &I, const MemoryLocation &Loc,
         "Unusual: Address one pointer dereference", &I);
 
   if (Flags & MemRef::Write) {
+    Check(!isConstantAddressSpace(UnderlyingObject->getType()->getPointerAddressSpace()),
+      "Undefined behavior: Write to const memory", &I);
+
     if (const GlobalVariable *GV = dyn_cast<GlobalVariable>(UnderlyingObject))
       Check(!GV->isConstant(), "Undefined behavior: Write to read-only memory",
             &I);

llvm/lib/IR/Verifier.cpp

@@ -4224,33 +4224,6 @@ void Verifier::visitLoadInst(LoadInst &LI) {
   visitInstruction(LI);
 }
 
-static bool isConstantAddressSpace(unsigned AS) {
-  switch (AS) {
-    using namespace AMDGPUAS;
-  case CONSTANT_ADDRESS:
-  case CONSTANT_ADDRESS_32BIT:
-  case CONSTANT_BUFFER_0:
-  case CONSTANT_BUFFER_1:
-  case CONSTANT_BUFFER_2:
-  case CONSTANT_BUFFER_3:
-  case CONSTANT_BUFFER_4:
-  case CONSTANT_BUFFER_5:
-  case CONSTANT_BUFFER_6:
-  case CONSTANT_BUFFER_7:
-  case CONSTANT_BUFFER_8:
-  case CONSTANT_BUFFER_9:
-  case CONSTANT_BUFFER_10:
-  case CONSTANT_BUFFER_11:
-  case CONSTANT_BUFFER_12:
-  case CONSTANT_BUFFER_13:
-  case CONSTANT_BUFFER_14:
-  case CONSTANT_BUFFER_15:
-    return true;
-  default:
-    return false;
-  }
-}
-
 void Verifier::visitStoreInst(StoreInst &SI) {
   PointerType *PTy = dyn_cast<PointerType>(SI.getOperand(1)->getType());
   Check(PTy, "Store operand must be a pointer.", &SI);
@@ -4273,10 +4246,6 @@ void Verifier::visitStoreInst(StoreInst &SI) {
     Check(SI.getSyncScopeID() == SyncScope::System,
           "Non-atomic store cannot have SynchronizationScope specified", &SI);
   }
-  if (TT.isAMDGPU()) {
-    Check(!isConstantAddressSpace(SI.getPointerAddressSpace()),
-          "Store cannot be to constant addrspace", &SI);
-  }
   visitInstruction(SI);
 }
 

llvm/test/Analysis/Lint/const-store.ll

@@ -0,0 +1,10 @@
+; RUN: not opt --mtriple=amdgcn --passes=lint --lint-abort-on-error %s -o - |& FileCheck %s
+; RUN: not opt --mtriple=amdgcn --mcpu=gfx1030 --passes=lint --lint-abort-on-error %s -o - |& FileCheck %s
+
+define amdgpu_kernel void @store_const(ptr addrspace(4) %out, i32 %a, i32 %b) {
+; CHECK: Undefined behavior: Write to const memory
+; CHECK-NEXT: store i32 %r, ptr addrspace(4) %out
+  %r = add i32 %a, %b
+  store i32 %r, ptr addrspace(4) %out
+  ret void
+}