sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

arm: Add branch flags onto macroops

Browse source 
Mark branch flags onto macroops to allow branch prediction before
microop decomposition
This commit is contained in:
Andrew Bardsley 2014-05-09 18:58:47 -04:00
parent eab00f4966
commit f7d80348fa
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/arch/arm/insts/macromem.cc
View file

@ -171,6 +171,16 @@ MacroMemOp::MacroMemOp(const char *mnem, ExtMachInst machInst,
(*uop)->setLastMicroop();
/* Take the control flags from the last microop for the macroop */
if ((*uop)->isControl())
setFlag(StaticInst::IsControl);
if ((*uop)->isCondCtrl())
setFlag(StaticInst::IsCondControl);
if ((*uop)->isIndirectCtrl())
setFlag(StaticInst::IsIndirectControl);
if ((*uop)->isReturn())
setFlag(StaticInst::IsReturn);
for (StaticInstPtr *curUop = microOps;
!(*curUop)->isLastMicroop(); curUop++) {
MicroOp * uopPtr = dynamic_cast<MicroOp *>(curUop->get());

15
src/arch/arm/isa/templates/mem.isa
View file

@ -1214,12 +1214,21 @@ def template LoadImmConstructor {{
uops[2] = new MicroUopRegMov(machInst, INTREG_PC, INTREG_UREG0);
uops[2]->setFlag(StaticInst::IsControl);
uops[2]->setFlag(StaticInst::IsIndirectControl);
if (conditional)
/* Also set flags on the macroop so that pre-microop decomposition
branch prediction can work */
setFlag(StaticInst::IsControl);
setFlag(StaticInst::IsIndirectControl);
if (conditional) {
uops[2]->setFlag(StaticInst::IsCondControl);
else
setFlag(StaticInst::IsCondControl);
} else {
uops[2]->setFlag(StaticInst::IsUncondControl);
if (_base == INTREG_SP && _add && _imm == 4 && %(is_ras_pop)s)
setFlag(StaticInst::IsUncondControl);
}
if (_base == INTREG_SP && _add && _imm == 4 && %(is_ras_pop)s) {
uops[2]->setFlag(StaticInst::IsReturn);
setFlag(StaticInst::IsReturn);
}
uops[2]->setLastMicroop();
} else {
uops[0] = new %(acc_name)s(machInst, _dest, _base, _add, _imm);