rebase

src/include/simeng/branchpredictors/GenericPredictor.hh

@@ -87,7 +87,7 @@ class GenericPredictor : public BranchPredictor {
 
   /** The Id of the last instruction that update was called on -- used to
    * ensure that update is called in program order. */
-  uint64_t lastUpdatedInstructionId = 0;
+  [[maybe_unused]] uint64_t lastUpdatedInstructionId_ = 0;
 };
 
 }  // namespace simeng

src/include/simeng/branchpredictors/PerceptronPredictor.hh

@@ -103,7 +103,7 @@ class PerceptronPredictor : public BranchPredictor {
 
   /** The Id of the last instruction that update was called on -- used to
    * ensure that update is called in program order. */
-  uint64_t lastUpdatedInstructionId = 0;
+  [[maybe_unused]] uint64_t lastUpdatedInstructionId_ = 0;
 };
 
 }  // namespace simeng

src/lib/branchpredictors/GenericPredictor.cc

@@ -92,8 +92,8 @@ void GenericPredictor::update(uint64_t address, bool isTaken,
                               uint64_t instructionId) {
   // Make sure that this function is called in program order; and then update
   // the lastUpdatedInstructionId variable
-  assert(instructionId >= lastUpdatedInstructionId &&
-         (lastUpdatedInstructionId = instructionId) >= 0 &&
+  assert(instructionId >= lastUpdatedInstructionId_ &&
+         (lastUpdatedInstructionId_ = instructionId) >= 0 &&
          "Update not called on branch instructions in program order");
 
   // Get previous prediction and index calculated from the FTQ

src/lib/branchpredictors/PerceptronPredictor.cc

@@ -104,8 +104,8 @@ void PerceptronPredictor::update(uint64_t address, bool isTaken,
                                  uint64_t instructionId) {
   // Make sure that this function is called in program order; and then update
   // the lastUpdatedInstructionId variable
-  assert(instructionId >= lastUpdatedInstructionId &&
-         (lastUpdatedInstructionId = instructionId) >= 0 &&
+  assert(instructionId >= lastUpdatedInstructionId_ &&
+         (lastUpdatedInstructionId_ = instructionId) >= 0 &&
          "Update not called on branch instructions in program order");
 
   // Retrieve the previous global history and branch direction prediction from
@@ -126,11 +126,8 @@ void PerceptronPredictor::update(uint64_t address, bool isTaken,
   // Update the perceptron if the prediction was wrong, or the dot product's
   // magnitude was not greater than the training threshold
   if ((directionPrediction != isTaken) ||
-      (abs(prevPout) < trainingThreshold_)) {
+      (static_cast<uint64_t>(std::abs(prevPout)) < trainingThreshold_)) {
     int8_t t = (isTaken) ? 1 : -1;
-  if ((directionPrediction != taken) ||
-      (static_cast<uint64_t>(std::abs(Pout)) < trainingThreshold_)) {
-    int8_t t = (taken) ? 1 : -1;
 
     for (uint64_t i = 0; i < globalHistoryLength_; i++) {
       int8_t xi =

src/lib/pipeline/FetchUnit.cc

@@ -53,7 +53,7 @@ void FetchUnit::tick() {
       // Set prediction to recorded value during loop buffer filling
       if (macroOp[0]->isBranch()) {
         macroOp[0]->setBranchPrediction(loopBuffer_.front().prediction);
-        BranchPrediction pred = branchPredictor_.predict(
+        [[maybe_unused]] BranchPrediction pred = branchPredictor_.predict(
             macroOp[0]->getInstructionAddress(), macroOp[0]->getBranchType(),
             macroOp[0]->getKnownOffset());
         assert(pred.isTaken == loopBuffer_.front().prediction.isTaken &&