changeset fdc91cab5760 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=fdc91cab5760
description:
cpu: Fix O3 LSQ debug dumping constness and formatting
diffstat:
src/cpu/o3/lsq.hh | 4 ++--
src/cpu/o3/lsq_impl.hh | 6 +++---
src/cpu/o3/lsq_unit.hh | 10 +++++-----
src/cpu/o3/lsq_unit_impl.hh | 17 ++++++++++-------
4 files changed, 20 insertions(+), 17 deletions(-)
diffs (130 lines):
diff -r fce94f92ea0f -r fdc91cab5760 src/cpu/o3/lsq.hh
--- a/src/cpu/o3/lsq.hh Mon Jan 07 13:05:45 2013 -0500
+++ b/src/cpu/o3/lsq.hh Mon Jan 07 13:05:46 2013 -0500
@@ -263,9 +263,9 @@
{ retryTid = tid; }
/** Debugging function to print out all instructions. */
- void dumpInsts();
+ void dumpInsts() const;
/** Debugging function to print out instructions from a specific thread. */
- void dumpInsts(ThreadID tid)
+ void dumpInsts(ThreadID tid) const
{ thread[tid].dumpInsts(); }
/** Executes a read operation, using the load specified at the load
diff -r fce94f92ea0f -r fdc91cab5760 src/cpu/o3/lsq_impl.hh
--- a/src/cpu/o3/lsq_impl.hh Mon Jan 07 13:05:45 2013 -0500
+++ b/src/cpu/o3/lsq_impl.hh Mon Jan 07 13:05:46 2013 -0500
@@ -577,10 +577,10 @@
template<class Impl>
void
-LSQ<Impl>::dumpInsts()
+LSQ<Impl>::dumpInsts() const
{
- list<ThreadID>::iterator threads = activeThreads->begin();
- list<ThreadID>::iterator end = activeThreads->end();
+ list<ThreadID>::const_iterator threads = activeThreads->begin();
+ list<ThreadID>::const_iterator end = activeThreads->end();
while (threads != end) {
ThreadID tid = *threads++;
diff -r fce94f92ea0f -r fdc91cab5760 src/cpu/o3/lsq_unit.hh
--- a/src/cpu/o3/lsq_unit.hh Mon Jan 07 13:05:45 2013 -0500
+++ b/src/cpu/o3/lsq_unit.hh Mon Jan 07 13:05:46 2013 -0500
@@ -241,17 +241,17 @@
bool sendStore(PacketPtr data_pkt);
/** Increments the given store index (circular queue). */
- inline void incrStIdx(int &store_idx);
+ inline void incrStIdx(int &store_idx) const;
/** Decrements the given store index (circular queue). */
- inline void decrStIdx(int &store_idx);
+ inline void decrStIdx(int &store_idx) const;
/** Increments the given load index (circular queue). */
- inline void incrLdIdx(int &load_idx);
+ inline void incrLdIdx(int &load_idx) const;
/** Decrements the given load index (circular queue). */
- inline void decrLdIdx(int &load_idx);
+ inline void decrLdIdx(int &load_idx) const;
public:
/** Debugging function to dump instructions in the LSQ. */
- void dumpInsts();
+ void dumpInsts() const;
private:
/** Pointer to the CPU. */
diff -r fce94f92ea0f -r fdc91cab5760 src/cpu/o3/lsq_unit_impl.hh
--- a/src/cpu/o3/lsq_unit_impl.hh Mon Jan 07 13:05:45 2013 -0500
+++ b/src/cpu/o3/lsq_unit_impl.hh Mon Jan 07 13:05:46 2013 -0500
@@ -1228,7 +1228,7 @@
template <class Impl>
inline void
-LSQUnit<Impl>::incrStIdx(int &store_idx)
+LSQUnit<Impl>::incrStIdx(int &store_idx) const
{
if (++store_idx >= SQEntries)
store_idx = 0;
@@ -1236,7 +1236,7 @@
template <class Impl>
inline void
-LSQUnit<Impl>::decrStIdx(int &store_idx)
+LSQUnit<Impl>::decrStIdx(int &store_idx) const
{
if (--store_idx < 0)
store_idx += SQEntries;
@@ -1244,7 +1244,7 @@
template <class Impl>
inline void
-LSQUnit<Impl>::incrLdIdx(int &load_idx)
+LSQUnit<Impl>::incrLdIdx(int &load_idx) const
{
if (++load_idx >= LQEntries)
load_idx = 0;
@@ -1252,7 +1252,7 @@
template <class Impl>
inline void
-LSQUnit<Impl>::decrLdIdx(int &load_idx)
+LSQUnit<Impl>::decrLdIdx(int &load_idx) const
{
if (--load_idx < 0)
load_idx += LQEntries;
@@ -1260,7 +1260,7 @@
template <class Impl>
void
-LSQUnit<Impl>::dumpInsts()
+LSQUnit<Impl>::dumpInsts() const
{
cprintf("Load store queue: Dumping instructions.\n");
cprintf("Load queue size: %i\n", loads);
@@ -1269,10 +1269,12 @@
int load_idx = loadHead;
while (load_idx != loadTail && loadQueue[load_idx]) {
- cprintf("%s ", loadQueue[load_idx]->pcState());
+ const DynInstPtr &inst(loadQueue[load_idx]);
+ cprintf("%s.[sn:%i] ", inst->pcState(), inst->seqNum);
incrLdIdx(load_idx);
}
+ cprintf("\n");
cprintf("Store queue size: %i\n", stores);
cprintf("Store queue: ");
@@ -1280,7 +1282,8 @@
int store_idx = storeHead;
while (store_idx != storeTail && storeQueue[store_idx].inst) {
- cprintf("%s ", storeQueue[store_idx].inst->pcState());
+ const DynInstPtr &inst(storeQueue[store_idx].inst);
+ cprintf("%s.[sn:%i] ", inst->pcState(), inst->seqNum);
incrStIdx(store_idx);
}
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
