From 8eefaa58af04260212674e77ae9eafb7df2cbb1a Mon Sep 17 00:00:00 2001
From: Marton Erdos <marton.erdos@arm.com>
Date: Thu, 17 Jun 2021 02:30:25 +0100
Subject: [PATCH] cpu-o3: Removed "Aggressive" SMT scheduling option

A comment claimed this to be different from "oldestReady", when in fact
it was not. Removed it for clarity.

Change-Id: Ic66ee9974ddc8d7a01929afabb601473b7ea23ad
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/46939
Reviewed-by: Richard Cooper <richard.cooper@arm.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 src/cpu/o3/O3CPU.py  | 2 +-
 src/cpu/o3/commit.cc | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/cpu/o3/O3CPU.py b/src/cpu/o3/O3CPU.py
index 7cbb5683f4..301b2166b9 100644
--- a/src/cpu/o3/O3CPU.py
+++ b/src/cpu/o3/O3CPU.py
@@ -52,7 +52,7 @@ class SMTQueuePolicy(ScopedEnum):
     vals = [ 'Dynamic', 'Partitioned', 'Threshold' ]
 
 class CommitPolicy(ScopedEnum):
-    vals = [ 'Aggressive', 'RoundRobin', 'OldestReady' ]
+    vals = [ 'RoundRobin', 'OldestReady' ]
 
 class O3CPU(BaseCPU):
     type = 'O3CPU'
diff --git a/src/cpu/o3/commit.cc b/src/cpu/o3/commit.cc
index ce624dacd9..2359c1a12d 100644
--- a/src/cpu/o3/commit.cc
+++ b/src/cpu/o3/commit.cc
@@ -1444,13 +1444,6 @@ Commit::getCommittingThread()
 {
     if (numThreads > 1) {
         switch (commitPolicy) {
-
-          case CommitPolicy::Aggressive:
-            //If Policy is Aggressive, commit will call
-            //this function multiple times per
-            //cycle
-            return oldestReady();
-
           case CommitPolicy::RoundRobin:
             return roundRobin();