From 9a90c15f37277d57d08fa8ed0eca7d971d9d157a Mon Sep 17 00:00:00 2001
From: Rose Thompson <ross1728@gmail.com>
Date: Wed, 15 Nov 2023 16:36:49 -0600
Subject: [PATCH] Extended SeparateBranch to support both just branches and all
 control flow instructions.

---
 bin/SeparateBranch.sh |  5 +++--
 sim/bpred-sim.py      | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/bin/SeparateBranch.sh b/bin/SeparateBranch.sh
index eb4ee4494..c81ba32c9 100755
--- a/bin/SeparateBranch.sh
+++ b/bin/SeparateBranch.sh
@@ -43,7 +43,8 @@ TrainLineNumberArray=($TrainLineNumbers)
 BeginLineNumberArray=($BeginLineNumbers)
 EndLineNumberArray=($EndLineNumbers)
 
-mkdir -p branch
+OutputPath=${File%%.*}
+mkdir -p $OutputPath
 Length=${#EndLineNumberArray[@]}
 for i in $(seq 0 1 $((Length-1)))
 do
@@ -51,5 +52,5 @@ do
     CurrTrain=$((${TrainLineNumberArray[$i]}+1))
     CurrEnd=$((${EndLineNumberArray[$i]}-1))
     echo $CurrName, $CurrTrain, $CurrEnd
-    sed -n "${CurrTrain},${CurrEnd}p" $File > branch/${CurrName}_branch.log
+    sed -n "${CurrTrain},${CurrEnd}p" $File > $OutputPath/${CurrName}_${File}
 done
diff --git a/sim/bpred-sim.py b/sim/bpred-sim.py
index 209e21fc4..530fab70c 100755
--- a/sim/bpred-sim.py
+++ b/sim/bpred-sim.py
@@ -114,7 +114,20 @@ def main():
                     grepstr="")
                 configs.append(tc)
 
-    if(args.target or args.iclass):
+    if(args.target):
+        # BTB and class size sweep
+        bpdSize = [6, 8, 10, 12, 14, 16]
+        for CurrBPSize in bpdSize:
+            name = 'BTB'+str(CurrBPSize)
+            configOptions = "+define+INSTR_CLASS_PRED=0 +define+BPRED_OVERRIDE +define+BPRED_TYPE=\`BP_GSHARE" + "+define+BPRED_SIZE=16" + "+define+RAS_SIZE=16+define+BTB_SIZE=" + str(CurrBPSize) + "+define+BTB_OVERRIDE" 
+            tc = TestCase(
+                name=name,
+                variant="rv32gc",
+                cmd="vsim > {} -c <<!\ndo wally-batch.do  rv32gc configOptions " + name + " embench " + configOptions,
+                grepstr="")
+            configs.append(tc)
+
+    if(args.iclass):
         # BTB and class size sweep
         bpdSize = [6, 8, 10, 12, 14, 16]
         for CurrBPSize in bpdSize: