style: [patch 1/22] use /r/3648/ to reorganize includes

src/cpu/activity.cc

@@ -28,9 +28,10 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/activity.hh"
+
 #include <string>
 
-#include "cpu/activity.hh"
 #include "cpu/timebuf.hh"
 #include "debug/Activity.hh"
 

src/cpu/base.cc

@@ -45,18 +45,19 @@
  *          Rick Strong
  */
 
+#include "cpu/base.hh"
+
 #include <iostream>
 #include <sstream>
 #include <string>
 
 #include "arch/tlb.hh"
-#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
+#include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/output.hh"
 #include "base/trace.hh"
 #include "cpu/checker/cpu.hh"
-#include "cpu/base.hh"
 #include "cpu/cpuevent.hh"
 #include "cpu/profile.hh"
 #include "cpu/thread_context.hh"

src/cpu/checker/cpu.cc

@@ -41,13 +41,14 @@
  *          Geoffrey Blake
  */
 
+#include "cpu/checker/cpu.hh"
+
 #include <list>
 #include <string>
 
 #include "arch/generic/tlb.hh"
 #include "arch/kernel_stats.hh"
 #include "arch/vtophys.hh"
-#include "cpu/checker/cpu.hh"
 #include "cpu/base.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/static_inst.hh"

src/cpu/dummy_checker.cc

@@ -38,6 +38,7 @@
  */
 
 #include "cpu/dummy_checker.hh"
+
 #include "params/DummyChecker.hh"
 
 ////////////////////////////////////////////////////////////////////////

src/cpu/exetrace.cc

@@ -31,6 +31,8 @@
  *          Steve Raasch
  */
 
+#include "cpu/exetrace.hh"
+
 #include <iomanip>
 
 #include "arch/isa_traits.hh"
@@ -38,7 +40,6 @@
 #include "base/loader/symtab.hh"
 #include "config/the_isa.hh"
 #include "cpu/base.hh"
-#include "cpu/exetrace.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "debug/ExecAll.hh"

src/cpu/func_unit.cc

@@ -28,10 +28,11 @@
  * Authors: Steve Raasch
  */
 
+#include "cpu/func_unit.hh"
+
 #include <sstream>
 
 #include "base/misc.hh"
-#include "cpu/func_unit.hh"
 
 using namespace std;
 

src/cpu/inteltrace.cc

@@ -31,11 +31,12 @@
  *          Steve Raasch
  */
 
+#include "cpu/inteltrace.hh"
+
 #include <iomanip>
 
 #include "config/the_isa.hh"
 #include "cpu/exetrace.hh"
-#include "cpu/inteltrace.hh"
 #include "cpu/static_inst.hh"
 
 using namespace std;

src/cpu/intr_control.cc

@@ -29,12 +29,13 @@
  *          Ron Dreslinski
  */
 
+#include "cpu/intr_control.hh"
+
 #include <string>
 #include <vector>
 
 #include "base/trace.hh"
 #include "cpu/base.hh"
-#include "cpu/intr_control.hh"
 #include "cpu/thread_context.hh"
 #include "debug/IntrControl.hh"
 #include "sim/sim_object.hh"

src/cpu/kvm/base.cc

@@ -37,6 +37,8 @@
  * Authors: Andreas Sandberg
  */
 
+#include "cpu/kvm/base.hh"
+
 #include <linux/kvm.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ -48,7 +50,6 @@
 
 #include "arch/mmapped_ipr.hh"
 #include "arch/utility.hh"
-#include "cpu/kvm/base.hh"
 #include "debug/Checkpoint.hh"
 #include "debug/Drain.hh"
 #include "debug/Kvm.hh"
@@ -58,8 +59,6 @@
 #include "sim/process.hh"
 #include "sim/system.hh"
 
-#include <signal.h>
-
 /* Used by some KVM macros */
 #define PAGE_SIZE pageSize
 

src/cpu/kvm/perfevent.cc

@@ -37,11 +37,11 @@
  * Authors: Andreas Sandberg
  */
 
+#include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
-#include <fcntl.h>
 #include <syscall.h>
 #include <unistd.h>
 

src/cpu/kvm/timer.cc

@@ -37,15 +37,17 @@
  * Authors: Andreas Sandberg
  */
 
+#include "cpu/kvm/timer.hh"
+
+#include <sys/syscall.h>
+#include <unistd.h>
+
 #include <algorithm>
 #include <csignal>
 #include <ctime>
