[gem5-dev] changeset in gem5: inorder: remove decode squash

[Korey Sewell]

changeset 852687db50eb in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=852687db50eb
description:
        inorder: remove decode squash
        also, cleanup comments for gem5.fast compilation

diffstat:

 src/cpu/inorder/resources/decode_unit.cc    |  17 +++--------------
 src/cpu/inorder/resources/decode_unit.hh    |   3 ---
 src/cpu/inorder/resources/execution_unit.cc |   5 +++--
 3 files changed, 6 insertions(+), 19 deletions(-)

diffs (70 lines):

diff -r b0a7c7b7748a -r 852687db50eb src/cpu/inorder/resources/decode_unit.cc
--- a/src/cpu/inorder/resources/decode_unit.cc  Sun Jun 19 21:43:37 2011 -0400
+++ b/src/cpu/inorder/resources/decode_unit.cc  Sun Jun 19 21:43:37 2011 -0400
@@ -54,7 +54,6 @@
 {
     ResourceRequest* decode_req = reqs[slot_num];
     DynInstPtr inst = reqs[slot_num]->inst;
-    ThreadID tid = inst->readTid();
 
     switch (decode_req->cmd)
     {
@@ -71,11 +70,12 @@
             if (inst->backSked != NULL) {
                 DPRINTF(InOrderDecode,
                     "[tid:%i]: Back End Schedule created for %s  [sn:%i].\n",
-                        tid, inst->instName(), inst->seqNum);
+                        inst->readTid(), inst->instName(), inst->seqNum);
                 decode_req->done();
             } else {
                 DPRINTF(Resource,
-                    "[tid:%i] Static Inst not available to decode.\n", tid);
+                    "[tid:%i] Static Inst not available to decode.\n",
+                        inst->readTid());
                 DPRINTF(Resource,
                     "Unable to create schedule for instruction [sn:%i] \n",
                     inst->seqNum);
@@ -90,14 +90,3 @@
     }
 }
 
-
-void
-DecodeUnit::squash(DynInstPtr inst, int stage_num, InstSeqNum squash_seq_num,
-                   ThreadID tid)
-{
-    DPRINTF(InOrderDecode,
-            "[tid:%i]: Updating due to squash from stage %i after [sn:%i].\n",
-            tid, stage_num, squash_seq_num);
-
-    //cpu->removeInstsUntil(squash_seq_num, tid);
-}
diff -r b0a7c7b7748a -r 852687db50eb src/cpu/inorder/resources/decode_unit.hh
--- a/src/cpu/inorder/resources/decode_unit.hh  Sun Jun 19 21:43:37 2011 -0400
+++ b/src/cpu/inorder/resources/decode_unit.hh  Sun Jun 19 21:43:37 2011 -0400
@@ -56,9 +56,6 @@
 
     void execute(int slot_num);
 
-    void squash(DynInstPtr inst, int stage_num, InstSeqNum squash_seq_num,
-                ThreadID tid);
-
     RegDepMap *regDepMap[ThePipeline::MaxThreads];
 
   protected:
diff -r b0a7c7b7748a -r 852687db50eb src/cpu/inorder/resources/execution_unit.cc
--- a/src/cpu/inorder/resources/execution_unit.cc       Sun Jun 19 21:43:37 
2011 -0400
+++ b/src/cpu/inorder/resources/execution_unit.cc       Sun Jun 19 21:43:37 
2011 -0400
@@ -88,9 +88,10 @@
     ResourceRequest* exec_req = reqs[slot_num];
     DynInstPtr inst = reqs[slot_num]->inst;
     Fault fault = NoFault;
+    Tick cur_tick = curTick();
+#if TRACING_ON
     InstSeqNum seq_num = inst->seqNum;
-    Tick cur_tick = curTick();
-
+#endif
     if (cur_tick == serializeTick) {
         DPRINTF(InOrderExecute, "Can not execute [tid:%i][sn:%i][PC:%s] %s. "
                 "All instructions are being serialized this cycle\n",
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev