changeset bd1089db3a88 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=bd1089db3a88
description:
ruby: remove few not required #includes
diffstat:
src/mem/ruby/SConscript | 1 -
src/mem/ruby/common/NetDest.hh | 10 +-
src/mem/ruby/common/Set.cc | 2 +-
src/mem/ruby/common/SubBlock.hh | 1 -
src/mem/ruby/filters/AbstractBloomFilter.hh | 1 -
src/mem/ruby/filters/BlockBloomFilter.hh | 1 -
src/mem/ruby/filters/BulkBloomFilter.hh | 1 -
src/mem/ruby/filters/GenericBloomFilter.cc | 1 -
src/mem/ruby/filters/GenericBloomFilter.hh | 1 -
src/mem/ruby/filters/H3BloomFilter.hh | 3 -
src/mem/ruby/filters/LSB_CountingBloomFilter.hh | 1 -
src/mem/ruby/filters/MultiBitSelBloomFilter.hh | 3 -
src/mem/ruby/filters/MultiGrainBloomFilter.hh | 1 -
src/mem/ruby/filters/NonCountingBloomFilter.hh | 1 -
src/mem/ruby/network/Network.cc | 1 -
src/mem/ruby/network/Topology.cc | 1 -
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 2 +-
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 2 +-
src/mem/ruby/network/orion/NetworkPower.cc | 1 +
src/mem/ruby/slicc_interface/AbstractCacheEntry.hh | 1 -
src/mem/ruby/slicc_interface/AbstractProtocol.hh | 50 ----------
src/mem/ruby/slicc_interface/NetworkMessage.hh | 1 -
src/mem/ruby/slicc_interface/RubyRequest.cc | 28 +++++
src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh | 1 -
src/mem/ruby/slicc_interface/RubySlicc_Util.hh | 2 +-
src/mem/ruby/system/RubyMemoryControl.cc | 5 +-
26 files changed, 35 insertions(+), 88 deletions(-)
diffs (truncated from 400 to 300 lines):
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/SConscript
--- a/src/mem/ruby/SConscript Sun Feb 23 19:16:15 2014 -0600
+++ b/src/mem/ruby/SConscript Sun Feb 23 19:16:15 2014 -0600
@@ -91,7 +91,6 @@
MakeInclude('slicc_interface/AbstractEntry.hh')
MakeInclude('slicc_interface/AbstractCacheEntry.hh')
-MakeInclude('slicc_interface/AbstractProtocol.hh')
MakeInclude('slicc_interface/Message.hh')
MakeInclude('slicc_interface/NetworkMessage.hh')
MakeInclude('slicc_interface/RubyRequest.hh')
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/common/NetDest.hh
--- a/src/mem/ruby/common/NetDest.hh Sun Feb 23 19:16:15 2014 -0600
+++ b/src/mem/ruby/common/NetDest.hh Sun Feb 23 19:16:15 2014 -0600
@@ -37,9 +37,6 @@
#include <iostream>
#include <vector>
-#include "debug/RubyMemory.hh"
-#include "mem/protocol/MachineType.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/common/Set.hh"
#include "mem/ruby/system/MachineID.hh"
@@ -111,11 +108,7 @@
return vec_index;
}
- NodeID
- bitIndex(NodeID index) const
- {
- return index;
- }
+ NodeID bitIndex(NodeID index) const { return index; }
std::vector<Set> m_bits; // a vector of bit vectors - i.e. Sets
};
@@ -129,4 +122,3 @@
}
#endif // __MEM_RUBY_COMMON_NETDEST_HH__
-
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/common/Set.cc
--- a/src/mem/ruby/common/Set.cc Sun Feb 23 19:16:15 2014 -0600
+++ b/src/mem/ruby/common/Set.cc Sun Feb 23 19:16:15 2014 -0600
@@ -29,11 +29,11 @@
// modified (rewritten) 05/20/05 by Dan Gibson to accomimdate FASTER
// >32 bit set sizes
+#include <cassert>
#include <cstdio>
#include "base/misc.hh"
#include "mem/ruby/common/Set.hh"
-#include "mem/ruby/system/System.hh"
Set::Set()
{
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/common/SubBlock.hh
--- a/src/mem/ruby/common/SubBlock.hh Sun Feb 23 19:16:15 2014 -0600
+++ b/src/mem/ruby/common/SubBlock.hh Sun Feb 23 19:16:15 2014 -0600
@@ -34,7 +34,6 @@
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/common/DataBlock.hh"
-#include "mem/ruby/common/Global.hh"
class SubBlock
{
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/filters/AbstractBloomFilter.hh
--- a/src/mem/ruby/filters/AbstractBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
+++ b/src/mem/ruby/filters/AbstractBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
@@ -32,7 +32,6 @@
#include <iostream>
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
class AbstractBloomFilter
{
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/filters/BlockBloomFilter.hh
--- a/src/mem/ruby/filters/BlockBloomFilter.hh Sun Feb 23 19:16:15 2014 -0600
+++ b/src/mem/ruby/filters/BlockBloomFilter.hh Sun Feb 23 19:16:15 2014 -0600
@@ -34,7 +34,6 @@
#include <vector>
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/filters/AbstractBloomFilter.hh"
class BlockBloomFilter : public AbstractBloomFilter
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/filters/BulkBloomFilter.hh
--- a/src/mem/ruby/filters/BulkBloomFilter.hh Sun Feb 23 19:16:15 2014 -0600
+++ b/src/mem/ruby/filters/BulkBloomFilter.hh Sun Feb 23 19:16:15 2014 -0600
@@ -34,7 +34,6 @@
#include <vector>
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/filters/AbstractBloomFilter.hh"
class BulkBloomFilter : public AbstractBloomFilter
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/filters/GenericBloomFilter.cc
--- a/src/mem/ruby/filters/GenericBloomFilter.cc Sun Feb 23 19:16:15
2014 -0600
+++ b/src/mem/ruby/filters/GenericBloomFilter.cc Sun Feb 23 19:16:15
2014 -0600
@@ -28,7 +28,6 @@
#include "base/str.hh"
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/filters/BlockBloomFilter.hh"
#include "mem/ruby/filters/BulkBloomFilter.hh"
#include "mem/ruby/filters/GenericBloomFilter.hh"
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/filters/GenericBloomFilter.hh
--- a/src/mem/ruby/filters/GenericBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
+++ b/src/mem/ruby/filters/GenericBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
@@ -33,7 +33,6 @@
#include <string>
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/filters/AbstractBloomFilter.hh"
class GenericBloomFilter
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/filters/H3BloomFilter.hh
--- a/src/mem/ruby/filters/H3BloomFilter.hh Sun Feb 23 19:16:15 2014 -0600
+++ b/src/mem/ruby/filters/H3BloomFilter.hh Sun Feb 23 19:16:15 2014 -0600
@@ -34,10 +34,7 @@
#include <vector>
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/filters/AbstractBloomFilter.hh"
-#include "mem/ruby/profiler/Profiler.hh"
-#include "mem/ruby/system/System.hh"
class H3BloomFilter : public AbstractBloomFilter
{
diff -r b9891fbae4c8 -r bd1089db3a88
src/mem/ruby/filters/LSB_CountingBloomFilter.hh
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
@@ -34,7 +34,6 @@
#include <vector>
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/filters/AbstractBloomFilter.hh"
class LSB_CountingBloomFilter : public AbstractBloomFilter
diff -r b9891fbae4c8 -r bd1089db3a88
src/mem/ruby/filters/MultiBitSelBloomFilter.hh
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
@@ -34,10 +34,7 @@
#include <vector>
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/filters/AbstractBloomFilter.hh"
-#include "mem/ruby/profiler/Profiler.hh"
-#include "mem/ruby/system/System.hh"
class MultiBitSelBloomFilter : public AbstractBloomFilter
{
diff -r b9891fbae4c8 -r bd1089db3a88
src/mem/ruby/filters/MultiGrainBloomFilter.hh
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
@@ -34,7 +34,6 @@
#include <vector>
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/filters/AbstractBloomFilter.hh"
class MultiGrainBloomFilter : public AbstractBloomFilter
diff -r b9891fbae4c8 -r bd1089db3a88
src/mem/ruby/filters/NonCountingBloomFilter.hh
--- a/src/mem/ruby/filters/NonCountingBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.hh Sun Feb 23 19:16:15
2014 -0600
@@ -34,7 +34,6 @@
#include <vector>
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/filters/AbstractBloomFilter.hh"
class NonCountingBloomFilter : public AbstractBloomFilter
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/network/Network.cc
--- a/src/mem/ruby/network/Network.cc Sun Feb 23 19:16:15 2014 -0600
+++ b/src/mem/ruby/network/Network.cc Sun Feb 23 19:16:15 2014 -0600
@@ -27,7 +27,6 @@
*/
#include "base/misc.hh"
-#include "mem/protocol/MachineType.hh"
#include "mem/ruby/network/BasicLink.hh"
#include "mem/ruby/network/Network.hh"
#include "mem/ruby/system/System.hh"
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/network/Topology.cc
--- a/src/mem/ruby/network/Topology.cc Sun Feb 23 19:16:15 2014 -0600
+++ b/src/mem/ruby/network/Topology.cc Sun Feb 23 19:16:15 2014 -0600
@@ -30,7 +30,6 @@
#include "base/trace.hh"
#include "debug/RubyNetwork.hh"
-#include "mem/protocol/MachineType.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/BasicLink.hh"
#include "mem/ruby/network/Topology.hh"
diff -r b9891fbae4c8 -r bd1089db3a88
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Sun Feb
23 19:16:15 2014 -0600
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Sun Feb
23 19:16:15 2014 -0600
@@ -32,7 +32,7 @@
#include "base/cast.hh"
#include "base/stl_helpers.hh"
-#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/common/Global.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/GarnetLink_d.hh"
diff -r b9891fbae4c8 -r bd1089db3a88
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Sun Feb
23 19:16:15 2014 -0600
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Sun Feb
23 19:16:15 2014 -0600
@@ -32,7 +32,7 @@
#include "base/cast.hh"
#include "base/stl_helpers.hh"
-#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/common/Global.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/BasicLink.hh"
#include "mem/ruby/network/garnet/flexible-pipeline/GarnetLink.hh"
diff -r b9891fbae4c8 -r bd1089db3a88 src/mem/ruby/network/orion/NetworkPower.cc
--- a/src/mem/ruby/network/orion/NetworkPower.cc Sun Feb 23 19:16:15
2014 -0600
+++ b/src/mem/ruby/network/orion/NetworkPower.cc Sun Feb 23 19:16:15
2014 -0600
@@ -29,6 +29,7 @@
* Tushar Krishna
*/
+#include "mem/ruby/common/Global.hh"
#include "mem/ruby/network/orion/NetworkPower.hh"
#include "mem/ruby/network/orion/OrionConfig.hh"
#include "mem/ruby/network/orion/OrionLink.hh"
diff -r b9891fbae4c8 -r bd1089db3a88
src/mem/ruby/slicc_interface/AbstractCacheEntry.hh
--- a/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh Sun Feb 23
19:16:15 2014 -0600
+++ b/src/mem/ruby/slicc_interface/AbstractCacheEntry.hh Sun Feb 23
19:16:15 2014 -0600
@@ -37,7 +37,6 @@
#include "mem/protocol/AccessPermission.hh"
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/slicc_interface/AbstractEntry.hh"
class DataBlock;
diff -r b9891fbae4c8 -r bd1089db3a88
src/mem/ruby/slicc_interface/AbstractProtocol.hh
--- a/src/mem/ruby/slicc_interface/AbstractProtocol.hh Sun Feb 23 19:16:15
2014 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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.
- */
-
-/*
- * Define all possible protocol parameters and their default value
- * here. Normally, all parameters should have default value "false"
- * means the feature of the protocol is turned off.
- */
-
-#ifndef __MEM_RUBY_SLICC_INTERFACE_ABSTRACTPROTOCOL_HH__
-#define __MEM_RUBY_SLICC_INTERFACE_ABSTRACTPROTOCOL_HH__
-
-class AbstractProtocol
-{
- public:
- AbstractProtocol() {}
-
- virtual ~AbstractProtocol() = 0;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
