Daniel Carvalho has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/17993 )
Change subject: base: Move SatCounter to base directory
......................................................................
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 <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/17993
Maintainer: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
---
R src/base/sat_counter.hh
M src/cpu/pred/2bit_local.hh
M src/cpu/pred/bi_mode.hh
M src/cpu/pred/tournament.hh
4 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
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 513419a..342a338 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 <cstdint>
@@ -127,4 +127,4 @@
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 ef52974..636620a 100644
--- a/src/cpu/pred/2bit_local.hh
+++ b/src/cpu/pred/2bit_local.hh
@@ -46,9 +46,9 @@
#include <vector>
+#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 f28fdc9..4090955 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 7b16e72..76de16d 100644
--- a/src/cpu/pred/tournament.hh
+++ b/src/cpu/pred/tournament.hh
@@ -47,9 +47,9 @@
#include <vector>
+#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"
/**
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/17993
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I26f799324bdd8720ab8834c72a2002149cee777c
Gerrit-Change-Number: 17993
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
