[llvm-branch-commits] [llvm-branch] r204647 - Merging r201096:

[Tom Stellard]

Author: tstellar
Date: Mon Mar 24 13:21:40 2014
New Revision: 204647

URL: http://llvm.org/viewvc/llvm-project?rev=204647&view=rev
Log:
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.

Modified:
    llvm/branches/release_34/lib/Target/R600/SILowerControlFlow.cpp

Modified: llvm/branches/release_34/lib/Target/R600/SILowerControlFlow.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/Target/R600/SILowerControlFlow.cpp?rev=204647&r1=204646&r2=204647&view=diff
==============================================================================
--- llvm/branches/release_34/lib/Target/R600/SILowerControlFlow.cpp (original)
+++ llvm/branches/release_34/lib/Target/R600/SILowerControlFlow.cpp Mon Mar 24 13:21:40 2014
@@ -521,7 +521,7 @@ bool SILowerControlFlowPass::runOnMachin
             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);