Merge branch 'fixes-v5.7' into fixes

[linux-2.6-microblaze.git] / tools / perf / util / parse-events.l

diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index 7b1c8ee..baa48f2 100644 (file)
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -342,11 +342,13 @@ bpf-output                                        { return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_BPF_OUT
         * Because the prefix cycles is mixed up with cpu-cycles.
         * loads and stores are mixed up with cache event
         */
-cycles-ct                                      { return str(yyscanner, PE_KERNEL_PMU_EVENT); }
-cycles-t                                       { return str(yyscanner, PE_KERNEL_PMU_EVENT); }
-mem-loads                                      { return str(yyscanner, PE_KERNEL_PMU_EVENT); }
-mem-stores                                     { return str(yyscanner, PE_KERNEL_PMU_EVENT); }
-topdown-[a-z-]+                                        { return str(yyscanner, PE_KERNEL_PMU_EVENT); }
+cycles-ct                              |
+cycles-t                               |
+mem-loads                              |
+mem-stores                             |
+topdown-[a-z-]+                                |
+tx-capacity-[a-z-]+                    |
+el-capacity-[a-z-]+                    { return str(yyscanner, PE_KERNEL_PMU_EVENT); }
 
 L1-dcache|l1-d|l1d|L1-data             |
 L1-icache|l1-i|l1i|L1-instruction      |