includes: sort all includes

32 files changed, 49 insertions, 54 deletions

diff --git a/src/cpu/o3/base_dyn_inst.cc b/src/cpu/o3/base_dyn_inst.cc
index 510109d8a..5cf01f230 100644
--- a/src/cpu/o3/base_dyn_inst.cc
+++ b/src/cpu/o3/base_dyn_inst.cc
@@ -28,9 +28,9 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/base_dyn_inst_impl.hh"
 #include "cpu/o3/cpu.hh"
 #include "cpu/o3/isa_specific.hh"
+#include "cpu/base_dyn_inst_impl.hh"
 
 // Explicit instantiation
 template class BaseDynInst<O3CPUImpl>;
diff --git a/src/cpu/o3/bpred_unit.hh b/src/cpu/o3/bpred_unit.hh
index 58b1147c9..84f2dc8c1 100644
--- a/src/cpu/o3/bpred_unit.hh
+++ b/src/cpu/o3/bpred_unit.hh
@@ -35,11 +35,11 @@
 
 #include "base/statistics.hh"
 #include "base/types.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/pred/2bit_local.hh"
 #include "cpu/pred/btb.hh"
 #include "cpu/pred/ras.hh"
 #include "cpu/pred/tournament.hh"
+#include "cpu/inst_seq.hh"
 
 class DerivO3CPUParams;
 
diff --git a/src/cpu/o3/bpred_unit_impl.hh b/src/cpu/o3/bpred_unit_impl.hh
index 14d47df9f..44e6f4230 100644
--- a/src/cpu/o3/bpred_unit_impl.hh
+++ b/src/cpu/o3/bpred_unit_impl.hh
@@ -30,9 +30,9 @@
 
 #include <algorithm>
 
+#include "arch/isa_traits.hh"
 #include "arch/types.hh"
 #include "arch/utility.hh"
-#include "arch/isa_traits.hh"
 #include "base/trace.hh"
 #include "base/traceflags.hh"
 #include "config/the_isa.hh"
diff --git a/src/cpu/o3/checker_builder.cc b/src/cpu/o3/checker_builder.cc
index b9afb3f9f..5d0bd2ed2 100644
--- a/src/cpu/o3/checker_builder.cc
+++ b/src/cpu/o3/checker_builder.cc
@@ -31,9 +31,9 @@
 #include <string>
 
 #include "cpu/checker/cpu_impl.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/alpha/dyn_inst.hh"
 #include "cpu/o3/alpha/impl.hh"
+#include "cpu/inst_seq.hh"
 #include "params/O3Checker.hh"
 #include "sim/process.hh"
 #include "sim/sim_object.hh"
diff --git a/src/cpu/o3/commit.cc b/src/cpu/o3/commit.cc
index 637d59f52..8e3ec0635 100644
--- a/src/cpu/o3/commit.cc
+++ b/src/cpu/o3/commit.cc
@@ -28,7 +28,7 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/commit_impl.hh"
+#include "cpu/o3/isa_specific.hh"
 
 template class DefaultCommit<O3CPUImpl>;
diff --git a/src/cpu/o3/commit.hh b/src/cpu/o3/commit.hh
index ff7b53440..2de381aeb 100644
--- a/src/cpu/o3/commit.hh
+++ b/src/cpu/o3/commit.hh
@@ -45,9 +45,9 @@
 #define __CPU_O3_COMMIT_HH__
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/inst_seq.hh"
+#include "cpu/timebuf.hh"
 
 class DerivO3CPUParams;
 
diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index e35c1bf29..a48e5f046 100644
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -45,15 +45,15 @@
 #include <string>
 
 #include "arch/utility.hh"
-#include "base/cp_annotate.hh"
 #include "base/loader/symtab.hh"
-#include "cpu/timebuf.hh"
+#include "base/cp_annotate.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/o3/commit.hh"
 #include "cpu/o3/thread_state.hh"
+#include "cpu/exetrace.hh"
+#include "cpu/timebuf.hh"
 #include "params/DerivO3CPU.hh"
 
 #if USE_CHECKER
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 4088f2399..565c68f7a 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -34,12 +34,12 @@
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
+#include "cpu/o3/cpu.hh"
+#include "cpu/o3/isa_specific.hh"
+#include "cpu/o3/thread_context.hh"
 #include "cpu/activity.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/thread_context.hh"
