From nobody Tue Dec 16 00:53:09 2025 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3010F1632F2 for ; Wed, 21 May 2025 13:55:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747835714; cv=none; b=s9CcKSvfczl4Hx3Y5b78Rwxes1OOhRGONmdNgPbRaPMb7eVBIj7GDydGb4euhkNxz0U0tFLVv4VOlJ5eoPUyBCSVYf/pL0OB8fDSjvYy2vBcHXxTUW894nfZ0bMKg8ZYkLXohumnW7giKoNc1kBdtC/PEkgwbERs2QaVuBuFjOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747835714; c=relaxed/simple; bh=fG2EQD4pWKzxvhn11dop3lFmr3qYuuLIJu17X/Z/8AY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=MRUNuooF7rMvqNOWqC2a9ltbODJpO3SsuuPemKPmR6vVLAsF+QkmveHoNCVVxfYg3pKSQQ3hnxXcQNq+7Bmpy3JLyBUddoxQ2aXZpAg/z8TcP8DtZJZp/RE6IfQwa+59qeT8tJzdm378I6q0qOqUothtY6F+b97+ne79jhMa9w4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=g/ewc31z; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="g/ewc31z" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e73194d7744so9562096276.0 for ; Wed, 21 May 2025 06:55:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747835711; x=1748440511; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=atmK08ol3WW/ppnYVn9Uz3Hh/SB0GDdHA4mC+AOhirQ=; b=g/ewc31zXnOiEoymNnVsgrqW1vAUhDDszUO2SjX1u3+fBqakRpIBFn5ogtAol6B8F5 do7UHfjKRberrYjqpUsMmHhGqUWrDhxGEOkL/GWp5qX4JsWstbmtC4dUECIGyY9Ponlp 1gThxzRs8hUr6O8/ZuFny1u7ajnYSNS8zWjHn3KqIEi8GMMtJIrR0MFBeFPkgBmvLq3K rMcYra9X1UuWba4W3ULbqvaiJ4vBrq12V9MTC0XNEzgxq6/0Z07A48c3e5kumMKymDwm 2sUC+G2x9jZOCdY+dEnNf43G7tktww/EtcxRlKTCjQRiqODRSvJUfrcGkg6mOQ5er7oB T72g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747835711; x=1748440511; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=atmK08ol3WW/ppnYVn9Uz3Hh/SB0GDdHA4mC+AOhirQ=; b=VDH5TxGDRtt8gjKeU5g7JKc4+sytwEBqqKI1CWjCq9ZLG+8UxHPJ4Xmkh/Y0HcHboV 713D7rczRNzzmnmu1o4EyU1CLT1QL7BlIfboBKqIpxTTcVI8jEQ9JO8+EIag0UVYehhC 1YadK2nz+74hx2BKz2hpR7KEDMFll7VSWCdROWDFEl0OvOZvVfmb1A44lAhcD0xfzCSL bCCLNt4yEuc2tjaRW1cyrmjDDO7eGEkTZdZQw6Z/RHmCVgxJBf4zCbaxZytLp0hAlGbo 9L+tvctLterc3HistL8R/muLSZvxu8dlLcTg05v29P2ANjiOBv9dLwmYeyw7OxDX+U+Z twfQ== X-Forwarded-Encrypted: i=1; AJvYcCWuA6T4vNzXYpbcAz4m0tJLJjTkXO5uHe2rW0KLs8kT/29q+vZLwOeWdzsLT/L/lVMNJeQ+C5FH2KlkJKU=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8rHgDbExVQOJJOPapU2kLuW13rTbTJxmiDGN+n12R5g+MIT3L /R+TlVWOP/elBMcQO6XAbc/vnanyup73w2AF+uwSFsAFrpQPliqreHn71bAdIMiy7wv9s2Pt+3N AuDha0DIpeQ== X-Google-Smtp-Source: AGHT+IGvXKaEfUBjfROjFc2BJrLoF70+H5fA22cCYPNw51sfb3lgLxzFduaZVUHFaIbgVLpJq+7ynPJM+DfL X-Received: from ybbdr5.prod.google.com ([2002:a05:6902:2405:b0:e7a:b53d:55e]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6902:2210:b0:e70:a83d:da74 with SMTP id 3f1490d57ef6-e7b6b157714mr27761773276.9.1747835711207; Wed, 21 May 2025 06:55:11 -0700 (PDT) Date: Wed, 21 May 2025 06:54:57 -0700 In-Reply-To: <20250521135500.677508-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250521135500.677508-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.1112.g889b7c5bd8-goog Message-ID: <20250521135500.677508-2-irogers@google.com> Subject: [PATCH v2 1/3] perf sample: Remove arch notion of sample parsing From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , "Masami Hiramatsu (Google)" , Ravi Bangoria , Leo Yan , Yujie Liu , Graham Woodward , Howard Chu , Weilin Wang , Dmitry Vyukov , Andi Kleen , Thomas Falcon , Matt Fleming , Chun-Tse Shao , Ben Gainey , Song Liu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" By definition arch sample parsing and synthesis will inhibit certain kinds of cross-platform record then analysis (report, script, etc.). Remove arch_perf_parse_sample_weight and arch_perf_synthesize_sample_weight replacing with a common implementation. Combine perf_sample p_stage_cyc and retire_lat to capture the differing uses regardless of compiled for architecture. Signed-off-by: Ian Rogers --- tools/perf/arch/powerpc/util/event.c | 26 --------------------- tools/perf/arch/x86/tests/sample-parsing.c | 4 ++-- tools/perf/arch/x86/util/event.c | 27 ---------------------- tools/perf/builtin-script.c | 2 +- tools/perf/util/dlfilter.c | 2 +- tools/perf/util/event.h | 2 -- tools/perf/util/evsel.c | 17 ++++++++++---- tools/perf/util/hist.c | 4 ++-- tools/perf/util/hist.h | 2 +- tools/perf/util/intel-tpebs.c | 4 ++-- tools/perf/util/sample.h | 5 +--- tools/perf/util/session.c | 2 +- tools/perf/util/sort.c | 6 ++--- tools/perf/util/synthetic-events.c | 10 ++++++-- 14 files changed, 34 insertions(+), 79 deletions(-) diff --git a/tools/perf/arch/powerpc/util/event.c b/tools/perf/arch/powerpc= /util/event.c index 77d8cc2b5691..024ac8b54c33 100644 --- a/tools/perf/arch/powerpc/util/event.c +++ b/tools/perf/arch/powerpc/util/event.c @@ -11,32 +11,6 @@ #include "../../../util/debug.h" #include "../../../util/sample.h" =20 -void arch_perf_parse_sample_weight(struct perf_sample *data, - const __u64 *array, u64 type) -{ - union perf_sample_weight weight; - - weight.full =3D *array; - if (type & PERF_SAMPLE_WEIGHT) - data->weight =3D weight.full; - else { - data->weight =3D weight.var1_dw; - data->ins_lat =3D weight.var2_w; - data->p_stage_cyc =3D weight.var3_w; - } -} - -void arch_perf_synthesize_sample_weight(const struct perf_sample *data, - __u64 *array, u64 type) -{ - *array =3D data->weight; - - if (type & PERF_SAMPLE_WEIGHT_STRUCT) { - *array &=3D 0xffffffff; - *array |=3D ((u64)data->ins_lat << 32); - } -} - const char *arch_perf_header_entry(const char *se_header) { if (!strcmp(se_header, "Local INSTR Latency")) diff --git a/tools/perf/arch/x86/tests/sample-parsing.c b/tools/perf/arch/x= 86/tests/sample-parsing.c index a061e8619267..95d8f7f1d2fb 100644 --- a/tools/perf/arch/x86/tests/sample-parsing.c +++ b/tools/perf/arch/x86/tests/sample-parsing.c @@ -29,7 +29,7 @@ static bool samples_same(const struct perf_sample *s1, { if (type & PERF_SAMPLE_WEIGHT_STRUCT) { COMP(ins_lat); - COMP(retire_lat); + COMP(p_stage_cyc_or_retire_lat); } =20 return true; @@ -50,7 +50,7 @@ static int do_test(u64 sample_type) struct perf_sample sample =3D { .weight =3D 101, .ins_lat =3D 102, - .retire_lat =3D 103, + .p_stage_cyc_or_retire_lat =3D 103, }; struct perf_sample sample_out; size_t i, sz, bufsz; diff --git a/tools/perf/arch/x86/util/event.c b/tools/perf/arch/x86/util/ev= ent.c index a0400707180c..576c1c36046c 100644 --- a/tools/perf/arch/x86/util/event.c +++ b/tools/perf/arch/x86/util/event.c @@ -92,33 +92,6 @@ int perf_event__synthesize_extra_kmaps(const struct perf= _tool *tool, =20 #endif =20 -void arch_perf_parse_sample_weight(struct perf_sample *data, - const __u64 *array, u64 type) -{ - union perf_sample_weight weight; - - weight.full =3D *array; - if (type & PERF_SAMPLE_WEIGHT) - data->weight =3D weight.full; - else { - data->weight =3D weight.var1_dw; - data->ins_lat =3D weight.var2_w; - data->retire_lat =3D weight.var3_w; - } -} - -void arch_perf_synthesize_sample_weight(const struct perf_sample *data, - __u64 *array, u64 type) -{ - *array =3D data->weight; - - if (type & PERF_SAMPLE_WEIGHT_STRUCT) { - *array &=3D 0xffffffff; - *array |=3D ((u64)data->ins_lat << 32); - *array |=3D ((u64)data->retire_lat << 48); - } -} - const char *arch_perf_header_entry(const char *se_header) { if (!strcmp(se_header, "Local Pipeline Stage Cycle")) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 6c3bf74dd78c..c02c435e0f0b 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -2251,7 +2251,7 @@ static void process_event(struct perf_script *script, fprintf(fp, "%16" PRIu16, sample->ins_lat); =20 if (PRINT_FIELD(RETIRE_LAT)) - fprintf(fp, "%16" PRIu16, sample->retire_lat); + fprintf(fp, "%16" PRIu16, sample->p_stage_cyc_or_retire_lat); =20 if (PRINT_FIELD(CGROUP)) { const char *cgrp_name; diff --git a/tools/perf/util/dlfilter.c b/tools/perf/util/dlfilter.c index ddacef881af2..7e61ddfa66b8 100644 --- a/tools/perf/util/dlfilter.c +++ b/tools/perf/util/dlfilter.c @@ -526,7 +526,7 @@ int dlfilter__do_filter_event(struct dlfilter *d, ASSIGN(period); ASSIGN(weight); ASSIGN(ins_lat); - ASSIGN(p_stage_cyc); + d_sample.p_stage_cyc =3D sample->p_stage_cyc_or_retire_lat; ASSIGN(transaction); ASSIGN(insn_cnt); ASSIGN(cyc_cnt); diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index 664bf39567ce..119bce37f4fd 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -390,8 +390,6 @@ extern unsigned int proc_map_timeout; #define PAGE_SIZE_NAME_LEN 32 char *get_page_size_name(u64 size, char *str); =20 -void arch_perf_parse_sample_weight(struct perf_sample *data, const __u64 *= array, u64 type); -void arch_perf_synthesize_sample_weight(const struct perf_sample *data, __= u64 *array, u64 type); const char *arch_perf_header_entry(const char *se_header); int arch_support_sort_key(const char *sort_key); =20 diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index d55482f094bf..097ab98bb81a 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2846,11 +2846,18 @@ perf_event__check_size(union perf_event *event, uns= igned int sample_size) return 0; } =20 -void __weak arch_perf_parse_sample_weight(struct perf_sample *data, - const __u64 *array, - u64 type __maybe_unused) +static void perf_parse_sample_weight(struct perf_sample *data, const __u64= *array, u64 type) { - data->weight =3D *array; + union perf_sample_weight weight; + + weight.full =3D *array; + if (type & PERF_SAMPLE_WEIGHT) { + data->weight =3D weight.full; + } else { + data->weight =3D weight.var1_dw; + data->ins_lat =3D weight.var2_w; + data->p_stage_cyc_or_retire_lat =3D weight.var3_w; + } } =20 u64 evsel__bitfield_swap_branch_flags(u64 value) @@ -3236,7 +3243,7 @@ int evsel__parse_sample(struct evsel *evsel, union pe= rf_event *event, =20 if (type & PERF_SAMPLE_WEIGHT_TYPE) { OVERFLOW_CHECK_u64(array); - arch_perf_parse_sample_weight(data, array, type); + perf_parse_sample_weight(data, array, type); array++; } =20 diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index afc6855327ab..ae9803dca0b1 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -829,7 +829,7 @@ __hists__add_entry(struct hists *hists, .period =3D sample->period, .weight1 =3D sample->weight, .weight2 =3D sample->ins_lat, - .weight3 =3D sample->p_stage_cyc, + .weight3 =3D sample->p_stage_cyc_or_retire_lat, .latency =3D al->latency, }, .parent =3D sym_parent, @@ -846,7 +846,7 @@ __hists__add_entry(struct hists *hists, .time =3D hist_time(sample->time), .weight =3D sample->weight, .ins_lat =3D sample->ins_lat, - .p_stage_cyc =3D sample->p_stage_cyc, + .p_stage_cyc_or_retire_lat =3D sample->p_stage_cyc_or_retire_lat, .simd_flags =3D sample->simd_flags, }, *he =3D hists__findnew_entry(hists, &entry, al, sample_self); =20 diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index c64254088fc7..67033bdabcf4 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -255,7 +255,7 @@ struct hist_entry { u64 code_page_size; u64 weight; u64 ins_lat; - u64 p_stage_cyc; + u64 p_stage_cyc_or_retire_lat; s32 socket; s32 cpu; int parallelism; diff --git a/tools/perf/util/intel-tpebs.c b/tools/perf/util/intel-tpebs.c index 4ad4bc118ea5..ec2f3ecf1e1c 100644 --- a/tools/perf/util/intel-tpebs.c +++ b/tools/perf/util/intel-tpebs.c @@ -202,8 +202,8 @@ static int process_sample_event(const struct perf_tool = *tool __maybe_unused, * latency value will be used. Save the number of samples and the sum of * retire latency value for each event. */ - t->last =3D sample->retire_lat; - update_stats(&t->stats, sample->retire_lat); + t->last =3D sample->p_stage_cyc_or_retire_lat; + update_stats(&t->stats, sample->p_stage_cyc_or_retire_lat); mutex_unlock(tpebs_mtx_get()); return 0; } diff --git a/tools/perf/util/sample.h b/tools/perf/util/sample.h index 0e96240052e9..3330d18fb5fd 100644 --- a/tools/perf/util/sample.h +++ b/tools/perf/util/sample.h @@ -104,10 +104,7 @@ struct perf_sample { u8 cpumode; u16 misc; u16 ins_lat; - union { - u16 p_stage_cyc; - u16 retire_lat; - }; + u16 p_stage_cyc_or_retire_lat; bool no_hw_idx; /* No hw_idx collected in branch_stack */ char insn[MAX_INSN]; void *raw_data; diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index a320672c264e..451bc24ccfba 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1094,7 +1094,7 @@ static void dump_sample(struct evsel *evsel, union pe= rf_event *event, printf("... weight: %" PRIu64 "", sample->weight); if (sample_type & PERF_SAMPLE_WEIGHT_STRUCT) { printf(",0x%"PRIx16"", sample->ins_lat); - printf(",0x%"PRIx16"", sample->p_stage_cyc); + printf(",0x%"PRIx16"", sample->p_stage_cyc_or_retire_lat); } printf("\n"); } diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 45e654653960..dda4ef0b5a73 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -1879,21 +1879,21 @@ struct sort_entry sort_global_ins_lat =3D { static int64_t sort__p_stage_cyc_cmp(struct hist_entry *left, struct hist_entry *right) { - return left->p_stage_cyc - right->p_stage_cyc; + return left->p_stage_cyc_or_retire_lat - right->p_stage_cyc_or_retire_lat; } =20 static int hist_entry__global_p_stage_cyc_snprintf(struct hist_entry *he, = char *bf, size_t size, unsigned int width) { return repsep_snprintf(bf, size, "%-*u", width, - he->p_stage_cyc * he->stat.nr_events); + he->p_stage_cyc_or_retire_lat * he->stat.nr_events); } =20 =20 static int hist_entry__p_stage_cyc_snprintf(struct hist_entry *he, char *b= f, size_t size, unsigned int width) { - return repsep_snprintf(bf, size, "%-*u", width, he->p_stage_cyc); + return repsep_snprintf(bf, size, "%-*u", width, he->p_stage_cyc_or_retire= _lat); } =20 struct sort_entry sort_local_p_stage_cyc =3D { diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index 2fc4d0537840..449a41900fc4 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -1567,10 +1567,16 @@ size_t perf_event__sample_event_size(const struct p= erf_sample *sample, u64 type, return result; } =20 -void __weak arch_perf_synthesize_sample_weight(const struct perf_sample *d= ata, +static void perf_synthesize_sample_weight(const struct perf_sample *data, __u64 *array, u64 type __maybe_unused) { *array =3D data->weight; + + if (type & PERF_SAMPLE_WEIGHT_STRUCT) { + *array &=3D 0xffffffff; + *array |=3D ((u64)data->ins_lat << 32); + *array |=3D ((u64)data->p_stage_cyc_or_retire_lat << 48); + } } =20 static __u64 *copy_read_group_values(__u64 *array, __u64 read_format, @@ -1730,7 +1736,7 @@ int perf_event__synthesize_sample(union perf_event *e= vent, u64 type, u64 read_fo } =20 if (type & PERF_SAMPLE_WEIGHT_TYPE) { - arch_perf_synthesize_sample_weight(sample, array, type); + perf_synthesize_sample_weight(sample, array, type); array++; } =20 --=20 2.49.0.1112.g889b7c5bd8-goog