maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

R600/SI: Store immediate offsets > 12-bits in soffset 

This will save us from having to extend these offsets to 64-bits
and storing them in a pair of vgprs.

llvm-svn: 228776
This commit is contained in:
Tom Stellard 2015-02-11 00:34:35 +00:00
parent c53861ab84
commit 94b7231740
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Target/R600/AMDGPUISelDAGToDAG.cpp
View File

@ -925,8 +925,6 @@ void AMDGPUDAGToDAGISel::SelectMUBUF(SDValue Addr, SDValue &Ptr,
SDValue N1 = Addr.getOperand(1); SDValue N1 = Addr.getOperand(1);
ConstantSDNode *C1 = cast<ConstantSDNode>(N1); ConstantSDNode *C1 = cast<ConstantSDNode>(N1);
if (isLegalMUBUFImmOffset(C1)) {
if (N0.getOpcode() == ISD::ADD) { if (N0.getOpcode() == ISD::ADD) {
// (add (add N2, N3), C1) -> addr64 // (add (add N2, N3), C1) -> addr64
SDValue N2 = N0.getOperand(0); SDValue N2 = N0.getOperand(0);
@ -934,17 +932,25 @@ void AMDGPUDAGToDAGISel::SelectMUBUF(SDValue Addr, SDValue &Ptr,
Addr64 = CurDAG->getTargetConstant(1, MVT::i1); Addr64 = CurDAG->getTargetConstant(1, MVT::i1);
Ptr = N2; Ptr = N2;
VAddr = N3; VAddr = N3;
Offset = CurDAG->getTargetConstant(C1->getZExtValue(), MVT::i16); } else {
return;
}
// (add N0, C1) -> offset // (add N0, C1) -> offset
VAddr = CurDAG->getTargetConstant(0, MVT::i32); VAddr = CurDAG->getTargetConstant(0, MVT::i32);
Ptr = N0; Ptr = N0;
}
if (isLegalMUBUFImmOffset(C1)) {
Offset = CurDAG->getTargetConstant(C1->getZExtValue(), MVT::i16); Offset = CurDAG->getTargetConstant(C1->getZExtValue(), MVT::i16);
return; return;
} else if (isUInt<32>(C1->getZExtValue())) {
// Illegal offset, store it in soffset.
Offset = CurDAG->getTargetConstant(0, MVT::i16);
SOffset = SDValue(CurDAG->getMachineNode(AMDGPU::S_MOV_B32, DL, MVT::i32,
CurDAG->getTargetConstant(C1->getZExtValue(), MVT::i32)), 0);
return;
} }
} }
if (Addr.getOpcode() == ISD::ADD) { if (Addr.getOpcode() == ISD::ADD) {
// (add N0, N1) -> addr64 // (add N0, N1) -> addr64
SDValue N0 = Addr.getOperand(0); SDValue N0 = Addr.getOperand(0);

21
llvm/test/CodeGen/R600/mubuf.ll
View File

@ -30,7 +30,8 @@ entry:
; MUBUF load with an immediate byte offset that doesn't fit into 12-bits ; MUBUF load with an immediate byte offset that doesn't fit into 12-bits
; CHECK-LABEL: {{^}}mubuf_load2: ; CHECK-LABEL: {{^}}mubuf_load2:
; CHECK: buffer_load_dword v{{[0-9]}}, v[{{[0-9]+:[0-9]+}}], s[{{[0-9]+:[0-9]+}}], 0 addr64 ; encoding: [0x00,0x80,0x30,0xe0 ; CHECK: s_movk_i32 [[SOFFSET:s[0-9]+]], 0x1000
; CHECK: buffer_load_dword v{{[0-9]}}, s[{{[0-9]+:[0-9]+}}], [[SOFFSET]] ; encoding: [0x00,0x00,0x30,0xe0
define void @mubuf_load2(i32 addrspace(1)* %out, i32 addrspace(1)* %in) { define void @mubuf_load2(i32 addrspace(1)* %out, i32 addrspace(1)* %in) {
entry: entry:
%0 = getelementptr i32 addrspace(1)* %in, i64 1024 %0 = getelementptr i32 addrspace(1)* %in, i64 1024
@ -85,12 +86,6 @@ main_body:
ret void ret void
} }
declare i32 @llvm.SI.buffer.load.dword.i32.i32(<16 x i8>, i32, i32, i32, i32, i32, i32, i32, i32) #3
declare void @llvm.SI.tbuffer.store.i32(<16 x i8>, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32)
attributes #1 = { "ShaderType"="2" "unsafe-fp-math"="true" }
attributes #3 = { nounwind readonly }
;;;==========================================================================;;; ;;;==========================================================================;;;
;;; MUBUF STORE TESTS ;;; MUBUF STORE TESTS
;;;==========================================================================;;; ;;;==========================================================================;;;
@ -118,7 +113,8 @@ entry:
; MUBUF store with an immediate byte offset that doesn't fit into 12-bits ; MUBUF store with an immediate byte offset that doesn't fit into 12-bits
; CHECK-LABEL: {{^}}mubuf_store2: ; CHECK-LABEL: {{^}}mubuf_store2:
; CHECK: buffer_store_dword v{{[0-9]}}, v[{{[0-9]+:[0-9]+}}], s[{{[0-9]:[0-9]}}], 0 addr64 ; encoding: [0x00,0x80,0x70,0xe0 ; CHECK: s_movk_i32 [[SOFFSET:s[0-9]+]], 0x1000
; CHECK: buffer_store_dword v{{[0-9]}}, s[{{[0-9]:[0-9]}}], [[SOFFSET]] ; encoding: [0x00,0x00,0x70,0xe0
define void @mubuf_store2(i32 addrspace(1)* %out) { define void @mubuf_store2(i32 addrspace(1)* %out) {
entry: entry:
%0 = getelementptr i32 addrspace(1)* %out, i64 1024 %0 = getelementptr i32 addrspace(1)* %out, i64 1024
@ -154,7 +150,8 @@ define void @store_sgpr_ptr_offset(i32 addrspace(1)* %out) #0 {
} }
; CHECK-LABEL: {{^}}store_sgpr_ptr_large_offset: ; CHECK-LABEL: {{^}}store_sgpr_ptr_large_offset:
; CHECK: buffer_store_dword v{{[0-9]+}}, v{{\[[0-9]+:[0-9]+\]}}, s{{\[[0-9]+:[0-9]+\]}}, 0 addr64 ; CHECK: s_mov_b32 [[SOFFSET:s[0-9]+]], 0x20000
; CHECK: buffer_store_dword v{{[0-9]+}}, s{{\[[0-9]+:[0-9]+\]}}, [[SOFFSET]]
define void @store_sgpr_ptr_large_offset(i32 addrspace(1)* %out) #0 { define void @store_sgpr_ptr_large_offset(i32 addrspace(1)* %out) #0 {
%out.gep = getelementptr i32 addrspace(1)* %out, i32 32768 %out.gep = getelementptr i32 addrspace(1)* %out, i32 32768
store i32 99, i32 addrspace(1)* %out.gep, align 4 store i32 99, i32 addrspace(1)* %out.gep, align 4
@ -169,3 +166,9 @@ define void @store_vgpr_ptr(i32 addrspace(1)* %out) #0 {
store i32 99, i32 addrspace(1)* %out.gep, align 4 store i32 99, i32 addrspace(1)* %out.gep, align 4
ret void ret void
} }
declare i32 @llvm.SI.buffer.load.dword.i32.i32(<16 x i8>, i32, i32, i32, i32, i32, i32, i32, i32) #3
declare void @llvm.SI.tbuffer.store.i32(<16 x i8>, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32)
attributes #1 = { "ShaderType"="2" "unsafe-fp-math"="true" }
attributes #3 = { nounwind readonly }