-#include "cpu/o3/isa_specific.hh"
-#include "cpu/o3/cpu.hh"
-#include "cpu/o3/thread_context.hh"
 #include "enums/MemoryMode.hh"
 #include "sim/core.hh"
 #include "sim/stat_control.hh"
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index 69289996b..7e9c33717 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -42,21 +42,20 @@
 
 #include "arch/types.hh"
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "config/full_system.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
-#include "cpu/activity.hh"
-#include "cpu/base.hh"
-#include "cpu/simple_thread.hh"
 #include "cpu/o3/comm.hh"
 #include "cpu/o3/cpu_policy.hh"
 #include "cpu/o3/scoreboard.hh"
 #include "cpu/o3/thread_state.hh"
+#include "cpu/activity.hh"
+#include "cpu/base.hh"
+#include "cpu/simple_thread.hh"
+#include "cpu/timebuf.hh"
 //#include "cpu/o3/thread_context.hh"
-#include "sim/process.hh"
-
 #include "params/DerivO3CPU.hh"
+#include "sim/process.hh"
 
 template <class>
 class Checker;
diff --git a/src/cpu/o3/cpu_policy.hh b/src/cpu/o3/cpu_policy.hh
index c06c9a201..ed0c31133 100644
--- a/src/cpu/o3/cpu_policy.hh
+++ b/src/cpu/o3/cpu_policy.hh
@@ -32,24 +32,22 @@
 #define __CPU_O3_CPU_POLICY_HH__
 
 #include "cpu/o3/bpred_unit.hh"
+#include "cpu/o3/comm.hh"
+#include "cpu/o3/commit.hh"
+#include "cpu/o3/decode.hh"
+#include "cpu/o3/fetch.hh"
 #include "cpu/o3/free_list.hh"
+#include "cpu/o3/iew.hh"
 #include "cpu/o3/inst_queue.hh"
 #include "cpu/o3/lsq.hh"
 #include "cpu/o3/lsq_unit.hh"
 #include "cpu/o3/mem_dep_unit.hh"
 #include "cpu/o3/regfile.hh"
+#include "cpu/o3/rename.hh"
 #include "cpu/o3/rename_map.hh"
 #include "cpu/o3/rob.hh"
 #include "cpu/o3/store_set.hh"
 
-#include "cpu/o3/commit.hh"
-#include "cpu/o3/decode.hh"
-#include "cpu/o3/fetch.hh"
-#include "cpu/o3/iew.hh"
-#include "cpu/o3/rename.hh"
-
-#include "cpu/o3/comm.hh"
-
 /**
  * Struct that defines the key classes to be used by the CPU.  All
  * classes use the typedefs defined here to determine what are the
diff --git a/src/cpu/o3/decode.cc b/src/cpu/o3/decode.cc
index 896e38331..9722a4fcd 100644
--- a/src/cpu/o3/decode.cc
+++ b/src/cpu/o3/decode.cc
@@ -28,7 +28,7 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/decode_impl.hh"
+#include "cpu/o3/isa_specific.hh"
 
 template class DefaultDecode<O3CPUImpl>;
diff --git a/src/cpu/o3/dyn_inst.hh b/src/cpu/o3/dyn_inst.hh
index 487c284e6..2e434ea02 100644
--- a/src/cpu/o3/dyn_inst.hh
+++ b/src/cpu/o3/dyn_inst.hh
@@ -45,10 +45,10 @@
 
 #include "arch/isa_traits.hh"
 #include "config/the_isa.hh"
-#include "cpu/base_dyn_inst.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/cpu.hh"
 #include "cpu/o3/isa_specific.hh"
+#include "cpu/base_dyn_inst.hh"
+#include "cpu/inst_seq.hh"
 
 class Packet;
 
diff --git a/src/cpu/o3/fetch.cc b/src/cpu/o3/fetch.cc
index d809b07e4..fb08b0957 100644
--- a/src/cpu/o3/fetch.cc
+++ b/src/cpu/o3/fetch.cc
@@ -28,7 +28,7 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/fetch_impl.hh"
+#include "cpu/o3/isa_specific.hh"
 
 template class DefaultFetch<O3CPUImpl>;
diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh
index 4a4ac0902..53f0f631e 100644
--- a/src/cpu/o3/fetch.hh
+++ b/src/cpu/o3/fetch.hh
@@ -44,12 +44,12 @@
 #ifndef __CPU_O3_FETCH_HH__
 #define __CPU_O3_FETCH_HH__
 
-#include "arch/utility.hh"
 #include "arch/predecoder.hh"
+#include "arch/utility.hh"
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
 #include "cpu/pc_event.hh"
+#include "cpu/timebuf.hh"
 #include "cpu/translation.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index c611f0e49..806cf7916 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -50,8 +50,8 @@
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
 #include "cpu/checker/cpu.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/o3/fetch.hh"
+#include "cpu/exetrace.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
 #include "params/DerivO3CPU.hh"
diff --git a/src/cpu/o3/free_list.cc b/src/cpu/o3/free_list.cc
index 1144238f4..88020a0a2 100644
--- a/src/cpu/o3/free_list.cc
+++ b/src/cpu/o3/free_list.cc
@@ -29,7 +29,6 @@
  */
 
 #include "base/trace.hh"
