Commit 55ebf7b0 authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r182253: 

------------------------------------------------------------------------
r182253 | jholewinski | 2013-05-20 05:13:28 -0700 (Mon, 20 May 2013) | 1 line

[NVPTX] Fix i1 kernel parameters and global variables.  ABI rules say we need to use .u8 for i1 parameters for kernels.
------------------------------------------------------------------------

llvm-svn: 182825
parent 487e8e6b

llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp

+12 −2
Original line number Diff line number Diff line
@@ -1199,6 +1199,10 @@ void NVPTXAsmPrinter::printModuleLevelGV(GlobalVariable *GVar, raw_ostream &O, 


  if (ETy->isPrimitiveType() || ETy->isIntegerTy() || isa<PointerType>(ETy)) {

    O << " .";

    // Special case: ABI requires that we use .u8 for predicates

    if (ETy->isIntegerTy(1))

      O << "u8";

    else

      O << getPTXFundamentalTypeStr(ETy, false);

    O << " ";

    O << *Mang->getSymbol(GVar);
@@ -1564,7 +1568,13 @@ void NVPTXAsmPrinter::emitFunctionParamList(const Function *F, raw_ostream &O) { 
        }



        // non-pointer scalar to kernel func

        O << "\t.param ." << getPTXFundamentalTypeStr(Ty) << " ";

        O << "\t.param .";

        // Special case: predicate operands become .u8 types

        if (Ty->isIntegerTy(1))

          O << "u8";

        else

          O << getPTXFundamentalTypeStr(Ty);

        O << " ";

        printParamName(I, paramIndex, O);

        continue;

      }

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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
; RUN: llc < %s -march=nvptx -mcpu=sm_20 -drvcuda | FileCheck %s



target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64"





; CHECK: .visible .global .align 1 .u8 mypred

@mypred = addrspace(1) global i1 true, align 1





define void @foo(i1 %p, i32* %out) {

  %ld = load i1 addrspace(1)* @mypred

  %val = zext i1 %ld to i32

  store i32 %val, i32* %out

  ret void

}





!nvvm.annotations = !{!0}

!0 = metadata !{void (i1, i32*)* @foo, metadata !"kernel", i32 1}

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

0 → 100644
+18 −0
Original line number Diff line number Diff line 
; RUN: llc < %s -march=nvptx -mcpu=sm_20 -drvcuda | FileCheck %s



target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64"



; Make sure predicate (i1) operands to kernels get expanded out to .u8



; CHECK: .entry foo

; CHECK:   .param .u8 foo_param_0

; CHECK:   .param .u32 foo_param_1

define void @foo(i1 %p, i32* %out) {

  %val = zext i1 %p to i32

  store i32 %val, i32* %out

  ret void

}





!nvvm.annotations = !{!0}

!0 = metadata !{void (i1, i32*)* @foo, metadata !"kernel", i32 1}