mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-09-28 22:55:52 +00:00
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@amd.com> git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@204638 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
2087afe423
commit
cba1dff815
@ -145,7 +145,9 @@ void SILowerControlFlowPass::SkipIfDead(MachineInstr &MI) {
|
||||
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(MachineInstr &MI) {
|
||||
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)
|
||||
|
18
test/CodeGen/R600/llvm.AMDGPU.kill.ll
Normal file
18
test/CodeGen/R600/llvm.AMDGPU.kill.ll
Normal file
@ -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}
|
Loading…
Reference in New Issue
Block a user