diff options
| -rw-r--r-- | src/cpu/inorder/resources/decode_unit.cc | 1 | ||||
| -rw-r--r-- | src/cpu/inorder/resources/execution_unit.cc | 13 | ||||
| -rw-r--r-- | src/cpu/inorder/resources/use_def.cc | 6 |
3 files changed, 17 insertions, 3 deletions
diff --git a/src/cpu/inorder/resources/decode_unit.cc b/src/cpu/inorder/resources/decode_unit.cc index b791253b2..43f847818 100644 --- a/src/cpu/inorder/resources/decode_unit.cc +++ b/src/cpu/inorder/resources/decode_unit.cc @@ -68,7 +68,6 @@ DecodeUnit::execute(int slot_num) DPRINTF(InOrderDecode, "[tid:%i]: %s Setting Destination Register(s) for [sn:%i].\n", tid, inst->instName(), inst->seqNum); - regDepMap[tid]->insert(inst); //inst->printSked(); diff --git a/src/cpu/inorder/resources/execution_unit.cc b/src/cpu/inorder/resources/execution_unit.cc index 2e52c5ac5..8ea320b6b 100644 --- a/src/cpu/inorder/resources/execution_unit.cc +++ b/src/cpu/inorder/resources/execution_unit.cc @@ -100,6 +100,17 @@ ExecutionUnit::execute(int slot_num) } + //@todo: may want to make a separate schedule entry for setting + // destination register dependencies + //@note: typically want to set the output dependencies right + // before we do any reading or writing of registers + // (in RegFile Manager(use_def.cc)) but there are some + // instructions that dont have src regs, so just in case + // take care of reg. dep. map stuff here + if (!inst->isRegDepEntry()) { + regDepMap[tid]->insert(inst); + } + switch (exec_req->cmd) { case ExecuteInst: @@ -139,11 +150,9 @@ ExecutionUnit::execute(int slot_num) lastControlTick = curTick(); // Evaluate Branch - DPRINTF(IEW, "Pre-Execute %s PC:%s nextPC:%s predPC:%s\n", inst->instName(), inst->pcState(), inst->readPredTarg()); fault = inst->execute(); executions++; inst->setExecuted(); - DPRINTF(IEW, "Post-Execute %s PC:%s nextPC:%s predPC:%s\n", inst->instName(), inst->pcState(), inst->readPredTarg()); if (fault == NoFault) { // If branch is mispredicted, then signal squash diff --git a/src/cpu/inorder/resources/use_def.cc b/src/cpu/inorder/resources/use_def.cc index 5bc78d6ba..b23a3c344 100644 --- a/src/cpu/inorder/resources/use_def.cc +++ b/src/cpu/inorder/resources/use_def.cc @@ -159,6 +159,12 @@ UseDefUnit::execute(int slot_idx) *nonSpecSeqNum[tid] = seq_num; } + //@todo: may want to make a separate schedule entry for setting + // destination register dependencies + if (!inst->isRegDepEntry()) { + regDepMap[tid]->insert(inst); + } + switch (ud_req->cmd) { case ReadSrcReg: |