changeset 0216ed80991b in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=0216ed80991b
description:
MEM: Move all read/write blob functions from Port to PortProxy
This patch moves the readBlob/writeBlob/memsetBlob from the Port class
to the PortProxy class, thus making a clear separation of the basic
port functionality (recv/send functional/atomic/timing), and the
higher-level functional accessors available on the port proxies.
There are only a few places in the code base where the blob functions
were used on ports, and they are all for peeking into the memory
system without making a normal memory access (in the memtest, and the
malta and tsunami pchip). The memtest also exemplifies how easy it is
to create a non-translating proxy if desired. The malta and tsunami
pchip used a slave port to perform a functional read, and this is now
changed to rely on the physProxy of the system (to which they already
have a pointer).
diffstat:
src/cpu/testers/memtest/memtest.cc | 5 +-
src/cpu/testers/memtest/memtest.hh | 2 +
src/dev/alpha/tsunami_pchip.cc | 4 +-
src/dev/mips/malta_pchip.cc | 4 +-
src/mem/SConscript | 1 +
src/mem/port.cc | 43 ------------------------
src/mem/port.hh | 33 +-----------------
src/mem/port_proxy.cc | 68 ++++++++++++++++++++++++++++++++++++++
src/mem/port_proxy.hh | 43 +++++++++++++----------
9 files changed, 104 insertions(+), 99 deletions(-)
diffs (truncated from 380 to 300 lines):
diff -r c744483edfcf -r 0216ed80991b src/cpu/testers/memtest/memtest.cc
--- a/src/cpu/testers/memtest/memtest.cc Fri Feb 24 11:45:30 2012 -0500
+++ b/src/cpu/testers/memtest/memtest.cc Fri Feb 24 11:46:39 2012 -0500
@@ -125,6 +125,7 @@
tickEvent(this),
cachePort("test", this),
funcPort("functional", this),
+ funcProxy(funcPort),
retryPkt(NULL),
// mainMem(main_mem),
// checkMem(check_mem),
@@ -237,7 +238,7 @@
exitSimLoop("maximum number of loads reached");
} else {
assert(pkt->isWrite());
- funcPort.writeBlob(req->getPaddr(), pkt_data, req->getSize());
+ funcProxy.writeBlob(req->getPaddr(), pkt_data, req->getSize());
numWrites++;
numWritesStat++;
}
@@ -349,7 +350,7 @@
outstandingAddrs.insert(paddr);
// ***** NOTE FOR RON: I'm not sure how to access checkMem. - Kevin
- funcPort.readBlob(req->getPaddr(), result, req->getSize());
+ funcProxy.readBlob(req->getPaddr(), result, req->getSize());
DPRINTF(MemTest,
"id %d initiating %sread at addr %x (blk %x) expecting %x\n",
diff -r c744483edfcf -r 0216ed80991b src/cpu/testers/memtest/memtest.hh
--- a/src/cpu/testers/memtest/memtest.hh Fri Feb 24 11:45:30 2012 -0500
+++ b/src/cpu/testers/memtest/memtest.hh Fri Feb 24 11:46:39 2012 -0500
@@ -38,6 +38,7 @@
#include "base/statistics.hh"
#include "mem/mem_object.hh"
#include "mem/port.hh"
+#include "mem/port_proxy.hh"
#include "params/MemTest.hh"
#include "sim/eventq.hh"
#include "sim/sim_exit.hh"
@@ -108,6 +109,7 @@
CpuPort cachePort;
CpuPort funcPort;
+ PortProxy funcProxy;
class MemTestSenderState : public Packet::SenderState, public FastAlloc
{
diff -r c744483edfcf -r 0216ed80991b src/dev/alpha/tsunami_pchip.cc
--- a/src/dev/alpha/tsunami_pchip.cc Fri Feb 24 11:45:30 2012 -0500
+++ b/src/dev/alpha/tsunami_pchip.cc Fri Feb 24 11:46:39 2012 -0500
@@ -284,8 +284,8 @@
baMask = (wsm[i] & (ULL(0xfff) << 20)) | (ULL(0x7f) << 13);
pteAddr = (tba[i] & tbaMask) | ((busAddr & baMask) >> 10);
- pioPort.readBlob(pteAddr, (uint8_t*)&pteEntry,
- sizeof(uint64_t));
+ sys->physProxy.readBlob(pteAddr, (uint8_t*)&pteEntry,
+ sizeof(uint64_t));
dmaAddr = ((pteEntry & ~ULL(0x1)) << 12) | (busAddr &
ULL(0x1fff));
diff -r c744483edfcf -r 0216ed80991b src/dev/mips/malta_pchip.cc
--- a/src/dev/mips/malta_pchip.cc Fri Feb 24 11:45:30 2012 -0500
+++ b/src/dev/mips/malta_pchip.cc Fri Feb 24 11:46:39 2012 -0500
@@ -283,8 +283,8 @@
baMask = (wsm[i] & (ULL(0xfff) << 20)) | (ULL(0x7f) << 13);
pteAddr = (tba[i] & tbaMask) | ((busAddr & baMask) >> 10);
- pioPort.readBlob(pteAddr, (uint8_t*)&pteEntry,
- sizeof(uint64_t));
+ sys->physProxy.readBlob(pteAddr, (uint8_t*)&pteEntry,
+ sizeof(uint64_t));
dmaAddr = ((pteEntry & ~ULL(0x1)) << 12) | (busAddr &
ULL(0x1fff));
diff -r c744483edfcf -r 0216ed80991b src/mem/SConscript
--- a/src/mem/SConscript Fri Feb 24 11:45:30 2012 -0500
+++ b/src/mem/SConscript Fri Feb 24 11:46:39 2012 -0500
@@ -41,6 +41,7 @@
Source('packet.cc')
Source('port.cc')
Source('tport.cc')
+Source('port_proxy.cc')
Source('fs_translating_port_proxy.cc')
Source('se_translating_port_proxy.cc')
diff -r c744483edfcf -r 0216ed80991b src/mem/port.cc
--- a/src/mem/port.cc Fri Feb 24 11:45:30 2012 -0500
+++ b/src/mem/port.cc Fri Feb 24 11:46:39 2012 -0500
@@ -32,9 +32,6 @@
* @file
* Port object definitions.
*/
-#include <cstring>
-
-#include "base/chunk_generator.hh"
#include "base/trace.hh"
#include "debug/Config.hh"
#include "mem/mem_object.hh"
@@ -64,46 +61,6 @@
}
void
-Port::blobHelper(Addr addr, uint8_t *p, int size, MemCmd cmd)
-{
- Request req;
-
- for (ChunkGenerator gen(addr, size, peerBlockSize());
- !gen.done(); gen.next()) {
- req.setPhys(gen.addr(), gen.size(), 0, Request::funcMasterId);
- Packet pkt(&req, cmd, Packet::Broadcast);
- pkt.dataStatic(p);
- sendFunctional(&pkt);
- p += gen.size();
- }
-}
-
-void
-Port::writeBlob(Addr addr, uint8_t *p, int size)
-{
- blobHelper(addr, p, size, MemCmd::WriteReq);
-}
-
-void
-Port::readBlob(Addr addr, uint8_t *p, int size)
-{
- blobHelper(addr, p, size, MemCmd::ReadReq);
-}
-
-void
-Port::memsetBlob(Addr addr, uint8_t val, int size)
-{
- // quick and dirty...
- uint8_t *buf = new uint8_t[size];
-
- std::memset(buf, val, size);
- blobHelper(addr, buf, size, MemCmd::WriteReq);
-
- delete [] buf;
-}
-
-
-void
Port::printAddr(Addr a)
{
Request req(a, 1, 0, Request::funcMasterId);
diff -r c744483edfcf -r 0216ed80991b src/mem/port.hh
--- a/src/mem/port.hh Fri Feb 24 11:45:30 2012 -0500
+++ b/src/mem/port.hh Fri Feb 24 11:46:39 2012 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 ARM Limited
+ * Copyright (c) 2011-2012 ARM Limited
* All rights reserved
*
* The license below extends only to copyright in the software and shall
@@ -38,6 +38,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Authors: Ron Dreslinski
+ * Andreas Hansson
*/
/**
@@ -54,11 +55,8 @@
#include <list>
-#include "base/misc.hh"
#include "base/range.hh"
-#include "base/types.hh"
#include "mem/packet.hh"
-#include "mem/request.hh"
/** This typedef is used to clean up getAddrRanges(). It's declared
* outside the Port object since it's also used by some mem objects.
@@ -227,37 +225,10 @@
*/
unsigned peerBlockSize() const { return peer->deviceBlockSize(); }
- /** This function is a wrapper around sendFunctional()
- that breaks a larger, arbitrarily aligned access into
- appropriate chunks. The default implementation can use
- getBlockSize() to determine the block size and go from there.
- */
- virtual void readBlob(Addr addr, uint8_t *p, int size);
-
- /** This function is a wrapper around sendFunctional()
- that breaks a larger, arbitrarily aligned access into
- appropriate chunks. The default implementation can use
- getBlockSize() to determine the block size and go from there.
- */
- virtual void writeBlob(Addr addr, uint8_t *p, int size);
-
- /** Fill size bytes starting at addr with byte value val. This
- should not need to be virtual, since it can be implemented in
- terms of writeBlob(). However, it shouldn't be
- performance-critical either, so it could be if we wanted to.
- */
- virtual void memsetBlob(Addr addr, uint8_t val, int size);
-
/** Inject a PrintReq for the given address to print the state of
* that address throughout the memory system. For debugging.
*/
void printAddr(Addr a);
-
- private:
-
- /** Internal helper function for read/writeBlob().
- */
- void blobHelper(Addr addr, uint8_t *p, int size, MemCmd cmd);
};
#endif //__MEM_PORT_HH__
diff -r c744483edfcf -r 0216ed80991b src/mem/port_proxy.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mem/port_proxy.cc Fri Feb 24 11:46:39 2012 -0500
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2012 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.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Andreas Hansson
+ */
+
+#include "base/chunk_generator.hh"
+#include "mem/port_proxy.hh"
+
+void
+PortProxy::blobHelper(Addr addr, uint8_t *p, int size, MemCmd cmd)
+{
+ Request req;
+
+ for (ChunkGenerator gen(addr, size, _port.peerBlockSize());
+ !gen.done(); gen.next()) {
+ req.setPhys(gen.addr(), gen.size(), 0, Request::funcMasterId);
+ Packet pkt(&req, cmd, Packet::Broadcast);
+ pkt.dataStatic(p);
+ _port.sendFunctional(&pkt);
+ p += gen.size();
+ }
+}
+
+void
+PortProxy::memsetBlob(Addr addr, uint8_t v, int size)
+{
+ // quick and dirty...
+ uint8_t *buf = new uint8_t[size];
+
+ std::memset(buf, v, size);
+ blobHelper(addr, buf, size, MemCmd::WriteReq);
+
+ delete [] buf;
+}
diff -r c744483edfcf -r 0216ed80991b src/mem/port_proxy.hh
--- a/src/mem/port_proxy.hh Fri Feb 24 11:45:30 2012 -0500
+++ b/src/mem/port_proxy.hh Fri Feb 24 11:46:39 2012 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 ARM Limited
+ * Copyright (c) 2011-2012 ARM Limited
* All rights reserved
*
* The license below extends only to copyright in the software and shall
@@ -41,13 +41,17 @@
* @file
* PortProxy Object Declaration.
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
