Ruby: Remove files and includes not in use

diff --git a/src/mem/protocol/MESI_CMP_directory-L1cache.sm b/src/mem/protocol/MESI_CMP_directory-L1cache.sm
index 287bda004cfbb92f79b4eae46224bbe808b485e5..b2ba0872e32324cdc5ed7c9c8d8b8bbf6078f078 100644 (file)
--- a/src/mem/protocol/MESI_CMP_directory-L1cache.sm
+++ b/src/mem/protocol/MESI_CMP_directory-L1cache.sm
@@ -130,7 +130,6 @@ machine(L1Cache, "MSI Directory L1 Cache CMP")
 
   MessageBuffer mandatoryQueue, ordered="false";
 
-  int cache_state_to_int(State state);
   int l2_select_low_bit, default="RubySystem::getBlockSizeBits()";
 
   void set_cache_entry(AbstractCacheEntry a);

diff --git a/src/mem/ruby/common/Address.hh b/src/mem/ruby/common/Address.hh
index 38fc047e119e2670edce4575cc2f101dc9698206..4a9a3adb2305ae386d85fe376d00c4c3efc64549 100644 (file)
--- a/src/mem/ruby/common/Address.hh
+++ b/src/mem/ruby/common/Address.hh
@@ -34,7 +34,6 @@
 
 #include "base/hashmap.hh"
 #include "mem/ruby/common/Global.hh"
-#include "mem/ruby/system/MachineID.hh"
 #include "mem/ruby/system/NodeID.hh"
 
 const int ADDRESS_WIDTH = 64; // address width in bytes

diff --git a/src/mem/ruby/common/NetDest.cc b/src/mem/ruby/common/NetDest.cc
index 12eaa03219ce9ce7bf9c9b0d73b4a144beac00e1..82c60f41579133000afb017cf564a425efa50ad7 100644 (file)
--- a/src/mem/ruby/common/NetDest.cc
+++ b/src/mem/ruby/common/NetDest.cc
@@ -26,7 +26,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mem/protocol/Protocol.hh"
 #include "mem/ruby/common/NetDest.hh"
 
 NetDest::NetDest()

diff --git a/src/mem/ruby/network/Topology.cc b/src/mem/ruby/network/Topology.cc
index 58af3811f3422f9d6849be13fafa8d6ad78df93e..a342d6d0287426ce62cff74c6527bc8bd1cb85ac 100644 (file)
--- 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/Protocol.hh"
 #include "mem/protocol/TopologyType.hh"
 #include "mem/ruby/common/NetDest.hh"
 #include "mem/ruby/network/BasicLink.hh"

diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc
index 3c35be217107bc54e5c88209558199c4149b3346..06c4ace9108825c544929e0b89b1ec8c6af6c41d 100644 (file)
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc
@@ -29,7 +29,6 @@
 #include <algorithm>
 
 #include "debug/RubyNetwork.hh"
-#include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/network/simple/PerfectSwitch.hh"
 #include "mem/ruby/network/simple/SimpleNetwork.hh"

diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index 0f3472773e7647973882969a38362e43b53a13fc..a1066f2adfb3f6a1c2737fab943a68486cb5ac74 100644 (file)
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -31,7 +31,6 @@
 
 #include "base/stl_helpers.hh"
 #include "mem/protocol/MachineType.hh"
-#include "mem/protocol/Protocol.hh"
 #include "mem/protocol/TopologyType.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/common/NetDest.hh"

diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc
index bcc1347a3928a20b9d447f9f02a365ac933ad358..a678a657d3090fa70f8b0a91a09c958dc954fea2 100644 (file)
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -30,7 +30,6 @@
 
 #include "base/stl_helpers.hh"
 #include "mem/protocol/MessageSizeType.hh"
-#include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/network/simple/PerfectSwitch.hh"
 #include "mem/ruby/network/simple/SimpleNetwork.hh"

diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index 108dd843d04c1f5dd1e028addbc3cf6e6c5639b8..822989204776650a052e3abd3cfbe5a2d10e0859 100644 (file)
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -30,7 +30,6 @@
 
 #include "base/cprintf.hh"
 #include "debug/RubyNetwork.hh"
-#include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/network/simple/Throttle.hh"
 #include "mem/ruby/network/Network.hh"

diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc
index 08a4439db0e758dea1462ec38e9d90f3f1a1ae19..04e44bc13f75d17408d8e8bdab9146de3441705f 100644 (file)
--- a/src/mem/ruby/profiler/Profiler.cc
+++ b/src/mem/ruby/profiler/Profiler.cc
@@ -52,7 +52,6 @@
 #include "base/stl_helpers.hh"
 #include "base/str.hh"
 #include "mem/protocol/MachineType.hh"
-#include "mem/protocol/Protocol.hh"
 #include "mem/protocol/RubyRequest.hh"
 #include "mem/ruby/network/Network.hh"
 #include "mem/ruby/profiler/AddressProfiler.hh"

diff --git a/src/mem/ruby/slicc_interface/AbstractEntry.hh b/src/mem/ruby/slicc_interface/AbstractEntry.hh
index 7076d2e4c0cad151bf116380ddf8b4439b5edcaf..fb1af2ea0e995efb9a00e218058124106da79d88 100644 (file)
--- a/src/mem/ruby/slicc_interface/AbstractEntry.hh
+++ b/src/mem/ruby/slicc_interface/AbstractEntry.hh
@@ -66,4 +66,3 @@ operator<<(std::ostream& out, const AbstractEntry& obj)
 }
 
 #endif // __MEM_RUBY_SLICC_INTERFACE_ABSTRACTENTRY_HH__
-

diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc
deleted file mode 100644 (file)
index 06c036a..0000000
--- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 1999-2008 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.
- */
-
-#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
-#include "mem/ruby/system/CacheMemory.hh"

diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
index 2b7eb8b3b385322fb0e9bf0ad928c84e03900b7e..18e7ad6fc182df6489322142c4eb0f6f39349790 100644 (file)
--- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
@@ -34,7 +34,6 @@
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/NetDest.hh"
-#include "mem/ruby/common/Set.hh"
 #include "mem/ruby/system/DirectoryMemory.hh"
 #include "mem/ruby/system/MachineID.hh"
 #include "mem/ruby/system/NodeID.hh"

diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
index 2385b1cbc28851e497767c57dda224b66ee3097f..508c2779448aef0457c476ce73d03bf5c509ae5a 100644 (file)
--- a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
@@ -26,7 +26,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mem/protocol/Protocol.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/profiler/AddressProfiler.hh"
 #include "mem/ruby/profiler/Profiler.hh"
@@ -36,17 +35,6 @@
 
 using namespace std;
 
-void
-profile_request(int cache_state, Directory_State directory_state,
-                GenericRequestType request_type)
-{
-    string requestStr = L1Cache_State_to_string(L1Cache_State(cache_state))+
-        ":" +
-        Directory_State_to_string(directory_state) + ":" +
-        GenericRequestType_to_string(request_type);
-    g_system_ptr->getProfiler()->profileRequest(requestStr);
-}
-
 void
 profile_request(const string& L1CacheState, const string& L2CacheState,
                 const string& directoryState, const string& requestType)

diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
index f23e15c9122ce20a56b4ed8767e6791d6a011898..b2e612bd41dcfe028a9d7b9a0845633edef55f1d 100644 (file)
--- a/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
@@ -36,9 +36,6 @@
 #include <string>
 
 #include "mem/protocol/AccessType.hh"
-#include "mem/protocol/Directory_State.hh"
-#include "mem/protocol/GenericRequestType.hh"
-#include "mem/protocol/L1Cache_State.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/profiler/Profiler.hh"
@@ -46,8 +43,6 @@
 
 class Set;
 
