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

AMDGPU: Cleanup SMRD buffer selection

Browse Source 
The usage of the Imm out argument from SelectSMRDOffset is pretty
confusing. Stop trying to reject CI immediates in the case where the
offset field can be used. It's not an illegal way to encode the
immediate, so just prefer the better encoding pattern with
AddedComplexity.

We probably don't even really need the different opcodes for the
different offset types anymore, but that will be more work to cleanup.

The SMRD non-buffer load patterns could also use a cleanup to be done
separately.
This commit is contained in:
Matt Arsenault 2020-01-30 11:03:17 -05:00
parent edc134394e
commit d5d8b833fb
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp
View File

@ -1874,19 +1874,30 @@ bool AMDGPUDAGToDAGISel::SelectSMRDSgpr(SDValue Addr, SDValue &SBase,
bool AMDGPUDAGToDAGISel::SelectSMRDBufferImm(SDValue Addr,
SDValue &Offset) const {
bool Imm = false;
return SelectSMRDOffset(Addr, Offset, Imm) && Imm;
if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(Addr)) {
if (auto Imm = AMDGPU::getSMRDEncodedOffset(*Subtarget,
C->getZExtValue())) {
Offset = CurDAG->getTargetConstant(*Imm, SDLoc(Addr), MVT::i32);
return true;
}
}
return false;
}
bool AMDGPUDAGToDAGISel::SelectSMRDBufferImm32(SDValue Addr,
SDValue &Offset) const {
assert(Subtarget->getGeneration() == AMDGPUSubtarget::SEA_ISLANDS);
bool Imm = false;
if (!SelectSMRDOffset(Addr, Offset, Imm))
return false;
if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(Addr)) {
if (auto Imm = AMDGPU::getSMRDEncodedLiteralOffset32(*Subtarget,
C->getZExtValue())) {
Offset = CurDAG->getTargetConstant(*Imm, SDLoc(Addr), MVT::i32);
return true;
}
}
return !Imm && isa<ConstantSDNode>(Offset);
return false;
}
bool AMDGPUDAGToDAGISel::SelectMOVRELOffset(SDValue Index,

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

@ -770,14 +770,16 @@ multiclass SMLoad_Pattern <string Instr, ValueType vt> {
def : GCNPat <
(SIsbuffer_load v4i32:$sbase, (SMRDBufferImm i32:$offset), timm:$cachepolicy),
(vt (!cast<SM_Pseudo>(Instr#"_IMM") $sbase, $offset, (extract_glc $cachepolicy),
(extract_dlc $cachepolicy)))
>;
(extract_dlc $cachepolicy)))> {
let AddedComplexity = 2;
}
// 2. 32-bit IMM offset on CI
def : GCNPat <
(vt (SIsbuffer_load v4i32:$sbase, (SMRDBufferImm32 i32:$offset), timm:$cachepolicy)),
(!cast<InstSI>(Instr#"_IMM_ci") $sbase, $offset, (extract_glc $cachepolicy), (extract_dlc $cachepolicy))> {
let OtherPredicates = [isGFX7Only];
let AddedComplexity = 1;
}
// 3. Offset loaded in an 32bit SGPR