Add negative test, move isConstantAddressSpace

Author: jofrn

llvm/include/llvm/Support/AMDGPUAddrSpace.h

@@ -93,6 +93,33 @@ inline bool isExtendedGlobalAddrSpace(unsigned AS) {
          AS == AMDGPUAS::CONSTANT_ADDRESS_32BIT ||
          AS > AMDGPUAS::MAX_AMDGPU_ADDRESS;
 }
+
+inline 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;
+  }
+}
 } // end namespace AMDGPU
 
 } // end namespace llvm

llvm/lib/Analysis/Lint.cpp

@@ -122,8 +122,6 @@ class Lint : public InstVisitor<Lint> {
   Value *findValue(Value *V, bool OffsetOk) const;
   Value *findValueImpl(Value *V, bool OffsetOk,
                        SmallPtrSetImpl<Value *> &Visited) const;
-
-  bool isConstantAddressSpace(unsigned AS) const;
 public:
   Module *Mod;
   Triple TT;
@@ -382,36 +380,6 @@ 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,
@@ -435,8 +403,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 (TT.isAMDGPU())
+      Check(!AMDGPU::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",

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

@@ -1,5 +1,7 @@
-; 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
+; RUN: not opt --mtriple=amdgcn --passes=lint --lint-abort-on-error %s -o /dev/null |& FileCheck %s
+; RUN: opt --mtriple=amdgcn --mcpu=gfx1030 --passes=lint %s -o /dev/null |& FileCheck %s --check-prefixes=CHECK,CHECK0
+; RUN: opt --mtriple=x86_64 --passes=lint --lint-abort-on-error %s -o /dev/null |& FileCheck %s --allow-empty --check-prefix=NOERR
+; NOERR: {{^$}}
 
 define amdgpu_kernel void @store_const(ptr addrspace(4) %out, i32 %a, i32 %b) {
 ; CHECK: Undefined behavior: Write to const memory
@@ -8,3 +10,12 @@ define amdgpu_kernel void @store_const(ptr addrspace(4) %out, i32 %a, i32 %b) {
   store i32 %r, ptr addrspace(4) %out
   ret void
 }
+
+define amdgpu_kernel void @memcpy_to_const(ptr addrspace(6) %dst, ptr %src) {
+; CHECK0: Undefined behavior: Write to const memory
+; CHECK0-NEXT: call void @llvm.memcpy.p6.p0.i32(ptr addrspace(6) %dst, ptr %src, i32 256, i1 false)
+  call void @llvm.memcpy.px.py.i32(ptr addrspace(6) %dst, ptr %src, i32 256, i1 false)
+  ret void
+}
+
+declare void @llvm.memcpy.px.py.i32(ptr addrspace(6) noalias nocapture writeonly, ptr noalias nocapture readonly, i32, i1 immarg)