changeset d2782c951841 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=d2782c951841
description:
Create a message port for sending messages as apposed to
reading/writing a memory range.
diffstat:
4 files changed, 73 insertions(+)
src/mem/mport.cc | 30 ++++++++++++++++++++++++++++++
src/mem/mport.hh | 40 ++++++++++++++++++++++++++++++++++++++++
src/mem/packet.cc | 2 ++
src/mem/packet.hh | 1 +
diffs (198 lines):
diff -r 0e9c904551c1 -r d2782c951841 src/mem/SConscript
--- a/src/mem/SConscript Sun Oct 12 12:07:25 2008 -0700
+++ b/src/mem/SConscript Sun Oct 12 12:08:51 2008 -0700
@@ -47,6 +47,7 @@
Source('physical.cc')
Source('port.cc')
Source('tport.cc')
+Source('mport.cc')
if env['FULL_SYSTEM']:
Source('vport.cc')
diff -r 0e9c904551c1 -r d2782c951841 src/mem/mport.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mem/mport.cc Sun Oct 12 12:08:51 2008 -0700
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2008 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * 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: Gabe Black
+ */
+
+#include "mem/mport.hh"
+
+Tick
+MessagePort::recvAtomic(PacketPtr pkt)
+{
+ if (pkt->cmd == MemCmd::MessageReq) {
+ // We received a message.
+ return recvMessage(pkt);
+ } else if (pkt->cmd == MemCmd::MessageResp) {
+ return recvResponse(pkt);
+ } else if (pkt->wasNacked()) {
+ return recvNack(pkt);
+ } else if (pkt->isError()) {
+ panic("Packet is error.\n");
+ } else {
+ panic("Unexpected memory command %s.\n", pkt->cmd.toString());
+ }
+}
+
+void
+MessagePort::sendMessageTiming(PacketPtr pkt, Tick latency)
+{
+ schedSendTiming(pkt, curTick + latency);
+}
+
+Tick
+MessagePort::sendMessageAtomic(PacketPtr pkt)
+{
+ return sendAtomic(pkt);
+}
diff -r 0e9c904551c1 -r d2782c951841 src/mem/mport.hh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mem/mport.hh Sun Oct 12 12:08:51 2008 -0700
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2008 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * 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: Gabe Black
+ */
+
+#ifndef __MEM_MPORT_HH__
+#define __MEM_MPORT_HH__
+
+#include "mem/tport.hh"
+
+/*
+ * This file defines a port class which is used for sending and receiving
+ * messages. These messages are atomic units which don't interact and
+ * should be smaller than a cache block. This class is based on
+ * the underpinnings of SimpleTimingPort, but it tweaks some of the external
+ * functions.
+ */
+
+class MessagePort : public SimpleTimingPort
+{
+ public:
+ MessagePort(std::string pname, MemObject *_owner = NULL) :
+ SimpleTimingPort(pname, _owner)
+ {}
+
+ virtual ~MessagePort()
+ {}
+
+ void
+ recvFunctional(PacketPtr pkt)
+ {
+ recvAtomic(pkt);
+ }
+
+ Tick recvAtomic(PacketPtr pkt);
+
+ virtual Tick recvMessage(PacketPtr pkt) = 0;
+
+ // Accept and ignore responses.
+ virtual Tick recvResponse(PacketPtr pkt)
+ {
+ return 0;
+ }
+
+ // Since by default we're assuming everything we send is accepted, panic.
+ virtual Tick recvNack(PacketPtr pkt)
+ {
+ panic("Unhandled message nack.\n");
+ }
+
+ void sendMessageTiming(PacketPtr pkt, Tick latency);
+ Tick sendMessageAtomic(PacketPtr pkt);
+};
+
+#endif
diff -r 0e9c904551c1 -r d2782c951841 src/mem/packet.cc
--- a/src/mem/packet.cc Sun Oct 12 12:07:25 2008 -0700
+++ b/src/mem/packet.cc Sun Oct 12 12:08:51 2008 -0700
@@ -118,6 +118,11 @@
/* SwapResp -- for Swap ldstub type operations */
{ SET5(IsRead, IsWrite, NeedsExclusive, IsResponse, HasData),
InvalidCmd, "SwapResp" },
+ /* IntReq -- for interrupts */
+ { SET4(IsWrite, IsRequest, NeedsResponse, HasData),
+ MessageReq, "MessageReq" },
+ /* IntResp -- for interrupts */
+ { SET2(IsWrite, IsResponse), MessageResp, "MessageResp" },
/* NetworkNackError -- nacked at network layer (not by protocol) */
{ SET2(IsResponse, IsError), InvalidCmd, "NetworkNackError" },
/* InvalidDestError -- packet dest field invalid */
diff -r 0e9c904551c1 -r d2782c951841 src/mem/packet.hh
--- a/src/mem/packet.hh Sun Oct 12 12:07:25 2008 -0700
+++ b/src/mem/packet.hh Sun Oct 12 12:08:51 2008 -0700
@@ -85,6 +85,8 @@
StoreCondResp,
SwapReq,
SwapResp,
+ MessageReq,
+ MessageResp,
// Error responses
// @TODO these should be classified as responses rather than
// requests; coding them as requests initially for backwards
diff -r 0e9c904551c1 -r d2782c951841 src/mem/tport.cc
--- a/src/mem/tport.cc Sun Oct 12 12:07:25 2008 -0700
+++ b/src/mem/tport.cc Sun Oct 12 12:08:51 2008 -0700
@@ -65,7 +65,7 @@
// code to hanldle nacks here, but I'm pretty sure it didn't work
// correctly with the drain code, so that would need to be fixed
// if we ever added it back.
- assert(pkt->isRequest());
+ //assert(pkt->isRequest());
if (pkt->memInhibitAsserted()) {
// snooper will supply based on copy of packet
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
