Commit ff1a12f9 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf expr: Add < and > operators 

These are broadly useful but required to handle TMA metrics. For example
encoding Ports_Utilization from:

  https://download.01.org/perfmon/TMA_Metrics.csv



requires '<'.

  {
    "BriefDescription": "This metric estimates fraction of cycles the CPU performance was potentially limited due to Core computation issues (non divider-related).  Two distinct categories can be attributed into this metric: (1) heavy data-dependency among contiguous instructions would manifest in this metric - such cases are often referred to as low Instruction Level Parallelism (ILP). (2) Contention on some hardware execution unit other than Divider. For example; when there are too many multiply operations.",
    "MetricExpr": "( ( cpu@EXE_ACTIVITY.EXE_BOUND_0_PORTS@ + cpu@EXE_ACTIVITY.1_PORTS_UTIL@ + ( cpu@EXE_ACTIVITY.2_PORTS_UTIL@ * ( ( ( cpu@UOPS_RETIRED.RETIRE_SLOTS@ ) / ( cpu@CPU_CLK_UNHALTED.THREAD@ ) ) / ( ( 4.000000 ) + 1.000000 ) ) ) ) / ( cpu@CPU_CLK_UNHALTED.THREAD@ ) if ( cpu@ARITH.DIVIDER_ACTIVE\\,cmask\\=1@ < cpu@EXE_ACTIVITY.EXE_BOUND_0_PORTS@ ) else ( ( cpu@EXE_ACTIVITY.EXE_BOUND_0_PORTS@ + cpu@EXE_ACTIVITY.1_PORTS_UTIL@ + ( cpu@EXE_ACTIVITY.2_PORTS_UTIL@ * ( ( ( cpu@UOPS_RETIRED.RETIRE_SLOTS@ ) / ( cpu@CPU_CLK_UNHALTED.THREAD@ ) ) / ( ( 4.000000 ) + 1.000000 ) ) ) ) - cpu@EXE_ACTIVITY.EXE_BOUND_0_PORTS@ ) / ( cpu@CPU_CLK_UNHALTED.THREAD@ ) )",
    "MetricGroup": "Topdown_Group_Ports_Utilization",
    "MetricName": "Topdown_Metric_Ports_Utilization"
  },

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20200610235823.52557-2-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3e21a28a

tools/perf/tests/expr.c

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,12 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused) 
	ret |= test(&ctx, ".1 + 2.", 2.1);

	ret |= test(&ctx, "d_ratio(1, 2)", 0.5);

	ret |= test(&ctx, "d_ratio(2.5, 0)", 0);

	ret |= test(&ctx, "1.1 < 2.2", 1);

	ret |= test(&ctx, "2.2 > 1.1", 1);

	ret |= test(&ctx, "1.1 < 1.1", 0);

	ret |= test(&ctx, "2.2 > 2.2", 0);

	ret |= test(&ctx, "2.2 < 1.1", 0);

	ret |= test(&ctx, "1.1 > 2.2", 0);



	if (ret)

		return ret;

tools/perf/util/expr.l

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ else { return ELSE; } 
"|"		{ return '|'; }

"^"		{ return '^'; }

"&"		{ return '&'; }

"<"		{ return '<'; }

">"		{ return '>'; }

"-"		{ return '-'; }

"+"		{ return '+'; }

"*"		{ return '*'; }

tools/perf/util/expr.y

+4 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static double d_ratio(double val0, double val1) 
%left '|'

%left '^'

%left '&'

%left '<' '>'

%left '-' '+'

%left '*' '/' '%'

%left NEG NOT
@@ -73,7 +74,7 @@ other: ID 
|

MIN | MAX | IF | ELSE | SMT_ON | NUMBER | '|' | '^' | '&' | '-' | '+' | '*' | '/' | '%' | '(' | ')' | ','

|

D_RATIO

'<' | '>' | D_RATIO



all_expr: if_expr			{ *final_val = $1; }

	;
@@ -94,6 +95,8 @@ expr: NUMBER 
	| expr '|' expr		{ $$ = (long)$1 | (long)$3; }

	| expr '&' expr		{ $$ = (long)$1 & (long)$3; }

	| expr '^' expr		{ $$ = (long)$1 ^ (long)$3; }

	| expr '<' expr		{ $$ = $1 < $3; }

	| expr '>' expr		{ $$ = $1 > $3; }

	| expr '+' expr		{ $$ = $1 + $3; }

	| expr '-' expr		{ $$ = $1 - $3; }

	| expr '*' expr		{ $$ = $1 * $3; }

CRA Git | Maintained and supported by SUSTech CRA and CCSE