mem: fix headers include order in the cache related classes

Change-Id: Ia57cc104978861ab342720654e408dbbfcbe4b69
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>

diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index c11208021c0b93256075e93d277798a9e8e857ca..b6b3b1481c71ae6b1485ebc65fabcf0151dc557b 100644 (file)
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -45,14 +45,15 @@
  * Definition of BaseCache functions.
  */
 
+#include "mem/cache/base.hh"
+
 #include "debug/Cache.hh"
 #include "debug/Drain.hh"
+#include "mem/cache/cache.hh"
+#include "mem/cache/mshr.hh"
 #include "mem/cache/tags/fa_lru.hh"
 #include "mem/cache/tags/lru.hh"
 #include "mem/cache/tags/random_repl.hh"
-#include "mem/cache/base.hh"
-#include "mem/cache/cache.hh"
-#include "mem/cache/mshr.hh"
 #include "sim/full_system.hh"
 
 using namespace std;

diff --git a/src/mem/cache/blk.cc b/src/mem/cache/blk.cc
index 210304dbf00b158db26cfafb4dbf5674a79be38c..9475bda31de0ce06103b7b6c854e819eb545eb46 100644 (file)
--- a/src/mem/cache/blk.cc
+++ b/src/mem/cache/blk.cc
@@ -38,9 +38,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "base/cprintf.hh"
 #include "mem/cache/blk.hh"
 
+#include "base/cprintf.hh"
+
 void
 CacheBlkPrintWrapper::print(std::ostream &os, int verbosity,
                             const std::string &prefix) const

diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc
index 5c4481e02f07c8626f8810db73baf620c52d8f35..56284dcc60748ab7141b489c184a8a5957b069b4 100644 (file)
--- a/src/mem/cache/mshr.cc
+++ b/src/mem/cache/mshr.cc
@@ -47,6 +47,8 @@
  * Miss Status and Handling Register (MSHR) definitions.
  */
 
+#include "mem/cache/mshr.hh"
+
 #include <algorithm>
 #include <cassert>
 #include <string>
@@ -56,7 +58,6 @@
 #include "base/types.hh"
 #include "debug/Cache.hh"
 #include "mem/cache/cache.hh"
-#include "mem/cache/mshr.hh"
 #include "sim/core.hh"
 
 using namespace std;

diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 8d2322e5142768f7bdcbe6896c950da6d6fb0777..c413fbc5dc287dfc6f09a8842f28042d185f1f9f 100644 (file)
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -46,8 +46,9 @@
  * Definitions of BaseTags.
  */
 
-#include "cpu/smt.hh" //maxThreadsPerCPU
 #include "mem/cache/tags/base.hh"
+
+#include "cpu/smt.hh" //maxThreadsPerCPU
 #include "mem/cache/base.hh"
 #include "sim/sim_exit.hh"
 

diff --git a/src/mem/cache/tags/base_set_assoc.cc b/src/mem/cache/tags/base_set_assoc.cc
index 6fc186d193a5eb648480c7860c438105daaa8d10..86036aa9b192e04b334a91ab8afff63a950cdab3 100644 (file)
--- a/src/mem/cache/tags/base_set_assoc.cc
+++ b/src/mem/cache/tags/base_set_assoc.cc
@@ -45,10 +45,11 @@
  * Definitions of a base set associative tag store.
  */
 
+#include "mem/cache/tags/base_set_assoc.hh"
+
 #include <string>
 
 #include "base/intmath.hh"
-#include "mem/cache/tags/base_set_assoc.hh"
 #include "sim/core.hh"
 
 using namespace std;

diff --git a/src/mem/cache/tags/base_set_assoc.hh b/src/mem/cache/tags/base_set_assoc.hh
index 053274c533532b7b8aad7fac7f84c6955867b7e6..31284991fb7ee7927f135828fc4d8cc5837b9eb9 100644 (file)
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -52,10 +52,10 @@
 #include <cstring>
 #include <list>
 
-#include "mem/cache/tags/base.hh"
-#include "mem/cache/tags/cacheset.hh"
 #include "mem/cache/base.hh"
 #include "mem/cache/blk.hh"
+#include "mem/cache/tags/base.hh"
+#include "mem/cache/tags/cacheset.hh"
 #include "mem/packet.hh"
 #include "params/BaseSetAssoc.hh"
 

diff --git a/src/mem/cache/tags/cacheset.hh b/src/mem/cache/tags/cacheset.hh
index 8bf0989f76bbe3065ddddd37f7fed01e4154a6ee..69109d10c78a31f87eb0006a50596c6220774afe 100644 (file)
--- a/src/mem/cache/tags/cacheset.hh
+++ b/src/mem/cache/tags/cacheset.hh
@@ -50,7 +50,6 @@
 
 #include <cassert>
 
-
 /**
  * An associative set of cache blocks.
  */

diff --git a/src/mem/cache/tags/fa_lru.cc b/src/mem/cache/tags/fa_lru.cc
index ecac88afa86126757e8e67d3774ea6910a13b6f1..0d6a3392d0378aeecbf46638db2bdaf725a9acf6 100644 (file)
--- a/src/mem/cache/tags/fa_lru.cc
+++ b/src/mem/cache/tags/fa_lru.cc
@@ -45,12 +45,13 @@
  * Definitions a fully associative LRU tagstore.
  */
 
+#include "mem/cache/tags/fa_lru.hh"
+
 #include <cassert>
 #include <sstream>
 
 #include "base/intmath.hh"
 #include "base/misc.hh"
-#include "mem/cache/tags/fa_lru.hh"
 
 using namespace std;
 

diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index ecfe467efad45dc1d1464f5dd527cde688681324..1bbd9fbfbfff4360c4277ac00a93dde581b44aa1 100644 (file)
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -51,8 +51,8 @@
 #include <list>
 #include <unordered_map>
 
-#include "mem/cache/tags/base.hh"
 #include "mem/cache/blk.hh"
+#include "mem/cache/tags/base.hh"
 #include "mem/packet.hh"
 #include "params/FALRU.hh"
 

diff --git a/src/mem/cache/tags/lru.cc b/src/mem/cache/tags/lru.cc
index a85b638895492d3d6fed31faa34649a6bcf51240..a38478755dfc0dfcc028c26e2c24e32040d1a5fa 100644 (file)
--- a/src/mem/cache/tags/lru.cc
+++ b/src/mem/cache/tags/lru.cc
@@ -45,8 +45,9 @@
  * Definitions of a LRU tag store.
  */
 
-#include "debug/CacheRepl.hh"
 #include "mem/cache/tags/lru.hh"
+
+#include "debug/CacheRepl.hh"
 #include "mem/cache/base.hh"
 
 LRU::LRU(const Params *p)

diff --git a/src/mem/cache/tags/random_repl.cc b/src/mem/cache/tags/random_repl.cc
index 9f1ef800ae6ae4066d1be2070526ca9721128ab5..4157a30cdc2dc4679ce2fa91caa730727f37b173 100644 (file)
--- a/src/mem/cache/tags/random_repl.cc
+++ b/src/mem/cache/tags/random_repl.cc
@@ -33,9 +33,10 @@
  * Definitions of a random replacement tag store.
  */
 
+#include "mem/cache/tags/random_repl.hh"
+
 #include "base/random.hh"
 #include "debug/CacheRepl.hh"
-#include "mem/cache/tags/random_repl.hh"
 #include "mem/cache/base.hh"
 
 RandomRepl::RandomRepl(const Params *p)