changeset f350fac86d0f in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=f350fac86d0f
description:
CPU: Add abandoned instructions to O3 Pipe Viewer
diffstat:
src/cpu/o3/commit_impl.hh | 15 +----
src/cpu/o3/dyn_inst.hh | 15 ++-
src/cpu/o3/dyn_inst_impl.hh | 43 ++++++++++-
util/o3-pipeview.py | 149 ++++++++++++++++++++++++++++++++++++-------
4 files changed, 171 insertions(+), 51 deletions(-)
diffs (truncated from 382 to 300 lines):
diff -r 5d0fcec59036 -r f350fac86d0f src/cpu/o3/commit_impl.hh
--- a/src/cpu/o3/commit_impl.hh Tue Sep 25 11:49:40 2012 -0500
+++ b/src/cpu/o3/commit_impl.hh Tue Sep 25 11:49:40 2012 -0500
@@ -58,7 +58,6 @@
#include "debug/Commit.hh"
#include "debug/CommitRate.hh"
#include "debug/ExecFaulting.hh"
-#include "debug/O3PipeView.hh"
#include "params/DerivO3CPU.hh"
#include "sim/faults.hh"
#include "sim/full_system.hh"
@@ -1219,19 +1218,7 @@
rob->retireHead(tid);
#if TRACING_ON
- // Print info needed by the pipeline activity viewer.
- DPRINTFR(O3PipeView, "O3PipeView:fetch:%llu:0x%08llx:%d:%llu:%s\n",
- head_inst->fetchTick,
- head_inst->instAddr(),
- head_inst->microPC(),
- head_inst->seqNum,
- head_inst->staticInst->disassemble(head_inst->instAddr()));
- DPRINTFR(O3PipeView, "O3PipeView:decode:%llu\n", head_inst->fetchTick +
head_inst->decodeTick);
- DPRINTFR(O3PipeView, "O3PipeView:rename:%llu\n", head_inst->fetchTick +
head_inst->renameTick);
- DPRINTFR(O3PipeView, "O3PipeView:dispatch:%llu\n", head_inst->fetchTick +
head_inst->dispatchTick);
- DPRINTFR(O3PipeView, "O3PipeView:issue:%llu\n", head_inst->fetchTick +
head_inst->issueTick);
- DPRINTFR(O3PipeView, "O3PipeView:complete:%llu\n", head_inst->fetchTick +
head_inst->completeTick);
- DPRINTFR(O3PipeView, "O3PipeView:retire:%llu\n", curTick());
+ head_inst->commitTick = curTick() - head_inst->fetchTick;
#endif
// If this was a store, record it for this cycle.
diff -r 5d0fcec59036 -r f350fac86d0f src/cpu/o3/dyn_inst.hh
--- a/src/cpu/o3/dyn_inst.hh Tue Sep 25 11:49:40 2012 -0500
+++ b/src/cpu/o3/dyn_inst.hh Tue Sep 25 11:49:40 2012 -0500
@@ -93,6 +93,8 @@
/** BaseDynInst constructor given a static inst pointer. */
BaseO3DynInst(StaticInstPtr _staticInst, StaticInstPtr _macroop);
+ ~BaseO3DynInst();
+
/** Executes the instruction.*/
Fault execute();
@@ -123,12 +125,13 @@
public:
#if TRACING_ON
/** Tick records used for the pipeline activity viewer. */
- Tick fetchTick;
- uint32_t decodeTick;
- uint32_t renameTick;
- uint32_t dispatchTick;
- uint32_t issueTick;
- uint32_t completeTick;
+ Tick fetchTick; // instruction fetch is completed.
+ int32_t decodeTick; // instruction enters decode phase
+ int32_t renameTick; // instruction enters rename phase
+ int32_t dispatchTick;
+ int32_t issueTick;
+ int32_t completeTick;
+ int32_t commitTick;
#endif
/** Reads a misc. register, including any side-effects the read
diff -r 5d0fcec59036 -r f350fac86d0f src/cpu/o3/dyn_inst_impl.hh
--- a/src/cpu/o3/dyn_inst_impl.hh Tue Sep 25 11:49:40 2012 -0500
+++ b/src/cpu/o3/dyn_inst_impl.hh Tue Sep 25 11:49:40 2012 -0500
@@ -43,6 +43,7 @@
#include "base/cp_annotate.hh"
#include "cpu/o3/dyn_inst.hh"
#include "sim/full_system.hh"
+#include "debug/O3PipeView.hh"
template <class Impl>
BaseO3DynInst<Impl>::BaseO3DynInst(StaticInstPtr staticInst,
@@ -62,6 +63,33 @@
initVars();
}
+template <class Impl>BaseO3DynInst<Impl>::~BaseO3DynInst()
+{
+#if TRACING_ON
+ Tick val, fetch = this->fetchTick;
+ // Print info needed by the pipeline activity viewer.
+ DPRINTFR(O3PipeView, "O3PipeView:fetch:%llu:0x%08llx:%d:%llu:%s\n",
+ fetch,
+ this->instAddr(),
+ this->microPC(),
+ this->seqNum,
+ this->staticInst->disassemble(this->instAddr()));
+ val = (this->decodeTick == -1) ? 0 : fetch + this->decodeTick;
+ DPRINTFR(O3PipeView, "O3PipeView:decode:%llu\n", val);
+ val = (this->renameTick == -1) ? 0 : fetch + this->renameTick;
+ DPRINTFR(O3PipeView, "O3PipeView:rename:%llu\n", val);
+ val = (this->dispatchTick == -1) ? 0 : fetch + this->dispatchTick;
+ DPRINTFR(O3PipeView, "O3PipeView:dispatch:%llu\n", val);
+ val = (this->issueTick == -1) ? 0 : fetch + this->issueTick;
+ DPRINTFR(O3PipeView, "O3PipeView:issue:%llu\n", val);
+ val = (this->completeTick == -1) ? 0 : fetch + this->completeTick;
+ DPRINTFR(O3PipeView, "O3PipeView:complete:%llu\n", val);
+ val = (this->commitTick == -1) ? 0 : fetch + this->commitTick;
+ DPRINTFR(O3PipeView, "O3PipeView:retire:%llu\n", val);
+#endif
+};
+
+
template <class Impl>
void
BaseO3DynInst<Impl>::initVars()
@@ -82,12 +110,15 @@
_numDestMiscRegs = 0;
#if TRACING_ON
- fetchTick = 0;
- decodeTick = 0;
- renameTick = 0;
- dispatchTick = 0;
- issueTick = 0;
- completeTick = 0;
+ // Value -1 indicates that particular phase
+ // hasn't happened (yet).
+ fetchTick = -1;
+ decodeTick = -1;
+ renameTick = -1;
+ dispatchTick = -1;
+ issueTick = -1;
+ completeTick = -1;
+ commitTick = -1;
#endif
}
diff -r 5d0fcec59036 -r f350fac86d0f util/o3-pipeview.py
--- a/util/o3-pipeview.py Tue Sep 25 11:49:40 2012 -0500
+++ b/util/o3-pipeview.py Tue Sep 25 11:49:40 2012 -0500
@@ -42,36 +42,76 @@
import optparse
import os
import sys
+import copy
+# Temporary storage for instructions. The queue is filled in out-of-order
+# until it reaches 'max_threshold' number of instructions. It is then
+# sorted out and instructions are printed out until their number drops to
+# 'min_threshold'.
+# It is assumed that the instructions are not out of order for more then
+# 'min_threshold' places - otherwise they will appear out of order.
+insts = {
+ 'queue': [] , # Instructions to print.
+ 'max_threshold':2000, # Instructions are sorted out and printed when
+ # their number reaches this threshold.
+ 'min_threshold':1000, # Printing stops when this number is reached.
+ 'sn_start':0, # The first instruction seq. number to be printed.
+ 'sn_stop':0, # The last instruction seq. number to be printed.
+ 'tick_start':0, # The first tick to be printed
+ 'tick_stop':0, # The last tick to be printed
+ 'tick_drift':2000, # Used to calculate the start and the end of main
+ # loop. We assume here that the instructions are not
+ # out of order for more then 2000 CPU ticks,
+ # otherwise the print may not start/stop
+ # at the time specified by tick_start/stop.
+ 'only_committed':0 # Set if only committed instructions are printed.
+}
def process_trace(trace, outfile, cycle_time, width, color, timestamps,
- start_tick, stop_tick, start_sn, stop_sn):
+ committed_only, start_tick, stop_tick, start_sn, stop_sn):
+ global insts
+
+ insts['sn_start'] = start_sn
+ insts['sn_stop'] = stop_sn
+ insts['tick_start'] = start_tick
+ insts['tick_stop'] = stop_tick
+ insts['tick_drift'] = insts['tick_drift'] * cycle_time
+ insts['only_committed'] = committed_only
line = None
fields = None
- # Skip lines up to region of interest
+
+ # Read the first line
+ line = trace.readline()
+ if not line: return
+ fields = line.split(':')
+
+ # Skip lines up to the starting tick
if start_tick != 0:
while True:
+ if fields[0] != 'O3PipeView': continue
+ if (int(fields[2]) > 0 and
+ int(fields[2]) >= start_tick-insts['tick_drift']): break
line = trace.readline()
if not line: return
fields = line.split(':')
+
+ # Skip lines up to the starting sequence number
+ if start_sn != 0:
+ while True:
if fields[0] != 'O3PipeView': continue
- if int(fields[2]) >= start_tick: break
- elif start_sn != 0:
- while True:
+ if (fields[1] == 'fetch' and
+ int(fields[5]) >= (start_sn-insts['max_threshold'])):
+ break
line = trace.readline()
if not line: return
fields = line.split(':')
- if fields[0] != 'O3PipeView': continue
- if fields[1] == 'fetch' and int(fields[5]) >= start_sn: break
- else:
- line = trace.readline()
- if not line: return
- fields = line.split(':')
+
# Skip lines up to next instruction fetch
while fields[0] != 'O3PipeView' or fields[1] != 'fetch':
line = trace.readline()
if not line: return
fields = line.split(':')
+
# Print header
outfile.write('// f = fetch, d = decode, n = rename, p = dispatch, '
'i = issue, c = complete, r = retire\n\n')
@@ -83,26 +123,65 @@
if timestamps:
outfile.write('timestamps'.center(25))
outfile.write('\n')
+
# Region of interest
curr_inst = {}
while True:
if fields[0] == 'O3PipeView':
curr_inst[fields[1]] = int(fields[2])
if fields[1] == 'fetch':
- if ((stop_tick > 0 and int(fields[2]) > stop_tick) or
- (stop_sn > 0 and int(fields[5]) > stop_sn)):
+ if ((stop_tick > 0 and int(fields[2]) >
stop_tick+insts['tick_drift']) or
+ (stop_sn > 0 and int(fields[5]) >
(stop_sn+insts['max_threshold']))):
+ print_insts(outfile, cycle_time, width, color, timestamps,
0)
return
(curr_inst['pc'], curr_inst['upc']) = fields[3:5]
curr_inst['sn'] = int(fields[5])
curr_inst['disasm'] = ' '.join(fields[6][:-1].split())
elif fields[1] == 'retire':
- print_inst(outfile, curr_inst, cycle_time, width, color,
- timestamps)
+ queue_inst(outfile, curr_inst, cycle_time, width, color,
timestamps)
line = trace.readline()
if not line: return
fields = line.split(':')
+#Sorts out instructions according to sequence number
+def compare_by_sn(a, b):
+ return cmp(a['sn'], b['sn'])
+
+# Puts new instruction into the print queue.
+# Sorts out and prints instructions when their number reaches threshold value
+def queue_inst(outfile, inst, cycle_time, width, color, timestamps):
+ global insts
+ l_copy = copy.deepcopy(inst)
+ insts['queue'].append(l_copy)
+ if len(insts['queue']) > insts['max_threshold']:
+ print_insts(outfile, cycle_time, width, color, timestamps,
insts['min_threshold'])
+
+# Sorts out and prints instructions in print queue
+def print_insts(outfile, cycle_time, width, color, timestamps,
lower_threshold):
+ global insts
+ insts['queue'].sort(compare_by_sn)
+ while len(insts['queue']) > lower_threshold:
+ print_item=insts['queue'].pop(0)
+ # As the instructions are processed out of order the main loop starts
+ # earlier then specified by start_sn/tick and finishes later then what
+ # is defined in stop_sn/tick.
+ # Therefore, here we have to filter out instructions that reside out of
+ # the specified boundaries.
+ if (insts['sn_start'] > 0 and print_item['sn'] < insts['sn_start']):
+ continue; # earlier then the starting sequence number
+ if (insts['sn_stop'] > 0 and print_item['sn'] > insts['sn_stop']):
+ continue; # later then the ending sequence number
+ if (insts['tick_start'] > 0 and print_item['fetch'] <
insts['tick_start']):
+ continue; # earlier then the starting tick number
+ if (insts['tick_stop'] > 0 and print_item['fetch'] >
insts['tick_stop']):
+ continue; # later then the ending tick number
+
+ if (insts['only_committed'] != 0 and print_item['retire'] == 0):
+ continue; # retire is set to zero if it hasn't been completed
+ print_inst(outfile, print_item, cycle_time, width, color, timestamps)
+
+# Prints a single instruction
def print_inst(outfile, inst, cycle_time, width, color, timestamps):
if color:
from m5.util.terminal import termcap
@@ -130,17 +209,30 @@
{'name': 'retire',
'color': termcap.Blue + termcap.Reverse,
'shorthand': 'r'}]
+
# Print
+
time_width = width * cycle_time
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