-#include <unistd.h>
-#include <sys/syscall.h>
 
 #include "base/misc.hh"
 #include "base/trace.hh"
-#include "cpu/kvm/timer.hh"
 #include "debug/KvmTimer.hh"
 
 /* According to timer_create(2), the value SIGEV_THREAD_ID can be used

src/cpu/kvm/vm.cc

@@ -38,17 +38,18 @@
  * Authors: Andreas Sandberg
  */
 
+#include "cpu/kvm/vm.hh"
+
+#include <fcntl.h>
 #include <linux/kvm.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <fcntl.h>
 #include <unistd.h>
 
 #include <cerrno>
 #include <memory>
 
-#include "cpu/kvm/vm.hh"
 #include "debug/Kvm.hh"
 #include "params/KvmVM.hh"
 #include "sim/system.hh"

src/cpu/kvm/x86_cpu.cc

@@ -28,18 +28,19 @@
  * Authors: Andreas Sandberg
  */
 
+#include "cpu/kvm/x86_cpu.hh"
+
 #include <linux/kvm.h>
 
 #include <algorithm>
 #include <cerrno>
 #include <memory>
 
-#include "arch/x86/regs/msr.hh"
-#include "arch/x86/cpuid.hh"
-#include "arch/x86/utility.hh"
 #include "arch/registers.hh"
+#include "arch/x86/cpuid.hh"
+#include "arch/x86/regs/msr.hh"
+#include "arch/x86/utility.hh"
 #include "cpu/kvm/base.hh"
-#include "cpu/kvm/x86_cpu.hh"
 #include "debug/Drain.hh"
 #include "debug/Kvm.hh"
 #include "debug/KvmContext.hh"

src/cpu/minor/activity.cc

@@ -37,9 +37,10 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/activity.hh"
+
 #include <sstream>
 
-#include "cpu/minor/activity.hh"
 #include "cpu/minor/trace.hh"
 
 namespace Minor

src/cpu/minor/cpu.cc

@@ -37,8 +37,9 @@
  * Authors: Andrew Bardsley
  */
 
-#include "arch/utility.hh"
 #include "cpu/minor/cpu.hh"
+
+#include "arch/utility.hh"
 #include "cpu/minor/dyn_inst.hh"
 #include "cpu/minor/fetch1.hh"
 #include "cpu/minor/pipeline.hh"

src/cpu/minor/decode.cc

@@ -38,6 +38,7 @@
  */
 
 #include "cpu/minor/decode.hh"
+
 #include "cpu/minor/pipeline.hh"
 #include "debug/Decode.hh"
 

src/cpu/minor/dyn_inst.cc

@@ -37,14 +37,15 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/dyn_inst.hh"
+
 #include <iomanip>
 #include <sstream>
 
 #include "arch/isa.hh"
 #include "arch/registers.hh"
-#include "cpu/minor/dyn_inst.hh"
-#include "cpu/minor/trace.hh"
 #include "cpu/base.hh"
+#include "cpu/minor/trace.hh"
 #include "cpu/reg_class.hh"
 #include "debug/MinorExecute.hh"
 #include "enums/OpClass.hh"

src/cpu/minor/execute.cc

@@ -37,12 +37,13 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/execute.hh"
+
 #include "arch/locked_mem.hh"
 #include "arch/registers.hh"
 #include "arch/utility.hh"
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/exec_context.hh"
-#include "cpu/minor/execute.hh"
 #include "cpu/minor/fetch1.hh"
 #include "cpu/minor/lsq.hh"
 #include "cpu/op_class.hh"

src/cpu/minor/fetch1.cc

@@ -37,12 +37,13 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/fetch1.hh"
+
 #include <cstring>
 #include <iomanip>
 #include <sstream>
 
 #include "base/cast.hh"
-#include "cpu/minor/fetch1.hh"
 #include "cpu/minor/pipeline.hh"
 #include "debug/Drain.hh"
 #include "debug/Fetch.hh"

src/cpu/minor/fetch2.cc

@@ -37,11 +37,12 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/fetch2.hh"
+
 #include <string>
 
 #include "arch/decoder.hh"
 #include "arch/utility.hh"
-#include "cpu/minor/fetch2.hh"
 #include "cpu/minor/pipeline.hh"
 #include "cpu/pred/bpred_unit.hh"
 #include "debug/Branch.hh"

src/cpu/minor/func_unit.cc

@@ -37,11 +37,12 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/func_unit.hh"
+
 #include <iomanip>
 #include <sstream>
 #include <typeinfo>
 
