kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/tools/perf/util/parse-events.l
..
..
@@ -15,6 +15,7 @@
15
15
 #include "../perf.h"
16
16
 #include "parse-events.h"
17
17
 #include "parse-events-bison.h"
18
+#include "evsel.h"
18
19
 
19
20
 char *parse_events_get_text(yyscan_t yyscanner);
20
21
 YYSTYPE *parse_events_get_lval(yyscan_t yyscanner);
..
..
@@ -40,14 +41,6 @@
40
41
 	return __value(yylval, text, base, PE_VALUE);
41
42
 }
42
43
 
43
-static int raw(yyscan_t scanner)
44
-{
45
-	YYSTYPE *yylval = parse_events_get_lval(scanner);
46
-	char *text = parse_events_get_text(scanner);
47
-
48
-	return __value(yylval, text + 1, 16, PE_RAW);
49
-}
50
-
51
44
 static int str(yyscan_t scanner, int token)
52
45
 {
53
46
 	YYSTYPE *yylval = parse_events_get_lval(scanner);
..
..
@@ -69,6 +62,17 @@
69
62
 	}
70
63
 
71
64
 	return token;
65
+}
66
+
67
+static int raw(yyscan_t scanner)
68
+{
69
+	YYSTYPE *yylval = parse_events_get_lval(scanner);
70
+	char *text = parse_events_get_text(scanner);
71
+
72
+	if (perf_pmu__parse_check(text) == PMU_EVENT_SYMBOL)
73
+		return str(scanner, PE_NAME);
74
+
75
+	return __value(yylval, text + 1, 16, PE_RAW);
72
76
 }
73
77
 
74
78
 static bool isbpf_suffix(char *text)
..
..
@@ -128,12 +132,16 @@
128
132
 	yyless(0);						\
129
133
 } while (0)
130
134
 
