aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/R600/SIInsertWaits.cpp
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2013-08-16 01:18:43 +0000
committerTom Stellard <thomas.stellard@amd.com>2013-08-16 01:18:43 +0000
commitb07ec9606813cf16b137f0bb9ce09ca7ce57f026 (patch)
tree2674dfd7f9aca32e97da4be172600c63d1b40294 /lib/Target/R600/SIInsertWaits.cpp
parenta6a39ced095c2f453624ce62c4aead25db41a18f (diff)
downloadexternal_llvm-b07ec9606813cf16b137f0bb9ce09ca7ce57f026.zip
external_llvm-b07ec9606813cf16b137f0bb9ce09ca7ce57f026.tar.gz
external_llvm-b07ec9606813cf16b137f0bb9ce09ca7ce57f026.tar.bz2
Revert "R600/SI: Fix incorrect encoding of DS_WRITE_B32 instructions"
This reverts commit a6a39ced095c2f453624ce62c4aead25db41a18f. This is the wrong version of this fix. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188523 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/R600/SIInsertWaits.cpp')
-rw-r--r--lib/Target/R600/SIInsertWaits.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Target/R600/SIInsertWaits.cpp b/lib/Target/R600/SIInsertWaits.cpp
index c477be5..ba202e3 100644
--- a/lib/Target/R600/SIInsertWaits.cpp
+++ b/lib/Target/R600/SIInsertWaits.cpp
@@ -134,7 +134,9 @@ Counters SIInsertWaits::getHwCounts(MachineInstr &MI) {
// LGKM may uses larger values
if (TSFlags & SIInstrFlags::LGKM_CNT) {
- const MachineOperand &Op = MI.getOperand(0);
+ MachineOperand &Op = MI.getOperand(0);
+ if (!Op.isReg())
+ Op = MI.getOperand(1);
assert(Op.isReg() && "First LGKM operand must be a register!");
unsigned Reg = Op.getReg();