changeset aef704eaedd2 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=aef704eaedd2
description:
sim: Clean up InstRecord
Track memory size and flags as well as add some comments and consts.
diffstat:
src/cpu/base_dyn_inst.hh | 10 +-
src/cpu/exetrace.cc | 2 +-
src/cpu/inorder/resources/cache_unit.cc | 7 +-
src/cpu/minor/lsq.cc | 2 +-
src/cpu/simple/atomic.cc | 10 +-
src/cpu/simple/timing.cc | 10 +-
src/sim/insttracer.hh | 117 +++++++++++++++++++++++--------
7 files changed, 104 insertions(+), 54 deletions(-)
diffs (truncated from 302 to 300 lines):
diff -r 61a0b02aa800 -r aef704eaedd2 src/cpu/base_dyn_inst.hh
--- a/src/cpu/base_dyn_inst.hh Sun Jan 25 07:22:26 2015 -0500
+++ b/src/cpu/base_dyn_inst.hh Sun Jan 25 07:22:44 2015 -0500
@@ -917,9 +917,8 @@
}
}
- if (traceData) {
- traceData->setAddr(addr);
- }
+ if (traceData)
+ traceData->setMem(addr, size, flags);
return fault;
}
@@ -929,9 +928,8 @@
BaseDynInst<Impl>::writeMem(uint8_t *data, unsigned size,
Addr addr, unsigned flags, uint64_t *res)
{
- if (traceData) {
- traceData->setAddr(addr);
- }
+ if (traceData)
+ traceData->setMem(addr, size, flags);
instFlags[ReqMade] = true;
Request *req = NULL;
diff -r 61a0b02aa800 -r aef704eaedd2 src/cpu/exetrace.cc
--- a/src/cpu/exetrace.cc Sun Jan 25 07:22:26 2015 -0500
+++ b/src/cpu/exetrace.cc Sun Jan 25 07:22:44 2015 -0500
@@ -120,7 +120,7 @@
ccprintf(outs, " D=%#018x", data.as_int);
}
- if (Debug::ExecEffAddr && addr_valid)
+ if (Debug::ExecEffAddr && getMemValid())
outs << " A=0x" << hex << addr;
if (Debug::ExecFetchSeq && fetch_seq_valid)
diff -r 61a0b02aa800 -r aef704eaedd2 src/cpu/inorder/resources/cache_unit.cc
--- a/src/cpu/inorder/resources/cache_unit.cc Sun Jan 25 07:22:26 2015 -0500
+++ b/src/cpu/inorder/resources/cache_unit.cc Sun Jan 25 07:22:44 2015 -0500
@@ -425,7 +425,7 @@
inst->totalSize = size;
if (inst->traceData) {
- inst->traceData->setAddr(addr);
+ inst->traceData->setMem(addr, size, flags);
}
if (inst->split2ndAccess) {
@@ -519,9 +519,8 @@
int fullSize = size;
inst->totalSize = size;
- if (inst->traceData) {
- inst->traceData->setAddr(addr);
- }
+ if (inst->traceData)
+ inst->traceData->setMem(addr, size, flags);
if (inst->split2ndAccess) {
size = inst->split2ndSize;
diff -r 61a0b02aa800 -r aef704eaedd2 src/cpu/minor/lsq.cc
--- a/src/cpu/minor/lsq.cc Sun Jan 25 07:22:26 2015 -0500
+++ b/src/cpu/minor/lsq.cc Sun Jan 25 07:22:44 2015 -0500
@@ -1499,7 +1499,7 @@
}
if (inst->traceData)
- inst->traceData->setAddr(addr);
+ inst->traceData->setMem(addr, size, flags);
request->request.setThreadContext(cpu.cpuId(), /* thread id */ 0);
request->request.setVirt(0 /* asid */,
diff -r 61a0b02aa800 -r aef704eaedd2 src/cpu/simple/atomic.cc
--- a/src/cpu/simple/atomic.cc Sun Jan 25 07:22:26 2015 -0500
+++ b/src/cpu/simple/atomic.cc Sun Jan 25 07:22:44 2015 -0500
@@ -317,9 +317,8 @@
// use the CPU's statically allocated read request and packet objects
Request *req = &data_read_req;
- if (traceData) {
- traceData->setAddr(addr);
- }
+ if (traceData)
+ traceData->setMem(addr, size, flags);
//The size of the data we're trying to read.
int fullSize = size;
@@ -413,9 +412,8 @@
// use the CPU's statically allocated write request and packet objects
Request *req = &data_write_req;
- if (traceData) {
- traceData->setAddr(addr);
- }
+ if (traceData)
+ traceData->setMem(addr, size, flags);
//The size of the data we're trying to read.
int fullSize = size;
diff -r 61a0b02aa800 -r aef704eaedd2 src/cpu/simple/timing.cc
--- a/src/cpu/simple/timing.cc Sun Jan 25 07:22:26 2015 -0500
+++ b/src/cpu/simple/timing.cc Sun Jan 25 07:22:44 2015 -0500
@@ -402,9 +402,8 @@
unsigned block_size = cacheLineSize();
BaseTLB::Mode mode = BaseTLB::Read;
- if (traceData) {
- traceData->setAddr(addr);
- }
+ if (traceData)
+ traceData->setMem(addr, size, flags);
RequestPtr req = new Request(asid, addr, size,
flags, dataMasterId(), pc, _cpuId, tid);
@@ -479,9 +478,8 @@
memcpy(newData, data, size);
}
- if (traceData) {
- traceData->setAddr(addr);
- }
+ if (traceData)
+ traceData->setMem(addr, size, flags);
RequestPtr req = new Request(asid, addr, size,
flags, dataMasterId(), pc, _cpuId, tid);
diff -r 61a0b02aa800 -r aef704eaedd2 src/sim/insttracer.hh
--- a/src/sim/insttracer.hh Sun Jan 25 07:22:26 2015 -0500
+++ b/src/sim/insttracer.hh Sun Jan 25 07:22:44 2015 -0500
@@ -1,4 +1,16 @@
/*
+ * Copyright (c) 2014 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder. You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
* Copyright (c) 2001-2005 The Regents of The University of Michigan
* All rights reserved.
*
@@ -56,20 +68,52 @@
StaticInstPtr staticInst;
TheISA::PCState pc;
StaticInstPtr macroStaticInst;
- bool predicate;
// The remaining fields are only valid for particular instruction
// types (e.g, addresses for memory ops) or when particular
// options are enabled (e.g., tracing full register contents).
// Each data field has an associated valid flag to indicate
// whether the data field is valid.
- Addr addr;
- bool addr_valid;
+ /*** @defgroup mem
+ * @{
+ * Memory request information in the instruction accessed memory.
+ * @see mem_valid
+ */
+ Addr addr; ///< The address that was accessed
+ Addr size; ///< The size of the memory request
+ unsigned flags; ///< The flags that were assigned to the request.
+
+ /** @} */
+
+ /** @defgroup data
+ * If this instruction wrote any data values they're recorded here
+ * WARNING: Instructions are quite loose with with what they write
+ * since many instructions write multiple values (e.g. destintation
+ * register, flags, status, ...) This only captures the last write.
+ * @TODO fix this and record all destintations that an instruction writes
+ * @see data_status
+ */
union {
uint64_t as_int;
double as_double;
} data;
+
+ /** @defgroup fetch_seq
+ * This records the serial number that the instruction was fetched in.
+ * @see fetch_seq_valid
+ */
+ InstSeqNum fetch_seq;
+
+ /** @defgroup commit_seq
+ * This records the instruction number that was committed in the pipeline
+ * @see cp_seq_valid
+ */
+ InstSeqNum cp_seq;
+
+ /** @ingroup data
+ * What size of data was written?
+ */
enum {
DataInvalid = 0,
DataInt8 = 1, // set to equal number of bytes
@@ -79,31 +123,42 @@
DataDouble = 3
} data_status;
- InstSeqNum fetch_seq;
+ /** @ingroup memory
+ * Are the memory fields in the record valid?
+ */
+ bool mem_valid;
+
+ /** @ingroup fetch_seq
+ * Are the fetch sequence number fields valid?
+ */
bool fetch_seq_valid;
+ /** @ingroup commit_seq
+ * Are the commit sequence number fields valid?
+ */
+ bool cp_seq_valid;
- InstSeqNum cp_seq;
- bool cp_seq_valid;
+ /** is the predicate for execution this inst true or false (not execed)?
+ */
+ bool predicate;
public:
InstRecord(Tick _when, ThreadContext *_thread,
const StaticInstPtr _staticInst,
TheISA::PCState _pc,
const StaticInstPtr _macroStaticInst = NULL)
- : when(_when), thread(_thread),
- staticInst(_staticInst), pc(_pc),
- macroStaticInst(_macroStaticInst),
- predicate(true), addr(0), addr_valid(false),
- data_status(DataInvalid),
- fetch_seq(0), fetch_seq_valid(false), cp_seq(0), cp_seq_valid(false)
- {
- }
+ : when(_when), thread(_thread), staticInst(_staticInst), pc(_pc),
+ macroStaticInst(_macroStaticInst), addr(0), size(0), flags(0),
+ fetch_seq(0), cp_seq(0), data_status(DataInvalid), mem_valid(false),
+ fetch_seq_valid(false), cp_seq_valid(false), predicate(true)
+ { }
virtual ~InstRecord() { }
void setWhen(Tick new_when) { when = new_when; }
-
- void setAddr(Addr a) { addr = a; addr_valid = true; }
+ void setMem(Addr a, Addr s, unsigned f)
+ {
+ addr = a; size = s; flags = f; mem_valid = true;
+ }
void setData(Twin64_t d) { data.as_int = d.a; data_status = DataInt64; }
void setData(Twin32_t d) { data.as_int = d.a; data_status = DataInt32; }
@@ -130,24 +185,26 @@
virtual void dump() = 0;
public:
- Tick getWhen() { return when; }
- ThreadContext *getThread() { return thread; }
- StaticInstPtr getStaticInst() { return staticInst; }
- TheISA::PCState getPCState() { return pc; }
- StaticInstPtr getMacroStaticInst() { return macroStaticInst; }
+ Tick getWhen() const { return when; }
+ ThreadContext *getThread() const { return thread; }
+ StaticInstPtr getStaticInst() const { return staticInst; }
+ TheISA::PCState getPCState() const { return pc; }
+ StaticInstPtr getMacroStaticInst() const { return macroStaticInst; }
- Addr getAddr() { return addr; }
- bool getAddrValid() { return addr_valid; }
+ Addr getAddr() const { return addr; }
+ Addr getSize() const { return size; }
+ unsigned getFlags() const { return flags; }
+ bool getMemValid() const { return mem_valid; }
- uint64_t getIntData() { return data.as_int; }
- double getFloatData() { return data.as_double; }
- int getDataStatus() { return data_status; }
+ uint64_t getIntData() const { return data.as_int; }
+ double getFloatData() const { return data.as_double; }
+ int getDataStatus() const { return data_status; }
- InstSeqNum getFetchSeq() { return fetch_seq; }
- bool getFetchSeqValid() { return fetch_seq_valid; }
+ InstSeqNum getFetchSeq() const { return fetch_seq; }
+ bool getFetchSeqValid() const { return fetch_seq_valid; }
- InstSeqNum getCpSeq() { return cp_seq; }
- bool getCpSeqValid() { return cp_seq_valid; }
+ InstSeqNum getCpSeq() const { return cp_seq; }
+ bool getCpSeqValid() const { return cp_seq_valid; }
};
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
