sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

mem: Add const getters for write packet data

Browse source 
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.
This commit is contained in:
Andreas Hansson 2014-12-02 06:07:36 -05:00
parent 25bfc24999
commit 9779ba2e37
20 changed files with 49 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cpu/inorder/resources/cache_unit.cc
View file

@ -68,7 +68,7 @@ using namespace ThePipeline;
#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 @@ CacheUnit::doCacheAccess(DynInstPtr inst, uint64_t *write_res,
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 @@ CacheUnit::processCacheCompletion(PacketPtr pkt)
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 @@ CacheUnit::processCacheCompletion(PacketPtr pkt)
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()));
}

2
src/cpu/inorder/resources/fetch_unit.cc
View file

@ -503,7 +503,7 @@ FetchUnit::processCacheCompletion(PacketPtr pkt)
// 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);

2
src/cpu/minor/execute.cc
View file

@ -355,7 +355,7 @@ Execute::handleMemResponse(MinorDynInstPtr inst,
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 */

2
src/cpu/minor/lsq.cc
View file

@ -560,7 +560,7 @@ LSQ::SplitDataRequest::retireResponse(PacketPtr response)
* by the response fragment */
std::memcpy(
data + (response->req->getVaddr() - request.getVaddr()),
response->getPtr<uint8_t>(),
response->getConstPtr<uint8_t>(),
response->req->getSize());
}
}

2
src/cpu/o3/fetch_impl.hh
View file

@ -388,7 +388,7 @@ DefaultFetch<Impl>::processCacheCompletion(PacketPtr pkt)
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

2
src/cpu/simple/atomic.cc
View file

@ -469,7 +469,7 @@ AtomicSimpleCPU::writeMem(uint8_t *data, unsigned size,
if (req->isSwap()) {
assert(res);
memcpy(res, pkt.getPtr<uint8_t>(), fullSize);
memcpy(res, pkt.getConstPtr<uint8_t>(), fullSize);
}
}

1
src/cpu/testers/memtest/memtest.cc
View file

@ -173,6 +173,7 @@ MemTest::completeRequest(PacketPtr pkt)
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

2
src/cpu/testers/rubytest/Check.cc
View file

@ -197,7 +197,7 @@ Check::initiateAction()
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

9
src/mem/abstract_mem.cc
View file

