Move checks int IR Verifier

Move the CUDA address-space checks out of ASMPrinter
and into the IR Verifier.

Author: LewisCrawford

llvm/lib/IR/Verifier.cpp

@@ -119,6 +119,7 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/ModRef.h"
+#include "llvm/Support/NVPTXAddrSpace.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>
 #include <cassert>
@@ -2927,6 +2928,20 @@ void Verifier::visitFunction(const Function &F) {
           "Calling convention does not support varargs or "
           "perfect forwarding!",
           &F);
+    if (F.getCallingConv() == CallingConv::PTX_Kernel &&
+        TT.getOS() == Triple::CUDA) {
+      for (const Argument &Arg : F.args()) {
+        if (Arg.getType()->isPointerTy()) {
+          auto AS = Arg.getType()->getPointerAddressSpace();
+          Check(AS != NVPTXAS::AddressSpace::ADDRESS_SPACE_SHARED,
+                ".shared ptr kernel args unsupported in CUDA.", &Arg, &F);
+          Check(AS != NVPTXAS::AddressSpace::ADDRESS_SPACE_CONST,
+                ".const ptr kernel args unsupported in CUDA.", &Arg, &F);
+          Check(AS != NVPTXAS::AddressSpace::ADDRESS_SPACE_LOCAL,
+                ".local ptr kernel args unsupported in CUDA.", &Arg, &F);
+        }
+      }
+    }
     break;
   }
 

llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp

@@ -1399,27 +1399,19 @@ void NVPTXAsmPrinter::emitFunctionParamList(const Function *F, raw_ostream &O) {
       if (PTy) {
         O << "\t.param .u" << PTySizeInBits << " .ptr";
 
-        bool IsCUDA = static_cast<NVPTXTargetMachine &>(TM).getDrvInterface() ==
-                      NVPTX::CUDA;
         switch (PTy->getAddressSpace()) {
         default:
           break;
         case ADDRESS_SPACE_GLOBAL:
           O << " .global";
           break;
         case ADDRESS_SPACE_SHARED:
-          if (IsCUDA)
-            report_fatal_error(".shared ptr kernel args unsupported in CUDA.");
           O << " .shared";
           break;
         case ADDRESS_SPACE_CONST:
-          if (IsCUDA)
-            report_fatal_error(".const ptr kernel args unsupported in CUDA.");
           O << " .const";
           break;
         case ADDRESS_SPACE_LOCAL:
-          if (IsCUDA)
-            report_fatal_error(".local ptr kernel args unsupported in CUDA.");
           O << " .local";
           break;
         }

llvm/test/CodeGen/NVPTX/lower-args-cuda.ll

@@ -1,4 +1,4 @@
-; RUN: not --crash llc < %s -mcpu=sm_75  -o /dev/null 2>&1 | FileCheck %s
+; RUN: not llc < %s -mcpu=sm_75  -o /dev/null 2>&1 | FileCheck %s
 
 target datalayout = "e-i64:64-i128:128-v16:16-v32:32-n16:32:64"
 target triple = "nvptx64-nvidia-cuda"