From ba5d82d58584d85df6d654b03a177f07e0aa3867 Mon Sep 17 00:00:00 2001 From: Dmitriy Ryabtsev Date: Wed, 16 Oct 2024 10:33:59 +0300 Subject: [PATCH] Move FLUSH* events to GENRAL group Signed-off-by: Dmitriy Ryabtsev --- adoc_event_tables/general.adoc | 2 ++ adoc_event_tables/prediction_spec.adoc | 8 -------- body.adoc | 6 ------ event_files/general.json | 12 ++++++++++++ event_files/prediction_spec.json | 14 -------------- gen_event_tables_adocs.py | 5 ++--- 6 files changed, 16 insertions(+), 31 deletions(-) delete mode 100644 adoc_event_tables/prediction_spec.adoc delete mode 100644 event_files/prediction_spec.json diff --git a/adoc_event_tables/general.adoc b/adoc_event_tables/general.adoc index 08a3094..081f460 100644 --- 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 deleted file mode 100644 index 413891c..0000000 --- a/adoc_event_tables/prediction_spec.adoc +++ /dev/null @@ -1,8 +0,0 @@ -.CTRL_FLOW group events -[width="100%",cols="30%,70%",options="header",] -|=== -|Name |Description -|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/body.adoc b/body.adoc index 9f3562c..d3eff56 100644 --- 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 index 21c8f86..112c38b 100644 --- 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" } ] \ No newline at end of file diff --git a/event_files/prediction_spec.json b/event_files/prediction_spec.json deleted file mode 100644 index 864ae4c..0000000 --- a/event_files/prediction_spec.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "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" - } -] \ No newline at end of file diff --git a/gen_event_tables_adocs.py b/gen_event_tables_adocs.py index 66fda32..6b33fac 100644 --- 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',