summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/AMDGPU/InstPrinter
diff options
context:
space:
mode:
authorKonstantin Zhuravlyov <kzhuravl_dev@outlook.com>2018-09-12 18:50:47 +0000
committerKonstantin Zhuravlyov <kzhuravl_dev@outlook.com>2018-09-12 18:50:47 +0000
commit71e43ee47d05293fccdecc61bc118301088b2466 (patch)
tree50643334b8857b7899a0cce15b7e9eaaae5dcf34 /llvm/lib/Target/AMDGPU/InstPrinter
parent0090753ef00944036c86811ade14a7eb049e9b52 (diff)
downloadbcm5719-llvm-71e43ee47d05293fccdecc61bc118301088b2466.tar.gz
bcm5719-llvm-71e43ee47d05293fccdecc61bc118301088b2466.zip
AMDGPU: Re-apply r341982 after fixing the layering issue
Move isa version determination into TargetParser. Also switch away from target features to CPU string when determining isa version. This fixes an issue when we output wrong isa version in the object code when features of a particular CPU are altered (i.e. gfx902 w/o xnack used to result in gfx900). llvm-svn: 342069
Diffstat (limited to 'llvm/lib/Target/AMDGPU/InstPrinter')
-rw-r--r--llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp b/llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp
index 76b19761ee1..fab0f87dfcb 100644
--- a/llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp
+++ b/llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp
@@ -1155,8 +1155,7 @@ void AMDGPUInstPrinter::printSwizzle(const MCInst *MI, unsigned OpNo,
void AMDGPUInstPrinter::printWaitFlag(const MCInst *MI, unsigned OpNo,
const MCSubtargetInfo &STI,
raw_ostream &O) {
- AMDGPU::IsaInfo::IsaVersion ISA =
- AMDGPU::IsaInfo::getIsaVersion(STI.getFeatureBits());
+ AMDGPU::IsaVersion ISA = AMDGPU::getIsaVersion(STI.getCPU());
unsigned SImm16 = MI->getOperand(OpNo).getImm();
unsigned Vmcnt, Expcnt, Lgkmcnt;
OpenPOWER on IntegriCloud