@ -309,7 +309,7 @@ AbstractMemory::checkLockedAddrList(PacketPtr pkt)
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 @@ AbstractMemory::access(PacketPtr pkt)
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 @@ AbstractMemory::access(PacketPtr pkt)
} 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 @@ AbstractMemory::functionalAccess(PacketPtr pkt)
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()) {

2
src/mem/cache/cache.hh vendored
View file

@ -287,7 +287,7 @@ class Cache : public BaseCache
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);
/**

12
src/mem/cache/cache_impl.hh vendored
View file

@ -357,7 +357,7 @@ Cache<TagStore>::access(PacketPtr pkt, BlkType *&blk,
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 @@ Cache<TagStore>::recvTimingResp(PacketPtr pkt)
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 @@ Cache<TagStore>::handleFill(PacketPtr pkt, BlkType *blk,
// 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 @@ Cache<TagStore>::handleFill(PacketPtr pkt, BlkType *blk,
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 @@ Cache<TagStore>::recvTimingSnoopReq(PacketPtr pkt)
// 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 @@ Cache<TagStore>::getTimingPacket()
pkt = new Packet(tgt_pkt);
pkt->allocate();
if (pkt->isWrite()) {
pkt->setData(tgt_pkt->getPtr<uint8_t>());
pkt->setData(tgt_pkt->getConstPtr<uint8_t>());
}
}
}

2
src/mem/external_slave.cc
View file

@ -108,7 +108,7 @@ StubSlavePort::recvAtomic(PacketPtr packet)
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;

4
src/mem/packet.cc
View file

@ -303,11 +303,11 @@ Packet::checkFunctional(Printable *obj, Addr addr, bool is_secure, int size,
}
} 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 {

22
src/mem/packet.hh
View file

@ -186,7 +186,6 @@ class MemCmd
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 @@ class Packet : public Printable
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 @@ class Packet : public Printable
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.
*/
template <typename T>
T get();
T get() const;
/**
* set the value in the data pointer to v.
@ -868,7 +874,7 @@ class Packet : public Printable
* Copy data into the packet from the provided pointer.
*/
void
setData(uint8_t *p)
setData(const uint8_t *p)
{
if (p != getPtr<uint8_t>())
std::memcpy(getPtr<uint8_t>(), p, getSize());
@ -879,7 +885,7 @@ class Packet : public Printable
* which is aligned to the given block size.
*/
void
setDataFromBlock(uint8_t *blk_data, int blkSize)
setDataFromBlock(const uint8_t *blk_data, int blkSize)
{
setData(blk_data + getOffset(blkSize));
}
@ -889,16 +895,16 @@ class Packet : public Printable
* is aligned to the given block size.
*/
void
writeData(uint8_t *p)
writeData(uint8_t *p) const
{
std::memcpy(p, getPtr<uint8_t>(), getSize());
std::memcpy(p, getConstPtr<uint8_t>(), getSize());
}
/**
* Copy data from the packet to the memory at the provided pointer.
*/
void
writeDataToBlock(uint8_t *blk_data, int blkSize)
writeDataToBlock(uint8_t *blk_data, int blkSize) const
{
writeData(blk_data + getOffset(blkSize));
}

2
src/mem/packet_access.hh
View file

@ -45,7 +45,7 @@
/** return the value of what is pointed to in the packet. */
template <typename T>
inline T
Packet::get()
Packet::get() const
{
assert(flags.isSet(STATIC_DATA|DYNAMIC_DATA));
assert(sizeof(T) <= size);

2
src/mem/ruby/common/DataBlock.cc
View file

@ -78,7 +78,7 @@ DataBlock::getData(int offset, int len) const
}
void
DataBlock::setData(uint8_t *data, int offset, int len)
DataBlock::setData(const uint8_t *data, int offset, int len)
{
assert(offset + len <= RubySystem::getBlockSizeBytes());
memcpy(&m_data[offset], data, len);

2
src/mem/ruby/common/DataBlock.hh
View file

@ -59,7 +59,7 @@ class DataBlock
uint8_t getByte(int whichByte) const;
const uint8_t *getData(int offset, int len) const;
void setByte(int whichByte, uint8_t data);
void setData(uint8_t *data, int offset, int len);
void setData(const uint8_t *data, int offset, int len);
void copyPartial(const DataBlock & dblk, int offset, int len);
bool equal(const DataBlock& obj) const;
void print(std::ostream& out) const;

2
src/mem/ruby/slicc_interface/RubyRequest.cc
View file

@ -72,7 +72,7 @@ RubyRequest::functionalWrite(Packet *pkt)
Addr mBase = m_PhysicalAddress.getAddress();
Addr mTail = mBase + m_Size;
uint8_t * pktData = pkt->getPtr<uint8_t>();
const uint8_t * pktData = pkt->getConstPtr<uint8_t>();
Addr cBase = std::max(wBase, mBase);
Addr cTail = std::min(wTail, mTail);

2
src/mem/ruby/slicc_interface/RubySlicc_Util.hh
View file

@ -135,7 +135,7 @@ testAndWrite(Address addr, DataBlock& blk, Packet *pkt)
lineAddr.makeLineAddress();
if (pktLineAddr == lineAddr) {
uint8_t *data = pkt->getPtr<uint8_t>();
const uint8_t *data = pkt->getConstPtr<uint8_t>();
unsigned int size_in_bytes = pkt->getSize();
unsigned startByte = pkt->getAddr() - lineAddr.getAddress();

4
src/mem/ruby/system/Sequencer.cc
View file

@ -526,7 +526,7 @@ Sequencer::hitCallback(SequencerRequest* srequest, DataBlock& data,
// update the data unless it is a non-data-carrying flush
if (g_system_ptr->m_warmup_enabled) {
data.setData(pkt->getPtr<uint8_t>(),
data.setData(pkt->getConstPtr<uint8_t>(),
request_address.getOffset(), pkt->getSize());
} else if (!pkt->isFlush()) {
if ((type == RubyRequestType_LD) ||
@ -538,7 +538,7 @@ Sequencer::hitCallback(SequencerRequest* srequest, DataBlock& data,
data.getData(request_address.getOffset(), pkt->getSize()),
pkt->getSize());
} else {
data.setData(pkt->getPtr<uint8_t>(),
data.setData(pkt->getConstPtr<uint8_t>(),
request_address.getOffset(), pkt->getSize());
}
}