changeset 3ae037a196a2 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=3ae037a196a2
description:
inorder: add names and slot #s to res. dprints
diffstat:
src/cpu/inorder/resource.cc | 18 +++++++++++-------
src/cpu/inorder/resource.hh | 6 +++---
2 files changed, 14 insertions(+), 10 deletions(-)
diffs (93 lines):
diff -r 8b869a22e2f8 -r 3ae037a196a2 src/cpu/inorder/resource.cc
--- a/src/cpu/inorder/resource.cc Fri Feb 18 14:30:38 2011 -0500
+++ b/src/cpu/inorder/resource.cc Fri Feb 18 14:31:31 2011 -0500
@@ -31,6 +31,8 @@
#include <vector>
#include <list>
+
+#include "base/str.hh"
#include "cpu/inorder/resource.hh"
#include "cpu/inorder/cpu.hh"
using namespace std;
@@ -376,7 +378,7 @@
ResourceRequest::ResourceRequest(Resource *_res)
: res(_res), inst(NULL), stagePasses(0), valid(false),
doneInResource(false),
- complSlotNum(-1), completed(false), squashed(false), processing(false),
+ completed(false), squashed(false), processing(false),
memStall(false)
{
}
@@ -391,6 +393,12 @@
inst = NULL;
}
+std::string
+ResourceRequest::name()
+{
+ return res->name() + "." + to_string(slotNum);
+}
+
void
ResourceRequest::setRequest(DynInstPtr _inst, int stage_num,
int res_idx, int slot_num, unsigned _cmd)
@@ -433,11 +441,6 @@
setCompleted(completed);
- // Used for debugging purposes
- if (completed) {
- complSlotNum = slotNum;
- }
-
doneInResource = true;
}
@@ -466,7 +469,8 @@
const char *
ResourceEvent::description()
{
- string desc = resource->name() + " event";
+ string desc = resource->name() + "-event:slot[" + to_string(slotIdx)
+ + "]";
return desc.c_str();
}
diff -r 8b869a22e2f8 -r 3ae037a196a2 src/cpu/inorder/resource.hh
--- a/src/cpu/inorder/resource.hh Fri Feb 18 14:30:38 2011 -0500
+++ b/src/cpu/inorder/resource.hh Fri Feb 18 14:31:31 2011 -0500
@@ -247,7 +247,7 @@
class ResourceEvent : public Event
{
public:
- /** Pointer to the CPU. */
+ /** Pointer to the Resource this is an event for */
Resource *resource;
@@ -305,6 +305,8 @@
ResourceRequest(Resource *_res);
virtual ~ResourceRequest();
+
+ std::string name();
int reqID;
@@ -330,7 +332,6 @@
/** Get Slot Number */
int getSlot() { return slotNum; }
- int getComplSlot() { return complSlotNum; }
bool hasSlot() { return slotNum >= 0; }
/** Get Stage Number */
@@ -393,7 +394,6 @@
int stageNum;
int resIdx;
int slotNum;
- int complSlotNum;
/** Resource Request Status */
bool completed;
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
