From nobody Thu Feb 12 09:23:40 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 D084F14EC7E for ; Thu, 13 Jun 2024 23:31:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321503; cv=none; b=WZLV22dH4eWBVNO9lO39G6k8eo1YQU9ja6shyf/GNRuegB8bW5vJ8ri6jY9OUXSOfmUYYPVle+21jr9I7gfm3qTZaffUhKZV08eyMvNRZkUHwe8T/C/zjmTiElvrsLomd6+N7i3D+RpKpkHVWuGD/N64V1tDRixOn6DzKcwMA10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321503; c=relaxed/simple; bh=ERrHbjKpSrLndzYhYX3mAlB26TR8JNOzocZcSDYCu0o=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=gfnY+3mQrthKiN4BR2zDAMfXDt0CFZKp4OzHd+P4i4OPMW3KDpMZTU97fDqWeYjz86FwwnEHl1nGwTBReETOp1H9qLUqR1uqPKX14CZ4MFe1tbo+yDwnmNHRR46YdoCNro7sko574jm/VWsxAi3l5RlsvRFihCXKMYEUvuLRYZ4= 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=H757mI7r; arc=none smtp.client-ip=209.85.128.201 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="H757mI7r" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-632591a256bso2762617b3.1 for ; Thu, 13 Jun 2024 16:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718321501; x=1718926301; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=qbSOB/P6de3ygMIG7fdBTW+eS92Yyh1ZhXc/HewO9bA=; b=H757mI7rXcdwMc7RqT84wjqCNsslS7Dbcq4i+lTRPlyCJ9P2El/c3bh/VmBHGTkl45 qeXaKeiIjnCG+LdUNZ1lx8Z3FTpbMkKA/SorZmkj5kaEqXF7L7TYi4eCK0SVCIKyGwQ/ Aeim6hodHDGdFKp9ZGhlMAach1u16QOKemf0iPa/wVMvm98cMakuQFj+4SOIDBm8s3rx xFkI7uMEUiQzKE2LoTeo429sA8/TMcD7FZXRRl3tZgK1DPKgRr8N9Wh8PsKrF8xzpkOg gqEE0rJlE8oPKohPLTealsZ/EYdeR1nVt0zp9ookmOHFb/iAqPbqg3CWkrYj2+eyPiny lqaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718321501; x=1718926301; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qbSOB/P6de3ygMIG7fdBTW+eS92Yyh1ZhXc/HewO9bA=; b=NBawFw/NdfiZKVLv7iHQWxgmkYC7zC3+Nmq7deWFjf27DJjId0GE7pfzeSUZxrcDca Poj+7Ce1Kvu8SM48sm0h8CoLHb3sv4Khi9awqf8xBZ1/8AYnmTp7rqLtSjgk4iHVzUIv 19Mm/oEkfCq1RJuB+bat18ACR+C+dmApLYJJXAIgUYnNqTEGsWX9A5VnWtE8gueTDpXP L7bowNNC3jo6mAIUJB090NYwOmxbjNwq6fcRksZx1tzbml134NtPzTnwB7hxbEUtCAB0 Dolrmlx8I/fbV3pwJ2sQ17Pk0G92D+Wsr7B3Tm3rALHlN69a2Hs/EbnPDU8CdDiR2TaN yHNg== X-Forwarded-Encrypted: i=1; AJvYcCXB6Ec9ijtF4mYNd1zxPBsq5IJDASa48wI+fxrsHPlPLKnAD7KHpIXb/l2KElLuXby7KfvPATy4u37UWNtZO6qXef7bRqWrDxeEQYYm X-Gm-Message-State: AOJu0YzQClt/Aj/GhrfoT9YvrF9dFdRXYCMe2qD9Z5yMBHlXPTAiy2n1 lZFbum3+WvwmezHpg5Dpm6MBRSkUT71gNuu4BVBD5Te5B3Mq45J6+/a3ZQfFGja6rWrAhaztyVE NESzxZg== X-Google-Smtp-Source: AGHT+IHE5wM91COFyENsSJs6TdkrEyube8x5jVXFZVcONmu94l5YziFn9V2oVKc/3BzWS0BiAYO2r5J5dtvN X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:96dd:26a6:1493:53c8]) (user=irogers job=sendgmr) by 2002:a05:690c:d1b:b0:61d:ece5:2bf with SMTP id 00721157ae682-6322265e839mr3417667b3.4.1718321500762; Thu, 13 Jun 2024 16:31:40 -0700 (PDT) Date: Thu, 13 Jun 2024 16:31:15 -0700 In-Reply-To: <20240613233122.3564730-1-irogers@google.com> Message-Id: <20240613233122.3564730-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240613233122.3564730-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Subject: [PATCH v3 1/8] perf build: Add '*.a' to clean targets 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix some excessively long lines by deploying '\'. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.perf | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 5c35c0d89306..acc41a6717db 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -1201,12 +1201,19 @@ endif # CONFIG_PERF_BPF_SKEL bpf-skel-clean: $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS) $(SKE= L_OUT)/vmlinux.h =20 -clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-cl= ean $(LIBPERF)-clean arm64-sysreg-defs-clean fixdep-clean python-clean bpf-= skel-clean tests-coresight-targets-clean - $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive = $(OUTPUT)perf-iostat $(LANG_BINDINGS) - $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete= -o -name '\.*.d' -delete -o -name '*.shellcheck_log' -delete +clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-cl= ean $(LIBPERF)-clean \ + arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean \ + tests-coresight-targets-clean + $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive \ + $(OUTPUT)perf-iostat $(LANG_BINDINGS) + $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '*.a' -delete -o \ + -name '\.*.cmd' -delete -o -name '\.*.d' -delete -o -name '*.shellcheck_= log' -delete $(Q)$(RM) $(OUTPUT).config-detected - $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso= 32 perf-read-vdsox32 $(OUTPUT)$(LIBJVMTI).so - $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo= $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTP= UT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \ + $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso= 32 \ + perf-read-vdsox32 $(OUTPUT)$(LIBJVMTI).so + $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo= \ + $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE \ + $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \ $(OUTPUT)util/intel-pt-decoder/inat-tables.c \ $(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c \ $(OUTPUT)pmu-events/pmu-events.c \ --=20 2.45.2.627.g7a2c4fd464-goog From nobody Thu Feb 12 09:23:40 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 4ED73156236 for ; Thu, 13 Jun 2024 23:31:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321505; cv=none; b=J+L5Cfl1n73v76Jhb1z1xAks5n0U1Wl6qfPCjzXEqU+y3oiMV6Di4nmi3NfUZ5arSNplLbhnP2fGFpZiBzhuECax47J0Aq+6FY74ICNZUWbwFleTkOslKjx9hxrI6G4IAYkjKNMq2zVsaI2fLz5qDX2M1qgMIqYsNHnei3si9Rk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321505; c=relaxed/simple; bh=rFcy+S2+2TKAedCtBmi8koJqecDAqvQ96WMKLQwJCVE=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=kYEbIRWZ6JpB7KnGUOdl9llFSQ2JRcuhshQW7XUvzmwTxmmjOBVRAjP10tXITsdnvOeIOOjqNnwtaAXfL3Mu2PldqBJ+VHJJXzaKZUzGrmSAPWOh2kalv7L52wXzN/1scPMpEtkgB8mFqowU73oPFqwDiUfBhyfgAnGdoelW31A= 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=bX8QD1l7; arc=none smtp.client-ip=209.85.128.201 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="bX8QD1l7" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-62fa71fbfc4so28886377b3.2 for ; Thu, 13 Jun 2024 16:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718321503; x=1718926303; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=r+7hNL7GU/EnUYuEiQpshzYvHRCk9RdYS1NEyctZDl4=; b=bX8QD1l70xe2wkNwM/mT9kDZR9IsbViT1kmFgT8bJ7BJYTAAWJFfMeSUSW0djdwLAK +7HS8N+OpeAOzdMhnHmLd5eh3ERWMSL+cHWMabVCSLLqAlhZKQuNH9i0m9l2ep5WxTNt Zl0iAT6cnh9zXFmtRXTGlaGx5kMhJRXkwhW2TLdGHwWFsLh9FqfGK1ChHTtmKTRB6Mye hpMGUJkkF6dJKTjSDKDviHLGaUEiKePpn7Si6MbY82+PSJNqhdDnU41umWgyr5voFtM4 Des/mtO6Z2f8WcybOPDe27HUMNWhM6XG1eHIK+n0U341X+Uhc/prm5LM0hZbwDNp4BKY WCTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718321503; x=1718926303; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r+7hNL7GU/EnUYuEiQpshzYvHRCk9RdYS1NEyctZDl4=; b=p2EcsMt5Llih8rQbyz73qryTBW2N9LHhRtA08B4wv5uJUBCKMk70ghyl3BgkEEHcp0 iG8cgpubrI4Uvs6PTti+z43A5XQVTtafQca7m8w/wYeq95Ius7S2MCPeKR8AglWEZhNU nOOSEliY1YeNzjP2o4WNjZEUYSnGqBd9vSVE/jIcjlM7Ps1FewcoQRvtW3DEZQkCHWCq F+pjyUdUHZCfm0H3nOccQ75pLL883dc/RlZUyvBAvPeXOKtKred52MSMPlfvbNFReJQE an1n0ekZY1SOH54zlSwUkZhW+pT6G2hoKI2gQ+1AAqON9UALcLM9MDBw2z5LBJQaoi/s n9vQ== X-Forwarded-Encrypted: i=1; AJvYcCXWQ/SifBuRuTZ34refV8HTQgN4gV1ipLeLeUED4uPYVVSOKWhM2VpJAmc9DiWPjBRpdb00s6bWKEV2GrOJhm5wu7HuQLArX2X6BUOy X-Gm-Message-State: AOJu0YwVQeaA6+sl8gTC3klao73QZHHF/m2qt3nraBlSytHWD1qBu31x BIKsecn6saOpRMt1AOO4ZYJAgJe1hf6v2/SUBGkKw1klvA0h32qIpG+y+CJ2DGAUuY0pvXYblMa Jqbc3gw== X-Google-Smtp-Source: AGHT+IFn2/Zt1q3vLtrOIzuqJ1p4Eu87kh7DLSgs2XgUvKC7/KbRAInI64oUnn9ccHvLPYSIt3Qb2v5r0Lgf X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:96dd:26a6:1493:53c8]) (user=irogers job=sendgmr) by 2002:a05:690c:19:b0:62d:cb6:1cff with SMTP id 00721157ae682-6322235c1e3mr2906847b3.1.1718321503168; Thu, 13 Jun 2024 16:31:43 -0700 (PDT) Date: Thu, 13 Jun 2024 16:31:16 -0700 In-Reply-To: <20240613233122.3564730-1-irogers@google.com> Message-Id: <20240613233122.3564730-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240613233122.3564730-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Subject: [PATCH v3 2/8] perf ui: Make ui its own library 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the ui code its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 2 +- tools/perf/Makefile.perf | 10 ++++++++++ tools/perf/ui/Build | 18 +++++++++--------- tools/perf/ui/browsers/Build | 14 +++++++------- tools/perf/ui/tui/Build | 8 ++++---- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index b0cb7ad8e6ac..16ed1357202b 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -55,7 +55,7 @@ CFLAGS_builtin-report.o +=3D -DDOCDIR=3D"BUILD_STR($(s= rcdir_SQ)/Documentation)" =20 perf-y +=3D util/ perf-y +=3D arch/ -perf-y +=3D ui/ +perf-ui-y +=3D ui/ perf-y +=3D scripts/ =20 gtk-y +=3D ui/gtk/ diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index acc41a6717db..c5a027381c55 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -425,10 +425,14 @@ endif =20 export PERL_PATH =20 +LIBPERF_UI_IN :=3D $(OUTPUT)perf-ui-in.o +LIBPERF_UI :=3D $(OUTPUT)libperf-ui.a + PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYMBOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif +PERFLIBS +=3D $(LIBPERF_UI) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -729,6 +733,12 @@ $(PERF_IN): prepare FORCE $(PMU_EVENTS_IN): FORCE prepare $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=3Dpmu-events obj= =3Dpmu-events =20 +$(LIBPERF_UI_IN): FORCE prepare + $(Q)$(MAKE) $(build)=3Dperf-ui + +$(LIBPERF_UI): $(LIBPERF_UI_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \ $(PERF_IN) $(PMU_EVENTS_IN) $(LIBS) -o $@ diff --git a/tools/perf/ui/Build b/tools/perf/ui/Build index 6b6d7143a37b..d2ecd9290600 100644 --- a/tools/perf/ui/Build +++ b/tools/perf/ui/Build @@ -1,12 +1,12 @@ -perf-y +=3D setup.o -perf-y +=3D helpline.o -perf-y +=3D progress.o -perf-y +=3D util.o -perf-y +=3D hist.o -perf-y +=3D stdio/hist.o +perf-ui-y +=3D setup.o +perf-ui-y +=3D helpline.o +perf-ui-y +=3D progress.o +perf-ui-y +=3D util.o +perf-ui-y +=3D hist.o +perf-ui-y +=3D stdio/hist.o =20 CFLAGS_setup.o +=3D -DLIBDIR=3D"BUILD_STR($(LIBDIR))" =20 -perf-$(CONFIG_SLANG) +=3D browser.o -perf-$(CONFIG_SLANG) +=3D browsers/ -perf-$(CONFIG_SLANG) +=3D tui/ +perf-ui-$(CONFIG_SLANG) +=3D browser.o +perf-ui-$(CONFIG_SLANG) +=3D browsers/ +perf-ui-$(CONFIG_SLANG) +=3D tui/ diff --git a/tools/perf/ui/browsers/Build b/tools/perf/ui/browsers/Build index 2608b5da3167..a07489e44765 100644 --- a/tools/perf/ui/browsers/Build +++ b/tools/perf/ui/browsers/Build @@ -1,7 +1,7 @@ -perf-y +=3D annotate.o -perf-y +=3D annotate-data.o -perf-y +=3D hists.o -perf-y +=3D map.o -perf-y +=3D scripts.o -perf-y +=3D header.o -perf-y +=3D res_sample.o +perf-ui-y +=3D annotate.o +perf-ui-y +=3D annotate-data.o +perf-ui-y +=3D hists.o +perf-ui-y +=3D map.o +perf-ui-y +=3D scripts.o +perf-ui-y +=3D header.o +perf-ui-y +=3D res_sample.o diff --git a/tools/perf/ui/tui/Build b/tools/perf/ui/tui/Build index f916df33a1a7..2ac058ad1a61 100644 --- a/tools/perf/ui/tui/Build +++ b/tools/perf/ui/tui/Build @@ -1,4 +1,4 @@ -perf-y +=3D setup.o -perf-y +=3D util.o -perf-y +=3D helpline.o -perf-y +=3D progress.o +perf-ui-y +=3D setup.o +perf-ui-y +=3D util.o +perf-ui-y +=3D helpline.o +perf-ui-y +=3D progress.o --=20 2.45.2.627.g7a2c4fd464-goog From nobody Thu Feb 12 09:23:40 2026 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 5F6CC156F36 for ; Thu, 13 Jun 2024 23:31:47 +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=1718321508; cv=none; b=CPenBgq0xE16H4qTRCNxseC7XD74UbpAqfbKvVzN28gmWOLWMUHroq36eGnb/XwwVdrlmYp6Ip72Ay23/xaWOXoXKwYQkY636e+tEFfjaTXTG0urcfxabjT1vq7yH1YDn/kebuFq1ohGtBUBZxBeByLLiape2aZrUqzLaiRGwnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321508; c=relaxed/simple; bh=0n3NWiOLohwJNKVKL9gV3Koesj5loLw/lRVeMyy3BQk=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=hCcrpdJHl7AGrkUdAlAm8l+4LaEOrTh4lCDZJsyxvEaCFXqfCrmnv2KT1svf/BF7bKDixxaNt39mngVS9N74M/BmcCfC9v8ZmuUmqXBSfFyDJHqhOp5LhrE9SGSGeIPxXCDqqWavfw4nPR3Qd0j6aBAO319pQS+nMIKAFpreVKI= 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=fPtBisXP; 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="fPtBisXP" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dfef7896c01so2723659276.2 for ; Thu, 13 Jun 2024 16:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718321506; x=1718926306; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=CxA/uxqQnuEGimdVVLwjMbl2Ju2kVgaw0AA0enSCOv4=; b=fPtBisXPeJQJTiULPQiFjCmvHHJbj/Ej6YVO8oH5ulF98wNoCyEHGl6rnPQ8MM+2me oihcrKKWFBOji+NM1Vgiv3B/L+6SXD16GGEZbF0Xc+LWqLJT+IHvnhv3NiH10JECHk7S SYYxPqCCXIqRA/cNluRAkgNW1BFdfTWqk5wt0k1e4DeptHiawJvwiG6mCCYVAfKL+5q4 iJH7d8WLTfsgoHzjwbB8eOx99cVBzQ4z4BR1sE6lFH7DECCdTfU7jsgqRiierwwhFzLX QrJ7DNNEPhaYv/QK+fHOrl+D3EVN/fwUcC1NYpGgJb1+63MLAfUPDaO2yVgcQtoldL5D c1TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718321506; x=1718926306; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CxA/uxqQnuEGimdVVLwjMbl2Ju2kVgaw0AA0enSCOv4=; b=M+iYB7/fkYfyy0Pnbfl2eDmnUVxlvnNhdClfjbYJ0SoqsdmihQA3dWUVyjlXMAPJUr Omhnea8XGzElifeBYJ8n7GrgyS+MVvjMrzJQ2z8JhJkAcDXbSwxsWo9i7KZ56yThvMtg d8hKfYgVPpHNyzz6subl4GtUSwmidbAHXdiHxBXN49Y5eW+v5xTtD/DdYY+/Ch1Mx55Y Xk1sIoqqMEUW6FN9hxKerU4UXxNlSoOLRjBdIwnTCgEBkvBGHwlGjqb/RJizfvM+8T3k ihs/9G9Zn2/9FiDBExmUxGavaqlYgusfXb9eRNExckXDtj8HNp3mt1C/1Bn8/Sm/pQ3w mKNA== X-Forwarded-Encrypted: i=1; AJvYcCUybtFyqTbpOJDOzgYyAFx50ftE4c5oCIPo9AlPZNT47GgY1sWY0lfQC9hFbykUDFQX7Nt0qwy/K1r1tg5zrMwTguv8wJXfECZFMogk X-Gm-Message-State: AOJu0YzRJ6yPrwIlIVlG/ZVuTOp+ojflaoGUdOV4OycfS6oZ5/kU7VqH QWSev/crYX+k5pHpbRYq0+3ptKQMRFfBw4WFfNAkXpGzRusj9ANrGY6yRm6RLFyZy7k5X9FKPxY 3rp8C+w== X-Google-Smtp-Source: AGHT+IG0QxtJ2klO/2YXDc0iBujvmja2VH2aEZOp3HvulIB/G5oRb8rNfXRnL0OTcbZ0KYmVBuD4OITIspBw X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:96dd:26a6:1493:53c8]) (user=irogers job=sendgmr) by 2002:a05:6902:1109:b0:df7:9609:4cd8 with SMTP id 3f1490d57ef6-dff150d9a54mr275213276.0.1718321506207; Thu, 13 Jun 2024 16:31:46 -0700 (PDT) Date: Thu, 13 Jun 2024 16:31:17 -0700 In-Reply-To: <20240613233122.3564730-1-irogers@google.com> Message-Id: <20240613233122.3564730-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240613233122.3564730-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Subject: [PATCH v3 3/8] perf pmu-events: Make pmu-events a library 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make pmu-events into a library so it may be linked against things like the python module and not built from source. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.perf | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index c5a027381c55..9640c6ae1837 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -428,11 +428,14 @@ export PERL_PATH LIBPERF_UI_IN :=3D $(OUTPUT)perf-ui-in.o LIBPERF_UI :=3D $(OUTPUT)libperf-ui.a =20 +LIBPMU_EVENTS_IN :=3D $(OUTPUT)pmu-events/pmu-events-in.o +LIBPMU_EVENTS :=3D $(OUTPUT)libpmu-events.a + PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYMBOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif -PERFLIBS +=3D $(LIBPERF_UI) +PERFLIBS +=3D $(LIBPERF_UI) $(LIBPMU_EVENTS) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -721,8 +724,6 @@ strip: $(PROGRAMS) $(OUTPUT)perf $(STRIP) $(STRIP_OPTS) $(PROGRAMS) $(OUTPUT)perf =20 PERF_IN :=3D $(OUTPUT)perf-in.o - -PMU_EVENTS_IN :=3D $(OUTPUT)pmu-events/pmu-events-in.o export NO_JEVENTS =20 build :=3D -f $(srctree)/tools/build/Makefile.build dir=3D. obj @@ -730,18 +731,21 @@ build :=3D -f $(srctree)/tools/build/Makefile.build d= ir=3D. obj $(PERF_IN): prepare FORCE $(Q)$(MAKE) $(build)=3Dperf =20 -$(PMU_EVENTS_IN): FORCE prepare +$(LIBPMU_EVENTS_IN): FORCE prepare $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=3Dpmu-events obj= =3Dpmu-events =20 +$(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(LIBPERF_UI_IN): FORCE prepare $(Q)$(MAKE) $(build)=3Dperf-ui =20 $(LIBPERF_UI): $(LIBPERF_UI_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 -$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN) +$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \ - $(PERF_IN) $(PMU_EVENTS_IN) $(LIBS) -o $@ + $(PERF_IN) $(LIBS) -o $@ =20 $(GTK_IN): FORCE prepare $(Q)$(MAKE) $(build)=3Dgtk --=20 2.45.2.627.g7a2c4fd464-goog From nobody Thu Feb 12 09:23:40 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 9B6E2157487 for ; Thu, 13 Jun 2024 23:31:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321511; cv=none; b=MnuHhc/0NevgtL5IZp33jm19YU0kYQXbF4ib7KVKS04dRIiP8IRIMHamLSTG3FKIVhCnksqmGUwkNoeEIUZd/GnT5cptkSpRXST8LPnTwZLbRfejGCXmyXPcQSx1l6HjarLIvqW4wv5Mu9Rc2CvmImGqpjoNe2VneVyzpDiQxiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321511; c=relaxed/simple; bh=oK3irJmCSFE7ua5CecZ8HCoDb46JjAuJtZy2yQu0bDE=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=BfvRDYhL9FUovwS8xGFlySE03pCypgfPiW4SS/yHqTUvgAxAhA+Y1YGinvQGNzx96x5UAeWeNDu01rtq89jKTzYank0X53N6itN1b08m0H9CgrQXtWMn3Kmt/pMo+SRWBrCIFGwBiUJxYN5FqK0nkIR/9AvIkOhfxjAd74iG5PY= 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=efj2gysj; arc=none smtp.client-ip=209.85.128.201 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="efj2gysj" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-632588b1bdeso2227337b3.2 for ; Thu, 13 Jun 2024 16:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718321509; x=1718926309; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=tZz9GimlctQ26ar42jVbROZvfuJkuQBTvjgjDoz9ZEU=; b=efj2gysjqlfnoo74Tnmn5FDdJYGg5TyHFlZh/32jTnv/98FRTWiuaVcJ64mr1QdkA8 xd6Kvdps7MTSP/BEd5eHs/QfTaOtvZn3BaMVZpN6PD47gK38GJNP7/n22oOTWghcvi+L vy07PaG29vnS76ZT6q9oWOvs+75xrAWoIdNGn1B9iNFgzuIpPemLC5ZiXqgQkD9BoaR8 j6M+/BoWXIPhj1mUq5g3tvOcQAJH9YnoYrGA2kMoa8842IWp5TFfg87kUDo3NRJPTZYN sBtiqnh//f32BmN5Uf1zxXiWbHcpcnSHT64raWZOggZWvU/CX3wB3m3TOtnmalC4fGBW hHDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718321509; x=1718926309; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tZz9GimlctQ26ar42jVbROZvfuJkuQBTvjgjDoz9ZEU=; b=RaBXv03CcvEObjnGC76S0wmWDK86zpnBTYCHcXaY9VqbdyLAVit2K1a9BcZVr0jnoF USBvwXfcCwaqHxnguxxVOIGTnlQe+7EQdSVSygKeeR1eR+WLGyo/SZAJz8Y/p3FTZ3Av 7T1aDVkn/cipwx4Dbd06LoM2KFCgNf8Je5VsqvNQaz/TsozRuZ2axWy5KbPD324M656l UJM5dadWs+x1tIo1zfu71AxG8fdyWm8vOSRIElgYeHx2BCu2w2wCVfDKyx3mQYWu3wtw 1r2iLrmT0YOD8QMhViDDaYbzcN7rKOpGacaMe96022Pj97UpSYAPzczLYpXTV5VxQ9jQ g6Qw== X-Forwarded-Encrypted: i=1; AJvYcCW8hDnUFyswGhIimQKsvO8P8dsjhLLGdUCvKaPHBFk2+lqeo01CUkW24dSlnx8GBaFtzPoIT7PVn+JvfZQvs72+VUEfvSzY5nDtZb1m X-Gm-Message-State: AOJu0YxUzU93OT+nDk/uVUwicz9UfOFn9AZ+YVSHEoeKUIeLMIGbOczg shpxeA5KLdh4euO5ht8IGcp6tCvckVgm44dPYmM6SP/zGt4Ev0CQPMIjsp9iLhVmjgNsM9rENMT 9Aihagg== X-Google-Smtp-Source: AGHT+IGm9OwPtvxK4Uf1mJoxJKk5ylmoXsTWxJwnyTKcDiq1xkFmLpebIRBJ+MmJxZh1CeiVTDFdMwDx3iee X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:96dd:26a6:1493:53c8]) (user=irogers job=sendgmr) by 2002:a05:690c:6d06:b0:631:d4ea:3748 with SMTP id 00721157ae682-63224df69aemr2044937b3.7.1718321508538; Thu, 13 Jun 2024 16:31:48 -0700 (PDT) Date: Thu, 13 Jun 2024 16:31:18 -0700 In-Reply-To: <20240613233122.3564730-1-irogers@google.com> Message-Id: <20240613233122.3564730-5-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240613233122.3564730-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Subject: [PATCH v3 4/8] perf test: Make tests its own library 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the tests code its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 3 +- tools/perf/Makefile.perf | 11 ++- tools/perf/arch/Build | 1 + tools/perf/arch/arm/Build | 2 +- tools/perf/arch/arm/tests/Build | 8 +- tools/perf/arch/arm64/Build | 2 +- tools/perf/arch/arm64/tests/Build | 8 +- tools/perf/arch/powerpc/Build | 2 +- tools/perf/arch/powerpc/tests/Build | 6 +- tools/perf/arch/x86/Build | 4 +- tools/perf/arch/x86/tests/Build | 20 ++-- tools/perf/tests/Build | 140 ++++++++++++++-------------- tools/perf/tests/workloads/Build | 12 +-- 13 files changed, 115 insertions(+), 104 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index 16ed1357202b..fddd45ab35b4 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -36,7 +36,7 @@ endif perf-$(CONFIG_LIBELF) +=3D builtin-probe.o =20 perf-y +=3D bench/ -perf-y +=3D tests/ +perf-test-y +=3D tests/ =20 perf-y +=3D perf.o =20 @@ -55,6 +55,7 @@ CFLAGS_builtin-report.o +=3D -DDOCDIR=3D"BUILD_STR($(s= rcdir_SQ)/Documentation)" =20 perf-y +=3D util/ perf-y +=3D arch/ +perf-test-y +=3D arch/ perf-ui-y +=3D ui/ perf-y +=3D scripts/ =20 diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 9640c6ae1837..9fa69dd0b472 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -425,6 +425,9 @@ endif =20 export PERL_PATH =20 +LIBPERF_TEST_IN :=3D $(OUTPUT)perf-test-in.o +LIBPERF_TEST :=3D $(OUTPUT)libperf-test.a + LIBPERF_UI_IN :=3D $(OUTPUT)perf-ui-in.o LIBPERF_UI :=3D $(OUTPUT)libperf-ui.a =20 @@ -435,7 +438,7 @@ PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYM= BOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif -PERFLIBS +=3D $(LIBPERF_UI) $(LIBPMU_EVENTS) +PERFLIBS +=3D $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVENTS) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -737,6 +740,12 @@ $(LIBPMU_EVENTS_IN): FORCE prepare $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 +$(LIBPERF_TEST_IN): FORCE prepare + $(Q)$(MAKE) $(build)=3Dperf-test + +$(LIBPERF_TEST): $(LIBPERF_TEST_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(LIBPERF_UI_IN): FORCE prepare $(Q)$(MAKE) $(build)=3Dperf-ui =20 diff --git a/tools/perf/arch/Build b/tools/perf/arch/Build index 688818844c11..6dd68c17924c 100644 --- a/tools/perf/arch/Build +++ b/tools/perf/arch/Build @@ -1,2 +1,3 @@ perf-y +=3D common.o perf-y +=3D $(SRCARCH)/ +perf-test-y +=3D $(SRCARCH)/ diff --git a/tools/perf/arch/arm/Build b/tools/perf/arch/arm/Build index 36222e64bbf7..6b4fdec52122 100644 --- a/tools/perf/arch/arm/Build +++ b/tools/perf/arch/arm/Build @@ -1,2 +1,2 @@ perf-y +=3D util/ -perf-$(CONFIG_DWARF_UNWIND) +=3D tests/ +perf-test-$(CONFIG_DWARF_UNWIND) +=3D tests/ diff --git a/tools/perf/arch/arm/tests/Build b/tools/perf/arch/arm/tests/Bu= ild index bc8e97380c82..599efa545727 100644 --- a/tools/perf/arch/arm/tests/Build +++ b/tools/perf/arch/arm/tests/Build @@ -1,5 +1,5 @@ -perf-y +=3D regs_load.o -perf-y +=3D dwarf-unwind.o -perf-y +=3D vectors-page.o +perf-test-y +=3D regs_load.o +perf-test-y +=3D dwarf-unwind.o +perf-test-y +=3D vectors-page.o =20 -perf-y +=3D arch-tests.o +perf-test-y +=3D arch-tests.o diff --git a/tools/perf/arch/arm64/Build b/tools/perf/arch/arm64/Build index a7dd46a5b678..58b2d965ed86 100644 --- a/tools/perf/arch/arm64/Build +++ b/tools/perf/arch/arm64/Build @@ -1,2 +1,2 @@ perf-y +=3D util/ -perf-y +=3D tests/ +perf-test-y +=3D tests/ diff --git a/tools/perf/arch/arm64/tests/Build b/tools/perf/arch/arm64/test= s/Build index e337c09e7f56..d44c9de92d42 100644 --- a/tools/perf/arch/arm64/tests/Build +++ b/tools/perf/arch/arm64/tests/Build @@ -1,5 +1,5 @@ -perf-y +=3D regs_load.o -perf-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o +perf-test-y +=3D regs_load.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o =20 -perf-y +=3D arch-tests.o -perf-y +=3D cpuid-match.o +perf-test-y +=3D arch-tests.o +perf-test-y +=3D cpuid-match.o diff --git a/tools/perf/arch/powerpc/Build b/tools/perf/arch/powerpc/Build index a7dd46a5b678..58b2d965ed86 100644 --- a/tools/perf/arch/powerpc/Build +++ b/tools/perf/arch/powerpc/Build @@ -1,2 +1,2 @@ perf-y +=3D util/ -perf-y +=3D tests/ +perf-test-y +=3D tests/ diff --git a/tools/perf/arch/powerpc/tests/Build b/tools/perf/arch/powerpc/= tests/Build index 3526ab0af9f9..275026950645 100644 --- a/tools/perf/arch/powerpc/tests/Build +++ b/tools/perf/arch/powerpc/tests/Build @@ -1,4 +1,4 @@ -perf-$(CONFIG_DWARF_UNWIND) +=3D regs_load.o -perf-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D regs_load.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o =20 -perf-y +=3D arch-tests.o +perf-test-y +=3D arch-tests.o diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build index ed37013b4289..132cf8beaca2 100644 --- a/tools/perf/arch/x86/Build +++ b/tools/perf/arch/x86/Build @@ -1,5 +1,5 @@ perf-y +=3D util/ -perf-y +=3D tests/ +perf-test-y +=3D tests/ =20 ifdef SHELLCHECK SHELL_TESTS :=3D entry/syscalls/syscalltbl.sh @@ -13,4 +13,4 @@ $(OUTPUT)%.shellcheck_log: % $(call rule_mkdir) $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) =20 -perf-y +=3D $(TEST_LOGS) +perf-test-y +=3D $(TEST_LOGS) diff --git a/tools/perf/arch/x86/tests/Build b/tools/perf/arch/x86/tests/Bu= ild index c1e3b7d39554..3227053f3355 100644 --- a/tools/perf/arch/x86/tests/Build +++ b/tools/perf/arch/x86/tests/Build @@ -1,15 +1,15 @@ -perf-$(CONFIG_DWARF_UNWIND) +=3D regs_load.o -perf-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D regs_load.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o =20 -perf-y +=3D arch-tests.o -perf-y +=3D sample-parsing.o -perf-y +=3D hybrid.o -perf-$(CONFIG_AUXTRACE) +=3D intel-pt-test.o +perf-test-y +=3D arch-tests.o +perf-test-y +=3D sample-parsing.o +perf-test-y +=3D hybrid.o +perf-test-$(CONFIG_AUXTRACE) +=3D intel-pt-test.o ifeq ($(CONFIG_EXTRA_TESTS),y) -perf-$(CONFIG_AUXTRACE) +=3D insn-x86.o +perf-test-$(CONFIG_AUXTRACE) +=3D insn-x86.o endif -perf-$(CONFIG_X86_64) +=3D bp-modify.o -perf-y +=3D amd-ibs-via-core-pmu.o +perf-test-$(CONFIG_X86_64) +=3D bp-modify.o +perf-test-y +=3D amd-ibs-via-core-pmu.o =20 ifdef SHELLCHECK SHELL_TESTS :=3D gen-insn-x86-dat.sh @@ -23,4 +23,4 @@ $(OUTPUT)%.shellcheck_log: % $(call rule_mkdir) $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) =20 -perf-y +=3D $(TEST_LOGS) +perf-test-y +=3D $(TEST_LOGS) diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index c7f9d9676095..5671ee530019 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -1,82 +1,82 @@ # SPDX-License-Identifier: GPL-2.0 =20 -perf-y +=3D builtin-test.o -perf-y +=3D tests-scripts.o -perf-y +=3D parse-events.o -perf-y +=3D dso-data.o -perf-y +=3D attr.o -perf-y +=3D vmlinux-kallsyms.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall-all-cpus.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall-tp-fields.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D mmap-basic.o -perf-y +=3D perf-record.o -perf-y +=3D evsel-roundtrip-name.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D evsel-tp-sched.o -perf-y +=3D fdarray.o -perf-y +=3D pmu.o -perf-y +=3D pmu-events.o -perf-y +=3D hists_common.o -perf-y +=3D hists_link.o -perf-y +=3D hists_filter.o -perf-y +=3D hists_output.o -perf-y +=3D hists_cumulate.o -perf-y +=3D python-use.o -perf-y +=3D bp_signal.o -perf-y +=3D bp_signal_overflow.o -perf-y +=3D bp_account.o -perf-y +=3D wp.o -perf-y +=3D task-exit.o -perf-y +=3D sw-clock.o -perf-y +=3D mmap-thread-lookup.o -perf-y +=3D thread-maps-share.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D switch-tracking.o -perf-y +=3D keep-tracking.o -perf-y +=3D code-reading.o -perf-y +=3D sample-parsing.o -perf-y +=3D parse-no-sample-id-all.o -perf-y +=3D kmod-path.o -perf-y +=3D thread-map.o -perf-y +=3D topology.o -perf-y +=3D mem.o -perf-y +=3D cpumap.o -perf-y +=3D stat.o -perf-y +=3D event_update.o -perf-y +=3D event-times.o -perf-y +=3D expr.o -perf-y +=3D backward-ring-buffer.o -perf-y +=3D sdt.o -perf-y +=3D is_printable_array.o -perf-y +=3D bitmap.o -perf-y +=3D perf-hooks.o -perf-y +=3D unit_number__scnprintf.o -perf-y +=3D mem2node.o -perf-y +=3D maps.o -perf-y +=3D time-utils-test.o -perf-y +=3D genelf.o -perf-y +=3D api-io.o -perf-y +=3D demangle-java-test.o -perf-y +=3D demangle-ocaml-test.o -perf-y +=3D pfm.o -perf-y +=3D parse-metric.o -perf-y +=3D pe-file-parsing.o -perf-y +=3D expand-cgroup.o -perf-y +=3D perf-time-to-tsc.o -perf-y +=3D dlfilter-test.o -perf-y +=3D sigtrap.o -perf-y +=3D event_groups.o -perf-y +=3D symbols.o -perf-y +=3D util.o +perf-test-y +=3D builtin-test.o +perf-test-y +=3D tests-scripts.o +perf-test-y +=3D parse-events.o +perf-test-y +=3D dso-data.o +perf-test-y +=3D attr.o +perf-test-y +=3D vmlinux-kallsyms.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall-all-cpus.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall-tp-fields.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D mmap-basic.o +perf-test-y +=3D perf-record.o +perf-test-y +=3D evsel-roundtrip-name.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D evsel-tp-sched.o +perf-test-y +=3D fdarray.o +perf-test-y +=3D pmu.o +perf-test-y +=3D pmu-events.o +perf-test-y +=3D hists_common.o +perf-test-y +=3D hists_link.o +perf-test-y +=3D hists_filter.o +perf-test-y +=3D hists_output.o +perf-test-y +=3D hists_cumulate.o +perf-test-y +=3D python-use.o +perf-test-y +=3D bp_signal.o +perf-test-y +=3D bp_signal_overflow.o +perf-test-y +=3D bp_account.o +perf-test-y +=3D wp.o +perf-test-y +=3D task-exit.o +perf-test-y +=3D sw-clock.o +perf-test-y +=3D mmap-thread-lookup.o +perf-test-y +=3D thread-maps-share.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D switch-tracking.o +perf-test-y +=3D keep-tracking.o +perf-test-y +=3D code-reading.o +perf-test-y +=3D sample-parsing.o +perf-test-y +=3D parse-no-sample-id-all.o +perf-test-y +=3D kmod-path.o +perf-test-y +=3D thread-map.o +perf-test-y +=3D topology.o +perf-test-y +=3D mem.o +perf-test-y +=3D cpumap.o +perf-test-y +=3D stat.o +perf-test-y +=3D event_update.o +perf-test-y +=3D event-times.o +perf-test-y +=3D expr.o +perf-test-y +=3D backward-ring-buffer.o +perf-test-y +=3D sdt.o +perf-test-y +=3D is_printable_array.o +perf-test-y +=3D bitmap.o +perf-test-y +=3D perf-hooks.o +perf-test-y +=3D unit_number__scnprintf.o +perf-test-y +=3D mem2node.o +perf-test-y +=3D maps.o +perf-test-y +=3D time-utils-test.o +perf-test-y +=3D genelf.o +perf-test-y +=3D api-io.o +perf-test-y +=3D demangle-java-test.o +perf-test-y +=3D demangle-ocaml-test.o +perf-test-y +=3D pfm.o +perf-test-y +=3D parse-metric.o +perf-test-y +=3D pe-file-parsing.o +perf-test-y +=3D expand-cgroup.o +perf-test-y +=3D perf-time-to-tsc.o +perf-test-y +=3D dlfilter-test.o +perf-test-y +=3D sigtrap.o +perf-test-y +=3D event_groups.o +perf-test-y +=3D symbols.o +perf-test-y +=3D util.o =20 ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) -perf-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o endif =20 CFLAGS_attr.o +=3D -DBINDIR=3D"BUILD_STR($(bindir_SQ))" -DPYTHON= =3D"BUILD_STR($(PYTHON_WORD))" CFLAGS_python-use.o +=3D -DPYTHONPATH=3D"BUILD_STR($(OUTPUT)python)" -DP= YTHON=3D"BUILD_STR($(PYTHON_WORD))" CFLAGS_dwarf-unwind.o +=3D -fno-optimize-sibling-calls =20 -perf-y +=3D workloads/ +perf-test-y +=3D workloads/ =20 ifdef SHELLCHECK SHELL_TESTS :=3D $(shell find tests/shell -executable -type f -name '*.s= h') @@ -90,4 +90,4 @@ $(OUTPUT)%.shellcheck_log: % $(call rule_mkdir) $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) =20 -perf-y +=3D $(TEST_LOGS) +perf-test-y +=3D $(TEST_LOGS) diff --git a/tools/perf/tests/workloads/Build b/tools/perf/tests/workloads/= Build index a1f34d5861e3..48bf0d3b0f3d 100644 --- a/tools/perf/tests/workloads/Build +++ b/tools/perf/tests/workloads/Build @@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 =20 -perf-y +=3D noploop.o -perf-y +=3D thloop.o -perf-y +=3D leafloop.o -perf-y +=3D sqrtloop.o -perf-y +=3D brstack.o -perf-y +=3D datasym.o +perf-test-y +=3D noploop.o +perf-test-y +=3D thloop.o +perf-test-y +=3D leafloop.o +perf-test-y +=3D sqrtloop.o +perf-test-y +=3D brstack.o +perf-test-y +=3D datasym.o =20 CFLAGS_sqrtloop.o =3D -g -O0 -fno-inline -U_FORTIFY_SOURCE CFLAGS_leafloop.o =3D -g -O0 -fno-inline -fno-omit-frame-pointer -= U_FORTIFY_SOURCE --=20 2.45.2.627.g7a2c4fd464-goog From nobody Thu Feb 12 09:23:40 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 0EFEB157E69 for ; Thu, 13 Jun 2024 23:31:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321513; cv=none; b=defTcu4y2Hw/Dh909e4DHBF7gmqVI6ZEK1qB4Nl2cEUi8+Jk9J/eYuiMtOJTLXZEzlGrG7GDhhQ+4I1hW7i2XcJydjamtNZffZTVXKjHxwN07AKO2ltxnaiYVfabh4qssyLtpgAdiHe8ltmjjjQ/V2pRdCtJz1KyVlxNj4tdAGI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321513; c=relaxed/simple; bh=YCtNNA8v+ohwBpi9Rus0CYVSC7ZO/eTuaCLvVJt5XpM=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=NGmolq7L4nRa3uauaKV91en9SeVkAxKCFlmVO41API22RyeGqqxgo1yUw04wj76sGkD9kg9I5AXGVIuTkQzy25lCUf99B+LV5K26Q2NgGH5CFAg3vAWkvATwZ050nhqfn2lswUlSA6IVbH/tc+ntFNZaZVL8bI0WLtoOx9sIy9g= 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=XAIjzW1n; arc=none smtp.client-ip=209.85.128.201 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="XAIjzW1n" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-62a3dec382eso17491947b3.1 for ; Thu, 13 Jun 2024 16:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718321511; x=1718926311; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=VsC80hpqUOVrh72YOJDioHn4WeJ5/uS/HucL7CDuoyM=; b=XAIjzW1ncKog4oWEFMl6ZwB2pkG2xTX6RIFqdXE8szl9fWK2oDQ/gW7V7gCXlstkCP 14kJ5fFiVljOqDwGaAvQrtp8A9jh020dt6GgMfh/g/oYbPInYm7gq/kbBuxiJFZCnPRp 4ONYWkfdLaPehuuOllngc77Bc0/dclB0GuorHCUCVHr1Ph+Cb8fX+ThYPV7YvRyiJu73 ZgXH88m933FXbTJiYBVWyjnQfbwPNzkIT22wVSswq5eLvpqbF/njpxsMdyHgpbqiS0MV 5WzwIHsF9eL+0RpdJxxdu/S8SNgzZqjGUhoZV8gQzGQbBgp7W2vGq64X9Ff+DQOXZTX0 rdwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718321511; x=1718926311; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VsC80hpqUOVrh72YOJDioHn4WeJ5/uS/HucL7CDuoyM=; b=iDAyMGateclo/EW/mDQqRwfmh7wh6ks4yjJmXLVJqmcLMDlWX7k2mQEPCeb3hVXI6M UdOXWJqFEA6dQs62bmlLuF4tGHKYdGAUTeoOt55gKxrk006pmR3vO9eiMtuuBZtL+bmT kezUKMfsm1H1K7+275pb4HW/kz+otSktdTlEgQbssj+NhzgesAKE7V9yuUjBRwWIKyoh 9Qi72g31Y0LknYFs3uA50wUSeJ37oWr7pMBF2paZ+mfrEo4ae46J+OWSIeG5mVkEinsk R3HYp7T/+/fCrBM1KeSzDt/9Rs/gyIQH4Mzncr3SQ+Usf27O/t4J5OPHvaN5ZTolg9Fv 4g1A== X-Forwarded-Encrypted: i=1; AJvYcCVaWxa9Tc8RdFSBd7p5G4p4GwAJAkslxgSOO58K7aIPh+nIZYmpXzX+CRHJB6jB4VFT7ap7IcJsvxe11Sr5kPvkJ3zAb/sx2HNKCPjt X-Gm-Message-State: AOJu0Yz5lg1XbxdmzzRmC0SppqwhhecJMRL/o4LMUP342/OUhmePZsAT /PzgYl+ARzrvqcSPUE/9nJL7jcjzlKbrxAearhIPIfR4q+ACB1iBGeggygK7hw5jAHUeuk05NBF JkpNOHw== X-Google-Smtp-Source: AGHT+IFQbqBkASsdg2SlSfv0w0FxeOcJheuzQSPKY3DmVk1q2TSfwkGhF+bycTWG9UalHmuP2wL6xbAMBhcl X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:96dd:26a6:1493:53c8]) (user=irogers job=sendgmr) by 2002:a05:690c:4b12:b0:620:32ea:e1d4 with SMTP id 00721157ae682-632015b69f0mr4076157b3.0.1718321510936; Thu, 13 Jun 2024 16:31:50 -0700 (PDT) Date: Thu, 13 Jun 2024 16:31:19 -0700 In-Reply-To: <20240613233122.3564730-1-irogers@google.com> Message-Id: <20240613233122.3564730-6-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240613233122.3564730-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Subject: [PATCH v3 5/8] perf bench: Make bench its own library 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the benchmark code into a library so it may be linked against things like the python module to avoid compiling code twice. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 4 ++-- tools/perf/Makefile.perf | 11 +++++++++- tools/perf/bench/Build | 46 ++++++++++++++++++++-------------------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index fddd45ab35b4..2787f5630ff7 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -1,4 +1,4 @@ -perf-y +=3D builtin-bench.o +perf-bench-y +=3D builtin-bench.o perf-y +=3D builtin-annotate.o perf-y +=3D builtin-config.o perf-y +=3D builtin-diff.o @@ -35,7 +35,7 @@ endif =20 perf-$(CONFIG_LIBELF) +=3D builtin-probe.o =20 -perf-y +=3D bench/ +perf-bench-y +=3D bench/ perf-test-y +=3D tests/ =20 perf-y +=3D perf.o diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 9fa69dd0b472..4a3c000b9845 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -425,6 +425,9 @@ endif =20 export PERL_PATH =20 +LIBPERF_BENCH_IN :=3D $(OUTPUT)perf-bench-in.o +LIBPERF_BENCH :=3D $(OUTPUT)libperf-bench.a + LIBPERF_TEST_IN :=3D $(OUTPUT)perf-test-in.o LIBPERF_TEST :=3D $(OUTPUT)libperf-test.a =20 @@ -438,7 +441,7 @@ PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYM= BOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif -PERFLIBS +=3D $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVENTS) +PERFLIBS +=3D $(LIBPERF_BENCH) $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVEN= TS) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -740,6 +743,12 @@ $(LIBPMU_EVENTS_IN): FORCE prepare $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 +$(LIBPERF_BENCH_IN): FORCE prepare + $(Q)$(MAKE) $(build)=3Dperf-bench + +$(LIBPERF_BENCH): $(LIBPERF_BENCH_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(LIBPERF_TEST_IN): FORCE prepare $(Q)$(MAKE) $(build)=3Dperf-test =20 diff --git a/tools/perf/bench/Build b/tools/perf/bench/Build index c2ab30907ae7..279ab2ab4abe 100644 --- a/tools/perf/bench/Build +++ b/tools/perf/bench/Build @@ -1,25 +1,25 @@ -perf-y +=3D sched-messaging.o -perf-y +=3D sched-pipe.o -perf-y +=3D sched-seccomp-notify.o -perf-y +=3D syscall.o -perf-y +=3D mem-functions.o -perf-y +=3D futex-hash.o -perf-y +=3D futex-wake.o -perf-y +=3D futex-wake-parallel.o -perf-y +=3D futex-requeue.o -perf-y +=3D futex-lock-pi.o -perf-y +=3D epoll-wait.o -perf-y +=3D epoll-ctl.o -perf-y +=3D synthesize.o -perf-y +=3D kallsyms-parse.o -perf-y +=3D find-bit-bench.o -perf-y +=3D inject-buildid.o -perf-y +=3D evlist-open-close.o -perf-y +=3D breakpoint.o -perf-y +=3D pmu-scan.o -perf-y +=3D uprobe.o +perf-bench-y +=3D sched-messaging.o +perf-bench-y +=3D sched-pipe.o +perf-bench-y +=3D sched-seccomp-notify.o +perf-bench-y +=3D syscall.o +perf-bench-y +=3D mem-functions.o +perf-bench-y +=3D futex-hash.o +perf-bench-y +=3D futex-wake.o +perf-bench-y +=3D futex-wake-parallel.o +perf-bench-y +=3D futex-requeue.o +perf-bench-y +=3D futex-lock-pi.o +perf-bench-y +=3D epoll-wait.o +perf-bench-y +=3D epoll-ctl.o +perf-bench-y +=3D synthesize.o +perf-bench-y +=3D kallsyms-parse.o +perf-bench-y +=3D find-bit-bench.o +perf-bench-y +=3D inject-buildid.o +perf-bench-y +=3D evlist-open-close.o +perf-bench-y +=3D breakpoint.o +perf-bench-y +=3D pmu-scan.o +perf-bench-y +=3D uprobe.o =20 -perf-$(CONFIG_X86_64) +=3D mem-memcpy-x86-64-asm.o -perf-$(CONFIG_X86_64) +=3D mem-memset-x86-64-asm.o +perf-bench-$(CONFIG_X86_64) +=3D mem-memcpy-x86-64-asm.o +perf-bench-$(CONFIG_X86_64) +=3D mem-memset-x86-64-asm.o =20 -perf-$(CONFIG_NUMA) +=3D numa.o +perf-bench-$(CONFIG_NUMA) +=3D numa.o --=20 2.45.2.627.g7a2c4fd464-goog From nobody Thu Feb 12 09:23:40 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.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 4D3C51581E7 for ; Thu, 13 Jun 2024 23:31:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321517; cv=none; b=YdEp2xK/5dGxzlqMk0ydd1X01bcXdJKevd8JIDXSz6rAhxUVLaIc6PILQpfRSSMf2EI7Ga6+HYSDv0F8eN5iSiQgPXpbtyQGJ1nBePd3dyWlwxRqil/ZK5+EzW3RD5QMejRj8+9OuRyPvbrB+ExypegQcnv0Gkq6ditTlDFHT40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321517; c=relaxed/simple; bh=urUO8Y3haQE+twhbUO02QJd7mDwhqYqqM+ick7Y5494=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=uDPt9JZhGm0Zc4CCMimzvRb/tje3iVmTxXT572hAbhI4m4LQnvoZ82oAxKbDlfam4xZVTwm67Fgt3Is7M3kE4ty3h2/VHotSqMQ8ESe2xx1vNCPjVWXMJ4G9C6tPBCs+Vzn6agdrJd3Qvats4HBERzw2lq5OGJ18qFYkJvM1w9I= 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=Fy9vvJJT; arc=none smtp.client-ip=209.85.128.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="Fy9vvJJT" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-62d054b1ceeso25491047b3.2 for ; Thu, 13 Jun 2024 16:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718321513; x=1718926313; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=AQjzrI9iAP+k1+LxMonKMA5zJbCh+x/ZjioYLNLQ4RU=; b=Fy9vvJJTdXw83SudEEsMEMz9P6UiP5Rtatn+Cq1KtJe+osaiBnCA4JksMTgY5uq/c8 hEZVojVFNk7RsbGYbV4sb0zd7wuq+fFfr7lYOsN7ISWlU8kZRlNvdttc/2oHXDMKBmyx 3nJyvjasjN89/Uac2K40t89dPN/MqG8PruBqawf1g8rCd4ObJOCiVG9Pjsv3Pz51/ix3 0q9NwK/aTP3CX5eZqv8yTrAc62WGoMe3z8ylLL1/EK1jOd+OQBJfL+WzM5c0raxuw2Lm yCiKEAcNbYWiA4Lwx/ObhroFa2JjdCZR7qGpSEXiagCIQpy6SrswTtLwKueuMmcQFoa3 W9Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718321513; x=1718926313; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AQjzrI9iAP+k1+LxMonKMA5zJbCh+x/ZjioYLNLQ4RU=; b=eDj1b2OUL9t8NwiKxS50yYoc6cyRX6qzr6NFLLPkJEKcuXnLeMiA67Wm7WROFmq/u8 S9Vd7DGp9mRFjt0FZyoeBtVUNs+5W5B7LFqeTLgcKFDxBBvibKlSGPA4sBQuzpIuOQKD 6REirKOs8J4Nbp7otJxZoVBzdmW+dZq4d3TjwqkYhUknqnttZLJmlcNChj/XB3gRNLX5 EedrgBFkEvBc9NAH5CLP88bZqKhN2QLFWgSyAKCs9GAD/fqmHT0Kx6LP0zIv4FRIqYMk 2UbeXSeVlnEKLWzb79EtCM2Te8VZfxrDWbPVwqBmBMJedpPvDeDihinBVizvDMp++9pw nREw== X-Forwarded-Encrypted: i=1; AJvYcCV8jr/E88mFSOXrIl++RYPiARgYuX1nRsOKPl2492peTTswJONB/FvxywvwcppjoUqdLYJdGt3n1ZV7eZEvOd1yQ6Jw6S8KuedMDgK2 X-Gm-Message-State: AOJu0YyoUzidxLcjQWCjsy6SI1qYKTc0WFIbbiyKdKK4TotVvTUauzKW swYGtzL2TAtZf+sDmjXg6/x2wOHr1gxaavZzYfXPtXr7dpiPO67t6M/1UE5rGQ8H9BbrNt+mL3+ Uhmeqtg== X-Google-Smtp-Source: AGHT+IGznBlcOmvOfpA6EXVwqlnlxaxbXzthPZ1s2mObVJOdSCDpnUMUOvljQx0WhUMOq6cg4qYbQsbcWejs X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:96dd:26a6:1493:53c8]) (user=irogers job=sendgmr) by 2002:a05:690c:6111:b0:62c:fa1a:21e7 with SMTP id 00721157ae682-63223f29c67mr2362377b3.6.1718321513360; Thu, 13 Jun 2024 16:31:53 -0700 (PDT) Date: Thu, 13 Jun 2024 16:31:20 -0700 In-Reply-To: <20240613233122.3564730-1-irogers@google.com> Message-Id: <20240613233122.3564730-7-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240613233122.3564730-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Subject: [PATCH v3 6/8] perf util: Make util its own library 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the util directory into its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. For convenience: arch/common.c scripts/perl/Perf-Trace-Util/Context.c scripts/python/Perf-Trace-Util/Context.c are made part of this library. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 5 +- tools/perf/Makefile.perf | 12 +- tools/perf/arch/Build | 4 +- tools/perf/arch/arm/Build | 2 +- tools/perf/arch/arm/util/Build | 10 +- tools/perf/arch/arm64/Build | 2 +- tools/perf/arch/arm64/util/Build | 20 +- tools/perf/arch/csky/Build | 2 +- tools/perf/arch/csky/util/Build | 6 +- tools/perf/arch/loongarch/Build | 2 +- tools/perf/arch/loongarch/util/Build | 8 +- tools/perf/arch/mips/Build | 2 +- tools/perf/arch/mips/util/Build | 6 +- tools/perf/arch/powerpc/Build | 2 +- tools/perf/arch/powerpc/util/Build | 24 +- tools/perf/arch/riscv/Build | 2 +- tools/perf/arch/riscv/util/Build | 8 +- tools/perf/arch/s390/Build | 2 +- tools/perf/arch/s390/util/Build | 16 +- tools/perf/arch/sh/Build | 2 +- tools/perf/arch/sh/util/Build | 2 +- tools/perf/arch/sparc/Build | 2 +- tools/perf/arch/sparc/util/Build | 2 +- tools/perf/arch/x86/Build | 2 +- tools/perf/arch/x86/util/Build | 42 +- tools/perf/arch/xtensa/Build | 2 +- tools/perf/scripts/Build | 4 +- tools/perf/scripts/perl/Perf-Trace-Util/Build | 2 +- .../perf/scripts/python/Perf-Trace-Util/Build | 2 +- tools/perf/util/Build | 394 +++++++++--------- tools/perf/util/arm-spe-decoder/Build | 2 +- tools/perf/util/cs-etm-decoder/Build | 2 +- tools/perf/util/hisi-ptt-decoder/Build | 2 +- tools/perf/util/intel-pt-decoder/Build | 2 +- tools/perf/util/perf-regs-arch/Build | 18 +- tools/perf/util/scripting-engines/Build | 4 +- 36 files changed, 316 insertions(+), 305 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index 2787f5630ff7..1d4957957d75 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -53,11 +53,12 @@ CFLAGS_builtin-trace.o +=3D -DSTRACE_GROUPS_DIR=3D"B= UILD_STR($(STRACE_GROUPS_DIR_ CFLAGS_builtin-report.o +=3D -DTIPDIR=3D"BUILD_STR($(tipdir_SQ))" CFLAGS_builtin-report.o +=3D -DDOCDIR=3D"BUILD_STR($(srcdir_SQ)/Documen= tation)" =20 -perf-y +=3D util/ +perf-util-y +=3D util/ +perf-util-y +=3D arch/ perf-y +=3D arch/ perf-test-y +=3D arch/ perf-ui-y +=3D ui/ -perf-y +=3D scripts/ +perf-util-y +=3D scripts/ =20 gtk-y +=3D ui/gtk/ =20 diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 4a3c000b9845..ff03f0431013 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -434,6 +434,9 @@ LIBPERF_TEST :=3D $(OUTPUT)libperf-test.a LIBPERF_UI_IN :=3D $(OUTPUT)perf-ui-in.o LIBPERF_UI :=3D $(OUTPUT)libperf-ui.a =20 +LIBPERF_UTIL_IN :=3D $(OUTPUT)perf-util-in.o +LIBPERF_UTIL :=3D $(OUTPUT)libperf-util.a + LIBPMU_EVENTS_IN :=3D $(OUTPUT)pmu-events/pmu-events-in.o LIBPMU_EVENTS :=3D $(OUTPUT)libpmu-events.a =20 @@ -441,7 +444,8 @@ PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYM= BOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif -PERFLIBS +=3D $(LIBPERF_BENCH) $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVEN= TS) +PERFLIBS +=3D $(LIBPERF_BENCH) $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPERF_UTI= L) +PERFLIBS +=3D $(LIBPMU_EVENTS) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -761,6 +765,12 @@ $(LIBPERF_UI_IN): FORCE prepare $(LIBPERF_UI): $(LIBPERF_UI_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 +$(LIBPERF_UTIL_IN): FORCE prepare + $(Q)$(MAKE) $(build)=3Dperf-util + +$(LIBPERF_UTIL): $(LIBPERF_UTIL_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \ $(PERF_IN) $(LIBS) -o $@ diff --git a/tools/perf/arch/Build b/tools/perf/arch/Build index 6dd68c17924c..f0d96a13445c 100644 --- a/tools/perf/arch/Build +++ b/tools/perf/arch/Build @@ -1,3 +1,3 @@ -perf-y +=3D common.o -perf-y +=3D $(SRCARCH)/ +perf-util-y +=3D common.o perf-test-y +=3D $(SRCARCH)/ +perf-util-y +=3D $(SRCARCH)/ diff --git a/tools/perf/arch/arm/Build b/tools/perf/arch/arm/Build index 6b4fdec52122..317425aa3712 100644 --- a/tools/perf/arch/arm/Build +++ b/tools/perf/arch/arm/Build @@ -1,2 +1,2 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-$(CONFIG_DWARF_UNWIND) +=3D tests/ diff --git a/tools/perf/arch/arm/util/Build b/tools/perf/arch/arm/util/Build index 37fc63708966..e6dd7cd79ebd 100644 --- a/tools/perf/arch/arm/util/Build +++ b/tools/perf/arch/arm/util/Build @@ -1,8 +1,8 @@ -perf-y +=3D perf_regs.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o =20 -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-$(CONFIG_AUXTRACE) +=3D pmu.o auxtrace.o cs-etm.o +perf-util-$(CONFIG_AUXTRACE) +=3D pmu.o auxtrace.o cs-etm.o diff --git a/tools/perf/arch/arm64/Build b/tools/perf/arch/arm64/Build index 58b2d965ed86..12ebc65ea7a3 100644 --- a/tools/perf/arch/arm64/Build +++ b/tools/perf/arch/arm64/Build @@ -1,2 +1,2 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-y +=3D tests/ diff --git a/tools/perf/arch/arm64/util/Build b/tools/perf/arch/arm64/util/= Build index 78ef7115be3d..343ef7589a77 100644 --- a/tools/perf/arch/arm64/util/Build +++ b/tools/perf/arch/arm64/util/Build @@ -1,14 +1,14 @@ -perf-y +=3D header.o -perf-y +=3D machine.o -perf-y +=3D perf_regs.o -perf-y +=3D tsc.o -perf-y +=3D pmu.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-y +=3D header.o +perf-util-y +=3D machine.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D tsc.o +perf-util-y +=3D pmu.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-$(CONFIG_AUXTRACE) +=3D ../../arm/util/pmu.o \ +perf-util-$(CONFIG_AUXTRACE) +=3D ../../arm/util/pmu.o \ ../../arm/util/auxtrace.o \ ../../arm/util/cs-etm.o \ arm-spe.o mem-events.o hisi-ptt.o diff --git a/tools/perf/arch/csky/Build b/tools/perf/arch/csky/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/csky/Build +++ b/tools/perf/arch/csky/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/csky/util/Build b/tools/perf/arch/csky/util/Bu= ild index 7d3050134ae0..99d83f41bf43 100644 --- a/tools/perf/arch/csky/util/Build +++ b/tools/perf/arch/csky/util/Build @@ -1,4 +1,4 @@ -perf-y +=3D perf_regs.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/loongarch/Build b/tools/perf/arch/loongarch/Bu= ild index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/loongarch/Build +++ b/tools/perf/arch/loongarch/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/loongarch/util/Build b/tools/perf/arch/loongar= ch/util/Build index d776125a2d06..2386ebbf6dd4 100644 --- a/tools/perf/arch/loongarch/util/Build +++ b/tools/perf/arch/loongarch/util/Build @@ -1,5 +1,5 @@ -perf-y +=3D perf_regs.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/mips/Build b/tools/perf/arch/mips/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/mips/Build +++ b/tools/perf/arch/mips/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/mips/util/Build b/tools/perf/arch/mips/util/Bu= ild index 51c8900a9a10..e4644f1e68a0 100644 --- a/tools/perf/arch/mips/util/Build +++ b/tools/perf/arch/mips/util/Build @@ -1,3 +1,3 @@ -perf-y +=3D perf_regs.o -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-y +=3D perf_regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o diff --git a/tools/perf/arch/powerpc/Build b/tools/perf/arch/powerpc/Build index 58b2d965ed86..12ebc65ea7a3 100644 --- a/tools/perf/arch/powerpc/Build +++ b/tools/perf/arch/powerpc/Build @@ -1,2 +1,2 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-y +=3D tests/ diff --git a/tools/perf/arch/powerpc/util/Build b/tools/perf/arch/powerpc/u= til/Build index 1d323f3a3322..6c588ecdf3bd 100644 --- a/tools/perf/arch/powerpc/util/Build +++ b/tools/perf/arch/powerpc/util/Build @@ -1,14 +1,14 @@ -perf-y +=3D header.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-y +=3D perf_regs.o -perf-y +=3D mem-events.o -perf-y +=3D pmu.o -perf-y +=3D sym-handling.o -perf-y +=3D evsel.o -perf-y +=3D event.o +perf-util-y +=3D header.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D mem-events.o +perf-util-y +=3D pmu.o +perf-util-y +=3D sym-handling.o +perf-util-y +=3D evsel.o +perf-util-y +=3D event.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_DWARF) +=3D skip-callchain-idx.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D skip-callchain-idx.o =20 -perf-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/riscv/Build b/tools/perf/arch/riscv/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/riscv/Build +++ b/tools/perf/arch/riscv/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/riscv/util/Build b/tools/perf/arch/riscv/util/= Build index 603dbb5ae4dc..65ec3c66a375 100644 --- a/tools/perf/arch/riscv/util/Build +++ b/tools/perf/arch/riscv/util/Build @@ -1,5 +1,5 @@ -perf-y +=3D perf_regs.o -perf-y +=3D header.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D header.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/s390/Build b/tools/perf/arch/s390/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/s390/Build +++ b/tools/perf/arch/s390/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/s390/util/Build b/tools/perf/arch/s390/util/Bu= ild index fa66f15a14ec..1ac830030ff3 100644 --- a/tools/perf/arch/s390/util/Build +++ b/tools/perf/arch/s390/util/Build @@ -1,11 +1,11 @@ -perf-y +=3D header.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-y +=3D perf_regs.o +perf-util-y +=3D header.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-y +=3D machine.o -perf-y +=3D pmu.o +perf-util-y +=3D machine.o +perf-util-y +=3D pmu.o =20 -perf-$(CONFIG_AUXTRACE) +=3D auxtrace.o +perf-util-$(CONFIG_AUXTRACE) +=3D auxtrace.o diff --git a/tools/perf/arch/sh/Build b/tools/perf/arch/sh/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/sh/Build +++ b/tools/perf/arch/sh/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/sh/util/Build b/tools/perf/arch/sh/util/Build index e813e618954b..32f44fc4ab98 100644 --- a/tools/perf/arch/sh/util/Build +++ b/tools/perf/arch/sh/util/Build @@ -1 +1 @@ -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o diff --git a/tools/perf/arch/sparc/Build b/tools/perf/arch/sparc/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/sparc/Build +++ b/tools/perf/arch/sparc/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/sparc/util/Build b/tools/perf/arch/sparc/util/= Build index e813e618954b..32f44fc4ab98 100644 --- a/tools/perf/arch/sparc/util/Build +++ b/tools/perf/arch/sparc/util/Build @@ -1 +1 @@ -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build index 132cf8beaca2..87d057491343 100644 --- a/tools/perf/arch/x86/Build +++ b/tools/perf/arch/x86/Build @@ -1,4 +1,4 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-y +=3D tests/ =20 ifdef SHELLCHECK diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build index 005907cb97d8..2607ed5c4296 100644 --- a/tools/perf/arch/x86/util/Build +++ b/tools/perf/arch/x86/util/Build @@ -1,24 +1,24 @@ -perf-y +=3D header.o -perf-y +=3D tsc.o -perf-y +=3D pmu.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-y +=3D perf_regs.o -perf-y +=3D topdown.o -perf-y +=3D machine.o -perf-y +=3D event.o -perf-y +=3D evlist.o -perf-y +=3D mem-events.o -perf-y +=3D evsel.o -perf-y +=3D iostat.o -perf-y +=3D env.o +perf-util-y +=3D header.o +perf-util-y +=3D tsc.o +perf-util-y +=3D pmu.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D topdown.o +perf-util-y +=3D machine.o +perf-util-y +=3D event.o +perf-util-y +=3D evlist.o +perf-util-y +=3D mem-events.o +perf-util-y +=3D evsel.o +perf-util-y +=3D iostat.o +perf-util-y +=3D env.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_BPF_PROLOGUE) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_BPF_PROLOGUE) +=3D dwarf-regs.o =20 -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-$(CONFIG_AUXTRACE) +=3D auxtrace.o -perf-$(CONFIG_AUXTRACE) +=3D archinsn.o -perf-$(CONFIG_AUXTRACE) +=3D intel-pt.o -perf-$(CONFIG_AUXTRACE) +=3D intel-bts.o +perf-util-$(CONFIG_AUXTRACE) +=3D auxtrace.o +perf-util-$(CONFIG_AUXTRACE) +=3D archinsn.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-bts.o diff --git a/tools/perf/arch/xtensa/Build b/tools/perf/arch/xtensa/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/xtensa/Build +++ b/tools/perf/arch/xtensa/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/scripts/Build b/tools/perf/scripts/Build index 7d8e2e57faac..46f0c6f76dbf 100644 --- a/tools/perf/scripts/Build +++ b/tools/perf/scripts/Build @@ -1,4 +1,4 @@ ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_LIBPERL) +=3D perl/Perf-Trace-Util/ + perf-util-$(CONFIG_LIBPERL) +=3D perl/Perf-Trace-Util/ endif -perf-$(CONFIG_LIBPYTHON) +=3D python/Perf-Trace-Util/ +perf-util-$(CONFIG_LIBPYTHON) +=3D python/Perf-Trace-Util/ diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Build b/tools/perf/scr= ipts/perl/Perf-Trace-Util/Build index cc76be005d5e..9b0e5a8b5070 100644 --- a/tools/perf/scripts/perl/Perf-Trace-Util/Build +++ b/tools/perf/scripts/perl/Perf-Trace-Util/Build @@ -1,4 +1,4 @@ -perf-y +=3D Context.o +perf-util-y +=3D Context.o =20 CFLAGS_Context.o +=3D $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-stric= t-prototypes -Wno-bad-function-cast -Wno-declaration-after-statement -Wno-s= witch-enum CFLAGS_Context.o +=3D -Wno-unused-parameter -Wno-nested-externs -Wno-undef diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Build b/tools/perf/s= cripts/python/Perf-Trace-Util/Build index 5b0b5ff7e14a..be3710c61320 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/Build +++ b/tools/perf/scripts/python/Perf-Trace-Util/Build @@ -1,4 +1,4 @@ -perf-y +=3D Context.o +perf-util-y +=3D Context.o =20 # -Wno-declaration-after-statement: The python headers have mixed code wit= h declarations (decls after asserts, for instance) CFLAGS_Context.o +=3D $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-str= ict-prototypes -Wno-unused-parameter -Wno-nested-externs -Wno-declaration-a= fter-statement diff --git a/tools/perf/util/Build b/tools/perf/util/Build index da64efd8718f..0f18fe81ef0b 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -1,181 +1,181 @@ include $(srctree)/tools/scripts/Makefile.include include $(srctree)/tools/scripts/utilities.mak =20 -perf-y +=3D arm64-frame-pointer-unwind-support.o -perf-y +=3D addr_location.o -perf-y +=3D annotate.o -perf-y +=3D block-info.o -perf-y +=3D block-range.o -perf-y +=3D build-id.o -perf-y +=3D cacheline.o -perf-y +=3D config.o -perf-y +=3D copyfile.o -perf-y +=3D ctype.o -perf-y +=3D db-export.o -perf-y +=3D disasm.o -perf-y +=3D env.o -perf-y +=3D event.o -perf-y +=3D evlist.o -perf-y +=3D sideband_evlist.o -perf-y +=3D evsel.o -perf-y +=3D evsel_fprintf.o -perf-y +=3D perf_event_attr_fprintf.o -perf-y +=3D evswitch.o -perf-y +=3D find_bit.o -perf-y +=3D get_current_dir_name.o -perf-y +=3D levenshtein.o -perf-y +=3D mmap.o -perf-y +=3D memswap.o -perf-y +=3D parse-events.o -perf-y +=3D print-events.o -perf-y +=3D tracepoint.o -perf-y +=3D perf_regs.o -perf-y +=3D perf-regs-arch/ -perf-y +=3D path.o -perf-y +=3D print_binary.o -perf-y +=3D print_insn.o -perf-y +=3D rlimit.o -perf-y +=3D argv_split.o -perf-y +=3D rbtree.o -perf-y +=3D libstring.o -perf-y +=3D bitmap.o -perf-y +=3D hweight.o -perf-y +=3D smt.o -perf-y +=3D strbuf.o -perf-y +=3D string.o -perf-y +=3D strlist.o -perf-y +=3D strfilter.o -perf-y +=3D top.o -perf-y +=3D usage.o -perf-y +=3D dso.o -perf-y +=3D dsos.o -perf-y +=3D symbol.o -perf-y +=3D symbol_fprintf.o -perf-y +=3D map_symbol.o -perf-y +=3D color.o -perf-y +=3D color_config.o -perf-y +=3D metricgroup.o -perf-y +=3D header.o -perf-y +=3D callchain.o -perf-y +=3D values.o -perf-y +=3D debug.o -perf-y +=3D fncache.o -perf-y +=3D machine.o -perf-y +=3D map.o -perf-y +=3D maps.o -perf-y +=3D pstack.o -perf-y +=3D session.o -perf-y +=3D sample-raw.o -perf-y +=3D s390-sample-raw.o -perf-y +=3D amd-sample-raw.o -perf-$(CONFIG_TRACE) +=3D syscalltbl.o -perf-y +=3D ordered-events.o -perf-y +=3D namespaces.o -perf-y +=3D comm.o -perf-y +=3D thread.o -perf-y +=3D threads.o -perf-y +=3D thread_map.o -perf-y +=3D parse-events-flex.o -perf-y +=3D parse-events-bison.o -perf-y +=3D pmu.o -perf-y +=3D pmus.o -perf-y +=3D pmu-flex.o -perf-y +=3D pmu-bison.o -perf-y +=3D svghelper.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-info.o -perf-y +=3D trace-event-scripting.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-parse.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-read.o -perf-y +=3D sort.o -perf-y +=3D hist.o -perf-y +=3D util.o -perf-y +=3D cpumap.o -perf-y +=3D affinity.o -perf-y +=3D cputopo.o -perf-y +=3D cgroup.o -perf-y +=3D target.o -perf-y +=3D rblist.o -perf-y +=3D intlist.o -perf-y +=3D vdso.o -perf-y +=3D counts.o -perf-y +=3D stat.o -perf-y +=3D stat-shadow.o -perf-y +=3D stat-display.o -perf-y +=3D perf_api_probe.o -perf-y +=3D record.o -perf-y +=3D srcline.o -perf-y +=3D srccode.o -perf-y +=3D synthetic-events.o -perf-y +=3D data.o -perf-y +=3D tsc.o -perf-y +=3D cloexec.o -perf-y +=3D call-path.o -perf-y +=3D rwsem.o -perf-y +=3D thread-stack.o -perf-y +=3D spark.o -perf-y +=3D topdown.o -perf-y +=3D iostat.o -perf-y +=3D stream.o -perf-$(CONFIG_AUXTRACE) +=3D auxtrace.o -perf-$(CONFIG_AUXTRACE) +=3D intel-pt-decoder/ -perf-$(CONFIG_AUXTRACE) +=3D intel-pt.o -perf-$(CONFIG_AUXTRACE) +=3D intel-bts.o -perf-$(CONFIG_AUXTRACE) +=3D arm-spe.o -perf-$(CONFIG_AUXTRACE) +=3D arm-spe-decoder/ -perf-$(CONFIG_AUXTRACE) +=3D hisi-ptt.o -perf-$(CONFIG_AUXTRACE) +=3D hisi-ptt-decoder/ -perf-$(CONFIG_AUXTRACE) +=3D s390-cpumsf.o +perf-util-y +=3D arm64-frame-pointer-unwind-support.o +perf-util-y +=3D addr_location.o +perf-util-y +=3D annotate.o +perf-util-y +=3D block-info.o +perf-util-y +=3D block-range.o +perf-util-y +=3D build-id.o +perf-util-y +=3D cacheline.o +perf-util-y +=3D config.o +perf-util-y +=3D copyfile.o +perf-util-y +=3D ctype.o +perf-util-y +=3D db-export.o +perf-util-y +=3D disasm.o +perf-util-y +=3D env.o +perf-util-y +=3D event.o +perf-util-y +=3D evlist.o +perf-util-y +=3D sideband_evlist.o +perf-util-y +=3D evsel.o +perf-util-y +=3D evsel_fprintf.o +perf-util-y +=3D perf_event_attr_fprintf.o +perf-util-y +=3D evswitch.o +perf-util-y +=3D find_bit.o +perf-util-y +=3D get_current_dir_name.o +perf-util-y +=3D levenshtein.o +perf-util-y +=3D mmap.o +perf-util-y +=3D memswap.o +perf-util-y +=3D parse-events.o +perf-util-y +=3D print-events.o +perf-util-y +=3D tracepoint.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D perf-regs-arch/ +perf-util-y +=3D path.o +perf-util-y +=3D print_binary.o +perf-util-y +=3D print_insn.o +perf-util-y +=3D rlimit.o +perf-util-y +=3D argv_split.o +perf-util-y +=3D rbtree.o +perf-util-y +=3D libstring.o +perf-util-y +=3D bitmap.o +perf-util-y +=3D hweight.o +perf-util-y +=3D smt.o +perf-util-y +=3D strbuf.o +perf-util-y +=3D string.o +perf-util-y +=3D strlist.o +perf-util-y +=3D strfilter.o +perf-util-y +=3D top.o +perf-util-y +=3D usage.o +perf-util-y +=3D dso.o +perf-util-y +=3D dsos.o +perf-util-y +=3D symbol.o +perf-util-y +=3D symbol_fprintf.o +perf-util-y +=3D map_symbol.o +perf-util-y +=3D color.o +perf-util-y +=3D color_config.o +perf-util-y +=3D metricgroup.o +perf-util-y +=3D header.o +perf-util-y +=3D callchain.o +perf-util-y +=3D values.o +perf-util-y +=3D debug.o +perf-util-y +=3D fncache.o +perf-util-y +=3D machine.o +perf-util-y +=3D map.o +perf-util-y +=3D maps.o +perf-util-y +=3D pstack.o +perf-util-y +=3D session.o +perf-util-y +=3D sample-raw.o +perf-util-y +=3D s390-sample-raw.o +perf-util-y +=3D amd-sample-raw.o +perf-util-$(CONFIG_TRACE) +=3D syscalltbl.o +perf-util-y +=3D ordered-events.o +perf-util-y +=3D namespaces.o +perf-util-y +=3D comm.o +perf-util-y +=3D thread.o +perf-util-y +=3D threads.o +perf-util-y +=3D thread_map.o +perf-util-y +=3D parse-events-flex.o +perf-util-y +=3D parse-events-bison.o +perf-util-y +=3D pmu.o +perf-util-y +=3D pmus.o +perf-util-y +=3D pmu-flex.o +perf-util-y +=3D pmu-bison.o +perf-util-y +=3D svghelper.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-info.o +perf-util-y +=3D trace-event-scripting.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-parse.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-read.o +perf-util-y +=3D sort.o +perf-util-y +=3D hist.o +perf-util-y +=3D util.o +perf-util-y +=3D cpumap.o +perf-util-y +=3D affinity.o +perf-util-y +=3D cputopo.o +perf-util-y +=3D cgroup.o +perf-util-y +=3D target.o +perf-util-y +=3D rblist.o +perf-util-y +=3D intlist.o +perf-util-y +=3D vdso.o +perf-util-y +=3D counts.o +perf-util-y +=3D stat.o +perf-util-y +=3D stat-shadow.o +perf-util-y +=3D stat-display.o +perf-util-y +=3D perf_api_probe.o +perf-util-y +=3D record.o +perf-util-y +=3D srcline.o +perf-util-y +=3D srccode.o +perf-util-y +=3D synthetic-events.o +perf-util-y +=3D data.o +perf-util-y +=3D tsc.o +perf-util-y +=3D cloexec.o +perf-util-y +=3D call-path.o +perf-util-y +=3D rwsem.o +perf-util-y +=3D thread-stack.o +perf-util-y +=3D spark.o +perf-util-y +=3D topdown.o +perf-util-y +=3D iostat.o +perf-util-y +=3D stream.o +perf-util-$(CONFIG_AUXTRACE) +=3D auxtrace.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-bts.o +perf-util-$(CONFIG_AUXTRACE) +=3D arm-spe.o +perf-util-$(CONFIG_AUXTRACE) +=3D arm-spe-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D hisi-ptt.o +perf-util-$(CONFIG_AUXTRACE) +=3D hisi-ptt-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D s390-cpumsf.o =20 ifdef CONFIG_LIBOPENCSD -perf-$(CONFIG_AUXTRACE) +=3D cs-etm.o -perf-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm.o +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder/ endif -perf-$(CONFIG_AUXTRACE) +=3D cs-etm-base.o - -perf-y +=3D parse-branch-options.o -perf-y +=3D dump-insn.o -perf-y +=3D parse-regs-options.o -perf-y +=3D parse-sublevel-options.o -perf-y +=3D term.o -perf-y +=3D help-unknown-cmd.o -perf-y +=3D dlfilter.o -perf-y +=3D mem-events.o -perf-y +=3D mem-info.o -perf-y +=3D vsprintf.o -perf-y +=3D units.o -perf-y +=3D time-utils.o -perf-y +=3D expr-flex.o -perf-y +=3D expr-bison.o -perf-y +=3D expr.o -perf-y +=3D branch.o -perf-y +=3D mem2node.o -perf-y +=3D clockid.o -perf-y +=3D list_sort.o -perf-y +=3D mutex.o -perf-y +=3D sharded_mutex.o - -perf-$(CONFIG_LIBBPF) +=3D bpf_map.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter_cgroup.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_ftrace.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_off_cpu.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-flex.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-bison.o +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm-base.o + +perf-util-y +=3D parse-branch-options.o +perf-util-y +=3D dump-insn.o +perf-util-y +=3D parse-regs-options.o +perf-util-y +=3D parse-sublevel-options.o +perf-util-y +=3D term.o +perf-util-y +=3D help-unknown-cmd.o +perf-util-y +=3D dlfilter.o +perf-util-y +=3D mem-events.o +perf-util-y +=3D mem-info.o +perf-util-y +=3D vsprintf.o +perf-util-y +=3D units.o +perf-util-y +=3D time-utils.o +perf-util-y +=3D expr-flex.o +perf-util-y +=3D expr-bison.o +perf-util-y +=3D expr.o +perf-util-y +=3D branch.o +perf-util-y +=3D mem2node.o +perf-util-y +=3D clockid.o +perf-util-y +=3D list_sort.o +perf-util-y +=3D mutex.o +perf-util-y +=3D sharded_mutex.o + +perf-util-$(CONFIG_LIBBPF) +=3D bpf_map.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter_cgroup.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_ftrace.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_off_cpu.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-flex.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-bison.o =20 ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_lock_contention.o + perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_lock_contention.o endif =20 ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork.o - perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork_top.o + perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork.o + perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork_top.o endif =20 -perf-$(CONFIG_LIBELF) +=3D symbol-elf.o -perf-$(CONFIG_LIBELF) +=3D probe-file.o -perf-$(CONFIG_LIBELF) +=3D probe-event.o +perf-util-$(CONFIG_LIBELF) +=3D symbol-elf.o +perf-util-$(CONFIG_LIBELF) +=3D probe-file.o +perf-util-$(CONFIG_LIBELF) +=3D probe-event.o =20 ifdef CONFIG_LIBBPF_DYNAMIC hashmap :=3D 1 @@ -185,60 +185,60 @@ ifndef CONFIG_LIBBPF endif =20 ifdef hashmap -perf-y +=3D hashmap.o +perf-util-y +=3D hashmap.o endif =20 ifndef CONFIG_LIBELF -perf-y +=3D symbol-minimal.o +perf-util-y +=3D symbol-minimal.o endif =20 ifndef CONFIG_SETNS -perf-y +=3D setns.o +perf-util-y +=3D setns.o endif =20 -perf-$(CONFIG_DWARF) +=3D probe-finder.o -perf-$(CONFIG_DWARF) +=3D dwarf-aux.o -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_DWARF) +=3D debuginfo.o -perf-$(CONFIG_DWARF) +=3D annotate-data.o +perf-util-$(CONFIG_DWARF) +=3D probe-finder.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-aux.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D debuginfo.o +perf-util-$(CONFIG_DWARF) +=3D annotate-data.o =20 -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind-local.o -perf-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBUNWIND_X86) +=3D libunwind/x86_32.o -perf-$(CONFIG_LIBUNWIND_AARCH64) +=3D libunwind/arm64.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind-local.o +perf-util-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBUNWIND_X86) +=3D libunwind/x86_32.o +perf-util-$(CONFIG_LIBUNWIND_AARCH64) +=3D libunwind/arm64.o =20 ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_LIBBABELTRACE) +=3D data-convert-bt.o + perf-util-$(CONFIG_LIBBABELTRACE) +=3D data-convert-bt.o endif =20 -perf-y +=3D data-convert-json.o +perf-util-y +=3D data-convert-json.o =20 -perf-y +=3D scripting-engines/ +perf-util-y +=3D scripting-engines/ =20 -perf-$(CONFIG_ZLIB) +=3D zlib.o -perf-$(CONFIG_LZMA) +=3D lzma.o -perf-$(CONFIG_ZSTD) +=3D zstd.o +perf-util-$(CONFIG_ZLIB) +=3D zlib.o +perf-util-$(CONFIG_LZMA) +=3D lzma.o +perf-util-$(CONFIG_ZSTD) +=3D zstd.o =20 -perf-$(CONFIG_LIBCAP) +=3D cap.o +perf-util-$(CONFIG_LIBCAP) +=3D cap.o =20 -perf-$(CONFIG_CXX_DEMANGLE) +=3D demangle-cxx.o -perf-y +=3D demangle-ocaml.o -perf-y +=3D demangle-java.o -perf-y +=3D demangle-rust.o +perf-util-$(CONFIG_CXX_DEMANGLE) +=3D demangle-cxx.o +perf-util-y +=3D demangle-ocaml.o +perf-util-y +=3D demangle-java.o +perf-util-y +=3D demangle-rust.o =20 ifdef CONFIG_JITDUMP -perf-$(CONFIG_LIBELF) +=3D jitdump.o -perf-$(CONFIG_LIBELF) +=3D genelf.o -perf-$(CONFIG_DWARF) +=3D genelf_debug.o +perf-util-$(CONFIG_LIBELF) +=3D jitdump.o +perf-util-$(CONFIG_LIBELF) +=3D genelf.o +perf-util-$(CONFIG_DWARF) +=3D genelf_debug.o endif =20 -perf-y +=3D perf-hooks.o +perf-util-y +=3D perf-hooks.o =20 -perf-$(CONFIG_LIBBPF) +=3D bpf-event.o -perf-$(CONFIG_LIBBPF) +=3D bpf-utils.o +perf-util-$(CONFIG_LIBBPF) +=3D bpf-event.o +perf-util-$(CONFIG_LIBBPF) +=3D bpf-utils.o =20 -perf-$(CONFIG_LIBPFM4) +=3D pfm.o +perf-util-$(CONFIG_LIBPFM4) +=3D pfm.o =20 CFLAGS_config.o +=3D -DETC_PERFCONFIG=3D"BUILD_STR($(ETC_PERFCONFIG_SQ))" =20 @@ -403,4 +403,4 @@ $(OUTPUT)%.shellcheck_log: % $(call rule_mkdir) $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) =20 -perf-y +=3D $(TEST_LOGS) +perf-util-y +=3D $(TEST_LOGS) diff --git a/tools/perf/util/arm-spe-decoder/Build b/tools/perf/util/arm-sp= e-decoder/Build index f8dae13fc876..960062b3cb9e 100644 --- a/tools/perf/util/arm-spe-decoder/Build +++ b/tools/perf/util/arm-spe-decoder/Build @@ -1 +1 @@ -perf-$(CONFIG_AUXTRACE) +=3D arm-spe-pkt-decoder.o arm-spe-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D arm-spe-pkt-decoder.o arm-spe-decoder.o diff --git a/tools/perf/util/cs-etm-decoder/Build b/tools/perf/util/cs-etm-= decoder/Build index 216cb17a3322..056d665f7f88 100644 --- a/tools/perf/util/cs-etm-decoder/Build +++ b/tools/perf/util/cs-etm-decoder/Build @@ -1 +1 @@ -perf-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder.o diff --git a/tools/perf/util/hisi-ptt-decoder/Build b/tools/perf/util/hisi-= ptt-decoder/Build index db3db8b75033..3298f7b7e308 100644 --- a/tools/perf/util/hisi-ptt-decoder/Build +++ b/tools/perf/util/hisi-ptt-decoder/Build @@ -1 +1 @@ -perf-$(CONFIG_AUXTRACE) +=3D hisi-ptt-pkt-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D hisi-ptt-pkt-decoder.o diff --git a/tools/perf/util/intel-pt-decoder/Build b/tools/perf/util/intel= -pt-decoder/Build index b41c2e9c6f88..30793d08c6d4 100644 --- a/tools/perf/util/intel-pt-decoder/Build +++ b/tools/perf/util/intel-pt-decoder/Build @@ -1,4 +1,4 @@ -perf-$(CONFIG_AUXTRACE) +=3D intel-pt-pkt-decoder.o intel-pt-insn-decoder.= o intel-pt-log.o intel-pt-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt-pkt-decoder.o intel-pt-insn-dec= oder.o intel-pt-log.o intel-pt-decoder.o =20 inat_tables_script =3D $(srctree)/tools/arch/x86/tools/gen-insn-attr-x86.a= wk inat_tables_maps =3D $(srctree)/tools/arch/x86/lib/x86-opcode-map.txt diff --git a/tools/perf/util/perf-regs-arch/Build b/tools/perf/util/perf-re= gs-arch/Build index d9d596d330a7..be95402aa540 100644 --- a/tools/perf/util/perf-regs-arch/Build +++ b/tools/perf/util/perf-regs-arch/Build @@ -1,9 +1,9 @@ -perf-y +=3D perf_regs_aarch64.o -perf-y +=3D perf_regs_arm.o -perf-y +=3D perf_regs_csky.o -perf-y +=3D perf_regs_loongarch.o -perf-y +=3D perf_regs_mips.o -perf-y +=3D perf_regs_powerpc.o -perf-y +=3D perf_regs_riscv.o -perf-y +=3D perf_regs_s390.o -perf-y +=3D perf_regs_x86.o +perf-util-y +=3D perf_regs_aarch64.o +perf-util-y +=3D perf_regs_arm.o +perf-util-y +=3D perf_regs_csky.o +perf-util-y +=3D perf_regs_loongarch.o +perf-util-y +=3D perf_regs_mips.o +perf-util-y +=3D perf_regs_powerpc.o +perf-util-y +=3D perf_regs_riscv.o +perf-util-y +=3D perf_regs_s390.o +perf-util-y +=3D perf_regs_x86.o diff --git a/tools/perf/util/scripting-engines/Build b/tools/perf/util/scri= pting-engines/Build index 586b94e90f4e..2282fe3772f3 100644 --- a/tools/perf/util/scripting-engines/Build +++ b/tools/perf/util/scripting-engines/Build @@ -1,7 +1,7 @@ ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_LIBPERL) +=3D trace-event-perl.o + perf-util-$(CONFIG_LIBPERL) +=3D trace-event-perl.o endif -perf-$(CONFIG_LIBPYTHON) +=3D trace-event-python.o +perf-util-$(CONFIG_LIBPYTHON) +=3D trace-event-python.o =20 CFLAGS_trace-event-perl.o +=3D $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -= Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow -Wno-nested-externs= -Wno-undef -Wno-switch-default -Wno-bad-function-cast -Wno-declaration-aft= er-statement -Wno-switch-enum =20 --=20 2.45.2.627.g7a2c4fd464-goog From nobody Thu Feb 12 09:23:40 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.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 9C0BD158213 for ; Thu, 13 Jun 2024 23:31:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321518; cv=none; b=q4oOmQnnUxGBOOiVRcy1NOnfM/7qY0m0SA0ivZ8Fhdi6ANMIb0ioKtfZxMvHr46vWuKJ5oEH8SS5tmeSYYtVSXgKwO6mWcHT4EBCza6dvQd9sEMNqVChbhIvRUmIEl+TC8ASgarVZEWORPGD7h1+hQlCIivmSFSoJXMdX9wPriE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321518; c=relaxed/simple; bh=jdDVD2dv1/rqbFd/3QUGMKf/GFRV78NDaLF0Z52AGZQ=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=OClHklH73sHqizIEpH3MfKQ5PQKpuVvRq3W/5xFQYxpj5EdZ/Z4Ze7G4TjCVvAhCzhYAMlb2B6otH0jNR4D7CNOgeuUQs0RrwvSWFxVXaZ00epVg4Zad67GxI2ztmAjya1cWhSXV+5GS9oURntmF016u06kKaHJlxop/PyWnAwE= 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=ckzpfkWI; arc=none smtp.client-ip=209.85.128.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="ckzpfkWI" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-632591a256bso2766707b3.1 for ; Thu, 13 Jun 2024 16:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718321515; x=1718926315; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=ypeRfrMxrBCZjC38pT/Y3lCrmNLlrnXhQoa5V7sluF8=; b=ckzpfkWIygC7VUDfqRy09zLyNvT4ne994HXsn+8JY5puHHPv6MR2wKIShwnzVvw3B1 thFHiGZVAjlUPIPEduWPGZpzeolhVhWzvF7qfRBxDAXFzqhPVtnJSzBbQIG799ghmAPS tMooMCfzStcGSTzAsqdZR2dwqZ0Xzrb62CrYPESEkepOpH2tywNH4cdZnSZbornQF4HD 8BVXv0SAOh72JlSqdXWTUxrQKK7PRwWMLu1ry3/5+AhODdJlX8wOnIBl8hPNXawMq2lR gdieRwTuk0s2sk4KyOGut4rlxe5Wy8B07UcaIMctCZ0JUycW7xxKjrKHgznT+ws7M/pi 5QCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718321515; x=1718926315; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ypeRfrMxrBCZjC38pT/Y3lCrmNLlrnXhQoa5V7sluF8=; b=RBuyI3lg1LVs8nnGMrift98WanikIcypL0PalhAglArKMMxltpz+paiBgCXtv6+O6i stxcR487RjEssVe6SyVY5pmr674XA9Q0vmmKvJe64QqboEAJTmSg+GXYplYDFo0u7fe6 LIE7spJjQKlVkc1LzgGpgdmPawXruGgEBdkdV9uckcGhqcttsm6oVU+MZKsqHrwjwzMD 33RikwoMerzHHTd1dHNvxn64MEwZDgzjhQ3z/J5VCsy7MpwOuhdE3fO7rDmfWp8YAL/X 5HuoBibMKCM/PHD+sLhf9oHT9t0TwTIwdkaRNQJXNHCBzje5MqcqIx3iMAyhrVU7+KHB c1gg== X-Forwarded-Encrypted: i=1; AJvYcCXKIXctlgfvNI0LdZ4jy/N3wXEcGwN56skZRogi/xC/fEtcVC45QguTB/bmTIiR3osLPntHIwlERFgiDwWyhT/Y0yOugPmz+pXSyNSc X-Gm-Message-State: AOJu0YyQtrO6z60fQXiWINCvK2TeNApVTp2E/8mtJT8b0cVx5zvnfszt KFhV7tOGBaeWxpS6tHc8k0UdnUaDp8MQnDRWzmPtZKTVReGlTsl5tp0C7THoe4eirqkyvz3Hsit qe4/yDQ== X-Google-Smtp-Source: AGHT+IECjGCpAnL81rYQNvtHQ6ytMQ7XbTUqkLVFUPe5FKv1Z+leN8VJRiP61DKyxD7hotouEdl4k2DYOgfr X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:96dd:26a6:1493:53c8]) (user=irogers job=sendgmr) by 2002:a05:6902:1104:b0:dfa:6ea5:c8d5 with SMTP id 3f1490d57ef6-dff1543a47dmr220005276.10.1718321515414; Thu, 13 Jun 2024 16:31:55 -0700 (PDT) Date: Thu, 13 Jun 2024 16:31:21 -0700 In-Reply-To: <20240613233122.3564730-1-irogers@google.com> Message-Id: <20240613233122.3564730-8-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240613233122.3564730-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Subject: [PATCH v3 7/8] perf python: Switch module to linking libraries from building source 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" setup.py was building most perf sources causing setup.py to mimic the Makefile logic as well as flex/bison code to be stubbed out, due to complexity building. By using libraries fewer functions are stubbed out, the build is faster and the Makefile logic is reused which should simplify updating. The libraries are passed through LDFLAGS to avoid complexity in python. Force the -fPIC flag for libbpf.a to ensure it is suitable for linking into the perf python module. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.config | 5 + tools/perf/Makefile.perf | 6 +- tools/perf/util/python.c | 271 ++++++++++++++----------------------- tools/perf/util/setup.py | 33 +---- 4 files changed, 110 insertions(+), 205 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 7f1e016a9253..639be696f597 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -910,6 +910,11 @@ else endif CFLAGS +=3D -DHAVE_LIBPYTHON_SUPPORT $(call detected,CONFIG_LIBPYTHON) + ifeq ($(filter -fPIC,$(CFLAGS)),) + # Building a shared library requires position independent code. + CFLAGS +=3D -fPIC + CXXFLAGS +=3D -fPIC + endif endif endif endif diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index ff03f0431013..4a1a9f09fa09 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -715,9 +715,9 @@ all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BI= NDINGS) $(OTHER_PROGRAMS) # Create python binding output directory if not already present $(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python') =20 -$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): $(PYTHON_EXT_SRCS) $(PYTHO= N_EXT_DEPS) $(LIBPERF) $(LIBSUBCMD) +$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): $(PYTHON_EXT_SRCS) $(PYTHO= N_EXT_DEPS) $(PERFLIBS) $(QUIET_GEN)LDSHARED=3D"$(CC) -pthread -shared" \ - CFLAGS=3D'$(CFLAGS)' LDFLAGS=3D'$(LDFLAGS)' \ + CFLAGS=3D'$(CFLAGS)' LDFLAGS=3D'$(LDFLAGS) $(LIBS)' \ $(PYTHON_WORD) util/setup.py \ --quiet build_ext; \ cp $(PYTHON_EXTBUILD_LIB)perf*.so $(OUTPUT)python/ @@ -933,7 +933,7 @@ $(LIBAPI)-clean: $(LIBBPF): FORCE | $(LIBBPF_OUTPUT) $(Q)$(MAKE) -C $(LIBBPF_DIR) FEATURES_DUMP=3D$(FEATURE_DUMP_EXPORT) \ O=3D OUTPUT=3D$(LIBBPF_OUTPUT)/ DESTDIR=3D$(LIBBPF_DESTDIR) prefix=3D su= bdir=3D \ - $@ install_headers + EXTRA_CFLAGS=3D"-fPIC" $@ install_headers =20 $(LIBBPF)-clean: $(call QUIET_CLEAN, libbpf) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 0aeb97c11c03..3be882b2e845 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -10,21 +10,19 @@ #endif #include #include "evlist.h" -#include "callchain.h" #include "evsel.h" #include "event.h" #include "print_binary.h" #include "thread_map.h" #include "trace-event.h" #include "mmap.h" -#include "stat.h" -#include "metricgroup.h" #include "util/bpf-filter.h" #include "util/env.h" -#include "util/pmu.h" -#include "util/pmus.h" +#include "util/kvm-stat.h" +#include "util/kwork.h" +#include "util/lock-contention.h" #include -#include "util.h" +#include "../builtin.h" =20 #if PY_MAJOR_VERSION < 3 #define _PyUnicode_FromString(arg) \ @@ -50,166 +48,6 @@ #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) #endif =20 -/* - * Avoid bringing in event parsing. - */ -int parse_event(struct evlist *evlist __maybe_unused, const char *str __ma= ybe_unused) -{ - return 0; -} - -/* - * Provide these two so that we don't have to link against callchain.c and - * start dragging hist.c, etc. - */ -struct callchain_param callchain_param; - -int parse_callchain_record(const char *arg __maybe_unused, - struct callchain_param *param __maybe_unused) -{ - return 0; -} - -/* - * Add these not to drag util/env.c - */ -struct perf_env perf_env; - -const char *perf_env__cpuid(struct perf_env *env __maybe_unused) -{ - return NULL; -} - -// This one is a bit easier, wouldn't drag too much, but leave it as a stu= b we need it here -const char *perf_env__arch(struct perf_env *env __maybe_unused) -{ - return NULL; -} - -/* - * These ones are needed not to drag the PMU bandwagon, jevents generated - * pmu_sys_event_tables, etc and evsel__find_pmu() is used so far just for - * doing per PMU perf_event_attr.exclude_guest handling, not really needed= , so - * far, for the perf python binding known usecases, revisit if this become - * necessary. - */ -struct perf_pmu *evsel__find_pmu(const struct evsel *evsel __maybe_unused) -{ - return NULL; -} - -int perf_pmu__scan_file(const struct perf_pmu *pmu, const char *name, cons= t char *fmt, ...) -{ - return EOF; -} - -const char *perf_pmu__name_from_config(struct perf_pmu *pmu __maybe_unused= , u64 config __maybe_unused) -{ - return NULL; -} - -struct perf_pmu *perf_pmus__find_by_type(unsigned int type __maybe_unused) -{ - return NULL; -} - -int perf_pmus__num_core_pmus(void) -{ - return 1; -} - -bool evsel__is_aux_event(const struct evsel *evsel __maybe_unused) -{ - return false; -} - -bool perf_pmus__supports_extended_type(void) -{ - return false; -} - -/* - * Add this one here not to drag util/metricgroup.c - */ -int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *= cgrp, - struct rblist *new_metric_events, - struct rblist *old_metric_events) -{ - return 0; -} - -/* - * Add this one here not to drag util/trace-event-info.c - */ -char *tracepoint_id_to_name(u64 config) -{ - return NULL; -} - -/* - * XXX: All these evsel destructors need some better mechanism, like a lin= ked - * list of destructors registered when the relevant code indeed is used in= stead - * of having more and more calls in perf_evsel__delete(). -- acme - * - * For now, add some more: - * - * Not to drag the BPF bandwagon... - */ -void bpf_counter__destroy(struct evsel *evsel); -int bpf_counter__install_pe(struct evsel *evsel, int cpu, int fd); -int bpf_counter__disable(struct evsel *evsel); - -void bpf_counter__destroy(struct evsel *evsel __maybe_unused) -{ -} - -int bpf_counter__install_pe(struct evsel *evsel __maybe_unused, int cpu __= maybe_unused, int fd __maybe_unused) -{ - return 0; -} - -int bpf_counter__disable(struct evsel *evsel __maybe_unused) -{ - return 0; -} - -// not to drag util/bpf-filter.c -#ifdef HAVE_BPF_SKEL -int perf_bpf_filter__prepare(struct evsel *evsel __maybe_unused) -{ - return 0; -} - -int perf_bpf_filter__destroy(struct evsel *evsel __maybe_unused) -{ - return 0; -} -#endif - -/* - * Support debug printing even though util/debug.c is not linked. That me= ans - * implementing 'verbose' and 'eprintf'. - */ -int verbose; -int debug_kmaps; -int debug_peo_args; - -int eprintf(int level, int var, const char *fmt, ...); - -int eprintf(int level, int var, const char *fmt, ...) -{ - va_list args; - int ret =3D 0; - - if (var >=3D level) { - va_start(args, fmt); - ret =3D vfprintf(stderr, fmt, args); - va_end(args); - } - - return ret; -} - /* Define PyVarObject_HEAD_INIT for python 2.5 */ #ifndef PyVarObject_HEAD_INIT # define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size, @@ -1510,15 +1348,102 @@ PyMODINIT_FUNC PyInit_perf(void) #endif } =20 -/* - * Dummy, to avoid dragging all the test_attr infrastructure in the python - * binding. - */ -void test_attr__open(struct perf_event_attr *attr, pid_t pid, struct perf_= cpu cpu, - int fd, int group_fd, unsigned long flags) + +/* The following are stubs to avoid dragging in builtin-* objects. */ +/* TODO: move the code out of the builtin-* file into util. */ + +unsigned int scripting_max_stack =3D PERF_MAX_STACK_DEPTH; + +bool kvm_entry_event(struct evsel *evsel __maybe_unused) { + return false; +} + +bool kvm_exit_event(struct evsel *evsel __maybe_unused) +{ + return false; +} + +bool exit_event_begin(struct evsel *evsel __maybe_unused, + struct perf_sample *sample __maybe_unused, + struct event_key *key __maybe_unused) +{ + return false; +} + +bool exit_event_end(struct evsel *evsel __maybe_unused, + struct perf_sample *sample __maybe_unused, + struct event_key *key __maybe_unused) +{ + return false; +} + +void exit_event_decode_key(struct perf_kvm_stat *kvm __maybe_unused, + struct event_key *key __maybe_unused, + char *decode __maybe_unused) +{ +} + +int find_scripts(char **scripts_array __maybe_unused, char **scripts_path= _array __maybe_unused, + int num __maybe_unused, int pathlen __maybe_unused) +{ + return -1; +} + +void perf_stat__set_no_csv_summary(int set __maybe_unused) +{ +} + +void perf_stat__set_big_num(int set __maybe_unused) +{ +} + +int script_spec_register(const char *spec __maybe_unused, struct scripting= _ops *ops __maybe_unused) +{ + return -1; +} + +arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *ar= ch __maybe_unused) +{ + return NULL; +} + +struct kwork_work *perf_kwork_add_work(struct perf_kwork *kwork __maybe_un= used, + struct kwork_class *class __maybe_unused, + struct kwork_work *key __maybe_unused) +{ + return NULL; +} + +void script_fetch_insn(struct perf_sample *sample __maybe_unused, + struct thread *thread __maybe_unused, + struct machine *machine __maybe_unused) +{ +} + +int perf_sample__sprintf_flags(u32 flags __maybe_unused, char *str __maybe= _unused, + size_t sz __maybe_unused) +{ + return -1; +} + +bool match_callstack_filter(struct machine *machine __maybe_unused, u64 *c= allstack __maybe_unused) +{ + return false; +} + +struct lock_stat *lock_stat_find(u64 addr __maybe_unused) +{ + return NULL; +} + +struct lock_stat *lock_stat_findnew(u64 addr __maybe_unused, const char *n= ame __maybe_unused, + int flags __maybe_unused) +{ + return NULL; } =20 -void evlist__free_stats(struct evlist *evlist) +int cmd_inject(int argc __maybe_unused, const char *argv[] __maybe_unused) { + return -1; } diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py index 3107f5aa8c9a..142e9d447ce7 100644 --- a/tools/perf/util/setup.py +++ b/tools/perf/util/setup.py @@ -60,7 +60,7 @@ class install_lib(_install_lib): =20 cflags =3D getenv('CFLAGS', '').split() # switch off several checks (need to be at the end of cflags list) -cflags +=3D ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-pa= rameter', '-Wno-redundant-decls', '-DPYTHON_PERF' ] +cflags +=3D ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-pa= rameter', '-Wno-redundant-decls' ] if cc_is_clang: cflags +=3D ["-Wno-unused-command-line-argument" ] else: @@ -72,36 +72,11 @@ cflags +=3D [ "-Wno-declaration-after-statement" ] src_perf =3D getenv('srctree') + '/tools/perf' build_lib =3D getenv('PYTHON_EXTBUILD_LIB') build_tmp =3D getenv('PYTHON_EXTBUILD_TMP') -libtraceevent =3D getenv('LIBTRACEEVENT') -libapikfs =3D getenv('LIBAPI') -libperf =3D getenv('LIBPERF') - -ext_sources =3D [f.strip() for f in open('util/python-ext-sources') - if len(f.strip()) > 0 and f[0] !=3D '#'] - -extra_libraries =3D [] - -if '-DHAVE_LIBTRACEEVENT' in cflags: - extra_libraries +=3D [ 'traceevent' ] -else: - ext_sources.remove('util/trace-event.c') - ext_sources.remove('util/trace-event-parse.c') - -# use full paths with source files -ext_sources =3D list(map(lambda x: '%s/%s' % (src_perf, x) , ext_sources)) - -if '-DHAVE_LIBNUMA_SUPPORT' in cflags: - extra_libraries +=3D [ 'numa' ] -if '-DHAVE_LIBCAP_SUPPORT' in cflags: - extra_libraries +=3D [ 'cap' ] =20 perf =3D Extension('perf', - sources =3D ext_sources, - include_dirs =3D ['util/include'], - libraries =3D extra_libraries, - extra_compile_args =3D cflags, - extra_objects =3D [ x for x in [libtraceevent, libapikfs, libperf] - if x is not None], + sources =3D [ src_perf + '/util/python.c' ], + include_dirs =3D ['util/include'], + extra_compile_args =3D cflags, ) =20 setup(name=3D'perf', --=20 2.45.2.627.g7a2c4fd464-goog From nobody Thu Feb 12 09:23:40 2026 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (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 C0634157E82 for ; Thu, 13 Jun 2024 23:31:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321520; cv=none; b=MEjZLk52bAdCrr3BGm93usiYPAgUdixTRH2u4kPegxWWn7r1DGRkrLiGcdcB8TsTFI+E0yM2Pf80C0Dj4+3WZxLo8a1oKiRzfbneip/3G7i9wOuisXWIBl2jOMFvajdaOrTPVsDBOrjOE2xzpUG+6q/1p294PFsHvBE8ZwEHfPA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718321520; c=relaxed/simple; bh=/ONs+RfIi9pLA0kZMRaJefFpcB8Apxh4eLPjFTsRe2k=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=WYIsJzymNjfxQsGO1qwxwnR4BE33yhRhugAiVGmrHjdaGYFhBRp7jxFZQpvsu1MTHCyt51mnITravOE2riiEAv7kWbI8dLrmhuE2/aJ60FU9jHCKp+P98OVXALtoCHPsAgzIk8cP2wIBd0l+39fsNx8BPyNZf1g6vedn+5+9UZc= 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=LJjVVOL1; arc=none smtp.client-ip=209.85.219.201 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="LJjVVOL1" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dfe44496da9so2702267276.0 for ; Thu, 13 Jun 2024 16:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718321518; x=1718926318; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=r+L2y8W9nebELrh4jjwhLDqIvkQwPnsfqcpkdzoDYes=; b=LJjVVOL1W7z8ariv5eRv9Oc6qcqSdVDidnv8bkp3K2wOzpZfTOLJVFmBqT9PRObT5z QXlNHk7ECb3QA/P9QyevKRSD21n8+RB3q6fRoW15Lni86MpU+MZcFOLOoZjxffImjaO5 LQyc/rILhpO3s/RwLj7aDZON71WIc9/bk91gebnxiO3kVRsJxQxUZ2zWUWR245RQtKbi qloZLDGq8vM9znddDkZiZia6VXCYlfD5tbAMhRTOUcDYUtgnvaKQBRof5aTfZZkuqZfp FfQRTUvRtoFKHpFQKXXNSoNonGdt8SO23oMIG7a17eYQDp5Y3zbDOEdnrCE1ARzR9pAx aH5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718321518; x=1718926318; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r+L2y8W9nebELrh4jjwhLDqIvkQwPnsfqcpkdzoDYes=; b=X/3CFnutYj5k2zT5iaN5BUd/Bd9CGQViQCoG91j/veCcrBJs6r6smszXlVmcwUtt0j Ivf/h/mRQF61nv+tZO2Kya69K2T8TG23l3/G1S3xwp7ZVlDqzUiUP+CsGKAPVrgyK9wb 1TcTnVMmVCUOaoflP9H5x3/bHgCdDtgzV7JiT3sH15WP/WDiqvRzZ+j0R7QeZEG7Zt6N sobPGkW4gz9mHjOQInj5r6jlUBhgYMw+Be+kbvNIeJhLVM8vP6tA93EQazK/bhZ55vZK zZec+5/tpG2EfUXRQCiLoPtMvWJhUtqWoJMN59wO8HiszsSsM9tNf1+y0FXGrtopocCV bWuQ== X-Forwarded-Encrypted: i=1; AJvYcCXQQ25ouIziXwwze9cuYvup+01ZqXC09fVh1KDfZBQdLlS4pRKGsfei+w7i9VxZJNqmj6hf1mxbdKR7Lp5hKZkjZ++S6UyI3x/z+0SD X-Gm-Message-State: AOJu0YzSqIlb60KfvTPIjn8lbaCZOnGXYAgtD87BzkFMT+SrhN2z4Qs4 PiHE1VabvDXzZISqDJazlw8kpFSNSrae6jzlftIp64mHn1kz7DLTzjj7ttksGw2M7SAFuuPmD3E 6EoR/xA== X-Google-Smtp-Source: AGHT+IEPh6V7sGbFHR3+mSLnMHVnCNCyXK9wRdgNwAVEtM+jm7kOCyEDIINjZOrKiPFf8Nvnv9P0x6gU6Ikz X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:96dd:26a6:1493:53c8]) (user=irogers job=sendgmr) by 2002:a05:6902:1204:b0:dfa:ff27:db1 with SMTP id 3f1490d57ef6-dff15412181mr135767276.4.1718321517470; Thu, 13 Jun 2024 16:31:57 -0700 (PDT) Date: Thu, 13 Jun 2024 16:31:22 -0700 In-Reply-To: <20240613233122.3564730-1-irogers@google.com> Message-Id: <20240613233122.3564730-9-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240613233122.3564730-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Subject: [PATCH v3 8/8] perf python: Clean up build dependencies 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The python build now depends on libraries and doesn't use python-ext-sources except for the util/python.c dependency. Switch to just directly depending on that file and util/setup.py. This allows the removal of python-ext-sources. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.perf | 10 +----- tools/perf/util/python-ext-sources | 53 ------------------------------ 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 tools/perf/util/python-ext-sources diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 4a1a9f09fa09..590081384882 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -380,14 +380,6 @@ python-clean :=3D $(call QUIET_CLEAN, python) $(RM) -r= $(PYTHON_EXTBUILD) $(OUTPUT # Use the detected configuration -include $(OUTPUT).config-detected =20 -ifeq ($(CONFIG_LIBTRACEEVENT),y) - PYTHON_EXT_SRCS :=3D $(shell grep -v ^\# util/python-ext-sources) -else - PYTHON_EXT_SRCS :=3D $(shell grep -v ^\#\\\|util/trace-event.c\\\|util/t= race-event-parse.c util/python-ext-sources) -endif - -PYTHON_EXT_DEPS :=3D util/python-ext-sources util/setup.py $(LIBAPI) - SCRIPTS =3D $(patsubst %.sh,%,$(SCRIPT_SH)) =20 PROGRAMS +=3D $(OUTPUT)perf @@ -715,7 +707,7 @@ all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BI= NDINGS) $(OTHER_PROGRAMS) # Create python binding output directory if not already present $(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python') =20 -$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): $(PYTHON_EXT_SRCS) $(PYTHO= N_EXT_DEPS) $(PERFLIBS) +$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): util/python.c util/setup.p= y $(PERFLIBS) $(QUIET_GEN)LDSHARED=3D"$(CC) -pthread -shared" \ CFLAGS=3D'$(CFLAGS)' LDFLAGS=3D'$(LDFLAGS) $(LIBS)' \ $(PYTHON_WORD) util/setup.py \ diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ex= t-sources deleted file mode 100644 index 1bec945f4838..000000000000 --- a/tools/perf/util/python-ext-sources +++ /dev/null @@ -1,53 +0,0 @@ -# -# List of files needed by perf python extension -# -# Each source file must be placed on its own line so that it can be -# processed by Makefile and util/setup.py accordingly. -# - -util/python.c -../lib/ctype.c -util/cap.c -util/evlist.c -util/evsel.c -util/evsel_fprintf.c -util/perf_event_attr_fprintf.c -util/cpumap.c -util/memswap.c -util/mmap.c -util/namespaces.c -../lib/bitmap.c -../lib/find_bit.c -../lib/list_sort.c -../lib/hweight.c -../lib/string.c -../lib/vsprintf.c -util/thread_map.c -util/util.c -util/cgroup.c -util/parse-branch-options.c -util/rblist.c -util/counts.c -util/print_binary.c -util/strlist.c -util/trace-event.c -util/trace-event-parse.c -../lib/rbtree.c -util/string.c -util/symbol_fprintf.c -util/units.c -util/affinity.c -util/rwsem.c -util/hashmap.c -util/perf_regs.c -util/fncache.c -util/rlimit.c -util/perf-regs-arch/perf_regs_aarch64.c -util/perf-regs-arch/perf_regs_arm.c -util/perf-regs-arch/perf_regs_csky.c -util/perf-regs-arch/perf_regs_loongarch.c -util/perf-regs-arch/perf_regs_mips.c -util/perf-regs-arch/perf_regs_powerpc.c -util/perf-regs-arch/perf_regs_riscv.c -util/perf-regs-arch/perf_regs_s390.c -util/perf-regs-arch/perf_regs_x86.c --=20 2.45.2.627.g7a2c4fd464-goog