upadte test

Author: Vandana2896

llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp

@@ -1,4 +1,4 @@
-//===-- NVPTXAsmPrinter.cpp - NVPTX LLVM assembly writer ------------------===//
+///===-- NVPTXAsmPrinter.cpp - NVPTX LLVM assembly writer ------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -1603,18 +1603,12 @@ void NVPTXAsmPrinter::emitFunctionParamList(const Function *F, raw_ostream &O) {
           O << "\t.param .u" << PTySizeInBits << " ";
 
           int addrSpace = PTy->getAddressSpace();
-<<<<<<< HEAD
-
-          if (static_cast<NVPTXTargetMachine &>(TM).getDrvInterface() == NVPTX::CUDA) {
+          if (static_cast<NVPTXTargetMachine &>(TM).getDrvInterface() ==
+              NVPTX::CUDA) {
             // Special handling for pointer arguments to kernel
             // CUDA kernels assume that pointers are in global address space
             // See:
             // https://docs.nvidia.com/cuda/parallel-thread-execution/index.html#parameter-state-space
-=======
-          if (static_cast<NVPTXTargetMachine &>(TM).getDrvInterface() ==
-              NVPTX::CUDA) {
->>>>>>> 3d49f303bf57 (Update NVPTXAsmPrinter.cpp)
-            assert(addrSpace == 0 && "Invalid address space");
             O << ".ptr .global ";
             if (I->getParamAlign().valueOrOne() != 1) {
               Align ParamAlign = I->getParamAlign().value();

llvm/test/CodeGen/NVPTX/i1-param.ll

@@ -8,7 +8,7 @@ target triple = "nvptx-nvidia-cuda"
 
 ; CHECK: .entry foo
 ; CHECK:   .param .u8 foo_param_0
-; CHECK:   .param .u64 foo_param_1
+; CHECK:   .param .u64 .ptr .global foo_param_1
 define void @foo(i1 %p, ptr %out) {
   %val = zext i1 %p to i32
   store i32 %val, ptr %out

llvm/test/CodeGen/NVPTX/kernel-param-align.ll

@@ -6,7 +6,7 @@
 ; CHECK-LABEL: func_align
 ; CHECK: .param .u64 .ptr .global .align 16 func_align_param_0,
 ; CHECK: .param .u64 .ptr .global func_align_param_1,
-; CHECK: .param .u64 .ptr .global func_align_param_2
+; CHECK: .param .u32 .ptr .global func_align_param_2
 define void @func_align(ptr nocapture readonly align 16 %input, ptr nocapture %out, ptr addrspace(3) %n) {
 entry:
   %0 = addrspacecast ptr %out to ptr addrspace(1)