[NVPTX] aggregates of addrspacecast as initializer

[jingyue]

Summary

Fixes a bug in NVPTXAsmPrinter on dealing with initializers that are aggregates
of addrspacecast. e.g.

constant {i32*, i32*} {null, addrspacecast(gep(...) to i32*)}

Depends on D9130

[jholewinski]

test/CodeGen/NVPTX/addrspacecast-gvar.ll

7

Unfortunately ptxas will reject that. It must be 'generic(g) + 8'

lib/Target/NVPTX/NVPTXAsmPrinter.h

void print() {
         if (static_cast<const NVPTXTargetMachine &>(AP.TM).is64Bit())
           nBytes = 8;
         for (pos = 0; pos < size; pos += nBytes) {
           if (pos)
             O << ", ";
           if (pos == nextSymbolPos) {
             const Value *v = Symbols[nSym];
             const Value *v0 = SymbolsBeforeStripping[nSym];
-            if (const GlobalValue *GVar = dyn_cast<GlobalValue>(v)) {
-              MCSymbol *Name = AP.getSymbol(GVar);
-              PointerType *PTy = dyn_cast<PointerType>(v0->getType());
-              bool IsNonGenericPointer = false; // Is v0 a non-generic pointer?
-              if (PTy && PTy->getAddressSpace() != 0) {
-                IsNonGenericPointer = true;
-              }
+            if (const GlobalValue *GVar = dyn_cast<GlobalValue>(v)) {
+              MCSymbol *Name = AP.getSymbol(GVar);
               if (EmitGeneric && !isa<Function>(v) && !IsNonGenericPointer) {
                 O << "generic(";
                 O << *Name;
                 O << ")";
               } else {
                 O << *Name;
               }
             } else if (const ConstantExpr *Cexpr = dyn_cast<ConstantExpr>(v)) {
+              if (EmitGeneric && !IsNonGenericPointer) {
+                O << "generic(";
                 O << *AP.lowerConstant(Cexpr);
+                O << ")";
+              } else {
+                O << *AP.lowerConstant(Cexpr);
+              }
             } else
               llvm_unreachable("symbol type unknown");
             nSym++;
             if (nSym >= numSymbols)
               nextSymbolPos = size + 1;
             else
               nextSymbolPos = symbolPosInBuffer[nSym];
           } else if (nBytes == 4)

test/CodeGen/NVPTX/addrspacecast-gvar.ll

 ; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck %s
 
 ; CHECK: .visible .global .align 4 .u32 g = 42;
 ; CHECK: .visible .global .align 4 .u32 g2 = generic(g);
 ; CHECK: .visible .global .align 4 .u32 g3 = g;
 ; CHECK: .visible .global .align 8 .u32 g4[2] = {0, generic(g)};
+; CHECK: .visible .global .align 8 .u32 g5[2] = {0, generic(g+8)};
 
 @g = addrspace(1) global i32 42
 @g2 = addrspace(1) global i32* addrspacecast (i32 addrspace(1)* @g to i32*)
 @g3 = addrspace(1) global i32 addrspace(1)* @g
 @g4 = constant {i32*, i32*} {i32* null, i32* addrspacecast (i32 addrspace(1)* @g to i32*)}
+@g5 = constant {i32*, i32*} {i32* null, i32* addrspacecast (i32 addrspace(1)* getelementptr (i32, i32 addrspace(1)* @g, i32 2) to i32*)}