changeset 755b18321206 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=755b18321206
description:
mem: Add const getters for write packet data
This patch takes a first step in tightening up how we use the data
pointer in write packets. A const getter is added for the pointer
itself (getConstPtr), and a number of member functions are also made
const accordingly. In a range of places throughout the memory system
the new member is used.
The patch also removes the unused isReadWrite function.
diffstat:
src/cpu/inorder/resources/cache_unit.cc | 12 ++++++------
src/cpu/inorder/resources/fetch_unit.cc | 2 +-
src/cpu/minor/execute.cc | 2 +-
src/cpu/minor/lsq.cc | 2 +-
src/cpu/o3/fetch_impl.hh | 2 +-
src/cpu/simple/atomic.cc | 2 +-
src/cpu/testers/memtest/memtest.cc | 1 +
src/cpu/testers/rubytest/Check.cc | 2 +-
src/mem/abstract_mem.cc | 9 +++++----
src/mem/cache/cache.hh | 2 +-
src/mem/cache/cache_impl.hh | 12 ++++++------
src/mem/external_slave.cc | 2 +-
src/mem/packet.cc | 4 ++--
src/mem/packet.hh | 22 ++++++++++++++--------
src/mem/packet_access.hh | 2 +-
src/mem/ruby/common/DataBlock.cc | 2 +-
src/mem/ruby/common/DataBlock.hh | 2 +-
src/mem/ruby/slicc_interface/RubyRequest.cc | 2 +-
src/mem/ruby/slicc_interface/RubySlicc_Util.hh | 2 +-
src/mem/ruby/system/Sequencer.cc | 4 ++--
20 files changed, 49 insertions(+), 41 deletions(-)
diffs (truncated from 425 to 300 lines):
diff -r b99fdc295c34 -r 755b18321206 src/cpu/inorder/resources/cache_unit.cc
--- a/src/cpu/inorder/resources/cache_unit.cc Tue Dec 02 06:07:34 2014 -0500
+++ b/src/cpu/inorder/resources/cache_unit.cc Tue Dec 02 06:07:36 2014 -0500
@@ -68,7 +68,7 @@
#if TRACING_ON
static std::string
-printMemData(uint8_t *data, unsigned size)
+printMemData(const uint8_t *data, unsigned size)
{
std::stringstream dataStr;
for (unsigned pos = 0; pos < size; pos++) {
@@ -855,7 +855,7 @@
DPRINTF(InOrderCachePort,
"[tid:%u]: [sn:%i]: Storing data: %s\n",
tid, inst->seqNum,
- printMemData(cache_req->dataPkt->getPtr<uint8_t>(),
+ printMemData(cache_req->dataPkt->getConstPtr<uint8_t>(),
cache_req->dataPkt->getSize()));
if (mem_req->isCondSwap()) {
@@ -1061,9 +1061,9 @@
DPRINTF(InOrderCachePort,
"[tid:%u]: [sn:%i]: Bytes loaded were: %s\n",
tid, inst->seqNum,
- (split_pkt) ? printMemData(split_pkt->getPtr<uint8_t>(),
+ (split_pkt) ? printMemData(split_pkt->getConstPtr<uint8_t>(),
split_pkt->getSize()) :
- printMemData(cache_pkt->getPtr<uint8_t>(),
+ printMemData(cache_pkt->getConstPtr<uint8_t>(),
cache_pkt->getSize()));
} else if(inst->isStore()) {
assert(cache_pkt->isWrite());
@@ -1071,9 +1071,9 @@
DPRINTF(InOrderCachePort,
"[tid:%u]: [sn:%i]: Bytes stored were: %s\n",
tid, inst->seqNum,
- (split_pkt) ? printMemData(split_pkt->getPtr<uint8_t>(),
+ (split_pkt) ? printMemData(split_pkt->getConstPtr<uint8_t>(),
split_pkt->getSize()) :
- printMemData(cache_pkt->getPtr<uint8_t>(),
+ printMemData(cache_pkt->getConstPtr<uint8_t>(),
cache_pkt->getSize()));
}
diff -r b99fdc295c34 -r 755b18321206 src/cpu/inorder/resources/fetch_unit.cc
--- a/src/cpu/inorder/resources/fetch_unit.cc Tue Dec 02 06:07:34 2014 -0500
+++ b/src/cpu/inorder/resources/fetch_unit.cc Tue Dec 02 06:07:36 2014 -0500
@@ -503,7 +503,7 @@
// Copy Data to pendingFetch queue...
(*pend_it)->block = new uint8_t[cacheBlkSize];
- memcpy((*pend_it)->block, cache_pkt->getPtr<uint8_t>(), cacheBlkSize);
+ memcpy((*pend_it)->block, cache_pkt->getConstPtr<uint8_t>(), cacheBlkSize);
(*pend_it)->valid = true;
cache_req->setMemAccPending(false);
diff -r b99fdc295c34 -r 755b18321206 src/cpu/minor/execute.cc
--- a/src/cpu/minor/execute.cc Tue Dec 02 06:07:34 2014 -0500
+++ b/src/cpu/minor/execute.cc Tue Dec 02 06:07:36 2014 -0500
@@ -355,7 +355,7 @@
if (is_load && packet->getSize() > 0) {
DPRINTF(MinorMem, "Memory data[0]: 0x%x\n",
- static_cast<unsigned int>(packet->getPtr<uint8_t>()[0]));
+ static_cast<unsigned int>(packet->getConstPtr<uint8_t>()[0]));
}
/* Complete the memory access instruction */
diff -r b99fdc295c34 -r 755b18321206 src/cpu/minor/lsq.cc
--- a/src/cpu/minor/lsq.cc Tue Dec 02 06:07:34 2014 -0500
+++ b/src/cpu/minor/lsq.cc Tue Dec 02 06:07:36 2014 -0500
@@ -560,7 +560,7 @@
* by the response fragment */
std::memcpy(
data + (response->req->getVaddr() - request.getVaddr()),
- response->getPtr<uint8_t>(),
+ response->getConstPtr<uint8_t>(),
response->req->getSize());
}
}
diff -r b99fdc295c34 -r 755b18321206 src/cpu/o3/fetch_impl.hh
--- a/src/cpu/o3/fetch_impl.hh Tue Dec 02 06:07:34 2014 -0500
+++ b/src/cpu/o3/fetch_impl.hh Tue Dec 02 06:07:36 2014 -0500
@@ -388,7 +388,7 @@
return;
}
- memcpy(fetchBuffer[tid], pkt->getPtr<uint8_t>(), fetchBufferSize);
+ memcpy(fetchBuffer[tid], pkt->getConstPtr<uint8_t>(), fetchBufferSize);
fetchBufferValid[tid] = true;
// Wake up the CPU (if it went to sleep and was waiting on
diff -r b99fdc295c34 -r 755b18321206 src/cpu/simple/atomic.cc
--- a/src/cpu/simple/atomic.cc Tue Dec 02 06:07:34 2014 -0500
+++ b/src/cpu/simple/atomic.cc Tue Dec 02 06:07:36 2014 -0500
@@ -469,7 +469,7 @@
if (req->isSwap()) {
assert(res);
- memcpy(res, pkt.getPtr<uint8_t>(), fullSize);
+ memcpy(res, pkt.getConstPtr<uint8_t>(), fullSize);
}
}
diff -r b99fdc295c34 -r 755b18321206 src/cpu/testers/memtest/memtest.cc
--- a/src/cpu/testers/memtest/memtest.cc Tue Dec 02 06:07:34 2014 -0500
+++ b/src/cpu/testers/memtest/memtest.cc Tue Dec 02 06:07:36 2014 -0500
@@ -173,6 +173,7 @@
safe_cast<MemTestSenderState *>(pkt->senderState);
uint8_t *data = state->data;
+ // @todo: This should really be a const pointer
uint8_t *pkt_data = pkt->getPtr<uint8_t>();
//Remove the address from the list of outstanding
diff -r b99fdc295c34 -r 755b18321206 src/cpu/testers/rubytest/Check.cc
--- a/src/cpu/testers/rubytest/Check.cc Tue Dec 02 06:07:34 2014 -0500
+++ b/src/cpu/testers/rubytest/Check.cc Tue Dec 02 06:07:36 2014 -0500
@@ -197,7 +197,7 @@
pkt->dataDynamic(writeData);
DPRINTF(RubyTest, "data 0x%x check 0x%x\n",
- *(pkt->getPtr<uint8_t>()), *writeData);
+ *(pkt->getConstPtr<uint8_t>()), *writeData);
// push the subblock onto the sender state. The sequencer will
// update the subblock on the return
diff -r b99fdc295c34 -r 755b18321206 src/mem/abstract_mem.cc
--- a/src/mem/abstract_mem.cc Tue Dec 02 06:07:34 2014 -0500
+++ b/src/mem/abstract_mem.cc Tue Dec 02 06:07:36 2014 -0500
@@ -309,7 +309,7 @@
A, system()->getMasterName(pkt->req->masterId()),
\
pkt->getSize(), pkt->getAddr(),
\
pkt->req->isUncacheable() ? 'U' : 'C');
\
- DDUMP(MemoryAccess, pkt->getPtr<uint8_t>(), pkt->getSize());
\
+ DDUMP(MemoryAccess, pkt->getConstPtr<uint8_t>(), pkt->getSize());
\
}
\
} while (0)
@@ -344,7 +344,8 @@
bool overwrite_mem = true;
// keep a copy of our possible write value, and copy what is at the
// memory address into the packet
- std::memcpy(&overwrite_val[0], pkt->getPtr<uint8_t>(), pkt->getSize());
+ std::memcpy(&overwrite_val[0], pkt->getConstPtr<uint8_t>(),
+ pkt->getSize());
std::memcpy(pkt->getPtr<uint8_t>(), hostAddr, pkt->getSize());
if (pkt->req->isCondSwap()) {
@@ -381,7 +382,7 @@
} else if (pkt->isWrite()) {
if (writeOK(pkt)) {
if (pmemAddr) {
- memcpy(hostAddr, pkt->getPtr<uint8_t>(), pkt->getSize());
+ memcpy(hostAddr, pkt->getConstPtr<uint8_t>(), pkt->getSize());
DPRINTF(MemoryAccess, "%s wrote %x bytes to address %x\n",
__func__, pkt->getSize(), pkt->getAddr());
}
@@ -416,7 +417,7 @@
pkt->makeResponse();
} else if (pkt->isWrite()) {
if (pmemAddr)
- memcpy(hostAddr, pkt->getPtr<uint8_t>(), pkt->getSize());
+ memcpy(hostAddr, pkt->getConstPtr<uint8_t>(), pkt->getSize());
TRACE_PACKET("Write");
pkt->makeResponse();
} else if (pkt->isPrint()) {
diff -r b99fdc295c34 -r 755b18321206 src/mem/cache/cache.hh
--- a/src/mem/cache/cache.hh Tue Dec 02 06:07:34 2014 -0500
+++ b/src/mem/cache/cache.hh Tue Dec 02 06:07:36 2014 -0500
@@ -287,7 +287,7 @@
bool pending_downgrade = false);
bool satisfyMSHR(MSHR *mshr, PacketPtr pkt, BlkType *blk);
- void doTimingSupplyResponse(PacketPtr req_pkt, uint8_t *blk_data,
+ void doTimingSupplyResponse(PacketPtr req_pkt, const uint8_t *blk_data,
bool already_copied, bool pending_inval);
/**
diff -r b99fdc295c34 -r 755b18321206 src/mem/cache/cache_impl.hh
--- a/src/mem/cache/cache_impl.hh Tue Dec 02 06:07:34 2014 -0500
+++ b/src/mem/cache/cache_impl.hh Tue Dec 02 06:07:36 2014 -0500
@@ -357,7 +357,7 @@
blk->status &= ~BlkWritable;
++fastWrites;
}
- std::memcpy(blk->data, pkt->getPtr<uint8_t>(), blkSize);
+ std::memcpy(blk->data, pkt->getConstPtr<uint8_t>(), blkSize);
DPRINTF(Cache, "%s new state is %s\n", __func__, blk->print());
incHitCount(pkt);
return true;
@@ -1211,7 +1211,7 @@
completion_time = clockEdge(responseLatency) +
pkt->lastWordDelay;
if (pkt->isRead() && !is_error) {
- target->pkt->setData(pkt->getPtr<uint8_t>());
+ target->pkt->setData(pkt->getConstPtr<uint8_t>());
}
}
target->pkt->makeTimingResponse();
@@ -1535,7 +1535,7 @@
// if we got new data, copy it in
if (pkt->isRead()) {
- std::memcpy(blk->data, pkt->getPtr<uint8_t>(), blkSize);
+ std::memcpy(blk->data, pkt->getConstPtr<uint8_t>(), blkSize);
}
blk->whenReady = clockEdge() + responseLatency * clockPeriod() +
@@ -1554,7 +1554,7 @@
template<class TagStore>
void
Cache<TagStore>::
-doTimingSupplyResponse(PacketPtr req_pkt, uint8_t *blk_data,
+doTimingSupplyResponse(PacketPtr req_pkt, const uint8_t *blk_data,
bool already_copied, bool pending_inval)
{
// sanity check
@@ -1810,7 +1810,7 @@
// the packet's invalidate flag is set...
assert(pkt->isInvalidate());
}
- doTimingSupplyResponse(pkt, wb_pkt->getPtr<uint8_t>(),
+ doTimingSupplyResponse(pkt, wb_pkt->getConstPtr<uint8_t>(),
false, false);
if (pkt->isInvalidate()) {
@@ -2020,7 +2020,7 @@
pkt = new Packet(tgt_pkt);
pkt->allocate();
if (pkt->isWrite()) {
- pkt->setData(tgt_pkt->getPtr<uint8_t>());
+ pkt->setData(tgt_pkt->getConstPtr<uint8_t>());
}
}
}
diff -r b99fdc295c34 -r 755b18321206 src/mem/external_slave.cc
--- a/src/mem/external_slave.cc Tue Dec 02 06:07:34 2014 -0500
+++ b/src/mem/external_slave.cc Tue Dec 02 06:07:36 2014 -0500
@@ -108,7 +108,7 @@
DPRINTF(ExternalPort, "StubSlavePort: recvAtomic a: 0x%x size: %d"
" data: ...\n", packet->getAddr(), size);
- DDUMP(ExternalPort, packet->getPtr<uint8_t>(), size);
+ DDUMP(ExternalPort, packet->getConstPtr<uint8_t>(), size);
}
return 0;
diff -r b99fdc295c34 -r 755b18321206 src/mem/packet.cc
--- a/src/mem/packet.cc Tue Dec 02 06:07:34 2014 -0500
+++ b/src/mem/packet.cc Tue Dec 02 06:07:36 2014 -0500
@@ -303,11 +303,11 @@
}
} else if (isWrite()) {
if (offset >= 0) {
- memcpy(data + offset, getPtr<uint8_t>(),
+ memcpy(data + offset, getConstPtr<uint8_t>(),
(min(func_end, val_end) - func_start) + 1);
} else {
// val_start > func_start
- memcpy(data, getPtr<uint8_t>() - offset,
+ memcpy(data, getConstPtr<uint8_t>() - offset,
(min(func_end, val_end) - val_start) + 1);
}
} else {
diff -r b99fdc295c34 -r 755b18321206 src/mem/packet.hh
--- a/src/mem/packet.hh Tue Dec 02 06:07:34 2014 -0500
+++ b/src/mem/packet.hh Tue Dec 02 06:07:36 2014 -0500
@@ -186,7 +186,6 @@
bool needsResponse() const { return testCmdAttrib(NeedsResponse); }
bool isInvalidate() const { return testCmdAttrib(IsInvalidate); }
bool hasData() const { return testCmdAttrib(HasData); }
- bool isReadWrite() const { return isRead() && isWrite(); }
bool isLLSC() const { return testCmdAttrib(IsLlsc); }
bool isSWPrefetch() const { return testCmdAttrib(IsSWPrefetch); }
bool isHWPrefetch() const { return testCmdAttrib(IsHWPrefetch); }
@@ -501,7 +500,6 @@
bool needsResponse() const { return cmd.needsResponse(); }
bool isInvalidate() const { return cmd.isInvalidate(); }
bool hasData() const { return cmd.hasData(); }
- bool isReadWrite() const { return cmd.isReadWrite(); }
bool isLLSC() const { return cmd.isLLSC(); }
bool isError() const { return cmd.isError(); }
bool isPrint() const { return cmd.isPrint(); }
@@ -852,11 +850,19 @@
return (T*)data;
}
+ template <typename T>
+ const T*
+ getConstPtr() const
+ {
+ assert(flags.isSet(STATIC_DATA|DYNAMIC_DATA));
+ return (const T*)data;
+ }
+
/**
* return the value of what is pointed to in the packet.
*/
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
