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

perf expr: Move actions to the left. 



No functional change, just modifying whitespace. This creates additional
space for adding logic to actions in later changes.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Tested-by: default avatarJohn Garry <john.garry@huawei.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: Ingo Molnar <mingo@redhat.com>
Cc: Jin Yao <yao.jin@linux.intel.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: Sandeep Dasgupta <sdasgup@google.com>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20210923074616.674826-7-irogers@google.com


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

tools/perf/util/expr.y

+75 −49
Original line number Diff line number Diff line
@@ -70,15 +70,20 @@ MIN | MAX | IF | ELSE | SMT_ON | NUMBER | '|' | '^' | '&' | '-' | '+' | '*' | '/ 
'<' | '>' | D_RATIO



all_expr: if_expr			{ *final_val = $1; }

	;



if_expr:

	expr IF expr ELSE expr { $$ = $3 ? $1 : $5; }

if_expr: expr IF expr ELSE expr

{

	$$ = $3 ? $1 : $5;

}

| expr

;



expr: NUMBER

	| ID			{

{

	$$ = $1;

}

| ID

{

	struct expr_id_data *data;



	$$ = NAN;
@@ -95,29 +100,50 @@ expr: NUMBER 
| expr '+' expr { BINARY_OP($$, +, $1, $3); }

| expr '-' expr { BINARY_OP($$, -, $1, $3); }

| expr '*' expr { BINARY_OP($$, *, $1, $3); }

	| expr '/' expr		{ if ($3 == 0) {

| expr '/' expr

{

	if ($3 == 0) {

		pr_debug("division by zero\n");

		YYABORT;

	}

	$$ = $1 / $3;

}

	| expr '%' expr		{ if ((long)$3 == 0) {

| expr '%' expr

{

	if ((long)$3 == 0) {

		pr_debug("division by zero\n");

		YYABORT;

	}

	$$ = (long)$1 % (long)$3;

}

	| '-' expr %prec NEG	{ $$ = -$2; }

	| '(' if_expr ')'	{ $$ = $2; }

	| MIN '(' expr ',' expr ')' { $$ = $3 < $5 ? $3 : $5; }

	| MAX '(' expr ',' expr ')' { $$ = $3 > $5 ? $3 : $5; }

	| SMT_ON		 { $$ = smt_on() > 0; }

	| D_RATIO '(' expr ',' expr ')' { if ($5 == 0) {

| D_RATIO '(' expr ',' expr ')'

{

	if ($5 == 0) {

		$$ = 0;

	} else {

		$$ = $3 / $5;

	}

}

| '-' expr %prec NEG

{

	$$ = -$2;

}

| '(' if_expr ')'

{

	$$ = $2;

}

| MIN '(' expr ',' expr ')'

{

	$$ = $3 < $5 ? $3 : $5;

}

| MAX '(' expr ',' expr ')'

{

	$$ = $3 > $5 ? $3 : $5;

}

| SMT_ON

{

	$$ = smt_on() > 0 ? 1.0 : 0.0;

}

;



%%