From 7a8dda49a4ec33be17bbd101ebd68e02562b9c3d Mon Sep 17 00:00:00 2001 From: Brandon Potter Date: Wed, 9 Nov 2016 14:27:37 -0600 Subject: style: [patch 1/22] use /r/3648/ to reorganize includes --- src/mem/ruby/network/MessageBuffer.cc | 3 ++- src/mem/ruby/network/Network.cc | 3 ++- src/mem/ruby/network/Topology.cc | 4 +++- src/mem/ruby/network/simple/PerfectSwitch.cc | 3 ++- src/mem/ruby/network/simple/PerfectSwitch.hh | 1 + src/mem/ruby/network/simple/SimpleNetwork.cc | 3 ++- src/mem/ruby/network/simple/Switch.cc | 3 ++- src/mem/ruby/network/simple/Throttle.cc | 5 +++-- 8 files changed, 17 insertions(+), 8 deletions(-) (limited to 'src/mem/ruby/network') diff --git a/src/mem/ruby/network/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc index b96b00504..d7e1d0384 100644 --- a/src/mem/ruby/network/MessageBuffer.cc +++ b/src/mem/ruby/network/MessageBuffer.cc @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/MessageBuffer.hh" + #include #include "base/cprintf.hh" @@ -33,7 +35,6 @@ #include "base/random.hh" #include "base/stl_helpers.hh" #include "debug/RubyQueue.hh" -#include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/system/RubySystem.hh" using namespace std; diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc index 721dbbabe..e9b28a731 100644 --- a/src/mem/ruby/network/Network.cc +++ b/src/mem/ruby/network/Network.cc @@ -26,9 +26,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/Network.hh" + #include "base/misc.hh" #include "mem/ruby/network/BasicLink.hh" -#include "mem/ruby/network/Network.hh" #include "mem/ruby/system/RubySystem.hh" uint32_t Network::m_virtual_networks; diff --git a/src/mem/ruby/network/Topology.cc b/src/mem/ruby/network/Topology.cc index c18f379ae..f7afffd66 100644 --- a/src/mem/ruby/network/Topology.cc +++ b/src/mem/ruby/network/Topology.cc @@ -26,13 +26,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/Topology.hh" + #include #include "base/trace.hh" #include "debug/RubyNetwork.hh" #include "mem/ruby/common/NetDest.hh" #include "mem/ruby/network/BasicLink.hh" -#include "mem/ruby/network/Topology.hh" +#include "mem/ruby/network/Network.hh" #include "mem/ruby/slicc_interface/AbstractController.hh" using namespace std; diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc index 027c8baee..156b96d23 100644 --- a/src/mem/ruby/network/simple/PerfectSwitch.cc +++ b/src/mem/ruby/network/simple/PerfectSwitch.cc @@ -26,13 +26,14 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/simple/PerfectSwitch.hh" + #include #include "base/cast.hh" #include "base/random.hh" #include "debug/RubyNetwork.hh" #include "mem/ruby/network/MessageBuffer.hh" -#include "mem/ruby/network/simple/PerfectSwitch.hh" #include "mem/ruby/network/simple/SimpleNetwork.hh" #include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/slicc_interface/Message.hh" diff --git a/src/mem/ruby/network/simple/PerfectSwitch.hh b/src/mem/ruby/network/simple/PerfectSwitch.hh index 1cc986964..12d5e468c 100644 --- a/src/mem/ruby/network/simple/PerfectSwitch.hh +++ b/src/mem/ruby/network/simple/PerfectSwitch.hh @@ -41,6 +41,7 @@ #include #include "mem/ruby/common/Consumer.hh" +#include "mem/ruby/common/TypeDefines.hh" class MessageBuffer; class NetDest; diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc index 1652ae7bb..56f948f4c 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.cc +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/simple/SimpleNetwork.hh" + #include #include @@ -34,7 +36,6 @@ #include "mem/ruby/common/NetDest.hh" #include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/simple/SimpleLink.hh" -#include "mem/ruby/network/simple/SimpleNetwork.hh" #include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/network/simple/Throttle.hh" #include "mem/ruby/profiler/Profiler.hh" diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc index 78f5b609c..7cc635d2a 100644 --- a/src/mem/ruby/network/simple/Switch.cc +++ b/src/mem/ruby/network/simple/Switch.cc @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/simple/Switch.hh" + #include #include "base/cast.hh" @@ -33,7 +35,6 @@ #include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/simple/PerfectSwitch.hh" #include "mem/ruby/network/simple/SimpleNetwork.hh" -#include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/network/simple/Throttle.hh" using namespace std; diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc index 3863ab944..5ed918c6b 100644 --- a/src/mem/ruby/network/simple/Throttle.cc +++ b/src/mem/ruby/network/simple/Throttle.cc @@ -26,15 +26,16 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "mem/ruby/network/simple/Throttle.hh" + #include #include "base/cast.hh" #include "base/cprintf.hh" #include "debug/RubyNetwork.hh" -#include "mem/ruby/network/simple/Switch.hh" -#include "mem/ruby/network/simple/Throttle.hh" #include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/Network.hh" +#include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/slicc_interface/Message.hh" #include "mem/ruby/system/RubySystem.hh" -- cgit v1.2.3