-void profile_request(int cache_state, Directory_State directory_state,
-                     GenericRequestType request_type);
 void profile_outstanding_persistent_request(int outstanding);
 void profile_outstanding_request(int outstanding);
 void profile_sharing(const Address& addr, AccessType type, NodeID requestor,

diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
index 058a51bae23e0576618d33442be44956f2563a5b..9b284dab44049e609ec558e378ded688a032181e 100644 (file)
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
@@ -36,9 +36,7 @@
 #include <cassert>
 
 #include "mem/protocol/AccessType.hh"
-#include "mem/protocol/Directory_State.hh"
 #include "mem/protocol/GenericRequestType.hh"
-#include "mem/protocol/L1Cache_State.hh"
 #include "mem/protocol/MachineType.hh"
 #include "mem/protocol/MessageSizeType.hh"
 #include "mem/protocol/PrefetchBit.hh"
@@ -69,12 +67,6 @@ multicast_retry()
     }
 }
 
-inline int
-cache_state_to_int(L1Cache_State state)
-{
-    return state;
-}
-
 inline Time
 get_time()
 {

diff --git a/src/mem/ruby/slicc_interface/SConscript b/src/mem/ruby/slicc_interface/SConscript
index 9d4e6fe3bbfa9aa0eba438f8340aa74bea7a88be..0fbdc1789916bf6e1eb3490c17d1377e365dc6eb 100644 (file)
--- a/src/mem/ruby/slicc_interface/SConscript
+++ b/src/mem/ruby/slicc_interface/SConscript
@@ -40,4 +40,3 @@ Source('AbstractEntry.cc')
 Source('AbstractCacheEntry.cc')
 Source('RubyRequest.cc')
 Source('RubySlicc_Profiler_interface.cc')
-Source('RubySlicc_ComponentMapping.cc')

diff --git a/src/mem/ruby/system/DirectoryMemory.cc b/src/mem/ruby/system/DirectoryMemory.cc
index c461ce09b71a11d85fdd87cb6638088570d924da..a91f05a693b0b5aef192c32cc7ed6352b8f42d4c 100644 (file)
--- a/src/mem/ruby/system/DirectoryMemory.cc
+++ b/src/mem/ruby/system/DirectoryMemory.cc
@@ -184,34 +184,6 @@ DirectoryMemory::lookup(PhysAddress address)
     return *entry;
 }
 
-#if 0
-Directory_Entry&
-DirectoryMemory::lookup(PhysAddress address)
-{
-    assert(isPresent(address));
-    Index index = address.memoryModuleIndex();
-
-    if (index < 0 || index > m_size) {
-        WARN_EXPR(address.getAddress());
-        WARN_EXPR(index);
-        WARN_EXPR(m_size);
-        ERROR_MSG("Directory Memory Assertion: accessing memory out of range");
-    }
-    Directory_Entry* entry = m_entries[index];
-
-    // allocate the directory entry on demand.
-    if (entry == NULL) {
-        entry = new Directory_Entry;
-        entry->getDataBlk().assign(m_ram->getBlockPtr(address));
-
-        // store entry to the table
-        m_entries[index] = entry;
-    }
-
-    return *entry;
-}
-#endif
-
 void
 DirectoryMemory::invalidateBlock(PhysAddress address)
 {

diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index 1b46e680d4a0a12e8a64f4b9e11adffae8ef1192..dcee571467a77a3217c798a30a18e9ac043e545d 100644 (file)
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -31,7 +31,6 @@
 #include "cpu/testers/rubytest/RubyTester.hh"
 #include "debug/MemoryAccess.hh"
 #include "debug/ProtocolTrace.hh"
-#include "mem/protocol/Protocol.hh"
 #include "mem/ruby/buffers/MessageBuffer.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/SubBlock.hh"

diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh
index 88a0186c5dfffe9f69332b27f0586f7e172fb4eb..15abf1c0fd5029fce1fddd9a92c9d4732529797e 100644 (file)
--- a/src/mem/ruby/system/System.hh
+++ b/src/mem/ruby/system/System.hh
@@ -44,7 +44,6 @@
 #include "sim/sim_object.hh"
 
 class AbstractController;
-class AbstractMemory;
 class CacheRecorder;
 class MemoryVector;
 class Network;
@@ -134,7 +133,6 @@ class RubySystem : public SimObject
     void registerNetwork(Network*);
     void registerProfiler(Profiler*);
     void registerTracer(Tracer*);
-    void registerAbstractMemory(AbstractMemory*);
     void registerAbstractController(AbstractController*);
 
   private: