From 69d229ce28f0d19069197b9165dc7e3177b168f3 Mon Sep 17 00:00:00 2001
From: Geoffrey Blake <geoffrey.blake@arm.com>
Date: Fri, 9 Mar 2012 09:59:28 -0500
Subject: [PATCH] O3/Ozone: Eliminate dead code counting software prefetch
 insts

Eliminates dead code in the O3 and Ozone CPU models that counted
software prefetch instructions separately for the ALPHA ISA only.
---
 src/cpu/o3/commit_impl.hh         | 13 -------------
 src/cpu/o3/iew_impl.hh            | 10 ----------
 src/cpu/ozone/back_end_impl.hh    | 10 ----------
 src/cpu/ozone/lw_back_end_impl.hh | 10 ----------
 4 files changed, 43 deletions(-)

diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index ce023e665..1bf493871 100644
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -1365,22 +1365,9 @@ DefaultCommit<Impl>::updateComInstStats(DynInstPtr &inst)
 {
     ThreadID tid = inst->threadNumber;
 
-    //
-    //  Pick off the software prefetches
-    //
-#ifdef TARGET_ALPHA
-    if (inst->isDataPrefetch()) {
-        statComSwp[tid]++;
-    } else {
-        if (!inst->isMicroop() || inst->isLastMicroop())
-            instsCommitted[tid]++;
-        opsCommitted[tid]++;
-    }
-#else
     if (!inst->isMicroop() || inst->isLastMicroop())
         instsCommitted[tid]++;
     opsCommitted[tid]++;
-#endif
 
     //
     //  Control Instructions
diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh
index 4aaa321c5..b306e6e58 100644
--- a/src/cpu/o3/iew_impl.hh
+++ b/src/cpu/o3/iew_impl.hh
@@ -1614,17 +1614,7 @@ DefaultIEW<Impl>::updateExeInstStats(DynInstPtr &inst)
 {
     ThreadID tid = inst->threadNumber;
 
-    //
-    //  Pick off the software prefetches
-    //
-#ifdef TARGET_ALPHA
-    if (inst->isDataPrefetch())
-        iewExecutedSwp[tid]++;
-    else
-        iewIewExecutedcutedInsts++;
-#else
     iewExecutedInsts++;
-#endif
 
 #if TRACING_ON
     inst->completeTick = curTick();
diff --git a/src/cpu/ozone/back_end_impl.hh b/src/cpu/ozone/back_end_impl.hh
index 1df0cdf0e..9c9ca311e 100644
--- a/src/cpu/ozone/back_end_impl.hh
+++ b/src/cpu/ozone/back_end_impl.hh
@@ -1728,17 +1728,7 @@ BackEnd<Impl>::updateExeInstStats(DynInstPtr &inst)
 {
     ThreadID tid = inst->threadNumber;
 
-    //
-    //  Pick off the software prefetches
-    //
-#ifdef TARGET_ALPHA
-    if (inst->isDataPrefetch())
-        exe_swp[tid]++;
-    else
-        exe_inst[tid]++;
-#else
     exe_inst[tid]++;
-#endif
 
     //
     //  Control operations
diff --git a/src/cpu/ozone/lw_back_end_impl.hh b/src/cpu/ozone/lw_back_end_impl.hh
index 1570c86ee..cd23293b4 100644
--- a/src/cpu/ozone/lw_back_end_impl.hh
+++ b/src/cpu/ozone/lw_back_end_impl.hh
@@ -1469,17 +1469,7 @@ LWBackEnd<Impl>::updateExeInstStats(DynInstPtr &inst)
 {
     ThreadID tid = inst->threadNumber;
 
-    //
-    //  Pick off the software prefetches
-    //
-#ifdef TARGET_ALPHA
-    if (inst->isDataPrefetch())
-        exeSwp[tid]++;
-    else
-        exeInst[tid]++;
-#else
     exeInst[tid]++;
-#endif
 
     //
     //  Control operations
-- 
2.30.2