mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-26 05:56:51 +00:00
R600/SI: Fix 64-bit private loads.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204630 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
657c472bb0
commit
875870fdb4
@ -739,12 +739,28 @@ SDValue SITargetLowering::LowerLOAD(SDValue Op, SelectionDAG &DAG) const {
|
||||
return SDValue();
|
||||
}
|
||||
|
||||
EVT MemVT = Load->getMemoryVT();
|
||||
|
||||
assert(!MemVT.isVector() && "Private loads should be scalarized");
|
||||
assert(!MemVT.isFloatingPoint() && "FP loads should be promoted to int");
|
||||
|
||||
SDValue Ptr = DAG.getNode(ISD::SRL, DL, MVT::i32, Load->getBasePtr(),
|
||||
DAG.getConstant(2, MVT::i32));
|
||||
Ret = DAG.getNode(AMDGPUISD::REGISTER_LOAD, DL, Op.getValueType(),
|
||||
Ret = DAG.getNode(AMDGPUISD::REGISTER_LOAD, DL, MVT::i32,
|
||||
Load->getChain(), Ptr,
|
||||
DAG.getTargetConstant(0, MVT::i32),
|
||||
Op.getOperand(2));
|
||||
if (MemVT.getSizeInBits() == 64) {
|
||||
SDValue IncPtr = DAG.getNode(ISD::ADD, DL, MVT::i32, Ptr,
|
||||
DAG.getConstant(1, MVT::i32));
|
||||
|
||||
SDValue LoadUpper = DAG.getNode(AMDGPUISD::REGISTER_LOAD, DL, MVT::i32,
|
||||
Load->getChain(), IncPtr,
|
||||
DAG.getTargetConstant(0, MVT::i32),
|
||||
Op.getOperand(2));
|
||||
|
||||
Ret = DAG.getNode(ISD::BUILD_PAIR, DL, MVT::i64, Ret, LoadUpper);
|
||||
}
|
||||
|
||||
MergedValues[0] = Ret;
|
||||
return DAG.getMergeValues(MergedValues, 2, DL);
|
||||
|
@ -1,12 +1,13 @@
|
||||
; REQUIRES: asserts
|
||||
; XFAIL: *
|
||||
; RUN: llc -march=r600 -mcpu=SI -verify-machineinstrs < %s | FileCheck -check-prefix=SI %s
|
||||
|
||||
declare void @llvm.AMDGPU.barrier.local() noduplicate nounwind
|
||||
|
||||
; SI-LABEL: @indirect_access_f64_alloca:
|
||||
; SI: BUFFER_STORE_DWORD
|
||||
define void @f64_alloca(double addrspace(1)* noalias %out, double addrspace(1)* noalias %in, i32 %b) nounwind {
|
||||
; SI-LABEL: @private_access_f64_alloca:
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
define void @private_access_f64_alloca(double addrspace(1)* noalias %out, double addrspace(1)* noalias %in, i32 %b) nounwind {
|
||||
%val = load double addrspace(1)* %in, align 8
|
||||
%array = alloca double, i32 16, align 8
|
||||
%ptr = getelementptr double* %array, i32 %b
|
||||
@ -17,9 +18,16 @@ define void @f64_alloca(double addrspace(1)* noalias %out, double addrspace(1)*
|
||||
ret void
|
||||
}
|
||||
|
||||
; SI-LABEL: @indirect_access_v2f64_alloca:
|
||||
; SI: BUFFER_STORE_DWORDX4
|
||||
define void @v2f64_alloca(<2 x double> addrspace(1)* noalias %out, <2 x double> addrspace(1)* noalias %in, i32 %b) nounwind {
|
||||
; SI-LABEL: @private_access_v2f64_alloca:
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
define void @private_access_v2f64_alloca(<2 x double> addrspace(1)* noalias %out, <2 x double> addrspace(1)* noalias %in, i32 %b) nounwind {
|
||||
%val = load <2 x double> addrspace(1)* %in, align 16
|
||||
%array = alloca <2 x double>, i32 16, align 16
|
||||
%ptr = getelementptr <2 x double>* %array, i32 %b
|
||||
@ -29,3 +37,39 @@ define void @v2f64_alloca(<2 x double> addrspace(1)* noalias %out, <2 x double>
|
||||
store <2 x double> %result, <2 x double> addrspace(1)* %out, align 16
|
||||
ret void
|
||||
}
|
||||
|
||||
; SI-LABEL: @private_access_i64_alloca:
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
define void @private_access_i64_alloca(i64 addrspace(1)* noalias %out, i64 addrspace(1)* noalias %in, i32 %b) nounwind {
|
||||
%val = load i64 addrspace(1)* %in, align 8
|
||||
%array = alloca i64, i32 16, align 8
|
||||
%ptr = getelementptr i64* %array, i32 %b
|
||||
store i64 %val, i64* %ptr, align 8
|
||||
call void @llvm.AMDGPU.barrier.local() noduplicate nounwind
|
||||
%result = load i64* %ptr, align 8
|
||||
store i64 %result, i64 addrspace(1)* %out, align 8
|
||||
ret void
|
||||
}
|
||||
|
||||
; SI-LABEL: @private_access_v2i64_alloca:
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELD_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
; SI: V_MOVRELS_B32_e32
|
||||
define void @private_access_v2i64_alloca(<2 x i64> addrspace(1)* noalias %out, <2 x i64> addrspace(1)* noalias %in, i32 %b) nounwind {
|
||||
%val = load <2 x i64> addrspace(1)* %in, align 16
|
||||
%array = alloca <2 x i64>, i32 16, align 16
|
||||
%ptr = getelementptr <2 x i64>* %array, i32 %b
|
||||
store <2 x i64> %val, <2 x i64>* %ptr, align 16
|
||||
call void @llvm.AMDGPU.barrier.local() noduplicate nounwind
|
||||
%result = load <2 x i64>* %ptr, align 16
|
||||
store <2 x i64> %result, <2 x i64> addrspace(1)* %out, align 16
|
||||
ret void
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user