Move FLUSH* events to GENRAL group

Signed-off-by: Dmitriy Ryabtsev <d.ryabtsev@yadro.com>
riscv · Oct 16, 2024 · ba5d82d · ba5d82d
1 parent abd04bb
commit ba5d82d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 31 deletions.
diff --git a/adoc_event_tables/general.adoc b/adoc_event_tables/general.adoc
@@ -16,5 +16,7 @@
 |INST.FPU.SPEC |Number of FPU instructions issued
 |UOP.RET |Number of micro-operations retired
 |UOP.SPEC |Number of micro-operations issued
+|FLUSH.SPEC |Counts pipeline flushes due to all reasons - such as branch misprediction, memory disambiguation, serializing instructions
+|FLUSH.CYCLES |Cycles to recover from pipeline flushes due to any reason. Examples: branch misprediction, memory disambiguation, serializing instruction
 |===
 
diff --git a/adoc_event_tables/prediction_spec.adoc b/adoc_event_tables/prediction_spec.adoc
diff --git a/body.adoc b/body.adoc
@@ -23,12 +23,6 @@ include::adoc_event_tables/prediction_retired.adoc[]
 
 include::adoc_event_tables/prediction_metrics.adoc[]
 
-=== CTRL_FLOW (speculative)
-
-Speculation prediction group. Unlike most of the groups below prediction events mostly naturally counted only at retirement time. So this group contains only a few events which make sense to count speculatively.
-
-include::adoc_event_tables/prediction_spec.adoc[]
-
 === CACHE (retirement)
 
 This group contains events and metrics for data and instruction caches (all levels) counted at retirement.

diff --git a/event_files/general.json b/event_files/general.json
@@ -82,5 +82,17 @@
         "EventCode": "0x0",
         "BriefDescription": "Number of micro-operations issued",
         "PublicDescription": "Number of micro-operations issued"
+    },
+    {
+        "EventName": "FLUSH.SPEC",
+        "EventCode": "0x0",
+        "BriefDescription": "Counts pipeline flushes due to all reasons",
+        "PublicDescription": "Counts pipeline flushes due to all reasons - such as branch misprediction, memory disambiguation, serializing instructions"
+    },
+    {
+        "EventName": "FLUSH.CYCLES",
+        "EventCode": "0x0",
+        "BriefDescription": "Cycles to recover from pipeline flushes",
+        "PublicDescription": "Cycles to recover from pipeline flushes due to any reason. Examples: branch misprediction, memory disambiguation, serializing instruction"
     }
 ]
diff --git a/event_files/prediction_spec.json b/event_files/prediction_spec.json
diff --git a/gen_event_tables_adocs.py b/gen_event_tables_adocs.py
@@ -2,9 +2,8 @@
 import json
 
 event_files = ['cache_retired.json', 'cache_spec.json', 'prediction_retired.json',
-               'prediction_spec.json', 'rvv_retired.json', 'rvv_spec.json',
-               'tlb_retired.json', 'tlb_spec.json', 'topdown.json',
-               'general.json']
+               'rvv_retired.json', 'rvv_spec.json', 'tlb_retired.json', 'tlb_spec.json',
+               'topdown.json', 'general.json']
 
 metric_files = ['cache_retired_metrics.json', 'cache_spec_metrics.json',
                 'prediction_metrics.json', 'rvv_retired_metrics.json', 'rvv_spec_metrics.json',