Hello Giacomo Travaglini,
I'd like you to do a code review. Please visit
https://gem5-review.googlesource.com/c/public/gem5/+/15398
to review the following change.
Change subject: cpu-o3: Make the smtIQPolicy a Param.ScopedEnum
......................................................................
cpu-o3: Make the smtIQPolicy a Param.ScopedEnum
The smtIQPolicy is a parameter in the o3 cpu that can have 3
different values. Previously this setting was done through a string
and a parser function would turn it into a c++ enum value. This
changeset turns the string into a python Param.ScopedEnum.
Change-Id: Ieecf0a19427dd250b0d5ae3d531ab46a37326ae5
Signed-off-by: Nikos Nikoleris <nikos.nikole...@arm.com>
Reviewed-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
---
M src/cpu/o3/O3CPU.py
M src/cpu/o3/inst_queue.hh
M src/cpu/o3/inst_queue_impl.hh
3 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/src/cpu/o3/O3CPU.py b/src/cpu/o3/O3CPU.py
index 02d56de..5908260 100644
--- a/src/cpu/o3/O3CPU.py
+++ b/src/cpu/o3/O3CPU.py
@@ -157,7 +157,8 @@
smtLSQPolicy = Param.SMTQueuePolicy('Partitioned',
"SMT LSQ Sharing Policy")
smtLSQThreshold = Param.Int(100, "SMT LSQ Threshold Sharing Parameter")
- smtIQPolicy = Param.String('Partitioned', "SMT IQ Sharing Policy")
+ smtIQPolicy = Param.SMTQueuePolicy('Partitioned',
+ "SMT IQ Sharing Policy")
smtIQThreshold = Param.Int(100, "SMT IQ Threshold Sharing Parameter")
smtROBPolicy = Param.String('Partitioned', "SMT ROB Sharing Policy")
smtROBThreshold = Param.Int(100, "SMT ROB Threshold Sharing Parameter")
diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh
index 37cc3a2..d6bc654 100644
--- a/src/cpu/o3/inst_queue.hh
+++ b/src/cpu/o3/inst_queue.hh
@@ -55,6 +55,7 @@
#include "cpu/inst_seq.hh"
#include "cpu/op_class.hh"
#include "cpu/timebuf.hh"
+#include "enums/SMTQueuePolicy.hh"
#include "sim/eventq.hh"
struct DerivO3CPUParams;
@@ -403,15 +404,8 @@
// Various parameters
//////////////////////////////////////
- /** IQ Resource Sharing Policy */
- enum IQPolicy {
- Dynamic,
- Partitioned,
- Threshold
- };
-
/** IQ sharing policy for SMT. */
- IQPolicy iqPolicy;
+ SMTQueuePolicy iqPolicy;
/** Number of Total Threads*/
ThreadID numThreads;
diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh
index b34e6d9..a8895f8 100644
--- a/src/cpu/o3/inst_queue_impl.hh
+++ b/src/cpu/o3/inst_queue_impl.hh
@@ -90,6 +90,7 @@
: cpu(cpu_ptr),
iewStage(iew_ptr),
fuPool(params->fuPool),
+ iqPolicy(params->smtIQPolicy),
numEntries(params->numIQEntries),
totalWidth(params->issueWidth),
commitToIEWDelay(params->commitToIEWDelay)
@@ -120,24 +121,14 @@
resetState();
- std::string policy = params->smtIQPolicy;
-
- //Convert string to lowercase
- std::transform(policy.begin(), policy.end(), policy.begin(),
- (int(*)(int)) tolower);
-
//Figure out resource sharing policy
- if (policy == "dynamic") {
- iqPolicy = Dynamic;
-
+ if (iqPolicy == SMTQueuePolicy::Dynamic) {
//Set Max Entries to Total ROB Capacity
for (ThreadID tid = 0; tid < numThreads; tid++) {
maxEntries[tid] = numEntries;
}
- } else if (policy == "partitioned") {
- iqPolicy = Partitioned;
-
+ } else if (iqPolicy == SMTQueuePolicy::Partitioned) {
//@todo:make work if part_amt doesnt divide evenly.
int part_amt = numEntries / numThreads;
@@ -148,9 +139,7 @@
DPRINTF(IQ, "IQ sharing policy set to Partitioned:"
"%i entries per thread.\n",part_amt);
- } else if (policy == "threshold") {
- iqPolicy = Threshold;
-
+ } else if (iqPolicy == SMTQueuePolicy::Threshold) {
double threshold = (double)params->smtIQThreshold / 100;
int thresholdIQ = (int)((double)threshold * numEntries);
@@ -162,9 +151,6 @@
DPRINTF(IQ, "IQ sharing policy set to Threshold:"
"%i entries per thread.\n",thresholdIQ);
- } else {
- panic("Invalid IQ sharing policy. Options are: Dynamic, "
- "Partitioned, Threshold");
}
for (ThreadID tid = numThreads; tid < Impl::MaxThreads; tid++) {
maxEntries[tid] = 0;
@@ -502,7 +488,7 @@
int
InstructionQueue<Impl>::entryAmount(ThreadID num_threads)
{
- if (iqPolicy == Partitioned) {
+ if (iqPolicy == SMTQueuePolicy::Partitioned) {
return numEntries / num_threads;
} else {
return 0;
@@ -514,7 +500,7 @@
void
InstructionQueue<Impl>::resetEntries()
{
- if (iqPolicy != Dynamic || numThreads > 1) {
+ if (iqPolicy != SMTQueuePolicy::Dynamic || numThreads > 1) {
int active_threads = activeThreads->size();
list<ThreadID>::iterator threads = activeThreads->begin();
@@ -523,9 +509,10 @@
while (threads != end) {
ThreadID tid = *threads++;
- if (iqPolicy == Partitioned) {
+ if (iqPolicy == SMTQueuePolicy::Partitioned) {
maxEntries[tid] = numEntries / active_threads;
- } else if (iqPolicy == Threshold && active_threads == 1) {
+ } else if (iqPolicy == SMTQueuePolicy::Threshold &&
+ active_threads == 1) {
maxEntries[tid] = numEntries;
}
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15398
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: Ieecf0a19427dd250b0d5ae3d531ab46a37326ae5
Gerrit-Change-Number: 15398
Gerrit-PatchSet: 1
Gerrit-Owner: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
