radeon/llvm: Use a custom inserter to lower LOAD_INPUT

This commit is contained in:
Tom Stellard
2012-05-08 10:01:58 -04:00
parent 52a7f212d3
commit ad385c402e
4 changed files with 15 additions and 39 deletions

View File

@@ -42,12 +42,6 @@ let isCodeGenOnly = 1 in {
[(int_AMDGPU_export_reg GPRF32:$src)]
>;
def LOAD_INPUT : AMDGPUShaderInst <
(outs GPRF32:$dst),
(ins i32imm:$src),
"LOAD_INPUT $dst, $src",
[] >;
def MASK_WRITE : AMDGPUShaderInst <
(outs),
(ins GPRF32:$src),

View File

@@ -88,8 +88,15 @@ MachineBasicBlock * R600TargetLowering::EmitInstrWithCustomInserter(
case AMDIL::LOCAL_SIZE_Z:
lowerImplicitParameter(MI, *BB, MRI, 8);
break;
case AMDIL::LOAD_INPUT:
{
int64_t RegIndex = MI->getOperand(1).getImm();
addLiveIn(MI, MF, MRI, TII,
AMDIL::R600_TReg32RegClass.getRegister(RegIndex));
MI->eraseFromParent();
break;
}
}
MI->eraseFromParent();
return BB;
}

View File

@@ -991,6 +991,13 @@ def LOCAL_SIZE_Y : R600PreloadInst <"LOCAL_SIZE_Y",
def LOCAL_SIZE_Z : R600PreloadInst <"LOCAL_SIZE_Z",
int_r600_read_local_size_z>;
def LOAD_INPUT : AMDGPUShaderInst <
(outs R600_Reg32:$dst),
(ins i32imm:$src),
"LOAD_INPUT $dst, $src",
[(set R600_Reg32:$dst, (int_R600_load_input imm:$src))]
>;
} // End usesCustomInserter = 1, isPseudo = 1
} // End isCodeGenOnly = 1
@@ -1032,12 +1039,4 @@ def : Insert_Element <i32, v4i32, R600_Reg32, R600_Reg128, 7, sel_w>;
include "R600ShaderPatterns.td"
// We need this pattern to avoid having real registers in PHI nodes.
// For some reason this pattern only works when it comes after the other
// instruction defs.
def : Pat <
(int_R600_load_input imm:$src),
(LOAD_INPUT imm:$src)
>;
} // End isR600toCayman Predicate

View File

@@ -32,7 +32,6 @@ namespace {
void lowerEXPORT_REG_FAKE(MachineInstr &MI, MachineBasicBlock &MBB,
MachineBasicBlock::iterator I);
void lowerLOAD_INPUT(MachineInstr & MI);
bool lowerSTORE_OUTPUT(MachineInstr & MI, MachineBasicBlock &MBB,
MachineBasicBlock::iterator I);
@@ -81,11 +80,6 @@ bool R600LowerShaderInstructionsPass::runOnMachineFunction(MachineFunction &MF)
deleteInstr = true;
break;
case AMDIL::LOAD_INPUT:
lowerLOAD_INPUT(MI);
deleteInstr = true;
break;
case AMDIL::STORE_OUTPUT:
deleteInstr = lowerSTORE_OUTPUT(MI, MBB, I);
break;
@@ -103,24 +97,6 @@ bool R600LowerShaderInstructionsPass::runOnMachineFunction(MachineFunction &MF)
return false;
}
/* The goal of this function is to replace the virutal destination register of
* a LOAD_INPUT instruction with the correct physical register that will.
*
* XXX: I don't think this is the right way things assign physical registers,
* but I'm not sure of another way to do this.
*/
void R600LowerShaderInstructionsPass::lowerLOAD_INPUT(MachineInstr &MI)
{
MachineOperand &dst = MI.getOperand(0);
MachineOperand &arg = MI.getOperand(1);
int64_t inputIndex = arg.getImm();
const TargetRegisterClass * inputClass = TM.getRegisterInfo()->getRegClass(AMDIL::R600_TReg32RegClassID);
unsigned newRegister = inputClass->getRegister(inputIndex);
unsigned dstReg = dst.getReg();
AMDGPU::utilAddLiveIn(MI.getParent()->getParent(), *MRI, TM.getInstrInfo(), newRegister, dstReg);
}
bool R600LowerShaderInstructionsPass::lowerSTORE_OUTPUT(MachineInstr &MI,
MachineBasicBlock &MBB, MachineBasicBlock::iterator I)
{