131
-static int pmu_str_check(yyscan_t scanner)
135
+static int pmu_str_check(yyscan_t scanner, struct parse_events_state *parse_state)
132
136
 {
133
137
 	YYSTYPE *yylval = parse_events_get_lval(scanner);
134
138
 	char *text = parse_events_get_text(scanner);
135
139
 
136
140
 	yylval->str = strdup(text);
141
+
142
+	if (parse_state->fake_pmu)
143
+		return PE_PMU_EVENT_FAKE;
144
+
137
145
 	switch (perf_pmu__parse_check(text)) {
138
146
 		case PMU_EVENT_SYMBOL_PREFIX:
139
147
 			return PE_PMU_EVENT_PRE;
..
..
@@ -152,6 +160,14 @@
152
160
 
153
161
 	yylval->num = (type << 16) + config;
154
162
 	return type == PERF_TYPE_HARDWARE ? PE_VALUE_SYM_HW : PE_VALUE_SYM_SW;
163
+}
164
+
165
+static int tool(yyscan_t scanner, enum perf_tool_event event)
166
+{
167
+	YYSTYPE *yylval = parse_events_get_lval(scanner);
168
+
169
+	yylval->num = event;
170
+	return PE_VALUE_SYM_TOOL;
155
171
 }
156
172
 
157
173
 static int term(yyscan_t scanner, int type)
..
..
@@ -194,16 +210,16 @@
194
210
 name_minus	[a-zA-Z_*?][a-zA-Z0-9\-_*?.:]*
195
211
 drv_cfg_term	[a-zA-Z0-9_\.]+(=[a-zA-Z0-9_*?\.:]+)?
196
212
 /* If you add a modifier you need to update check_modifier() */
197
-modifier_event	[ukhpPGHSDIW]+
213
+modifier_event	[ukhpPGHSDIWe]+
198
214
 modifier_bp	[rwx]{1,3}
199
215
 
200
216
 %%
201
217
 
202
218
 %{
203
-	{
204
-		int start_token;
219
+	struct parse_events_state *_parse_state = parse_events_get_extra(yyscanner);
205
220
 
206
-		start_token = parse_events_get_extra(yyscanner);
221
+	{
222
+		int start_token = _parse_state->stoken;
207
223
 
208
224
 		if (start_token == PE_START_TERMS)
209
225
 			BEGIN(config);
..
..
@@ -211,7 +227,7 @@
211
227
 			BEGIN(event);
212
228
 
213
229
 		if (start_token) {
214
-			parse_events_set_extra(NULL, yyscanner);
230
+			_parse_state->stoken = 0;
215
231
 			/*
216
232
 			 * The flex parser does not init locations variable
217
233
 			 * via the scan_string interface, so we need do the
..
..
@@ -243,7 +259,9 @@
243
259
 			BEGIN(INITIAL);
244
260
 			REWIND(0);
245
261
 		}
246
-
262
+,		{
263
+			return ',';
264
+		}
247
265
 }
248
266
 
249
267
 <array>{
..
..
@@ -269,10 +287,16 @@
269
287
 call-graph		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CALLGRAPH); }
270
288
 stack-size		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_STACKSIZE); }
271
289
 max-stack		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_MAX_STACK); }
290
+nr			{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_MAX_EVENTS); }
272
291
 inherit			{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_INHERIT); }
273
292
 no-inherit		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NOINHERIT); }
274
293
 overwrite		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_OVERWRITE); }
275
294
 no-overwrite		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NOOVERWRITE); }
295
+percore			{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_PERCORE); }
296
+aux-output		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT); }
297
+aux-sample-size		{ return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE); }
298
+r{num_raw_hex}		{ return raw(yyscanner); }
299
+r0x{num_raw_hex}	{ return raw(yyscanner); }
276
300
 ,			{ return ','; }
277
301
 "/"			{ BEGIN(INITIAL); return '/'; }
278
302
 {name_minus}		{ return str(yyscanner, PE_NAME); }
..
..
@@ -321,7 +345,7 @@
321
345
 alignment-faults				{ return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_ALIGNMENT_FAULTS); }
322
346
 emulation-faults				{ return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_EMULATION_FAULTS); }
323
347
 dummy						{ return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_DUMMY); }
324
-duration_time					{ return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_DUMMY); }
348
+duration_time					{ return tool(yyscanner, PERF_TOOL_DURATION_TIME); }
325
349
 bpf-output					{ return sym(yyscanner, PERF_TYPE_SOFTWARE, PERF_COUNT_SW_BPF_OUTPUT); }
326
350
 
327
351
 	/*
..
..
@@ -329,11 +353,13 @@
329
353
 	 * Because the prefix cycles is mixed up with cpu-cycles.
330
354
 	 * loads and stores are mixed up with cache event
331
355
 	 */
332
-cycles-ct					{ return str(yyscanner, PE_KERNEL_PMU_EVENT); }
333
-cycles-t					{ return str(yyscanner, PE_KERNEL_PMU_EVENT); }
334
-mem-loads					{ return str(yyscanner, PE_KERNEL_PMU_EVENT); }
335
-mem-stores					{ return str(yyscanner, PE_KERNEL_PMU_EVENT); }
336
-topdown-[a-z-]+					{ return str(yyscanner, PE_KERNEL_PMU_EVENT); }
356
+cycles-ct				|
357
+cycles-t				|
358
+mem-loads				|
359
+mem-stores				|
360
+topdown-[a-z-]+				|
361
+tx-capacity-[a-z-]+			|
362
+el-capacity-[a-z-]+			{ return str(yyscanner, PE_KERNEL_PMU_EVENT); }
337
363
 
338
364
 L1-dcache|l1-d|l1d|L1-data		|
339
365
 L1-icache|l1-i|l1i|L1-instruction	|
..
..
@@ -358,7 +384,7 @@
358
384
 {modifier_event}	{ return str(yyscanner, PE_MODIFIER_EVENT); }
359
385
 {bpf_object}		{ if (!isbpf(yyscanner)) { USER_REJECT }; return str(yyscanner, PE_BPF_OBJECT); }
360
386
 {bpf_source}		{ if (!isbpf(yyscanner)) { USER_REJECT }; return str(yyscanner, PE_BPF_SOURCE); }
361
-{name}			{ return pmu_str_check(yyscanner); }
387
+{name}			{ return pmu_str_check(yyscanner, _parse_state); }
362
388
 {name_tag}		{ return str(yyscanner, PE_NAME); }
363
389
 "/"			{ BEGIN(config); return '/'; }
364
390
 -			{ return '-'; }