[llvm] r348952 - [NVPTX] do not rely on cached subtarget info.
Artem Belevich via llvm-commits
llvm-commits at lists.llvm.org
Wed Dec 12 10:31:04 PST 2018
Author: tra
Date: Wed Dec 12 10:31:04 2018
New Revision: 348952
URL: http://llvm.org/viewvc/llvm-project?rev=348952&view=rev
Log:
[NVPTX] do not rely on cached subtarget info.
If a module has function references, but no functions
themselves, we may end up never calling runOnMachineFunction
and therefore would never initialize nvptxSubtarget field
which would eventually cause a crash.
Instead of relying on nvptxSubtarget being initialized by
one of the methods, retrieve subtarget info directly.
Differential Revision: https://reviews.llvm.org/D55580
Added:
llvm/trunk/test/CodeGen/NVPTX/nofunc.ll
Modified:
llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.h
Modified: llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp?rev=348952&r1=348951&r2=348952&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.cpp Wed Dec 12 10:31:04 2018
@@ -219,11 +219,12 @@ void NVPTXAsmPrinter::lowerToMCInst(cons
return;
}
+ const NVPTXSubtarget &STI = MI->getMF()->getSubtarget<NVPTXSubtarget>();
for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
const MachineOperand &MO = MI->getOperand(i);
MCOperand MCOp;
- if (!nvptxSubtarget->hasImageHandles()) {
+ if (!STI.hasImageHandles()) {
if (lowerImageHandleOperand(MI, i, MCOp)) {
OutMI.addOperand(MCOp);
continue;
@@ -329,11 +330,12 @@ MCOperand NVPTXAsmPrinter::GetSymbolRef(
void NVPTXAsmPrinter::printReturnValStr(const Function *F, raw_ostream &O) {
const DataLayout &DL = getDataLayout();
- const TargetLowering *TLI = nvptxSubtarget->getTargetLowering();
+ const NVPTXSubtarget &STI = TM.getSubtarget<NVPTXSubtarget>(*F);
+ const TargetLowering *TLI = STI.getTargetLowering();
Type *Ty = F->getReturnType();
- bool isABI = (nvptxSubtarget->getSmVersion() >= 20);
+ bool isABI = (STI.getSmVersion() >= 20);
if (Ty->getTypeID() == Type::VoidTyID)
return;
@@ -474,7 +476,6 @@ void NVPTXAsmPrinter::EmitFunctionEntryL
}
bool NVPTXAsmPrinter::runOnMachineFunction(MachineFunction &F) {
- nvptxSubtarget = &F.getSubtarget<NVPTXSubtarget>();
bool Result = AsmPrinter::runOnMachineFunction(F);
// Emit closing brace for the body of function F.
// The closing brace must be emitted here because we need to emit additional
@@ -508,8 +509,9 @@ void NVPTXAsmPrinter::emitImplicitDef(co
OutStreamer->AddComment(Twine("implicit-def: ") +
getVirtualRegisterName(RegNo));
} else {
+ const NVPTXSubtarget &STI = MI->getMF()->getSubtarget<NVPTXSubtarget>();
OutStreamer->AddComment(Twine("implicit-def: ") +
- nvptxSubtarget->getRegisterInfo()->getName(RegNo));
+ STI.getRegisterInfo()->getName(RegNo));
}
OutStreamer->AddBlankLine();
}
@@ -1431,12 +1433,14 @@ void NVPTXAsmPrinter::printParamName(Fun
void NVPTXAsmPrinter::emitFunctionParamList(const Function *F, raw_ostream &O) {
const DataLayout &DL = getDataLayout();
const AttributeList &PAL = F->getAttributes();
- const TargetLowering *TLI = nvptxSubtarget->getTargetLowering();
+ const NVPTXSubtarget &STI = TM.getSubtarget<NVPTXSubtarget>(*F);
+ const TargetLowering *TLI = STI.getTargetLowering();
Function::const_arg_iterator I, E;
unsigned paramIndex = 0;
bool first = true;
bool isKernelFunc = isKernelFunction(*F);
- bool isABI = (nvptxSubtarget->getSmVersion() >= 20);
+ bool isABI = (STI.getSmVersion() >= 20);
+ bool hasImageHandles = STI.hasImageHandles();
MVT thePointerTy = TLI->getPointerTy(DL);
if (F->arg_empty()) {
@@ -1460,7 +1464,7 @@ void NVPTXAsmPrinter::emitFunctionParamL
if (isImage(*I)) {
std::string sname = I->getName();
if (isImageWriteOnly(*I) || isImageReadWrite(*I)) {
- if (nvptxSubtarget->hasImageHandles())
+ if (hasImageHandles)
O << "\t.param .u64 .ptr .surfref ";
else
O << "\t.param .surfref ";
@@ -1468,7 +1472,7 @@ void NVPTXAsmPrinter::emitFunctionParamL
O << "_param_" << paramIndex;
}
else { // Default image is read_only
- if (nvptxSubtarget->hasImageHandles())
+ if (hasImageHandles)
O << "\t.param .u64 .ptr .texref ";
else
O << "\t.param .texref ";
@@ -1476,7 +1480,7 @@ void NVPTXAsmPrinter::emitFunctionParamL
O << "_param_" << paramIndex;
}
} else {
- if (nvptxSubtarget->hasImageHandles())
+ if (hasImageHandles)
O << "\t.param .u64 .ptr .samplerref ";
else
O << "\t.param .samplerref ";
Modified: llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.h?rev=348952&r1=348951&r2=348952&view=diff
==============================================================================
--- llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.h (original)
+++ llvm/trunk/lib/Target/NVPTX/NVPTXAsmPrinter.h Wed Dec 12 10:31:04 2018
@@ -258,9 +258,6 @@ private:
typedef DenseMap<const TargetRegisterClass *, VRegMap> VRegRCMap;
VRegRCMap VRegMapping;
- // Cache the subtarget here.
- const NVPTXSubtarget *nvptxSubtarget;
-
// List of variables demoted to a function scope.
std::map<const Function *, std::vector<const GlobalVariable *>> localDecls;
Added: llvm/trunk/test/CodeGen/NVPTX/nofunc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/NVPTX/nofunc.ll?rev=348952&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/NVPTX/nofunc.ll (added)
+++ llvm/trunk/test/CodeGen/NVPTX/nofunc.ll Wed Dec 12 10:31:04 2018
@@ -0,0 +1,15 @@
+; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck %s
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_20 | FileCheck %s
+
+; Test that we don't crash if we're compiling a module with function references,
+; but without any functions in it.
+
+target datalayout = "e-i64:64-i128:128-v16:16-v32:32-n16:32:64"
+target triple = "nvptx64-nvidia-cuda"
+
+ at Funcs = local_unnamed_addr addrspace(1) externally_initialized
+ global [1 x void (i8*)*] [void (i8*)* @func], align 8
+
+declare void @func(i8*)
+
+; CHECK: Funcs[1] = {func}
More information about the llvm-commits
mailing list