If single 'p' modifier is specified for event, set the system precise value for perf_events_attr::precise_ip.
If more than a single 'p' is specified keep the intended value. If precise is not supported by system, warning is disaplyed. Signed-off-by: Jiri Olsa <[email protected]> Cc: Corey Ashford <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Andi Kleen <[email protected]> Cc: David Ahern <[email protected]> Cc: Stephane Eranian <[email protected]> --- tools/perf/util/parse-events.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 2e3ef10..6be4599 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -533,6 +533,26 @@ int parse_events_add_breakpoint(struct list_head **list, int *idx, return add_event(list, idx, &attr, NULL); } +static int precise_default(void) +{ + int precise = perf_precise__get(); + static int warned; + + /* + * Precise info not supported by by this kernel, + * set 1 as the precise value. + */ + if (precise == -1) + precise = 1; + + /* PEBS is not supported here, display warning. */ + if (precise == 0 && !warned++) + pr_warning("warning: no precise support, " + "using non-precise event(s)\n"); + + return precise; +} + static int config_term(struct perf_event_attr *attr, struct parse_events_term *term) { @@ -701,7 +721,12 @@ static int get_event_modifier(struct event_modifier *mod, char *str, int eh = evsel ? evsel->attr.exclude_hv : 0; int eH = evsel ? evsel->attr.exclude_host : 0; int eG = evsel ? evsel->attr.exclude_guest : 0; - int precise = evsel ? evsel->attr.precise_ip : 0; + /* + * No previous state setup for precise, + * let's start from 0 and get incremented + * for both (evsel?) cases. + */ + int precise = 0; int sample_read = 0; int exclude = eu | ek | eh; @@ -810,7 +835,18 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) evsel->attr.exclude_user = mod.eu; evsel->attr.exclude_kernel = mod.ek; evsel->attr.exclude_hv = mod.eh; - evsel->attr.precise_ip = mod.precise; + + /* + * Let the group precise modifier (if any) overwrite the + * event modifier. + */ + if (mod.precise) { + if (mod.precise > 1) + evsel->attr.precise_ip = mod.precise; + else + evsel->attr.precise_ip = precise_default(); + } + evsel->attr.exclude_host = mod.eH; evsel->attr.exclude_guest = mod.eG; evsel->exclude_GH = mod.exclude_GH; -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
