Remove RETIRED and SPEC groups and move events from them to GENERAL g…

…roup

Signed-off-by: Dmitriy Ryabtsev <d.ryabtsev@yadro.com>

adoc_event_tables/general.adoc

@@ -1,7 +1,20 @@
-.GEN group events
+.GENERAL group events
 [width="100%",cols="30%,70%",options="header",]
 |===
 |Name |Description
 |CYCLES.HART |Cycles when the hart is not in halt state. The cycles are counted with real (potentially variable) frequency the hart is working at
+|INST.RET |Number of instructions retired
+|INST.SPEC |Number of instructions issued
+|INST.LOAD.RET |Number of memory load instructions retired
+|INST.LOAD.SPEC |Number of memory load instructions issued
+|INST.LOAD.UC.RET |Number of memory load instructions retired which accessed uncacheble memory
+|INST.STORE.RET |Number of memory store instructions retired
+|INST.STORE.SPEC |Number of memory store instructions issued
+|INST.INT.RET |Number of integer instructions retired
+|INST.INT.SPEC |Number of integer instructions issued
+|INST.FPU.RET |Number of FPU instructions retired
+|INST.FPU.SPEC |Number of FPU instructions issued
+|UOP.RET |Number of micro-operations retired
+|UOP.SPEC |Number of micro-operations issued
 |===
 

body.adoc

@@ -9,24 +9,12 @@ In addition most of the groups are further split into 2 variants:
 
 In general RETIRED events look more useful for performance analysis. In addition in the future it may be possible to provide more context for them - e.g. precise sample IP. But on the other hand they it may be significantly more expensive to implement. It is up to implementations to decide if they want to provide RETIRED, SPEC or both variants of a group.
 
-=== GEN
+=== GENERAL
 
 This group contains general events not specific to a particular part of CPU pipeline. 
 
 include::adoc_event_tables/general.adoc[]
 
-=== RETIRED
-
-This group contains events measured at retirement which didn't fall into any specific group below.
-
-include::adoc_event_tables/retired.adoc[]
-
-=== SPEC
-
-This group contains speculative events which didn't fall into any specific group below.
-
-include::adoc_event_tables/spec.adoc[]
-
 === CTRL_FLOW (retirement)
 
 Retirement control flow group which contains events and metrics for measuring things branch mispredictions, data mis-speculations etc.

event_files/general.json

@@ -4,5 +4,83 @@
         "EventCode": "0x0",
         "BriefDescription": "Cycles when the hart is not in halt state",
         "PublicDescription": "Cycles when the hart is not in halt state. The cycles are counted with real (potentially variable) frequency the hart is working at"
+    },
+    {
+        "EventName": "INST.RET",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of instructions retired",
+        "PublicDescription": "Number of instructions retired"
+    },
+    {
+        "EventName": "INST.SPEC",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of instructions issued",
+        "PublicDescription": "Number of instructions issued"
+    },
+    {
+        "EventName": "INST.LOAD.RET",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of memory load instructions retired",
+        "PublicDescription": "Number of memory load instructions retired"
+    },
+    {
+        "EventName": "INST.LOAD.SPEC",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of memory load instructions issued",
+        "PublicDescription": "Number of memory load instructions issued"
+    },
+    {
+        "EventName": "INST.LOAD.UC.RET",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of memory load instructions retired which accessed uncacheble memory",
+        "PublicDescription": "Number of memory load instructions retired which accessed uncacheble memory"
+    },
+    {
+        "EventName": "INST.STORE.RET",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of memory store instructions retired",
+        "PublicDescription": "Number of memory store instructions retired"
+    },
+    {
+        "EventName": "INST.STORE.SPEC",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of memory store instructions issued",
+        "PublicDescription": "Number of memory store instructions issued"
+    },
+    {
+        "EventName": "INST.INT.RET",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of integer instructions retired",
+        "PublicDescription": "Number of integer instructions retired"
+    },
+    {
+        "EventName": "INST.INT.SPEC",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of integer instructions issued",
+        "PublicDescription": "Number of integer instructions issued"
+    },
+    {
+        "EventName": "INST.FPU.RET",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of FPU instructions retired",
+        "PublicDescription": "Number of FPU instructions retired"
+    },
+    {
+        "EventName": "INST.FPU.SPEC",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of FPU instructions issued",
+        "PublicDescription": "Number of FPU instructions issued"
+    },
+    {
+        "EventName": "UOP.RET",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of micro-operations retired",
+        "PublicDescription": "Number of micro-operations retired"
+    },
+    {
+        "EventName": "UOP.SPEC",
+        "EventCode": "0x0",
+        "BriefDescription": "Number of micro-operations issued",
+        "PublicDescription": "Number of micro-operations issued"
     }
 ]

gen_event_tables_adocs.py

@@ -4,7 +4,7 @@
 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', 'retired.json', 'spec.json']
+               'general.json']
 
 metric_files = ['cache_retired_metrics.json', 'cache_spec_metrics.json',
                 'prediction_metrics.json', 'rvv_retired_metrics.json', 'rvv_spec_metrics.json',
@@ -19,9 +19,7 @@
                  'tlb_retired.json': 'TLB',
                  'tlb_spec.json': 'TLB',
                  'topdown.json': 'TOPDOWN',
-                 'general.json': 'GEN',
-                 'retired.json': 'RETIRED',
-                 'spec.json': 'SPEC',
+                 'general.json': 'GENERAL',
                  'cache_retired_metrics.json': 'CACHE',
                  'cache_spec_metrics.json': 'CACHE',
                  'prediction_metrics.json': 'CTRL_FLOW',