From 4e3426624557b555c354035ee3961eab7554d81d Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 4 Jun 2009 21:50:20 -0700 Subject: move: put predictor includes and cc files into the same place --HG-- rename : src/cpu/2bit_local_pred.cc => src/cpu/pred/2bit_local.cc rename : src/cpu/o3/2bit_local_pred.hh => src/cpu/pred/2bit_local.hh rename : src/cpu/btb.cc => src/cpu/pred/btb.cc rename : src/cpu/o3/btb.hh => src/cpu/pred/btb.hh rename : src/cpu/ras.cc => src/cpu/pred/ras.cc rename : src/cpu/o3/ras.hh => src/cpu/pred/ras.hh rename : src/cpu/tournament_pred.cc => src/cpu/pred/tournament.cc rename : src/cpu/o3/tournament_pred.hh => src/cpu/pred/tournament.hh --- src/cpu/inorder/resources/bpred_unit.hh | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/cpu/inorder/resources') diff --git a/src/cpu/inorder/resources/bpred_unit.hh b/src/cpu/inorder/resources/bpred_unit.hh index abbb70e0d..1571e3206 100644 --- a/src/cpu/inorder/resources/bpred_unit.hh +++ b/src/cpu/inorder/resources/bpred_unit.hh @@ -32,21 +32,18 @@ #ifndef __CPU_INORDER_BPRED_UNIT_HH__ #define __CPU_INORDER_BPRED_UNIT_HH__ -// For Addr type. +#include + #include "arch/isa_traits.hh" #include "base/statistics.hh" #include "cpu/inst_seq.hh" - -//#include "cpu/inorder/params.hh" -#include "cpu/o3/2bit_local_pred.hh" -#include "cpu/o3/btb.hh" -#include "cpu/o3/ras.hh" -#include "cpu/o3/tournament_pred.hh" -#include "params/InOrderCPU.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" - -#include +#include "cpu/pred/2bit_local.hh" +#include "cpu/pred/btb.hh" +#include "cpu/pred/ras.hh" +#include "cpu/pred/tournament.hh" +#include "params/InOrderCPU.hh" /** * Basically a wrapper class to hold both the branch predictor -- cgit v1.2.3