Ruby: Shuffle some of the included files
This patch adds and removes included files from some of the files so as to organize remove some false dependencies and include some files directly instead of transitively. --HG-- extra : rebase_source : 09b482ee9ae00b3a204ace0c63550bc3ca220134
This commit is contained in:
parent
734ef9a209
commit
ea94029ea5
23 changed files with 16 additions and 15 deletions
|
@ -31,7 +31,6 @@
|
||||||
#include "mem/ruby/common/Consumer.hh"
|
#include "mem/ruby/common/Consumer.hh"
|
||||||
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
|
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
|
||||||
#include "mem/ruby/eventqueue/RubyEventQueueNode.hh"
|
#include "mem/ruby/eventqueue/RubyEventQueueNode.hh"
|
||||||
#include "mem/ruby/system/System.hh"
|
|
||||||
|
|
||||||
RubyEventQueue::RubyEventQueue(EventQueue* eventq, Tick _clock)
|
RubyEventQueue::RubyEventQueue(EventQueue* eventq, Tick _clock)
|
||||||
: EventManager(eventq), m_clock(_clock)
|
: EventManager(eventq), m_clock(_clock)
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
#include "mem/protocol/MachineType.hh"
|
#include "mem/protocol/MachineType.hh"
|
||||||
#include "mem/ruby/network/Network.hh"
|
#include "mem/ruby/network/Network.hh"
|
||||||
#include "mem/ruby/network/Topology.hh"
|
#include "mem/ruby/network/Topology.hh"
|
||||||
|
#include "mem/ruby/system/System.hh"
|
||||||
|
|
||||||
Network::Network(const Params *p)
|
Network::Network(const Params *p)
|
||||||
: SimObject(p)
|
: SimObject(p)
|
||||||
|
|
|
@ -46,8 +46,7 @@
|
||||||
|
|
||||||
#include "mem/protocol/LinkDirection.hh"
|
#include "mem/protocol/LinkDirection.hh"
|
||||||
#include "mem/protocol/MessageSizeType.hh"
|
#include "mem/protocol/MessageSizeType.hh"
|
||||||
#include "mem/ruby/common/Global.hh"
|
#include "mem/ruby/common/TypeDefines.hh"
|
||||||
#include "mem/ruby/system/System.hh"
|
|
||||||
#include "params/RubyNetwork.hh"
|
#include "params/RubyNetwork.hh"
|
||||||
#include "sim/sim_object.hh"
|
#include "sim/sim_object.hh"
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,6 @@
|
||||||
#include "mem/ruby/network/Network.hh"
|
#include "mem/ruby/network/Network.hh"
|
||||||
#include "mem/ruby/network/Topology.hh"
|
#include "mem/ruby/network/Topology.hh"
|
||||||
#include "mem/ruby/slicc_interface/AbstractController.hh"
|
#include "mem/ruby/slicc_interface/AbstractController.hh"
|
||||||
#include "mem/ruby/system/System.hh"
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "base/stl_helpers.hh"
|
#include "base/stl_helpers.hh"
|
||||||
#include "mem/protocol/MachineType.hh"
|
#include "mem/protocol/MachineType.hh"
|
||||||
#include "mem/ruby/buffers/MessageBuffer.hh"
|
#include "mem/ruby/buffers/MessageBuffer.hh"
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "base/stl_helpers.hh"
|
#include "base/stl_helpers.hh"
|
||||||
#include "debug/RubyNetwork.hh"
|
#include "debug/RubyNetwork.hh"
|
||||||
#include "mem/ruby/buffers/MessageBuffer.hh"
|
#include "mem/ruby/buffers/MessageBuffer.hh"
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
* Authors: Niket Agarwal
|
* Authors: Niket Agarwal
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "mem/ruby/common/Global.hh"
|
||||||
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
|
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
|
||||||
#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
|
#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
* Authors: Niket Agarwal
|
* Authors: Niket Agarwal
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
|
#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
|
||||||
#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
|
#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
|
||||||
#include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh"
|
#include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh"
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "base/stl_helpers.hh"
|
#include "base/stl_helpers.hh"
|
||||||
#include "mem/protocol/MachineType.hh"
|
#include "mem/protocol/MachineType.hh"
|
||||||
#include "mem/ruby/buffers/MessageBuffer.hh"
|
#include "mem/ruby/buffers/MessageBuffer.hh"
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "base/stl_helpers.hh"
|
#include "base/stl_helpers.hh"
|
||||||
#include "debug/RubyNetwork.hh"
|
#include "debug/RubyNetwork.hh"
|
||||||
#include "mem/ruby/buffers/MessageBuffer.hh"
|
#include "mem/ruby/buffers/MessageBuffer.hh"
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
* Authors: Niket Agarwal
|
* Authors: Niket Agarwal
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "base/stl_helpers.hh"
|
#include "base/stl_helpers.hh"
|
||||||
#include "debug/RubyNetwork.hh"
|
#include "debug/RubyNetwork.hh"
|
||||||
#include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh"
|
#include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh"
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "debug/RubyNetwork.hh"
|
#include "debug/RubyNetwork.hh"
|
||||||
#include "mem/ruby/buffers/MessageBuffer.hh"
|
#include "mem/ruby/buffers/MessageBuffer.hh"
|
||||||
#include "mem/ruby/network/simple/PerfectSwitch.hh"
|
#include "mem/ruby/network/simple/PerfectSwitch.hh"
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "base/stl_helpers.hh"
|
#include "base/stl_helpers.hh"
|
||||||
#include "mem/protocol/TopologyType.hh"
|
#include "mem/protocol/TopologyType.hh"
|
||||||
#include "mem/ruby/buffers/MessageBuffer.hh"
|
#include "mem/ruby/buffers/MessageBuffer.hh"
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
|
|
||||||
#include <numeric>
|
#include <numeric>
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "base/stl_helpers.hh"
|
#include "base/stl_helpers.hh"
|
||||||
#include "mem/protocol/MessageSizeType.hh"
|
#include "mem/protocol/MessageSizeType.hh"
|
||||||
#include "mem/ruby/buffers/MessageBuffer.hh"
|
#include "mem/ruby/buffers/MessageBuffer.hh"
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "base/cprintf.hh"
|
#include "base/cprintf.hh"
|
||||||
#include "debug/RubyNetwork.hh"
|
#include "debug/RubyNetwork.hh"
|
||||||
#include "mem/ruby/buffers/MessageBuffer.hh"
|
#include "mem/ruby/buffers/MessageBuffer.hh"
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "mem/ruby/slicc_interface/AbstractController.hh"
|
#include "mem/ruby/slicc_interface/AbstractController.hh"
|
||||||
|
#include "mem/ruby/system/System.hh"
|
||||||
|
|
||||||
AbstractController::AbstractController(const Params *p) : SimObject(p)
|
AbstractController::AbstractController(const Params *p) : SimObject(p)
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,8 +32,6 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include "mem/protocol/AccessPermission.hh"
|
#include "mem/protocol/AccessPermission.hh"
|
||||||
#include "mem/ruby/common/Address.hh"
|
|
||||||
#include "mem/ruby/common/Global.hh"
|
|
||||||
|
|
||||||
class DataBlock;
|
class DataBlock;
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#ifndef __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
|
#ifndef __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
|
||||||
#define __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
|
#define __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
|
||||||
|
|
||||||
#include "mem/ruby/common/Global.hh"
|
#include "mem/ruby/common/TypeDefines.hh"
|
||||||
|
|
||||||
class AbstractReplacementPolicy
|
class AbstractReplacementPolicy
|
||||||
{
|
{
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include "mem/protocol/SequencerMsg.hh"
|
#include "mem/protocol/SequencerMsg.hh"
|
||||||
#include "mem/protocol/SequencerRequestType.hh"
|
#include "mem/protocol/SequencerRequestType.hh"
|
||||||
#include "mem/ruby/buffers/MessageBuffer.hh"
|
#include "mem/ruby/buffers/MessageBuffer.hh"
|
||||||
#include "mem/ruby/slicc_interface/AbstractController.hh"
|
|
||||||
#include "mem/ruby/system/DMASequencer.hh"
|
#include "mem/ruby/system/DMASequencer.hh"
|
||||||
#include "mem/ruby/system/System.hh"
|
#include "mem/ruby/system/System.hh"
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "mem/ruby/common/Address.hh"
|
#include "mem/ruby/common/Address.hh"
|
||||||
#include "mem/ruby/common/Global.hh"
|
|
||||||
#include "mem/ruby/slicc_interface/AbstractEntry.hh"
|
#include "mem/ruby/slicc_interface/AbstractEntry.hh"
|
||||||
#include "mem/ruby/system/MemoryVector.hh"
|
#include "mem/ruby/system/MemoryVector.hh"
|
||||||
#include "mem/ruby/system/SparseMemory.hh"
|
#include "mem/ruby/system/SparseMemory.hh"
|
||||||
|
|
|
@ -104,8 +104,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "base/cast.hh"
|
||||||
#include "base/cprintf.hh"
|
#include "base/cprintf.hh"
|
||||||
#include "mem/ruby/common/Address.hh"
|
|
||||||
#include "mem/ruby/common/Consumer.hh"
|
#include "mem/ruby/common/Consumer.hh"
|
||||||
#include "mem/ruby/common/Global.hh"
|
#include "mem/ruby/common/Global.hh"
|
||||||
#include "mem/ruby/network/Network.hh"
|
#include "mem/ruby/network/Network.hh"
|
||||||
|
@ -113,7 +113,6 @@
|
||||||
#include "mem/ruby/slicc_interface/NetworkMessage.hh"
|
#include "mem/ruby/slicc_interface/NetworkMessage.hh"
|
||||||
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
|
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
|
||||||
#include "mem/ruby/system/MemoryControl.hh"
|
#include "mem/ruby/system/MemoryControl.hh"
|
||||||
#include "mem/ruby/system/System.hh"
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
|
|
@ -34,14 +34,11 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "mem/protocol/MemoryMsg.hh"
|
#include "mem/protocol/MemoryMsg.hh"
|
||||||
#include "mem/ruby/common/Address.hh"
|
|
||||||
#include "mem/ruby/common/Consumer.hh"
|
#include "mem/ruby/common/Consumer.hh"
|
||||||
#include "mem/ruby/common/Global.hh"
|
|
||||||
#include "mem/ruby/profiler/MemCntrlProfiler.hh"
|
#include "mem/ruby/profiler/MemCntrlProfiler.hh"
|
||||||
#include "mem/ruby/slicc_interface/Message.hh"
|
#include "mem/ruby/slicc_interface/Message.hh"
|
||||||
#include "mem/ruby/system/AbstractMemOrCache.hh"
|
#include "mem/ruby/system/AbstractMemOrCache.hh"
|
||||||
#include "mem/ruby/system/MemoryNode.hh"
|
#include "mem/ruby/system/MemoryNode.hh"
|
||||||
#include "mem/ruby/system/System.hh"
|
|
||||||
#include "params/RubyMemoryControl.hh"
|
#include "params/RubyMemoryControl.hh"
|
||||||
#include "sim/sim_object.hh"
|
#include "sim/sim_object.hh"
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#include "base/hashmap.hh"
|
#include "base/hashmap.hh"
|
||||||
#include "mem/protocol/AccessType.hh"
|
#include "mem/protocol/AccessType.hh"
|
||||||
#include "mem/ruby/common/Address.hh"
|
#include "mem/ruby/common/Address.hh"
|
||||||
#include "mem/ruby/common/Global.hh"
|
|
||||||
#include "mem/ruby/common/NetDest.hh"
|
#include "mem/ruby/common/NetDest.hh"
|
||||||
#include "mem/ruby/system/MachineID.hh"
|
#include "mem/ruby/system/MachineID.hh"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue