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.

diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index ce023e665da3cbd44069b245e11bfd0ac2c9b4cd..1bf4938712499c2e630462646e016123b262808a 100644 (file)
--- 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 4aaa321c59034d7c5a26a12cee5d7dbfab5e1ac0..b306e6e587a55cea952b8e6513019f8691dc6ec4 100644 (file)
--- 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 1df0cdf0e80b48acfc4eed3e45056c76abdf9e5d..9c9ca311e0b2259b2910bef3580253a9120200eb 100644 (file)
--- 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 1570c86ee60f2e7aa188bb7c18114aee7aec938f..cd23293b4bc6e81d6767a5fed17a46f2ed6334e5 100644 (file)
--- 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