-#include "cpu/minor/func_unit.hh"
 #include "debug/MinorTiming.hh"
 #include "enums/OpClass.hh"
 

src/cpu/minor/lsq.cc

@@ -37,6 +37,8 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/lsq.hh"
+
 #include <iomanip>
 #include <sstream>
 
@@ -45,7 +47,6 @@
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/exec_context.hh"
 #include "cpu/minor/execute.hh"
-#include "cpu/minor/lsq.hh"
 #include "cpu/minor/pipeline.hh"
 #include "debug/Activity.hh"
 #include "debug/MinorMem.hh"

src/cpu/minor/pipeline.cc

@@ -37,13 +37,14 @@
  * Authors: Andrew Bardsley
  */
 
+#include "cpu/minor/pipeline.hh"
+
 #include <algorithm>
 
 #include "cpu/minor/decode.hh"
 #include "cpu/minor/execute.hh"
 #include "cpu/minor/fetch1.hh"
 #include "cpu/minor/fetch2.hh"
-#include "cpu/minor/pipeline.hh"
 #include "debug/Drain.hh"
 #include "debug/MinorCPU.hh"
 #include "debug/MinorTrace.hh"

src/cpu/minor/scoreboard.cc

@@ -37,8 +37,9 @@
  * Authors: Andrew Bardsley
  */
 
-#include "arch/registers.hh"
 #include "cpu/minor/scoreboard.hh"
+
+#include "arch/registers.hh"
 #include "cpu/reg_class.hh"
 #include "debug/MinorScoreboard.hh"
 #include "debug/MinorTiming.hh"

src/cpu/nativetrace.cc

@@ -28,8 +28,9 @@
  * Authors: Gabe Black
  */
 
-#include "base/socket.hh"
 #include "cpu/nativetrace.hh"
+
+#include "base/socket.hh"
 #include "cpu/static_inst.hh"
 #include "debug/GDBMisc.hh"
 #include "params/NativeTrace.hh"

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

src/cpu/o3/checker.cc

@@ -40,8 +40,9 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/checker/cpu_impl.hh"
 #include "cpu/o3/checker.hh"
+
+#include "cpu/checker/cpu_impl.hh"
 #include "params/O3Checker.hh"
 
 class MemObject;

src/cpu/o3/cpu.cc

@@ -44,14 +44,15 @@
  *          Rick Strong
  */
 
+#include "cpu/o3/cpu.hh"
+
 #include "arch/kernel_stats.hh"
 #include "config/the_isa.hh"
+#include "cpu/activity.hh"
 #include "cpu/checker/cpu.hh"
 #include "cpu/checker/thread_context.hh"
-#include "cpu/o3/cpu.hh"
 #include "cpu/o3/isa_specific.hh"
 #include "cpu/o3/thread_context.hh"
-#include "cpu/activity.hh"
 #include "cpu/quiesce_event.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/thread_context.hh"
@@ -69,6 +70,7 @@
 #if THE_ISA == ALPHA_ISA
 #include "arch/alpha/osfpal.hh"
 #include "debug/Activity.hh"
+
 #endif
 
 struct BaseCPUParams;

src/cpu/o3/deriv.cc

@@ -28,9 +28,10 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/deriv.hh"
+
 #include <string>
 
-#include "cpu/o3/deriv.hh"
 #include "params/DerivO3CPU.hh"
 
 DerivO3CPU *

src/cpu/o3/free_list.cc

