[llvm-branch-commits] [llvm-branch] r204638 - Merging r202336:

[Tom Stellard]

Author: tstellar
Date: Mon Mar 24 13:21:25 2014
New Revision: 204638

URL: http://llvm.org/viewvc/llvm-project?rev=204638&view=rev
Log:
Merging r202336:

------------------------------------------------------------------------
r202336 | michel.daenzer | 2014-02-26 17:47:02 -0800 (Wed, 26 Feb 2014) | 4 lines

R600/SI: Allow SI_KILL for geometry shaders

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

Added:
    llvm/branches/release_34/test/CodeGen/R600/llvm.AMDGPU.kill.ll
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=204638&r1=204637&r2=204638&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:25 2014
@@ -145,7 +145,9 @@ void SILowerControlFlowPass::SkipIfDead(
   MachineBasicBlock &MBB = *MI.getParent();
   DebugLoc DL = MI.getDebugLoc();
 
-  if (!shouldSkip(&MBB, &MBB.getParent()->back()))
+  if (MBB.getParent()->getInfo<SIMachineFunctionInfo>()->ShaderType !=
+      ShaderType::PIXEL ||
+      !shouldSkip(&MBB, &MBB.getParent()->back()))
     return;
 
   MachineBasicBlock::iterator Insert = &MI;
@@ -296,9 +298,11 @@ void SILowerControlFlowPass::Kill(Machin
   MachineBasicBlock &MBB = *MI.getParent();
   DebugLoc DL = MI.getDebugLoc();
 
-  // Kill is only allowed in pixel shaders
+  // Kill is only allowed in pixel / geometry shaders
   assert(MBB.getParent()->getInfo<SIMachineFunctionInfo>()->ShaderType ==
-         ShaderType::PIXEL);
+         ShaderType::PIXEL ||
+         MBB.getParent()->getInfo<SIMachineFunctionInfo>()->ShaderType ==
+         ShaderType::GEOMETRY);
 
   // Clear this pixel from the exec mask if the operand is negative
   BuildMI(MBB, &MI, DL, TII->get(AMDGPU::V_CMPX_LE_F32_e32), AMDGPU::VCC)

Added: llvm/branches/release_34/test/CodeGen/R600/llvm.AMDGPU.kill.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/test/CodeGen/R600/llvm.AMDGPU.kill.ll?rev=204638&view=auto
==============================================================================
--- llvm/branches/release_34/test/CodeGen/R600/llvm.AMDGPU.kill.ll (added)
+++ llvm/branches/release_34/test/CodeGen/R600/llvm.AMDGPU.kill.ll Mon Mar 24 13:21:25 2014
@@ -0,0 +1,18 @@
+; RUN: llc < %s -march=r600 -mcpu=verde -verify-machineinstrs | FileCheck --check-prefix=SI %s
+
+; SI-LABEL: @kill_gs
+; SI: V_CMPX_LE_F32
+
+define void @kill_gs() #0 {
+main_body:
+  %0 = icmp ule i32 0, 3
+  %1 = select i1 %0, float 1.000000e+00, float -1.000000e+00
+  call void @llvm.AMDGPU.kill(float %1)
+  ret void
+}
+
+declare void @llvm.AMDGPU.kill(float)
+
+attributes #0 = { "ShaderType"="2" }
+
+!0 = metadata !{metadata !"const", null, i32 1}