From 578dd474b9d91aae48c87bb2c964eb1a1a8b58de Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 10 Apr 2019 23:11:46 +0200 Subject: [PATCH] base: Move SatCounter to base directory Saturating counters are used by many objects, not only the cpu predictors. Therefore, move the class to the base folder so that it can be more easily used. Change-Id: I26f799324bdd8720ab8834c72a2002149cee777c Signed-off-by: Daniel Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/17993 Maintainer: Jason Lowe-Power Tested-by: kokoro Reviewed-by: Jason Lowe-Power --- src/{cpu/pred => base}/sat_counter.hh | 6 +++--- src/cpu/pred/2bit_local.hh | 2 +- src/cpu/pred/bi_mode.hh | 2 +- src/cpu/pred/tournament.hh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/{cpu/pred => base}/sat_counter.hh (97%) diff --git a/src/cpu/pred/sat_counter.hh b/src/base/sat_counter.hh similarity index 97% rename from src/cpu/pred/sat_counter.hh rename to src/base/sat_counter.hh index 513419a05..342a3382f 100644 --- a/src/cpu/pred/sat_counter.hh +++ b/src/base/sat_counter.hh @@ -41,8 +41,8 @@ * Daniel Carvalho */ -#ifndef __CPU_PRED_SAT_COUNTER_HH__ -#define __CPU_PRED_SAT_COUNTER_HH__ +#ifndef __BASE_SAT_COUNTER_HH__ +#define __BASE_SAT_COUNTER_HH__ #include @@ -127,4 +127,4 @@ class SatCounter uint8_t counter; }; -#endif // __CPU_PRED_SAT_COUNTER_HH__ +#endif // __BASE_SAT_COUNTER_HH__ diff --git a/src/cpu/pred/2bit_local.hh b/src/cpu/pred/2bit_local.hh index ef52974b7..636620a34 100644 --- a/src/cpu/pred/2bit_local.hh +++ b/src/cpu/pred/2bit_local.hh @@ -46,9 +46,9 @@ #include +#include "base/sat_counter.hh" #include "base/types.hh" #include "cpu/pred/bpred_unit.hh" -#include "cpu/pred/sat_counter.hh" #include "params/LocalBP.hh" /** diff --git a/src/cpu/pred/bi_mode.hh b/src/cpu/pred/bi_mode.hh index f28fdc926..40909554b 100644 --- a/src/cpu/pred/bi_mode.hh +++ b/src/cpu/pred/bi_mode.hh @@ -35,8 +35,8 @@ #ifndef __CPU_PRED_BI_MODE_PRED_HH__ #define __CPU_PRED_BI_MODE_PRED_HH__ +#include "base/sat_counter.hh" #include "cpu/pred/bpred_unit.hh" -#include "cpu/pred/sat_counter.hh" #include "params/BiModeBP.hh" /** diff --git a/src/cpu/pred/tournament.hh b/src/cpu/pred/tournament.hh index 7b16e7224..76de16d7e 100644 --- a/src/cpu/pred/tournament.hh +++ b/src/cpu/pred/tournament.hh @@ -47,9 +47,9 @@ #include +#include "base/sat_counter.hh" #include "base/types.hh" #include "cpu/pred/bpred_unit.hh" -#include "cpu/pred/sat_counter.hh" #include "params/TournamentBP.hh" /** -- 2.30.2