derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ruby: remove few not required #includes

Browse Source
This commit is contained in:
Nilay Vaish
2014-02-23 19:16:15 -06:00
parent 82378f7301
commit cde20fd476
26 changed files with 35 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mem/ruby/SConscript
View File

@@ -91,7 +91,6 @@ def MakeInclude(source):
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')

10
src/mem/ruby/common/NetDest.hh
View File

@@ -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 @@ class NetDest
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 @@ operator<<(std::ostream& out, const NetDest& obj)
}
#endif // __MEM_RUBY_COMMON_NETDEST_HH__

2
src/mem/ruby/common/Set.cc
View File

@@ -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()
{

1
src/mem/ruby/common/SubBlock.hh
View File

@@ -34,7 +34,6 @@
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/common/DataBlock.hh"
#include "mem/ruby/common/Global.hh"
class SubBlock
{

1
src/mem/ruby/filters/AbstractBloomFilter.hh
View File

@@ -32,7 +32,6 @@
#include <iostream>
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/common/Global.hh"
class AbstractBloomFilter
{

1
src/mem/ruby/filters/BlockBloomFilter.hh
View File

@@ -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

1
src/mem/ruby/filters/BulkBloomFilter.hh
View File

@@ -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

1
src/mem/ruby/filters/GenericBloomFilter.cc
View File

@@ -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"

1
src/mem/ruby/filters/GenericBloomFilter.hh
View File

@@ -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

3
src/mem/ruby/filters/H3BloomFilter.hh
View File

@@ -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
{

1
src/mem/ruby/filters/LSB_CountingBloomFilter.hh
View File

@@ -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

3
src/mem/ruby/filters/MultiBitSelBloomFilter.hh
View File

@@ -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
{

1
src/mem/ruby/filters/MultiGrainBloomFilter.hh
View File

@@ -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

1
src/mem/ruby/filters/NonCountingBloomFilter.hh
View File

@@ -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

1
src/mem/ruby/network/Network.cc
View File

@@ -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"

1
src/mem/ruby/network/Topology.cc
View File

@@ -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"

2
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
View File

@@ -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"

2
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
View File

@@ -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"

1
src/mem/ruby/network/orion/NetworkPower.cc
View File

@@ -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"

1
src/mem/ruby/slicc_interface/AbstractCacheEntry.hh
View File

@@ -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;

50
src/mem/ruby/slicc_interface/AbstractProtocol.hh
View File

@@ -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;
static const bool m_CMP = false ;
static const bool m_TwoLevelCache = false ;
};
#endif // __MEM_RUBY_SLICC_INTERFACE_ABSTRACTPROTOCOL_HH__

1
src/mem/ruby/slicc_interface/NetworkMessage.hh
View File

@@ -31,7 +31,6 @@
#include <iostream>
#include "base/refcnt.hh"
#include "mem/protocol/MessageSizeType.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/slicc_interface/Message.hh"

28
src/mem/ruby/slicc_interface/RubyRequest.cc
View File

@@ -1,3 +1,31 @@
/*
* Copyright (c) 2011 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 <iostream>
#include "mem/ruby/slicc_interface/RubyRequest.hh"

1
src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
View File

@@ -31,7 +31,6 @@
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/system/DirectoryMemory.hh"
#include "mem/ruby/system/MachineID.hh"

2
src/mem/ruby/slicc_interface/RubySlicc_Util.hh
View File

@@ -37,7 +37,7 @@
#include "debug/RubySlicc.hh"
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
#include "mem/ruby/common/DataBlock.hh"
#include "mem/packet.hh"
inline int

5
src/mem/ruby/system/RubyMemoryControl.cc
View File

@@ -107,10 +107,9 @@
#include "base/cast.hh"
#include "base/cprintf.hh"
#include "debug/RubyMemory.hh"
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/network/Network.hh"
#include "mem/ruby/profiler/Profiler.hh"
#include "mem/ruby/slicc_interface/NetworkMessage.hh"
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
@@ -119,8 +118,6 @@
using namespace std;
class Consumer;
// Value to reset watchdog timer to.
// If we're idle for this many memory control cycles,
// shut down our clock (our rescheduling of ourselves).