summaryrefslogtreecommitdiff
path: root/src/mem/ruby
diff options
context:
space:
mode:
Diffstat (limited to 'src/mem/ruby')
-rw-r--r--src/mem/ruby/network/Topology.cc1
-rw-r--r--src/mem/ruby/network/simple/SimpleNetwork.cc1
-rw-r--r--src/mem/ruby/slicc_interface/RubyRequest.hh2
-rw-r--r--src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh1
-rw-r--r--src/mem/ruby/slicc_interface/RubySlicc_Util.hh48
5 files changed, 0 insertions, 53 deletions
diff --git a/src/mem/ruby/network/Topology.cc b/src/mem/ruby/network/Topology.cc
index b92fba976..540b6bdc0 100644
--- a/src/mem/ruby/network/Topology.cc
+++ b/src/mem/ruby/network/Topology.cc
@@ -30,7 +30,6 @@
#include "debug/RubyNetwork.hh"
#include "mem/protocol/MachineType.hh"
-#include "mem/protocol/TopologyType.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/BasicLink.hh"
#include "mem/ruby/network/BasicRouter.hh"
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index 0eb8887d2..c2bf5c955 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -31,7 +31,6 @@
#include "base/cast.hh"
#include "base/stl_helpers.hh"
-#include "mem/protocol/TopologyType.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/BasicLink.hh"
diff --git a/src/mem/ruby/slicc_interface/RubyRequest.hh b/src/mem/ruby/slicc_interface/RubyRequest.hh
index 0e7ab039d..870ad1d0e 100644
--- a/src/mem/ruby/slicc_interface/RubyRequest.hh
+++ b/src/mem/ruby/slicc_interface/RubyRequest.hh
@@ -38,8 +38,6 @@
#include "mem/ruby/common/Address.hh"
#include "mem/packet.hh"
-typedef void* RubyPortHandle;
-
class RubyRequest : public Message
{
public:
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
index bed42018b..596b00fbe 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
@@ -51,7 +51,6 @@ void profile_request(const std::string& L1CacheStateStr,
const std::string& directoryStateStr,
const std::string& requestTypeStr);
void profile_miss(const RubyRequest& msg, NodeID id);
-void profile_L1Cache_miss(const RubyRequest& msg, NodeID id);
void profile_token_retry(const Address& addr, AccessType type, int count);
void profile_filter_action(int action);
void profile_persistent_prediction(const Address& addr, AccessType type);
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
index d535ba7cd..b8fd46dd0 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
@@ -35,37 +35,17 @@
#include <cassert>
-#include "mem/protocol/AccessType.hh"
-#include "mem/protocol/GenericRequestType.hh"
-#include "mem/protocol/MachineType.hh"
-#include "mem/protocol/MessageSizeType.hh"
-#include "mem/protocol/PrefetchBit.hh"
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/common/Global.hh"
-#include "mem/ruby/network/Network.hh"
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
-#include "mem/ruby/system/MachineID.hh"
#include "mem/ruby/system/System.hh"
-class Set;
-class NetDest;
-
inline int
random(int n)
{
return random() % n;
}
-inline bool
-multicast_retry()
-{
- if (RubySystem::getRandomization()) {
- return (random() & 0x1);
- } else {
- return true;
- }
-}
-
inline Time
get_time()
{
@@ -92,24 +72,6 @@ IDToInt(NodeID id)
return nodenum;
}
-inline int
-addressToInt(Address addr)
-{
- return (int)addr.getLineAddress();
-}
-
-inline bool
-long_enough_ago(Time event)
-{
- return ((get_time() - event) > 200);
-}
-
-inline int
-getAddThenMod(int addend1, int addend2, int modulus)
-{
- return (addend1 + addend2) % modulus;
-}
-
inline Time
getTimeModInt(Time time, int modulus)
{
@@ -129,16 +91,6 @@ getTimeMinusTime(Time t1, Time t2)
return t1 - t2;
}
-inline Time
-getPreviousDelayedCycles(Time t1, Time t2)
-{
- if (RubySystem::getRandomization()) { // when randomizing delayed
- return 0;
- } else {
- return getTimeMinusTime(t1, t2);
- }
-}
-
// Return type for time_to_int is "Time" and not "int" so we get a
// 64-bit integer
inline Time