AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi/llvm: Move lowering of RETURN to ConvertToISA pass

Browse Source
This commit is contained in:
Tom Stellard
2012-05-10 15:29:00 -04:00
parent fa63f97652
commit f8e9c29020
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeon/SIInstrInfo.cpp
+2
View File
@@ -107,6 +107,8 @@ unsigned SIInstrInfo::getISAOpcode(unsigned AMDILopcode) const
{
switch (AMDILopcode) {
case AMDIL::MAD_f32: return AMDIL::V_MAD_LEGACY_F32;
//XXX We need a better way of detecting end of program
case AMDIL::RETURN: return AMDIL::S_ENDPGM;
default: return AMDGPUInstrInfo::getISAOpcode(AMDILopcode);
}
}
src/gallium/drivers/radeon/SILowerShaderInstructions.cpp
-11
View File
@@ -35,7 +35,6 @@ namespace {
const char *getPassName() const { return "SI Lower Shader Instructions"; }
void lowerRETURN(MachineBasicBlock &MBB, MachineBasicBlock::iterator I);
void lowerSET_M0(MachineInstr &MI, MachineBasicBlock &MBB,
MachineBasicBlock::iterator I);
};
@@ -57,9 +56,6 @@ bool SILowerShaderInstructionsPass::runOnMachineFunction(MachineFunction &MF)
I != MBB.end(); I = Next, Next = llvm::next(I) ) {
MachineInstr &MI = *I;
switch (MI.getOpcode()) {
case AMDIL::RETURN:
lowerRETURN(MBB, I);
break;
case AMDIL::SET_M0:
lowerSET_M0(MI, MBB, I);
break;
@@ -72,13 +68,6 @@ bool SILowerShaderInstructionsPass::runOnMachineFunction(MachineFunction &MF)
return false;
}
void SILowerShaderInstructionsPass::lowerRETURN(MachineBasicBlock &MBB,
MachineBasicBlock::iterator I)
{
const struct TargetInstrInfo * TII = TM.getInstrInfo();
BuildMI(MBB, I, MBB.findDebugLoc(I), TII->get(AMDIL::S_ENDPGM));
}
void SILowerShaderInstructionsPass::lowerSET_M0(MachineInstr &MI,
MachineBasicBlock &MBB, MachineBasicBlock::iterator I)
{