-
 #include "cpu/o3/free_list.hh"
 
 SimpleFreeList::SimpleFreeList(ThreadID activeThreads,
diff --git a/src/cpu/o3/fu_pool.hh b/src/cpu/o3/fu_pool.hh
index 20d742cc8..ea4b53e1a 100644
--- a/src/cpu/o3/fu_pool.hh
+++ b/src/cpu/o3/fu_pool.hh
@@ -36,8 +36,8 @@
 #include <string>
 #include <vector>
 
-#include "cpu/sched_list.hh"
 #include "cpu/op_class.hh"
+#include "cpu/sched_list.hh"
 #include "params/FUPool.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/cpu/o3/iew.cc b/src/cpu/o3/iew.cc
index f99be7fe0..9bf2db4d0 100644
--- a/src/cpu/o3/iew.cc
+++ b/src/cpu/o3/iew.cc
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/iew_impl.hh"
 #include "cpu/o3/inst_queue.hh"
+#include "cpu/o3/isa_specific.hh"
 
 template class DefaultIEW<O3CPUImpl>;
diff --git a/src/cpu/o3/iew.hh b/src/cpu/o3/iew.hh
index 6599964b6..d157b4383 100644
--- a/src/cpu/o3/iew.hh
+++ b/src/cpu/o3/iew.hh
@@ -46,11 +46,11 @@
 #include <queue>
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "config/full_system.hh"
 #include "cpu/o3/comm.hh"
-#include "cpu/o3/scoreboard.hh"
 #include "cpu/o3/lsq.hh"
+#include "cpu/o3/scoreboard.hh"
+#include "cpu/timebuf.hh"
 
 class DerivO3CPUParams;
 class FUPool;
diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh
index 8bf3c56f4..8b1bd4d00 100644
--- a/src/cpu/o3/iew_impl.hh
+++ b/src/cpu/o3/iew_impl.hh
@@ -46,10 +46,10 @@
 
 #include <queue>
 
-#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
 #include "cpu/o3/fu_pool.hh"
 #include "cpu/o3/iew.hh"
+#include "cpu/timebuf.hh"
 #include "params/DerivO3CPU.hh"
 
 using namespace std;
diff --git a/src/cpu/o3/impl.hh b/src/cpu/o3/impl.hh
index ffccd4a84..8905bdb1c 100644
--- a/src/cpu/o3/impl.hh
+++ b/src/cpu/o3/impl.hh
@@ -35,7 +35,6 @@
 #include "config/the_isa.hh"
 #include "cpu/o3/cpu_policy.hh"
 
-
 // Forward declarations.
 template <class Impl>
 class BaseO3DynInst;
diff --git a/src/cpu/o3/inst_queue.cc b/src/cpu/o3/inst_queue.cc
index a539066f9..cbc3d2e82 100644
--- a/src/cpu/o3/inst_queue.cc
+++ b/src/cpu/o3/inst_queue.cc
@@ -28,8 +28,8 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/inst_queue_impl.hh"
+#include "cpu/o3/isa_specific.hh"
 
 // Force instantiation of InstructionQueue.
 template class InstructionQueue<O3CPUImpl>;
diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh
index 64df35743..eb35fd285 100644
--- a/src/cpu/o3/inst_queue.hh
+++ b/src/cpu/o3/inst_queue.hh
@@ -49,11 +49,11 @@
 #include <vector>
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "base/types.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/dep_graph.hh"
+#include "cpu/inst_seq.hh"
 #include "cpu/op_class.hh"
+#include "cpu/timebuf.hh"
 #include "sim/eventq.hh"
 
 class DerivO3CPUParams;
diff --git a/src/cpu/o3/isa_specific.hh b/src/cpu/o3/isa_specific.hh
index e9347af91..9bae3fd15 100755
--- a/src/cpu/o3/isa_specific.hh
+++ b/src/cpu/o3/isa_specific.hh
@@ -28,7 +28,6 @@
  * Authors: Korey Sewell
  */
 
-#include "cpu/base.hh"
-
-#include "cpu/o3/impl.hh"
 #include "cpu/o3/dyn_inst.hh"
+#include "cpu/o3/impl.hh"
+#include "cpu/base.hh"
diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index 0ad5d51c2..14917bc16 100644
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -35,8 +35,8 @@
 #include <queue>
 
 #include "config/full_system.hh"
-#include "cpu/inst_seq.hh"
 #include "cpu/o3/lsq_unit.hh"
+#include "cpu/inst_seq.hh"
 #include "mem/port.hh"
 #include "sim/sim_object.hh"
 
diff --git a/src/cpu/o3/lsq_unit.hh b/src/cpu/o3/lsq_unit.hh
index bdc524dec..36c2ff8c8 100644
--- a/src/cpu/o3/lsq_unit.hh
+++ b/src/cpu/o3/lsq_unit.hh
@@ -39,10 +39,10 @@
 
 #include "arch/faults.hh"
 #include "arch/locked_mem.hh"
-#include "config/full_system.hh"
-#include "config/the_isa.hh"
 #include "base/fast_alloc.hh"
 #include "base/hashmap.hh"
+#include "config/full_system.hh"
+#include "config/the_isa.hh"
 #include "cpu/inst_seq.hh"
 #include "mem/packet.hh"
 #include "mem/port.hh"
diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh
index 70b87ff26..6a366d056 100644
--- a/src/cpu/o3/lsq_unit_impl.hh
+++ b/src/cpu/o3/lsq_unit_impl.hh
@@ -42,11 +42,11 @@
  */
 
 #include "arch/locked_mem.hh"
+#include "base/str.hh"
 #include "config/the_isa.hh"
 #include "config/use_checker.hh"
 #include "cpu/o3/lsq.hh"
 #include "cpu/o3/lsq_unit.hh"
-#include "base/str.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
 
diff --git a/src/cpu/o3/mem_dep_unit.cc b/src/cpu/o3/mem_dep_unit.cc
index 6a14dcbff..ac0db4784 100644
--- a/src/cpu/o3/mem_dep_unit.cc
+++ b/src/cpu/o3/mem_dep_unit.cc
@@ -29,8 +29,8 @@
  */
 
 #include "cpu/o3/isa_specific.hh"
-#include "cpu/o3/store_set.hh"
 #include "cpu/o3/mem_dep_unit_impl.hh"
+#include "cpu/o3/store_set.hh"
 
 // Force instantation of memory dependency unit using store sets and
 // O3CPUImpl.
diff --git a/src/cpu/o3/rename.hh b/src/cpu/o3/rename.hh
index 901283111..e2472a62d 100644
--- a/src/cpu/o3/rename.hh
+++ b/src/cpu/o3/rename.hh
@@ -34,8 +34,8 @@
 #include <list>
 
 #include "base/statistics.hh"
-#include "cpu/timebuf.hh"
 #include "config/the_isa.hh"
+#include "cpu/timebuf.hh"
 
 class DerivO3CPUParams;
 
diff --git a/src/cpu/o3/scoreboard.hh b/src/cpu/o3/scoreboard.hh
index b1c2bd026..4789e2181 100644
--- a/src/cpu/o3/scoreboard.hh
+++ b/src/cpu/o3/scoreboard.hh
@@ -35,6 +35,7 @@
 #include <iostream>
 #include <utility>
 #include <vector>
+
 #include "base/trace.hh"
 #include "base/traceflags.hh"
 #include "cpu/o3/comm.hh"
diff --git a/src/cpu/o3/thread_context.cc b/src/cpu/o3/thread_context.cc
index 0d8c67643..7ca716dd1 100755
--- a/src/cpu/o3/thread_context.cc
+++ b/src/cpu/o3/thread_context.cc
@@ -28,9 +28,9 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/impl.hh"
 #include "cpu/o3/thread_context.hh"
 #include "cpu/o3/thread_context_impl.hh"
-#include "cpu/o3/impl.hh"
 
 template class O3ThreadContext<O3CPUImpl>;
 
diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh
index 4e559000b..ef0fdbb4d 100755
--- a/src/cpu/o3/thread_context.hh
+++ b/src/cpu/o3/thread_context.hh
@@ -32,8 +32,8 @@
 #define __CPU_O3_THREAD_CONTEXT_HH__
 
 #include "config/the_isa.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/o3/isa_specific.hh"
+#include "cpu/thread_context.hh"
 
 class EndQuiesceEvent;
 namespace Kernel {