@@ -29,10 +29,11 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/free_list.hh"
+
 #include "arch/registers.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "cpu/o3/free_list.hh"
 #include "debug/FreeList.hh"
 
 UnifiedFreeList::UnifiedFreeList(const std::string &_my_name,

src/cpu/o3/fu_pool.cc

@@ -40,9 +40,10 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/fu_pool.hh"
+
 #include <sstream>
 
-#include "cpu/o3/fu_pool.hh"
 #include "cpu/func_unit.hh"
 
 using namespace std;

src/cpu/o3/probe/simple_trace.cc

@@ -37,8 +37,9 @@
  * Authors: Matt Horsnell
  */
 
-#include "base/trace.hh"
 #include "cpu/o3/probe/simple_trace.hh"
+
+#include "base/trace.hh"
 #include "debug/SimpleTrace.hh"
 
 void SimpleTrace::traceCommit(const O3CPUImpl::DynInstPtr &dynInst)

src/cpu/o3/regfile.cc

@@ -31,9 +31,9 @@
  *          Steve Reinhardt
  */
 
-#include "cpu/o3/free_list.hh"
 #include "cpu/o3/regfile.hh"
 
+#include "cpu/o3/free_list.hh"
 
 PhysRegFile::PhysRegFile(unsigned _numPhysicalIntRegs,
                          unsigned _numPhysicalFloatRegs,

src/cpu/o3/rename_map.cc

@@ -29,9 +29,10 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/rename_map.hh"
+
 #include <vector>
 
-#include "cpu/o3/rename_map.hh"
 #include "debug/Rename.hh"
 
 using namespace std;

src/cpu/o3/scoreboard.cc

@@ -30,8 +30,9 @@
  *          Kevin Lim
  */
 
-#include "config/the_isa.hh"
 #include "cpu/o3/scoreboard.hh"
+
+#include "config/the_isa.hh"
 #include "debug/Scoreboard.hh"
 
 Scoreboard::Scoreboard(const std::string &_my_name,

src/cpu/o3/store_set.cc

@@ -28,10 +28,11 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/o3/store_set.hh"
+
 #include "base/intmath.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
-#include "cpu/o3/store_set.hh"
 #include "debug/StoreSet.hh"
 
 StoreSet::StoreSet(uint64_t clear_period, int _SSIT_size, int _LFST_size)

src/cpu/o3/thread_context.cc

@@ -28,8 +28,9 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/o3/impl.hh"
 #include "cpu/o3/thread_context.hh"
+
+#include "cpu/o3/impl.hh"
 #include "cpu/o3/thread_context_impl.hh"
 
 template class O3ThreadContext<O3CPUImpl>;

src/cpu/pc_event.cc

@@ -29,6 +29,8 @@
  *          Steve Reinhardt
  */
 
+#include "cpu/pc_event.hh"
+
 #include <algorithm>
 #include <string>
 #include <utility>
@@ -36,7 +38,6 @@
 #include "base/debug.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"
-#include "cpu/pc_event.hh"
 #include "cpu/thread_context.hh"
 #include "debug/PCEvent.hh"
 #include "sim/core.hh"

src/cpu/pred/2bit_local.cc

@@ -28,10 +28,11 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/pred/2bit_local.hh"
+
 #include "base/intmath.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
-#include "cpu/pred/2bit_local.hh"
 #include "debug/Fetch.hh"
 
 LocalBP::LocalBP(const LocalBPParams *params)

src/cpu/pred/bi_mode.cc

@@ -32,9 +32,10 @@
  * Implementation of a bi-mode branch predictor
  */
 
+#include "cpu/pred/bi_mode.hh"
+
 #include "base/bitfield.hh"
 #include "base/intmath.hh"
-#include "cpu/pred/bi_mode.hh"
 
 BiModeBP::BiModeBP(const BiModeBPParams *params)
     : BPredUnit(params),

src/cpu/pred/btb.cc

@@ -28,9 +28,10 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/pred/btb.hh"
+
 #include "base/intmath.hh"
 #include "base/trace.hh"
-#include "cpu/pred/btb.hh"
 #include "debug/Fetch.hh"
 
 DefaultBTB::DefaultBTB(unsigned _numEntries,

src/cpu/pred/tournament.cc

@@ -40,9 +40,10 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/pred/tournament.hh"
+
 #include "base/bitfield.hh"
 #include "base/intmath.hh"
-#include "cpu/pred/tournament.hh"
 
 TournamentBP::TournamentBP(const TournamentBPParams *params)
     : BPredUnit(params),

src/cpu/profile.cc

@@ -28,15 +28,16 @@
  * Authors: Nathan Binkert
  */
 
+#include "cpu/profile.hh"
+
 #include <string>
 
-#include "base/loader/symtab.hh"
 #include "base/bitfield.hh"
 #include "base/callback.hh"
+#include "base/loader/symtab.hh"
 #include "base/statistics.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"
-#include "cpu/profile.hh"
 #include "cpu/thread_context.hh"
 
 using namespace std;

src/cpu/quiesce_event.cc

@@ -28,8 +28,9 @@
  * Authors: Kevin Lim
  */
 
-#include "cpu/base.hh"
 #include "cpu/quiesce_event.hh"
+
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Quiesce.hh"
 

src/cpu/simple/atomic.cc

@@ -41,13 +41,14 @@
  * Authors: Steve Reinhardt
  */
 
+#include "cpu/simple/atomic.hh"
+
 #include "arch/locked_mem.hh"
 #include "arch/mmapped_ipr.hh"
 #include "arch/utility.hh"
 #include "base/bigint.hh"
 #include "base/output.hh"
 #include "config/the_isa.hh"
-#include "cpu/simple/atomic.hh"
 #include "cpu/exetrace.hh"
 #include "debug/Drain.hh"
 #include "debug/ExecFaulting.hh"
@@ -57,8 +58,8 @@
 #include "mem/physical.hh"
 #include "params/AtomicSimpleCPU.hh"
 #include "sim/faults.hh"
-#include "sim/system.hh"
 #include "sim/full_system.hh"
+#include "sim/system.hh"
 
 using namespace std;
 using namespace TheISA;

src/cpu/simple/base.cc

@@ -41,21 +41,22 @@
  * Authors: Steve Reinhardt
  */
 
+#include "cpu/simple/base.hh"
+
 #include "arch/kernel_stats.hh"
 #include "arch/stacktrace.hh"
 #include "arch/tlb.hh"
 #include "arch/utility.hh"
 #include "arch/vtophys.hh"
-#include "base/loader/symtab.hh"
 #include "base/cp_annotate.hh"
 #include "base/cprintf.hh"
 #include "base/inifile.hh"
+#include "base/loader/symtab.hh"
 #include "base/misc.hh"
 #include "base/pollevent.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"
-#include "cpu/simple/base.hh"
 #include "cpu/base.hh"
 #include "cpu/checker/cpu.hh"
 #include "cpu/checker/thread_context.hh"

src/cpu/simple/probes/simpoint.cc

@@ -38,9 +38,10 @@
  *          Curtis Dunham
  */
 
-#include "base/output.hh"
 #include "cpu/simple/probes/simpoint.hh"
 
+#include "base/output.hh"
+
 SimPoint::SimPoint(const SimPointParams *p)
     : ProbeListenerObject(p),
       intervalSize(p->interval),

src/cpu/simple/timing.cc

@@ -41,16 +41,18 @@
  * Authors: Steve Reinhardt
  */
 
+#include "cpu/simple/timing.hh"
+
 #include "arch/locked_mem.hh"
 #include "arch/mmapped_ipr.hh"
 #include "arch/utility.hh"
 #include "base/bigint.hh"
 #include "config/the_isa.hh"
-#include "cpu/simple/timing.hh"
 #include "cpu/exetrace.hh"
 #include "debug/Config.hh"
 #include "debug/Drain.hh"
 #include "debug/ExecFaulting.hh"
+#include "debug/Mwait.hh"
 #include "debug/SimpleCPU.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
@@ -59,8 +61,6 @@
 #include "sim/full_system.hh"
 #include "sim/system.hh"
 
-#include "debug/Mwait.hh"
-
 using namespace std;
 using namespace TheISA;
 

src/cpu/simple_thread.cc

@@ -31,6 +31,8 @@
  *          Kevin Lim
  */
 
+#include "cpu/simple_thread.hh"
+
 #include <string>
 
 #include "arch/isa_traits.hh"
@@ -45,7 +47,6 @@
 #include "cpu/base.hh"
 #include "cpu/profile.hh"
 #include "cpu/quiesce_event.hh"
-#include "cpu/simple_thread.hh"
 #include "cpu/thread_context.hh"
 #include "mem/fs_translating_port_proxy.hh"
 #include "mem/se_translating_port_proxy.hh"

src/cpu/static_inst.cc

@@ -29,9 +29,10 @@
  *          Nathan Binkert
  */
 
+#include "cpu/static_inst.hh"
+
 #include <iostream>
 
-#include "cpu/static_inst.hh"
 #include "sim/core.hh"
 
 StaticInstPtr StaticInst::nullStaticInstPtr;

src/cpu/testers/directedtest/DirectedGenerator.cc

@@ -28,6 +28,7 @@
  */
 
 #include "cpu/testers/directedtest/DirectedGenerator.hh"
+
 #include "sim/system.hh"
 
 DirectedGenerator::DirectedGenerator(const Params *p)

src/cpu/testers/directedtest/InvalidateGenerator.cc

@@ -27,8 +27,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "cpu/testers/directedtest/DirectedGenerator.hh"
 #include "cpu/testers/directedtest/InvalidateGenerator.hh"
+
+#include "cpu/testers/directedtest/DirectedGenerator.hh"
 #include "cpu/testers/directedtest/RubyDirectedTester.hh"
 #include "debug/DirectedTest.hh"
 

src/cpu/testers/directedtest/RubyDirectedTester.cc

@@ -39,8 +39,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "cpu/testers/directedtest/DirectedGenerator.hh"
 #include "cpu/testers/directedtest/RubyDirectedTester.hh"
+
+#include "cpu/testers/directedtest/DirectedGenerator.hh"
 #include "debug/DirectedTest.hh"
 #include "sim/sim_exit.hh"
 

src/cpu/testers/directedtest/SeriesRequestGenerator.cc

@@ -27,10 +27,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "cpu/testers/directedtest/SeriesRequestGenerator.hh"
+
 #include "base/random.hh"
 #include "cpu/testers/directedtest/DirectedGenerator.hh"
 #include "cpu/testers/directedtest/RubyDirectedTester.hh"
-#include "cpu/testers/directedtest/SeriesRequestGenerator.hh"
 #include "debug/DirectedTest.hh"
 
 SeriesRequestGenerator::SeriesRequestGenerator(const Params *p)

src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc

@@ -28,6 +28,8 @@
  * Authors: Tushar Krishna
  */
 
+#include "cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh"
+
 #include <cmath>
 #include <iomanip>
 #include <set>
@@ -37,7 +39,6 @@
 #include "base/misc.hh"
 #include "base/random.hh"
 #include "base/statistics.hh"
-#include "cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh"
 #include "debug/GarnetSyntheticTraffic.hh"
 #include "mem/mem_object.hh"
 #include "mem/packet.hh"

src/cpu/testers/memtest/memtest.cc

@@ -42,9 +42,10 @@
  *          Andreas Hansson
  */
 
+#include "cpu/testers/memtest/memtest.hh"
+
 #include "base/random.hh"
 #include "base/statistics.hh"
-#include "cpu/testers/memtest/memtest.hh"
 #include "debug/MemTest.hh"
 #include "mem/mem_object.hh"
 #include "sim/sim_exit.hh"

src/cpu/testers/rubytest/Check.cc

@@ -27,8 +27,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "base/random.hh"
 #include "cpu/testers/rubytest/Check.hh"
+
+#include "base/random.hh"
 #include "debug/RubyTest.hh"
 #include "mem/ruby/common/SubBlock.hh"
 

src/cpu/testers/rubytest/CheckTable.cc

@@ -27,10 +27,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "cpu/testers/rubytest/CheckTable.hh"
+
 #include "base/intmath.hh"
 #include "base/random.hh"
 #include "cpu/testers/rubytest/Check.hh"
-#include "cpu/testers/rubytest/CheckTable.hh"
 #include "debug/RubyTest.hh"
 
 CheckTable::CheckTable(int _num_writers, int _num_readers, RubyTester* _tester)

src/cpu/testers/rubytest/RubyTester.cc

@@ -39,9 +39,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "cpu/testers/rubytest/RubyTester.hh"
+
 #include "base/misc.hh"
 #include "cpu/testers/rubytest/Check.hh"
-#include "cpu/testers/rubytest/RubyTester.hh"
 #include "debug/RubyTest.hh"
 #include "mem/ruby/common/SubBlock.hh"
 #include "sim/sim_exit.hh"

src/cpu/thread_context.cc

@@ -41,13 +41,14 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/thread_context.hh"
+
 #include "arch/kernel_stats.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "cpu/quiesce_event.hh"
-#include "cpu/thread_context.hh"
 #include "debug/Context.hh"
 #include "debug/Quiesce.hh"
 #include "params/BaseCPU.hh"

src/cpu/thread_state.cc

@@ -28,12 +28,13 @@
  * Authors: Kevin Lim
  */
 
+#include "cpu/thread_state.hh"
+
 #include "arch/kernel_stats.hh"
 #include "base/output.hh"
 #include "cpu/base.hh"
 #include "cpu/profile.hh"
 #include "cpu/quiesce_event.hh"
-#include "cpu/thread_state.hh"
 #include "mem/fs_translating_port_proxy.hh"
 #include "mem/port.hh"
 #include "mem/port_proxy.hh"

src/cpu/timing_expr.cc

@@ -37,9 +37,10 @@
  * Authors: Andrew Bardsley
  */
 
-#include "base/intmath.hh"
 #include "cpu/timing_expr.hh"
 
+#include "base/intmath.hh"
+
 TimingExprEvalContext::TimingExprEvalContext(const StaticInstPtr &inst_,
     ThreadContext *thread_,
     TimingExprLet *let_) :