changeset 9c3e3d1c7a87 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=9c3e3d1c7a87
description:
ruby: replace Time with Cycles in Message class
Concomitant changes are being committed as well, including the io
operator<<
for the Cycles class.
diffstat:
src/base/SConscript | 1 +
src/base/types.cc | 43 +++++++++++++++++++
src/base/types.hh | 3 +
src/mem/ruby/buffers/MessageBufferNode.hh | 2 +-
src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh | 1 +
src/mem/ruby/network/garnet/flexible-pipeline/flit.hh | 1 +
src/mem/ruby/slicc_interface/Message.hh | 21 ++++----
src/mem/ruby/slicc_interface/NetworkMessage.hh | 2 +-
src/mem/ruby/slicc_interface/RubyRequest.hh | 4 +-
src/mem/ruby/system/MemoryNode.hh | 1 +
src/mem/slicc/symbols/Type.py | 4 +-
11 files changed, 66 insertions(+), 17 deletions(-)
diffs (226 lines):
diff -r b03b556a8fbb -r 9c3e3d1c7a87 src/base/SConscript
--- a/src/base/SConscript Sun Feb 10 21:26:24 2013 -0600
+++ b/src/base/SConscript Sun Feb 10 21:26:24 2013 -0600
@@ -59,6 +59,7 @@
Source('str.cc')
Source('time.cc')
Source('trace.cc')
+Source('types.cc')
Source('userinfo.cc')
Source('loader/aout_object.cc')
diff -r b03b556a8fbb -r 9c3e3d1c7a87 src/base/types.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/base/types.cc Sun Feb 10 21:26:24 2013 -0600
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2013 Mark D. Hill and David A. Wood
+ * 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: Nilay Vaish
+ */
+
+#include "base/types.hh"
+
+#ifndef SWIG // keep the operators away from SWIG
+
+std::ostream&
+operator<<(std::ostream &out, const Cycles & cycles)
+{
+ out << cycles.c;
+ return out;
+}
+
+#endif // SWIG not touching operators
+
diff -r b03b556a8fbb -r 9c3e3d1c7a87 src/base/types.hh
--- a/src/base/types.hh Sun Feb 10 21:26:24 2013 -0600
+++ b/src/base/types.hh Sun Feb 10 21:26:24 2013 -0600
@@ -40,6 +40,7 @@
#include <inttypes.h>
#include <cassert>
+#include <ostream>
/** uint64_t constant */
#define ULL(N) ((uint64_t)N##ULL)
@@ -125,6 +126,8 @@
const Cycles operator >>(const int32_t shift)
{ return Cycles(c >> shift); }
+ friend std::ostream& operator<<(std::ostream &out, const Cycles & cycles);
+
#endif // SWIG not touching operators
};
diff -r b03b556a8fbb -r 9c3e3d1c7a87 src/mem/ruby/buffers/MessageBufferNode.hh
--- a/src/mem/ruby/buffers/MessageBufferNode.hh Sun Feb 10 21:26:24 2013 -0600
+++ b/src/mem/ruby/buffers/MessageBufferNode.hh Sun Feb 10 21:26:24 2013 -0600
@@ -49,7 +49,7 @@
public:
Cycles m_time;
- uint64 m_msg_counter; // FIXME, should this be a 64-bit value?
+ uint64_t m_msg_counter; // FIXME, should this be a 64-bit value?
MsgPtr m_msgptr;
};
diff -r b03b556a8fbb -r 9c3e3d1c7a87
src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh Sun Feb 10
21:26:24 2013 -0600
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh Sun Feb 10
21:26:24 2013 -0600
@@ -34,6 +34,7 @@
#include <cassert>
#include <iostream>
+#include "mem/ruby/common/TypeDefines.hh"
#include "mem/ruby/network/garnet/NetworkHeader.hh"
#include "mem/ruby/slicc_interface/Message.hh"
diff -r b03b556a8fbb -r 9c3e3d1c7a87
src/mem/ruby/network/garnet/flexible-pipeline/flit.hh
--- a/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh Sun Feb 10
21:26:24 2013 -0600
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh Sun Feb 10
21:26:24 2013 -0600
@@ -31,6 +31,7 @@
#include <cassert>
#include <iostream>
+#include "mem/ruby/common/TypeDefines.hh"
#include "mem/ruby/network/garnet/NetworkHeader.hh"
#include "mem/ruby/slicc_interface/Message.hh"
diff -r b03b556a8fbb -r 9c3e3d1c7a87 src/mem/ruby/slicc_interface/Message.hh
--- a/src/mem/ruby/slicc_interface/Message.hh Sun Feb 10 21:26:24 2013 -0600
+++ b/src/mem/ruby/slicc_interface/Message.hh Sun Feb 10 21:26:24 2013 -0600
@@ -32,7 +32,6 @@
#include <iostream>
#include "base/refcnt.hh"
-#include "mem/ruby/common/TypeDefines.hh"
#include "mem/packet.hh"
class Message;
@@ -41,7 +40,7 @@
class Message : public RefCounted
{
public:
- Message(Time curTime)
+ Message(Cycles curTime)
: m_time(curTime),
m_LastEnqueueTime(curTime),
m_DelayedCycles(0)
@@ -72,19 +71,19 @@
virtual bool functionalWrite(Packet *pkt) = 0;
//{ fatal("Write functional access not implemented!"); }
- void setDelayedCycles(const Time cycles) { m_DelayedCycles = cycles; }
- const Time getDelayedCycles() const {return m_DelayedCycles;}
+ void setDelayedCycles(const Cycles cycles) { m_DelayedCycles = cycles; }
+ const Cycles getDelayedCycles() const {return m_DelayedCycles;}
- void setLastEnqueueTime(const Time& time) { m_LastEnqueueTime = time; }
- const Time getLastEnqueueTime() const {return m_LastEnqueueTime;}
+ void setLastEnqueueTime(const Cycles& time) { m_LastEnqueueTime = time; }
+ const Cycles getLastEnqueueTime() const {return m_LastEnqueueTime;}
- const Time& getTime() const { return m_time; }
- void setTime(const Time& new_time) { m_time = new_time; }
+ const Cycles& getTime() const { return m_time; }
+ void setTime(const Cycles& new_time) { m_time = new_time; }
private:
- Time m_time;
- Time m_LastEnqueueTime; // my last enqueue time
- int m_DelayedCycles; // my delayed cycles
+ Cycles m_time;
+ Cycles m_LastEnqueueTime; // my last enqueue time
+ Cycles m_DelayedCycles; // my delayed cycles
};
inline std::ostream&
diff -r b03b556a8fbb -r 9c3e3d1c7a87
src/mem/ruby/slicc_interface/NetworkMessage.hh
--- a/src/mem/ruby/slicc_interface/NetworkMessage.hh Sun Feb 10 21:26:24
2013 -0600
+++ b/src/mem/ruby/slicc_interface/NetworkMessage.hh Sun Feb 10 21:26:24
2013 -0600
@@ -42,7 +42,7 @@
class NetworkMessage : public Message
{
public:
- NetworkMessage(Time curTime)
+ NetworkMessage(Cycles curTime)
: Message(curTime), m_internal_dest_valid(false)
{ }
diff -r b03b556a8fbb -r 9c3e3d1c7a87 src/mem/ruby/slicc_interface/RubyRequest.hh
--- a/src/mem/ruby/slicc_interface/RubyRequest.hh Sun Feb 10 21:26:24
2013 -0600
+++ b/src/mem/ruby/slicc_interface/RubyRequest.hh Sun Feb 10 21:26:24
2013 -0600
@@ -51,7 +51,7 @@
PacketPtr pkt;
unsigned m_contextId;
- RubyRequest(Time curTime, uint64_t _paddr, uint8_t* _data, int _len,
+ RubyRequest(Cycles curTime, uint64_t _paddr, uint8_t* _data, int _len,
uint64_t _pc, RubyRequestType _type, RubyAccessMode _access_mode,
PacketPtr _pkt, PrefetchBit _pb = PrefetchBit_No,
unsigned _proc_id = 100)
@@ -70,7 +70,7 @@
m_LineAddress.makeLineAddress();
}
- RubyRequest(Time curTime) : Message(curTime)
+ RubyRequest(Cycles curTime) : Message(curTime)
{
}
diff -r b03b556a8fbb -r 9c3e3d1c7a87 src/mem/ruby/system/MemoryNode.hh
--- a/src/mem/ruby/system/MemoryNode.hh Sun Feb 10 21:26:24 2013 -0600
+++ b/src/mem/ruby/system/MemoryNode.hh Sun Feb 10 21:26:24 2013 -0600
@@ -42,6 +42,7 @@
#include "mem/protocol/MemoryRequestType.hh"
#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/TypeDefines.hh"
#include "mem/ruby/slicc_interface/Message.hh"
class MemoryNode
diff -r b03b556a8fbb -r 9c3e3d1c7a87 src/mem/slicc/symbols/Type.py
--- a/src/mem/slicc/symbols/Type.py Sun Feb 10 21:26:24 2013 -0600
+++ b/src/mem/slicc/symbols/Type.py Sun Feb 10 21:26:24 2013 -0600
@@ -246,7 +246,7 @@
''', klass="class")
if self.isMessage:
- code('(Time curTime) : %s(curTime) {' % self["interface"])
+ code('(Cycles curTime) : %s(curTime) {' % self["interface"])
else:
code('()\n\t\t{')
@@ -291,7 +291,7 @@
params = ', '.join(params)
if self.isMessage:
- params = "const Time curTime, " + params
+ params = "const Cycles curTime, " + params
code('${{self.c_ident}}($params)')
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
