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

perf expr: Move ID handling to its own function 



This will facilitate sharing in a follow-on change.

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: Ingo Molnar <mingo@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul A . Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Song Liu <song@kernel.org>
Cc: Wan Jiabing <wanjiabing@vivo.com>
Cc: Yury Norov <yury.norov@gmail.com>
Link: https://lore.kernel.org/r/20211111002109.194172-8-irogers@google.com


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

tools/perf/util/expr.y

+35 −26
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define YYDEBUG 1

#include <assert.h>

#include <math.h>

#include <stdlib.h>

#include "util/debug.h"

#define IN_EXPR_Y 1

#include "expr.h"
@@ -82,6 +83,39 @@ static struct ids union_expr(struct ids ids1, struct ids ids2) 
	return result;

}



static struct ids handle_id(struct expr_parse_ctx *ctx, char *id,

			    bool compute_ids)

{

	struct ids result;



	if (!compute_ids) {

		/*

		 * Compute the event's value from ID. If the ID isn't known then

		 * it isn't used to compute the formula so set to NAN.

		 */

		struct expr_id_data *data;



		result.val = NAN;

		if (expr__resolve_id(ctx, id, &data) == 0)

			result.val = expr_id_data__value(data);



		result.ids = NULL;

		free(id);

	} else {

		/*

		 * Set the value to BOTTOM to show that any value is possible

		 * when the event is computed. Create a set of just the ID.

		 */

		result.val = BOTTOM;

		result.ids = ids__new();

		if (!result.ids || ids__insert(result.ids, id)) {

			pr_err("Error creating IDs for '%s'", id);

			free(id);

		}

	}

	return result;

}



/*

 * If we're not computing ids or $1 and $3 are constants, compute the new

 * constant value using OP. Its invariant that there are no ids.  If computing
@@ -167,32 +201,7 @@ expr: NUMBER 
	$$.val = $1;

	$$.ids = NULL;

}

| ID

{

	if (!compute_ids) {

		/*

		 * Compute the event's value from ID. If the ID isn't known then

		 * it isn't used to compute the formula so set to NAN.

		 */

		struct expr_id_data *data;



		$$.val = NAN;

		if (expr__resolve_id(ctx, $1, &data) == 0)

			$$.val = expr_id_data__value(data);



		$$.ids = NULL;

		free($1);

	} else {

		/*

		 * Set the value to BOTTOM to show that any value is possible

		 * when the event is computed. Create a set of just the ID.

		 */

		$$.val = BOTTOM;

		$$.ids = ids__new();

		if (!$$.ids || ids__insert($$.ids, $1))

			YYABORT;

	}

}

| ID		{ $$ = handle_id(ctx, $1, compute_ids); }

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

| expr '&' expr { BINARY_LONG_OP($$, &, $1, $3); }

| expr '^' expr { BINARY_LONG_OP($$, ^, $1, $3); }