cpu: remove formatting-only BTB review noise

Change-Id: I9789aae768c0e4c4b09d954c5846b6423eda5735

Author: Yakkhini

src/cpu/pred/btb/btb_ittage.cc

@@ -102,19 +102,8 @@ class BTBITTAGE : public TimedBaseBTBPredictor
     void putPCHistoryForBlock1(Addr startAddr, const boost::dynamic_bitset<> &history,
                                const boost::dynamic_bitset<> &phistory, const boost::dynamic_bitset<> &bwhistory,
                                const std::vector<boost::dynamic_bitset<>> &lhistory,
-                               std::vector<FullBTBPrediction> &stagePreds, const FullBTBPrediction &lowerPred) override
-    {
-        (void)phistory;
-        (void)bwhistory;
-        (void)lhistory;
-        if (!participatesInBlock1()) {
-            for (int s = getDelay(); s < stagePreds.size(); s++) {
-                stagePreds[s].indirectTargets = lowerPred.indirectTargets;
-            }
-            return;
-        }
-        putPCHistory(startAddr, history, stagePreds);
-    }
+                               std::vector<FullBTBPrediction> &stagePreds,
+                               const FullBTBPrediction &lowerPred) override;
 
     std::shared_ptr<void> getPredictionMeta() override;
 

src/cpu/pred/btb/btb_ittage.hh

@@ -381,6 +381,25 @@ BTBTAGE::putPCHistory(Addr startPC, const bitset &history, std::vector<FullBTBPr
     }
 }
 
+void
+BTBTAGE::putPCHistoryForBlock1(Addr startAddr, const boost::dynamic_bitset<> &history,
+                               const boost::dynamic_bitset<> &phistory, const boost::dynamic_bitset<> &bwhistory,
+                               const std::vector<boost::dynamic_bitset<>> &lhistory,
+                               std::vector<FullBTBPrediction> &stagePreds, const FullBTBPrediction &lowerPred)
+{
+    (void)phistory;
+    (void)bwhistory;
+    (void)lhistory;
+    if (!participatesInBlock1()) {
+        for (int s = getDelay(); s < stagePreds.size(); s++) {
+            stagePreds[s].condTakens = lowerPred.condTakens;
+            stagePreds[s].tageInfoForMgscs = lowerPred.tageInfoForMgscs;
+        }
+        return;
+    }
+    putPCHistory(startAddr, history, stagePreds);
+}
+
 std::shared_ptr<void>
 BTBTAGE::getPredictionMeta()
 {

src/cpu/pred/btb/btb_tage.cc

@@ -14,16 +14,15 @@
 #include "cpu/pred/btb/folded_hist.hh"
 #include "cpu/pred/btb/timed_base_pred.hh"
 
+// Conditional includes based on build mode
 #ifdef UNIT_TEST
 #include "cpu/pred/btb/test/test_dprintf.hh"
-
 #else
 #include "debug/DecoupleBP.hh"
 #include "debug/TAGEHistory.hh"
 #include "debug/TAGEUseful.hh"
 #include "params/BTBTAGE.hh"
 #include "sim/sim_object.hh"
-
 #endif
 
 namespace gem5
@@ -131,20 +130,8 @@ class BTBTAGE : public TimedBaseBTBPredictor
     void putPCHistoryForBlock1(Addr startAddr, const boost::dynamic_bitset<> &history,
                                const boost::dynamic_bitset<> &phistory, const boost::dynamic_bitset<> &bwhistory,
                                const std::vector<boost::dynamic_bitset<>> &lhistory,
-                               std::vector<FullBTBPrediction> &stagePreds, const FullBTBPrediction &lowerPred) override
-    {
-        (void)phistory;
-        (void)bwhistory;
-        (void)lhistory;
-        if (!participatesInBlock1()) {
-            for (int s = getDelay(); s < stagePreds.size(); s++) {
-                stagePreds[s].condTakens = lowerPred.condTakens;
-                stagePreds[s].tageInfoForMgscs = lowerPred.tageInfoForMgscs;
-            }
-            return;
-        }
-        putPCHistory(startAddr, history, stagePreds);
-    }
+                               std::vector<FullBTBPrediction> &stagePreds,
+                               const FullBTBPrediction &lowerPred) override;
 
     std::shared_ptr<void> getPredictionMeta() override;
 

src/cpu/pred/btb/btb_tage.hh

@@ -82,7 +82,6 @@ namespace test
 
 class UBTB : public TimedBaseBTBPredictor
 {
-  private:
   public:
 #ifdef UNIT_TEST
     UBTB(unsigned numEntries, unsigned tagBits);