summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2014-03-24 18:21:40 +0000
committerTom Stellard <thomas.stellard@amd.com>2014-03-24 18:21:40 +0000
commit187225db529de6f63e844038cab578f06261a22f (patch)
tree23d900a93dd40e310491d2b705e389146e7daa37
parent5f71aeed1a8f37298c5a2179e1ef1b61ca7226a5 (diff)
downloadllvm-187225db529de6f63e844038cab578f06261a22f.tar.gz
llvm-187225db529de6f63e844038cab578f06261a22f.tar.bz2
llvm-187225db529de6f63e844038cab578f06261a22f.tar.xz
Merging r201096:
------------------------------------------------------------------------ r201096 | thomas.stellard | 2014-02-10 08:58:27 -0800 (Mon, 10 Feb 2014) | 6 lines R600/SI: Only use S_WQM_B64 in pixel shaders This doesn't change any functionality, since we only have two shader types (compute and pixel) that use local memory. We're just changing the logic to match the documentation. git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@204647 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/R600/SILowerControlFlow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/R600/SILowerControlFlow.cpp b/lib/Target/R600/SILowerControlFlow.cpp
index 47315ab95c..d52f558774 100644
--- a/lib/Target/R600/SILowerControlFlow.cpp
+++ b/lib/Target/R600/SILowerControlFlow.cpp
@@ -521,7 +521,7 @@ bool SILowerControlFlowPass::runOnMachineFunction(MachineFunction &MF) {
AMDGPU::M0).addImm(0xffffffff);
}
- if (NeedWQM && MFI->ShaderType != ShaderType::COMPUTE) {
+ if (NeedWQM && MFI->ShaderType == ShaderType::PIXEL) {
MachineBasicBlock &MBB = MF.front();
BuildMI(MBB, MBB.getFirstNonPHI(), DebugLoc(), TII->get(AMDGPU::S_WQM_B64),
AMDGPU::EXEC).addReg(AMDGPU::EXEC);