RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-20 11:33:24 +02:00
Code Issues Projects Releases Wiki Activity

Revert "AMDGPU : Update TrapCode based on Trap Handler ABI."

Browse Source 
This reverts commit r295867.

llvm-svn: 295871
This commit is contained in:
Wei Ding 2017-02-22 20:29:22 +00:00
parent 30c8615f7d
commit 4029bfd5f8
5 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Target/AMDGPU/AMDGPUSubtarget.h
View File

@ -74,19 +74,15 @@ public:
TrapHandlerAbiHsa = 1
};
enum TrapID {
TrapIDHardwareReserved = 0,
TrapIDHSADebugTrap = 1,
TrapIDLLVMTrap = 2,
TrapIDLLVMDebugTrap = 3,
TrapIDDebugBreakpoint = 7,
TrapIDDebugReserved8 = 8,
TrapIDDebugReservedFE = 0xfe,
TrapIDDebugReservedFF = 0xff
enum TrapCode {
TrapCodeBreakPoint = 0,
TrapCodeLLVMTrap = 1,
TrapCodeLLVMDebugTrap = 2,
TrapCodeHSADebugTrap = 3
};
enum TrapRegValues {
LLVMTrapHandlerRegValue = 1
TrapCodeLLVMTrapRegValue = 1
};
protected:

2
lib/Target/AMDGPU/SIISelLowering.cpp
View File

@ -1804,7 +1804,7 @@ MachineBasicBlock *SITargetLowering::EmitInstrWithCustomInserter(
.addReg(AMDGPU::SGPR0_SGPR1, RegState::Implicit);
} else {
switch (TrapType) {
case SISubtarget::TrapIDLLVMTrap:
case SISubtarget::TrapCodeLLVMTrap:
BuildMI(*BB, MI, DL, TII->get(AMDGPU::S_ENDPGM));
break;
case SISubtarget::TrapCodeLLVMDebugTrap: {

6
lib/Target/AMDGPU/SIInstrInfo.td
View File

@ -632,9 +632,9 @@ def DSTOMOD {
int NONE = 0;
}
def TRAPID{
int LLVM_TRAP = 2;
int LLVM_DEBUG_TRAP = 3;
def TRAPTYPE {
int LLVM_TRAP = 1;
int LLVM_DEBUG_TRAP = 2;
}
//===----------------------------------------------------------------------===//

4
lib/Target/AMDGPU/SIInstructions.td
View File

@ -391,12 +391,12 @@ def SI_PC_ADD_REL_OFFSET : SPseudoInstSI <
let Predicates = [isGCN] in {
def : Pat<
(trap),
(S_TRAP_PSEUDO TRAPID.LLVM_TRAP)
(S_TRAP_PSEUDO TRAPTYPE.LLVM_TRAP)
>;
def : Pat<
(debugtrap),
(S_TRAP_PSEUDO TRAPID.LLVM_DEBUG_TRAP)
(S_TRAP_PSEUDO TRAPTYPE.LLVM_DEBUG_TRAP)
>;
def : Pat<

4
test/CodeGen/AMDGPU/trap.ll
View File

@ -28,7 +28,7 @@ declare void @llvm.debugtrap() #0
; GCN-LABEL: {{^}}hsa_trap:
; HSA-TRAP: enable_trap_handler = 1
; HSA-TRAP: s_mov_b64 s[0:1], s[4:5]
; HSA-TRAP: s_trap 2
; HSA-TRAP: s_trap 1
; for llvm.trap in hsa path without ABI, direct generate s_endpgm instruction without any warning information
; NO-HSA-TRAP: enable_trap_handler = 0
@ -55,7 +55,7 @@ define void @hsa_trap() {
; GCN-LABEL: {{^}}hsa_debugtrap:
; HSA-TRAP: enable_trap_handler = 1
; HSA-TRAP: s_mov_b64 s[0:1], s[4:5]
; HSA-TRAP: s_trap 3
; HSA-TRAP: s_trap 2
; for llvm.debugtrap in non-hsa path without ABI, generate a warning and a s_endpgm instruction
; NO-HSA-TRAP: enable_trap_handler = 0