ibex: Branch predict

Also adapt the current bp column logic. This will be a major rewrite
anyways, I assume.

Author: wallento

pipelineviewer/ibex.py

@@ -4,7 +4,7 @@
 from attrdict import AttrDict
 
 class PipelineIbex(Pipeline):
-  event_name = {"IF": 0, "IDEX": 1, "WB": 2, "DONE": 3}
+  event_name = {"IF": 0, "IDEX": 1, "WB": 2, "DONE": 3, "BRANCH_PREDICT": 4, "BRANCH_UPDATE": 5}
 
   def __init__(self, tracepath):
     log = {}
@@ -31,7 +31,7 @@ def __init__(self, tracepath):
         if "insn_type" in keys:
           insn_type = str(event["insn_type"])
         log[event["insn_id"]] = AttrDict(
-          {"pc": pc, "insn_type": insn_type, "insn": insn, "mode": riscv_priv_modes[event["mode"]], "IF": timestamp, "IDEX": None, "WB": None, "end": None})
+          {"pc": pc, "insn_type": insn_type, "insn": insn, "mode": riscv_priv_modes[event["mode"]], "IF": timestamp, "IDEX": None, "WB": None, "end": None, "BP": None})
 
       elif id_str == "IDEX":
         # single cycle idex in the standard pipeline
@@ -43,6 +43,10 @@ def __init__(self, tracepath):
       elif id_str == "DONE":
         # idex starts in the pipeline with
         log[event["insn_id"]]["end"] = event["timestamp"]
+      elif id_str == "BRANCH_PREDICT":
+        log[event["insn_id"]]["BP"] = AttrDict(taken=event["taken"], mispredict=False)
+      elif id_str == "BRANCH_UPDATE":
+        log[event["insn_id"]]["BP"].mispredict = (event["mispredict"] != 0)
 
     self.log = log
 

pipelineviewer/main.py

@@ -175,11 +175,11 @@ def render(pipeline, args):
             elif c == "b":
                 if "BP" in i and i.BP:
                     if i.BP.taken:
-                        line += ", BP taken @{} ({})".format(i.BP.index,
-                                                             i.BP.type)
+                        line += ", BP taken"
                     else:
-                        line += ", BP not taken @{} ({})".format(
-                            i.BP.index, i.BP.type)
+                        line += ", BP not taken"
+                    if i.BP.mispredict:
+                        line += " (mispredict)"
                 if "BHT" in i and i.BHT:
                     if i.BHT.taken:
                         line += ", BHT @{} taken ({:02b}->{:02b})".format(