From nobody Mon May 25 08:11:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 867301E1DF0 for ; Fri, 15 May 2026 17:39:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866745; cv=none; b=obh1prwwIAxhV8Q6+WTJiQwRLmv6Z1J2nO26YamqKtZwK/mNUanXzUCkRZp7m0XKiSHr3x/608DArkvymzF0zAnhRrDiQSR3q9sBlUVLJcqxXFmbXz9Ha5cUdm9EKLdWyXlriNhWXve06krNLIsDSOgyYa2VroXLdtSPxnFpWbo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866745; c=relaxed/simple; bh=QJWhGnFqUspUPqt/ZDCu0S7y6LbXz1284XXhAWWfSyA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tC4pYsx8qxUWaIqbSQVp4O7wi9Xrgq3vYwYV83QSQT3yKFfKWkt3XWt+B9M4Q93M9jadookq7Mp69hWh8GYkJGPcnobfc9QmSiqciFX2pcVpPB/X+3miWBh5SLkV4a4q/DvdP4egyusJ+y9ZWgjv2sfspRGkAtveO+pl4fRPPPg= 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=cZiv/Wop; arc=none smtp.client-ip=74.125.82.74 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="cZiv/Wop" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-135405e4035so2195c88.1 for ; Fri, 15 May 2026 10:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866744; x=1779471544; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=995f1i5Pu7SDgq4PnZXVb1hHnnIiiWib94RWRsl+x6E=; b=cZiv/WopY4F9Q2vTUqZIcX3zYKNQgqy02NoYwBmN5PInE6HCkWnoeaLaUtRxuKCV5z 2T1iSNbAFBA6gX5MM6oiag2l466WQdotlabsxjv8faPUtFw+jpvlt05FS8M8B6N4sAZk 04hVLpgg7xEkV6E1TCDTw/CWb+FvLE4v38trJ/URLlbqMMJz1lFc3DY3K1fo4F8PQG4w l7MUeJ/5dSviovH7vkVvEIudCVQ6UlEGM1bBOS5beTVF1KBL427E7DAljkkvDrmh6ksp GpzadtlTbh7VZiamkNuo/Vh0TR0MAzXotJbz/BPFulNZBvDV7kQnCBZZlrTx/CICLmLd Hd2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866744; x=1779471544; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=995f1i5Pu7SDgq4PnZXVb1hHnnIiiWib94RWRsl+x6E=; b=D+FPElsZtRTxLRTHCEqPpOR94aB6OzKdAxzaehDx3Nrr4rlpuR3Df6/uDfOdkPWaHu ugn91O2YK4IyQeXTbs/t25y8cySCWDHzUW0I9I6aMvKZd9hPLTkXhssduH279Pu3CsBB Uf5+lTnaYanWzbXhxH8ZlebgDPOz2/AKP62k5li1jgTBavp2BU8E7SN8EfwEqmqQAILT IkRhWq+6o1YYUnfx4MAK8GVsxuUnIE9ARpCRe1sNia2nf3L5+RoJRqtvzguOvVRkqdEV ZQQ/cIITk3qODhfpSiQi7l4FHSFf0ip4bDjdWI0avH7+SOaADM+HcOJbWiyhxfCbQk2B Xg9g== X-Forwarded-Encrypted: i=1; AFNElJ/+HrMOhp9VrKJNbI50dOZ00DR4j2bj4dlBfEAw8lphomdgYJbObc6SsQuVYxxPK+PjcgmMLz+gVWKrNfQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/oDAyKBNQr0/ET8Bb95tz1WjXxrdWHL1rpVtvCrX8XlbkWU74 +6FUL9DFodqi5F5YJUFUB3LhrwhBSQYa23NJqqXjaULge1O7ZiErCpgZpW9q7nMlMbQlyq1C4yM HMU9zfnhRjw== X-Received: from dlbur22-n1.prod.google.com ([2002:a05:7022:ea56:10b0:12d:4be7:8b60]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:60b:b0:127:33e0:ea44 with SMTP id a92af1059eb24-135049480a6mr2228177c88.29.1778866743389; Fri, 15 May 2026 10:39:03 -0700 (PDT) Date: Fri, 15 May 2026 10:38:38 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-2-irogers@google.com> Subject: [PATCH v4 01/14] tools build: Fix feature checks to touch target files on success From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In tools/build/feature/Makefile, test-clang-bpf-co-re.bin and test-bpftool-skeletons.bin redirected grep output but never touched or created the $@ target file upon success. Because the target file was never created on disk, Kbuild could never cache the result of the check. Consequently, Make treated the prerequisite as missing and continuously re-executed the Clang BPF backend and bpftool feature checks on every single sub-make evaluation during build startup. Refactor both feature check recipes to redirect grep output to .make.output and touch $@ upon success (> $(@:.bin=3D.make.output) 2>&1 && touch $@). Th= is perfectly matches standard Kbuild feature check conventions and ensures the target file is touched on disk purely upon success, allowing Kbuild to perfectly cache positive detections and avoid redundant sub-make forks. For test-clang-bpf-co-re.bin, add the explicit source file prerequisite test-clang-bpf-co-re.c and simplify the Clang recipe using $<. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/build/feature/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index 704c687ed3ad..ea278becee2f 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -383,9 +383,9 @@ $(OUTPUT)test-libaio.bin: $(OUTPUT)test-libzstd.bin: $(BUILD) -lzstd =20 -$(OUTPUT)test-clang-bpf-co-re.bin: - $(CLANG) -S -g --target=3Dbpf -o - $(patsubst %.bin,%.c,$(@F)) | \ - grep BTF_KIND_VAR +$(OUTPUT)test-clang-bpf-co-re.bin: test-clang-bpf-co-re.c + $(CLANG) -S -g --target=3Dbpf -o - $< | \ + grep BTF_KIND_VAR > $(@:.bin=3D.make.output) 2>&1 && touch $@ =20 $(OUTPUT)test-file-handle.bin: $(BUILD) @@ -398,7 +398,7 @@ $(OUTPUT)test-libopenssl.bin: =20 $(OUTPUT)test-bpftool-skeletons.bin: $(SYSTEM_BPFTOOL) version | grep '^features:.*skeletons' \ - > $(@:.bin=3D.make.output) 2>&1 + > $(@:.bin=3D.make.output) 2>&1 && touch $@ =20 # Testing Rust is special: we don't compile anything, it's enough to check= the # compiler presence. Compiling a test code for this purposes is problemati= c, --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.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 8D51D40315B for ; Fri, 15 May 2026 17:39:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866751; cv=none; b=HbcCk3Pr2Wyk9aLhorolbeRV1vbOFZOMD3Bu+88p3wAJiJ0lZPa8LlNW5qqtV1XlFRgAIkam7W5CQflppEAuljLPVGKgEgokrSahx/GFUhk6QJ8CqpDgYZk1YWhV46yoGI/5atqwinzA6dJbi9RLnxx5tMLMxAhi8vLl6vvrZQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866751; c=relaxed/simple; bh=Fe8gKaAoxmBrnXKFIsHy9D2jio602d2Hb+xYIlY7jqc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=eyGT1xvja7yTrBGqIjkjsk7d2EindYjZGyVEEKKUMeBcSXYzpKzFS7SPckGbieosnvctIKZa88boGDjdzpa+QfzW0247xhS4suloY1czMISNSrRRuZPd4kWglWAKnrn3xWOb5qhAGUoZt0OOezd965HsAN7d5K1ZSguzarA5NIE= 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=UU9w8D1c; arc=none smtp.client-ip=74.125.82.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="UU9w8D1c" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2fe1cf409a1so130648eec.1 for ; Fri, 15 May 2026 10:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866746; x=1779471546; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=iGwNldacOVCvHmvUdji2eOK+t9zrcgmlfdJtC+b5nNE=; b=UU9w8D1cE177SX5ZEJU8ovKwJ+ThCoGtBCn45C4k++ZW5YsWiqEqSdy9S32c91tDGa icBtPEcBXLArTEopTqDmzRc8HEAHS5Q1wd9NecMfeKZ1IwqTQ27XT01LWPngS6qZ3K3B ixP3qADWpyKEUY5sAjKrvOfp6RlvIsqtOuMTDX+dTyYUjwVM/H8SaFQY6l9WxIZl5NBs /K+USAst0QLL7FPYYVavLMzCd0Yejz/p3OFcVn0pAxCjjah8c9nbDfKi6EQ5QTwy0y97 rvQhC9HJfW/RzmJ0bEkSCuz6XrUI54dV8SAHbrftreLNPGdwUChArZQmVcBaqp9kKEzR Tk0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866746; x=1779471546; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iGwNldacOVCvHmvUdji2eOK+t9zrcgmlfdJtC+b5nNE=; b=qK3sVy0WJl8mIL1w5JNQLS6GE9u74jOTSSDIhqzl3cAicqnFhL69nAWg7cWBTvgyrV 4tqjPoPW0cnBKiJ+lqD6ELakUprdzDIwGo08RcOl/q+9CvCJwK30pdIb6r0EYkkWoZ9i bdJRjCBWDUxGck4siqWnNc9yuMKy0p0p6Hl0p3Bl+bT6xsMLlBAQKa1JWQIBc9AzGQ7/ 0SNHGKmquOQyRt59whRxrRaH13swFMrYlAyzo7RwdaXSjZ+m3fnaxaMgnWcoO0xYbOR0 B30cz4cudDmXh7zPi6p5laSzKG434cPUFsY2+hGCxobWUAhBHX/1DUZkoeQblT9GACME v0EA== X-Forwarded-Encrypted: i=1; AFNElJ9Kc2lY0IvAekjVqRrFL4lDXNpkclchC5aha+YKK3iYqizhSo4EDW6fHl4V/aIbhSrwuSUc07QeN3EZCWA=@vger.kernel.org X-Gm-Message-State: AOJu0YwHuuGr6JKYQt6v6TjX2i/SKBGBkLjPHQYCnOlb3PR73kc/pMN9 vBPM4k6vXkqi8csXx2YBTwcdHZvGFUlYvScAoSKJBbmVS7Arc1+3R1HhV0krK0PpKzxAdGVVeKF bNjcSP3XRXg== X-Received: from dyng37.prod.google.com ([2002:a05:7300:7f25:b0:2f9:af7:5044]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:e6c6:b0:2ea:e93a:ff9b with SMTP id 5a478bee46e88-303982b72e9mr2319552eec.13.1778866745315; Fri, 15 May 2026 10:39:05 -0700 (PDT) Date: Fri, 15 May 2026 10:38:39 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-3-irogers@google.com> Subject: [PATCH v4 02/14] perf trace beauty: Make beauty generated C code standalone .o files From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Previously, builtin-trace.c directly included 15 embedded C files (e.g. trace/beauty/mmap.c and fsconfig_arrays.c), which in turn depend on dozens of generated beauty script arrays. To satisfy these embedded inclusions, the global Makefile.perf would define all the generator variables/rules and include them in the prepare umbrella target, choking parallel build startup. Furthermore, tools/perf/util/syscalltbl.c included its own generated mapper, and util/env.c conditionally included arch_errno_names.c inline, splitting consumers across directories and preventing clean Make encapsulation. Refactor the framework to achieve better encapsulation: 1. Move util/syscalltbl.[ch] into trace/beauty/ to co-locate with all generated code consumers. 2. Create fsconfig.c and flatten embedded beauty .c files to compile as independent standalone objects via trace/beauty/Build, exporting their formatting functions via beauty.h and env.h. Switch arch_errno_names.o and syscalltbl.o assignments directly to perf-util-y and add an unconditional top-level recursive kbuild hook (perf-util-y +=3D trace/be= auty/) to compile them into libperf-util.a, resolving remote linkage for util/e= nv.c, util/bpf-trace-summary.c, and standalone python extensions. 3. Bridge private opaque references (struct trace) securely via accessors trace__show_zeros() and trace__host(), avoiding header entanglements. 4. Consolidate all generator variables, script paths, and array generation rules entirely out of Makefile.perf and place them directly inside the exact local Build files where their output objects are compiled (trace/beauty/Build and trace/beauty/tracepoints/Build), binding prerequisites locally. Use directly inside generator recipes to guarantee dynamic directory creation before script redirection, and append across all rules to print clean, standardized GEN ... file.c output during compilation. 5. Clean up clean target to recursively remove the generated directory instead of relying on dozens of individual variables. This unchokes the "prepare" target parallel barrier, allows make to evaluate generation scripts purely locally where consumed, and flattens the tracepoi= nt formatting architecture. Testing a parallel build (make -j28 all from scratch) shows improvements: Before: real 0m28.689s user 2m38.490s sys 0m30.148s After: real 0m27.642s user 2m32.356s sys 0m26.683s So reclaiming ~9.6 seconds of raw CPU time and over 1 full second off overall real-world build latency, by overlapping sub-make startup and avoiding top-level double-parsing overhead. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Build | 2 + tools/perf/Makefile.perf | 282 +----------------- tools/perf/builtin-trace.c | 32 +- tools/perf/trace/beauty/Build | 276 +++++++++++++++++ tools/perf/trace/beauty/arch_errno_names.c | 2 + tools/perf/trace/beauty/arch_errno_names.sh | 2 +- tools/perf/trace/beauty/beauty.h | 60 ++++ tools/perf/trace/beauty/eventfd.c | 6 +- tools/perf/trace/beauty/fsconfig.c | 5 + tools/perf/trace/beauty/futex_op.c | 5 +- tools/perf/trace/beauty/futex_val3.c | 5 +- tools/perf/trace/beauty/mmap.c | 24 +- tools/perf/trace/beauty/mode_t.c | 6 +- tools/perf/trace/beauty/msg_flags.c | 8 +- tools/perf/trace/beauty/open_flags.c | 2 + tools/perf/trace/beauty/perf_event_open.c | 21 +- tools/perf/trace/beauty/pid.c | 5 +- tools/perf/trace/beauty/sched_policy.c | 8 +- tools/perf/trace/beauty/seccomp.c | 12 +- tools/perf/trace/beauty/signum.c | 6 +- tools/perf/trace/beauty/socket_type.c | 6 +- .../perf/{util =3D> trace/beauty}/syscalltbl.c | 0 .../perf/{util =3D> trace/beauty}/syscalltbl.h | 0 tools/perf/trace/beauty/tracepoints/Build | 21 ++ tools/perf/trace/beauty/waitid_options.c | 8 +- tools/perf/util/Build | 4 +- tools/perf/util/bpf-trace-summary.c | 2 +- tools/perf/util/env.c | 4 - tools/perf/util/env.h | 1 + 29 files changed, 447 insertions(+), 368 deletions(-) create mode 100644 tools/perf/trace/beauty/fsconfig.c rename tools/perf/{util =3D> trace/beauty}/syscalltbl.c (100%) rename tools/perf/{util =3D> trace/beauty}/syscalltbl.h (100%) diff --git a/tools/perf/Build b/tools/perf/Build index b03cc59dabf8..e18c80a5c1bc 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -34,6 +34,8 @@ ifeq ($(CONFIG_LIBTRACEEVENT),y) perf-$(CONFIG_TRACE) +=3D trace/beauty/ endif =20 +perf-util-y +=3D trace/beauty/ + perf-$(CONFIG_LIBELF) +=3D builtin-probe.o =20 perf-bench-y +=3D bench/ diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 0aba14f22a06..c81797ceec42 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -509,225 +509,6 @@ arm64-sysreg-defs-clean: $(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=3D$(arm64_gen_sysreg_outdir) \ prefix=3D subdir=3D clean > /dev/null =20 -beauty_linux_dir :=3D $(srctree)/tools/perf/trace/beauty/include/linux/ -beauty_uapi_linux_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi= /linux/ -beauty_uapi_sound_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi= /sound/ -beauty_arch_asm_dir :=3D $(srctree)/tools/perf/trace/beauty/arch/x86/inclu= de/asm/ -beauty_x86_arch_asm_uapi_dir :=3D $(srctree)/tools/perf/trace/beauty/arch/= x86/include/uapi/asm/ - -linux_uapi_dir :=3D $(srctree)/tools/include/uapi/linux -asm_generic_uapi_dir :=3D $(srctree)/tools/include/uapi/asm-generic -arch_asm_uapi_dir :=3D $(srctree)/tools/arch/$(SRCARCH)/include/uapi/asm/ -x86_arch_asm_dir :=3D $(srctree)/tools/arch/x86/include/asm/ - -beauty_outdir :=3D $(OUTPUT)trace/beauty/generated -beauty_ioctl_outdir :=3D $(beauty_outdir)/ioctl - -# Create output directory if not already present -$(shell [ -d '$(beauty_ioctl_outdir)' ] || mkdir -p '$(beauty_ioctl_outdir= )') - -syscall_array :=3D $(beauty_outdir)/syscalltbl.c -syscall_tbl :=3D $(srctree)/tools/perf/trace/beauty/syscalltbl.sh -syscall_tbl_data :=3D $(srctree)/tools/scripts/syscall.tbl \ - $(wildcard $(srctree)/tools/perf/arch/*/entry/syscalls/syscall*.tbl) - -$(syscall_array): $(syscall_tbl) $(syscall_tbl_data) - $(Q)$(SHELL) '$(syscall_tbl)' $(srctree)/tools $@ - -fs_at_flags_array :=3D $(beauty_outdir)/fs_at_flags_array.c -fs_at_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/fs_at_flags.sh - -$(fs_at_flags_array): $(beauty_uapi_linux_dir)/fcntl.h $(fs_at_flags_tbl) - $(Q)$(SHELL) '$(fs_at_flags_tbl)' $(beauty_uapi_linux_dir) > $@ - -clone_flags_array :=3D $(beauty_outdir)/clone_flags_array.c -clone_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/clone.sh - -$(clone_flags_array): $(beauty_uapi_linux_dir)/sched.h $(clone_flags_tbl) - $(Q)$(SHELL) '$(clone_flags_tbl)' $(beauty_uapi_linux_dir) > $@ - -drm_ioctl_array :=3D $(beauty_ioctl_outdir)/drm_ioctl_array.c -drm_hdr_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi/drm -drm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh - -$(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_i= octl_tbl) - $(Q)$(SHELL) '$(drm_ioctl_tbl)' $(drm_hdr_dir) > $@ - -fadvise_advice_array :=3D $(beauty_outdir)/fadvise_advice_array.c -fadvise_advice_tbl :=3D $(srctree)/tools/perf/trace/beauty/fadvise.sh - -$(fadvise_advice_array): $(beauty_uapi_linux_dir)/fadvise.h $(fadvise_advi= ce_tbl) - $(Q)$(SHELL) '$(fadvise_advice_tbl)' $(beauty_uapi_linux_dir) > $@ - -fsmount_arrays :=3D $(beauty_outdir)/fsmount_arrays.c -fsmount_tbls :=3D $(srctree)/tools/perf/trace/beauty/fsmount.sh - -$(fsmount_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_tbls) - $(Q)$(SHELL) '$(fsmount_tbls)' $(beauty_uapi_linux_dir) > $@ - -fspick_arrays :=3D $(beauty_outdir)/fspick_arrays.c -fspick_tbls :=3D $(srctree)/tools/perf/trace/beauty/fspick.sh - -$(fspick_arrays): $(beauty_uapi_linux_dir)/mount.h $(fspick_tbls) - $(Q)$(SHELL) '$(fspick_tbls)' $(beauty_uapi_linux_dir) > $@ - -fsconfig_arrays :=3D $(beauty_outdir)/fsconfig_arrays.c -fsconfig_tbls :=3D $(srctree)/tools/perf/trace/beauty/fsconfig.sh - -$(fsconfig_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsconfig_tbls) - $(Q)$(SHELL) '$(fsconfig_tbls)' $(beauty_uapi_linux_dir) > $@ - -pkey_alloc_access_rights_array :=3D $(beauty_outdir)/pkey_alloc_access_rig= hts_array.c -asm_generic_hdr_dir :=3D $(srctree)/tools/include/uapi/asm-generic/ -pkey_alloc_access_rights_tbl :=3D $(srctree)/tools/perf/trace/beauty/pkey_= alloc_access_rights.sh - -$(pkey_alloc_access_rights_array): $(asm_generic_hdr_dir)/mman-common.h $(= pkey_alloc_access_rights_tbl) - $(Q)$(SHELL) '$(pkey_alloc_access_rights_tbl)' $(asm_generic_hdr_dir) > $@ - -sndrv_ctl_ioctl_array :=3D $(beauty_ioctl_outdir)/sndrv_ctl_ioctl_array.c -sndrv_ctl_hdr_dir :=3D $(srctree)/tools/include/uapi/sound -sndrv_ctl_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/sndrv_ctl_ioct= l.sh - -$(sndrv_ctl_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_ctl_io= ctl_tbl) - $(Q)$(SHELL) '$(sndrv_ctl_ioctl_tbl)' $(beauty_uapi_sound_dir) > $@ - -sndrv_pcm_ioctl_array :=3D $(beauty_ioctl_outdir)/sndrv_pcm_ioctl_array.c -sndrv_pcm_hdr_dir :=3D $(srctree)/tools/include/uapi/sound -sndrv_pcm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/sndrv_pcm_ioct= l.sh - -$(sndrv_pcm_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_pcm_io= ctl_tbl) - $(Q)$(SHELL) '$(sndrv_pcm_ioctl_tbl)' $(beauty_uapi_sound_dir) > $@ - -kcmp_type_array :=3D $(beauty_outdir)/kcmp_type_array.c -kcmp_hdr_dir :=3D $(srctree)/tools/include/uapi/linux/ -kcmp_type_tbl :=3D $(srctree)/tools/perf/trace/beauty/kcmp_type.sh - -$(kcmp_type_array): $(kcmp_hdr_dir)/kcmp.h $(kcmp_type_tbl) - $(Q)$(SHELL) '$(kcmp_type_tbl)' $(kcmp_hdr_dir) > $@ - -kvm_ioctl_array :=3D $(beauty_ioctl_outdir)/kvm_ioctl_array.c -kvm_hdr_dir :=3D $(srctree)/tools/include/uapi/linux -kvm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/kvm_ioctl.sh - -$(kvm_ioctl_array): $(kvm_hdr_dir)/kvm.h $(kvm_ioctl_tbl) - $(Q)$(SHELL) '$(kvm_ioctl_tbl)' $(kvm_hdr_dir) > $@ - -socket_arrays :=3D $(beauty_outdir)/socket.c -socket_tbl :=3D $(srctree)/tools/perf/trace/beauty/socket.sh - -$(socket_arrays): $(linux_uapi_dir)/in.h $(beauty_linux_dir)/socket.h $(so= cket_tbl) - $(Q)$(SHELL) '$(socket_tbl)' $(linux_uapi_dir) $(beauty_linux_dir) > $@ - -sockaddr_arrays :=3D $(beauty_outdir)/sockaddr.c -sockaddr_tbl :=3D $(srctree)/tools/perf/trace/beauty/sockaddr.sh - -$(sockaddr_arrays): $(beauty_linux_dir)/socket.h $(sockaddr_tbl) - $(Q)$(SHELL) '$(sockaddr_tbl)' $(beauty_linux_dir) > $@ - -vhost_virtio_ioctl_array :=3D $(beauty_ioctl_outdir)/vhost_virtio_ioctl_ar= ray.c -vhost_virtio_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/vhost_virti= o_ioctl.sh - -$(vhost_virtio_ioctl_array): $(beauty_uapi_linux_dir)/vhost.h $(vhost_virt= io_ioctl_tbl) - $(Q)$(SHELL) '$(vhost_virtio_ioctl_tbl)' $(beauty_uapi_linux_dir) > $@ - -perf_ioctl_array :=3D $(beauty_ioctl_outdir)/perf_ioctl_array.c -perf_hdr_dir :=3D $(srctree)/tools/include/uapi/linux -perf_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/perf_ioctl.sh - -$(perf_ioctl_array): $(perf_hdr_dir)/perf_event.h $(perf_ioctl_tbl) - $(Q)$(SHELL) '$(perf_ioctl_tbl)' $(perf_hdr_dir) > $@ - -madvise_behavior_array :=3D $(beauty_outdir)/madvise_behavior_array.c -madvise_hdr_dir :=3D $(srctree)/tools/include/uapi/asm-generic/ -madvise_behavior_tbl :=3D $(srctree)/tools/perf/trace/beauty/madvise_behav= ior.sh - -$(madvise_behavior_array): $(madvise_hdr_dir)/mman-common.h $(madvise_beha= vior_tbl) - $(Q)$(SHELL) '$(madvise_behavior_tbl)' $(madvise_hdr_dir) > $@ - -mmap_flags_array :=3D $(beauty_outdir)/mmap_flags_array.c -mmap_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mmap_flags.sh - -$(mmap_flags_array): $(linux_uapi_dir)/mman.h $(asm_generic_uapi_dir)/mman= .h $(asm_generic_uapi_dir)/mman-common.h $(mmap_flags_tbl) - $(Q)$(SHELL) '$(mmap_flags_tbl)' $(linux_uapi_dir) $(asm_generic_uapi_dir= ) $(arch_asm_uapi_dir) > $@ - -mremap_flags_array :=3D $(beauty_outdir)/mremap_flags_array.c -mremap_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mremap_flags.sh - -$(mremap_flags_array): $(linux_uapi_dir)/mman.h $(mremap_flags_tbl) - $(Q)$(SHELL) '$(mremap_flags_tbl)' $(linux_uapi_dir) > $@ - -mount_flags_array :=3D $(beauty_outdir)/mount_flags_array.c -mount_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mount_flags.sh - -$(mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(mount_flags_tbl) - $(Q)$(SHELL) '$(mount_flags_tbl)' $(beauty_uapi_linux_dir) > $@ - -move_mount_flags_array :=3D $(beauty_outdir)/move_mount_flags_array.c -move_mount_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/move_mount_fl= ags.sh - -$(move_mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(move_mount_f= lags_tbl) - $(Q)$(SHELL) '$(move_mount_flags_tbl)' $(beauty_uapi_linux_dir) > $@ - -mmap_prot_array :=3D $(beauty_outdir)/mmap_prot_array.c -mmap_prot_tbl :=3D $(srctree)/tools/perf/trace/beauty/mmap_prot.sh - -$(mmap_prot_array): $(asm_generic_uapi_dir)/mman.h $(asm_generic_uapi_dir)= /mman-common.h $(mmap_prot_tbl) - $(Q)$(SHELL) '$(mmap_prot_tbl)' $(asm_generic_uapi_dir) $(arch_asm_uapi_d= ir) > $@ - -prctl_option_array :=3D $(beauty_outdir)/prctl_option_array.c -prctl_option_tbl :=3D $(srctree)/tools/perf/trace/beauty/prctl_option.sh - -$(prctl_option_array): $(beauty_uapi_linux_dir)/prctl.h $(prctl_option_tbl) - $(Q)$(SHELL) '$(prctl_option_tbl)' $(beauty_uapi_linux_dir) > $@ - -usbdevfs_ioctl_array :=3D $(beauty_ioctl_outdir)/usbdevfs_ioctl_array.c -usbdevfs_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/usbdevfs_ioctl.= sh - -$(usbdevfs_ioctl_array): $(beauty_uapi_linux_dir)/usbdevice_fs.h $(usbdevf= s_ioctl_tbl) - $(Q)$(SHELL) '$(usbdevfs_ioctl_tbl)' $(beauty_uapi_linux_dir) > $@ - -x86_arch_prctl_code_array :=3D $(beauty_outdir)/x86_arch_prctl_code_array.c -x86_arch_prctl_code_tbl :=3D $(srctree)/tools/perf/trace/beauty/x86_arch_p= rctl.sh - -$(x86_arch_prctl_code_array): $(beauty_x86_arch_asm_uapi_dir)/prctl.h $(x8= 6_arch_prctl_code_tbl) - $(Q)$(SHELL) '$(x86_arch_prctl_code_tbl)' $(beauty_x86_arch_asm_uapi_dir)= > $@ - -x86_arch_irq_vectors_array :=3D $(beauty_outdir)/x86_arch_irq_vectors_arra= y.c -x86_arch_irq_vectors_tbl :=3D $(srctree)/tools/perf/trace/beauty/tracepoin= ts/x86_irq_vectors.sh - -$(x86_arch_irq_vectors_array): $(beauty_arch_asm_dir)/irq_vectors.h $(x86_= arch_irq_vectors_tbl) - $(Q)$(SHELL) '$(x86_arch_irq_vectors_tbl)' $(beauty_arch_asm_dir) > $@ - -x86_arch_MSRs_array :=3D $(beauty_outdir)/x86_arch_MSRs_array.c -x86_arch_MSRs_tbl :=3D $(srctree)/tools/perf/trace/beauty/tracepoints/x86_= msr.sh - -$(x86_arch_MSRs_array): $(x86_arch_asm_dir)/msr-index.h $(x86_arch_MSRs_tb= l) - $(Q)$(SHELL) '$(x86_arch_MSRs_tbl)' $(x86_arch_asm_dir) > $@ - -rename_flags_array :=3D $(beauty_outdir)/rename_flags_array.c -rename_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/rename_flags.sh - -$(rename_flags_array): $(beauty_uapi_linux_dir)/fs.h $(rename_flags_tbl) - $(Q)$(SHELL) '$(rename_flags_tbl)' $(beauty_uapi_linux_dir) > $@ - -arch_errno_name_array :=3D $(beauty_outdir)/arch_errno_name_array.c -arch_errno_hdr_dir :=3D $(srctree)/tools -arch_errno_tbl :=3D $(srctree)/tools/perf/trace/beauty/arch_errno_names.sh - -$(arch_errno_name_array): $(arch_errno_tbl) - $(Q)$(SHELL) '$(arch_errno_tbl)' '$(patsubst -%,,$(CC))' $(arch_errno_hdr= _dir) > $@ - -statx_mask_array :=3D $(beauty_outdir)/statx_mask_array.c -statx_mask_tbl :=3D $(srctree)/tools/perf/trace/beauty/statx_mask.sh - -$(statx_mask_array): $(beauty_uapi_linux_dir)/stat.h $(statx_mask_tbl) - $(Q)$(SHELL) '$(statx_mask_tbl)' $(beauty_uapi_linux_dir) > $@ - -sync_file_range_arrays :=3D $(beauty_outdir)/sync_file_range_arrays.c -sync_file_range_tbls :=3D $(srctree)/tools/perf/trace/beauty/sync_file_ran= ge.sh - -$(sync_file_range_arrays): $(beauty_uapi_linux_dir)/fs.h $(sync_file_range= _tbls) - $(Q)$(SHELL) '$(sync_file_range_tbls)' $(beauty_uapi_linux_dir) > $@ =20 TESTS_CORESIGHT_DIR :=3D $(srctree)/tools/perf/tests/shell/coresight =20 @@ -848,38 +629,6 @@ build-dir =3D $(or $(__build-dir),.) =20 prepare: $(OUTPUT)PERF-VERSION-FILE archheaders \ arm64-sysreg-defs \ - $(syscall_array) \ - $(fs_at_flags_array) \ - $(clone_flags_array) \ - $(drm_ioctl_array) \ - $(fadvise_advice_array) \ - $(fsconfig_arrays) \ - $(fsmount_arrays) \ - $(fspick_arrays) \ - $(pkey_alloc_access_rights_array) \ - $(sndrv_pcm_ioctl_array) \ - $(sndrv_ctl_ioctl_array) \ - $(kcmp_type_array) \ - $(kvm_ioctl_array) \ - $(socket_arrays) \ - $(sockaddr_arrays) \ - $(vhost_virtio_ioctl_array) \ - $(madvise_behavior_array) \ - $(mmap_flags_array) \ - $(mmap_prot_array) \ - $(mremap_flags_array) \ - $(mount_flags_array) \ - $(move_mount_flags_array) \ - $(perf_ioctl_array) \ - $(prctl_option_array) \ - $(usbdevfs_ioctl_array) \ - $(x86_arch_irq_vectors_array) \ - $(x86_arch_MSRs_array) \ - $(x86_arch_prctl_code_array) \ - $(rename_flags_array) \ - $(arch_errno_name_array) \ - $(statx_mask_array) \ - $(sync_file_range_arrays) \ $(LIBAPI) \ $(LIBPERF) \ $(LIBSUBCMD) \ @@ -1299,35 +1048,8 @@ clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)= -clean $(LIBSYMBOL)-clean $( 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)$(fadvise_advice_array) \ - $(OUTPUT)$(fsconfig_arrays) \ - $(OUTPUT)$(fsmount_arrays) \ - $(OUTPUT)$(fspick_arrays) \ - $(OUTPUT)$(madvise_behavior_array) \ - $(OUTPUT)$(mmap_flags_array) \ - $(OUTPUT)$(mmap_prot_array) \ - $(OUTPUT)$(mremap_flags_array) \ - $(OUTPUT)$(mount_flags_array) \ - $(OUTPUT)$(move_mount_flags_array) \ - $(OUTPUT)$(drm_ioctl_array) \ - $(OUTPUT)$(pkey_alloc_access_rights_array) \ - $(OUTPUT)$(sndrv_ctl_ioctl_array) \ - $(OUTPUT)$(sndrv_pcm_ioctl_array) \ - $(OUTPUT)$(kvm_ioctl_array) \ - $(OUTPUT)$(kcmp_type_array) \ - $(OUTPUT)$(socket_arrays) \ - $(OUTPUT)$(sockaddr_arrays) \ - $(OUTPUT)$(vhost_virtio_ioctl_array) \ - $(OUTPUT)$(perf_ioctl_array) \ - $(OUTPUT)$(prctl_option_array) \ - $(OUTPUT)$(usbdevfs_ioctl_array) \ - $(OUTPUT)$(x86_arch_irq_vectors_array) \ - $(OUTPUT)$(x86_arch_MSRs_array) \ - $(OUTPUT)$(x86_arch_prctl_code_array) \ - $(OUTPUT)$(rename_flags_array) \ - $(OUTPUT)$(arch_errno_name_array) \ - $(OUTPUT)$(sync_file_range_arrays) + $(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c + $(Q)$(RM) -r $(OUTPUT)trace/beauty/generated $(call QUIET_CLEAN, Documentation) \ $(MAKE) -C $(DOC_DIR) O=3D$(OUTPUT) clean >/dev/null =20 diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index e58c49d047a2..f362fa7ab1af 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -60,12 +60,13 @@ #include "callchain.h" #include "print_binary.h" #include "string2.h" -#include "syscalltbl.h" +#include "trace/beauty/syscalltbl.h" #include "../perf.h" #include "trace_augment.h" #include "dwarf-regs.h" =20 #include +#include #include #include #include @@ -234,6 +235,16 @@ struct trace { const char *uid_str; }; =20 +bool trace__show_zeros(const struct trace *trace) +{ + return trace->show_zeros; +} + +struct machine *trace__host(const struct trace *trace) +{ + return trace->host; +} + static void trace__load_vmlinux_btf(struct trace *trace __maybe_unused) { #ifdef HAVE_LIBBPF_SUPPORT @@ -776,10 +787,6 @@ static const char *fsmount_flags[] =3D { }; static DEFINE_STRARRAY(fsmount_flags, "FSMOUNT_"); =20 -#include "trace/beauty/generated/fsconfig_arrays.c" - -static DEFINE_STRARRAY(fsconfig_cmds, "FSCONFIG_"); - static const char *epoll_ctl_ops[] =3D { "ADD", "DEL", "MOD", }; static DEFINE_STRARRAY_OFFSET(epoll_ctl_ops, "EPOLL_CTL_", 1); =20 @@ -1128,21 +1135,6 @@ static bool syscall_arg__strtoul_btf_type(char *bf _= _maybe_unused, size_t size _ .parm =3D &strarray__##array, \ .show_zero =3D true, } =20 -#include "trace/beauty/eventfd.c" -#include "trace/beauty/futex_op.c" -#include "trace/beauty/futex_val3.c" -#include "trace/beauty/mmap.c" -#include "trace/beauty/mode_t.c" -#include "trace/beauty/msg_flags.c" -#include "trace/beauty/open_flags.c" -#include "trace/beauty/perf_event_open.c" -#include "trace/beauty/pid.c" -#include "trace/beauty/sched_policy.c" -#include "trace/beauty/seccomp.c" -#include "trace/beauty/signum.c" -#include "trace/beauty/socket_type.c" -#include "trace/beauty/waitid_options.c" - static const struct syscall_fmt syscall_fmts[] =3D { { .name =3D "access", .arg =3D { [1] =3D { .scnprintf =3D SCA_ACCMODE, /* mode */ }, }, }, diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build index 561590ee8cda..93cde93461a3 100644 --- a/tools/perf/trace/beauty/Build +++ b/tools/perf/trace/beauty/Build @@ -19,6 +19,23 @@ perf-y +=3D socket.o perf-y +=3D statx.o perf-y +=3D sync_file_range.o perf-y +=3D timespec.o +perf-util-y +=3D syscalltbl.o +perf-y +=3D fsconfig.o +perf-y +=3D eventfd.o +perf-y +=3D futex_op.o +perf-y +=3D futex_val3.o +perf-y +=3D mmap.o +perf-y +=3D mode_t.o +perf-y +=3D msg_flags.o +perf-y +=3D open_flags.o +perf-y +=3D perf_event_open.o +perf-y +=3D pid.o +perf-y +=3D sched_policy.o +perf-y +=3D seccomp.o +perf-y +=3D signum.o +perf-y +=3D socket_type.o +perf-y +=3D waitid_options.o +perf-util-y +=3D arch_errno_names.o perf-y +=3D tracepoints/ =20 ifdef SHELLCHECK @@ -34,3 +51,262 @@ $(OUTPUT)%.shellcheck_log: % $(Q)$(call echo-cmd,test)$(SHELLCHECK) "$<" > $@ || (cat $@ && rm $@ && f= alse) =20 perf-y +=3D $(SHELL_TEST_LOGS) + +beauty_linux_dir :=3D $(srctree)/tools/perf/trace/beauty/include/linux/ +beauty_uapi_linux_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi= /linux/ +beauty_uapi_sound_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi= /sound/ +beauty_arch_asm_dir :=3D $(srctree)/tools/perf/trace/beauty/arch/x86/inclu= de/asm/ +beauty_x86_arch_asm_uapi_dir :=3D $(srctree)/tools/perf/trace/beauty/arch/= x86/include/uapi/asm/ + +linux_uapi_dir :=3D $(srctree)/tools/include/uapi/linux +asm_generic_uapi_dir :=3D $(srctree)/tools/include/uapi/asm-generic +arch_asm_uapi_dir :=3D $(srctree)/tools/arch/$(SRCARCH)/include/uapi/asm/ +x86_arch_asm_dir :=3D $(srctree)/tools/arch/x86/include/asm/ + +beauty_outdir :=3D $(OUTPUT)trace/beauty/generated +beauty_ioctl_outdir :=3D $(beauty_outdir)/ioctl + +syscall_array :=3D $(beauty_outdir)/syscalltbl.c +syscall_tbl :=3D $(srctree)/tools/perf/trace/beauty/syscalltbl.sh +syscall_tbl_data :=3D $(srctree)/tools/scripts/syscall.tbl \ + $(wildcard $(srctree)/tools/perf/arch/*/entry/syscalls/syscall*.tbl) + +$(syscall_array): $(syscall_tbl) $(syscall_tbl_data) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(syscall_tbl)' $(srctree)/tools $@ + +fs_at_flags_array :=3D $(beauty_outdir)/fs_at_flags_array.c +fs_at_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/fs_at_flags.sh + +$(fs_at_flags_array): $(beauty_uapi_linux_dir)/fcntl.h $(fs_at_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(fs_at_flags_tbl)' $(beauty_uapi_linux= _dir) > $@ + +clone_flags_array :=3D $(beauty_outdir)/clone_flags_array.c +clone_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/clone.sh + +$(clone_flags_array): $(beauty_uapi_linux_dir)/sched.h $(clone_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(clone_flags_tbl)' $(beauty_uapi_linux= _dir) > $@ + +drm_ioctl_array :=3D $(beauty_ioctl_outdir)/drm_ioctl_array.c +drm_hdr_dir :=3D $(srctree)/tools/perf/trace/beauty/include/uapi/drm +drm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh + +$(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_i= octl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(drm_ioctl_tbl)' $(drm_hdr_dir) > $@ + +fadvise_advice_array :=3D $(beauty_outdir)/fadvise_advice_array.c +fadvise_advice_tbl :=3D $(srctree)/tools/perf/trace/beauty/fadvise.sh + +$(fadvise_advice_array): $(beauty_uapi_linux_dir)/fadvise.h $(fadvise_advi= ce_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(fadvise_advice_tbl)' $(beauty_uapi_li= nux_dir) > $@ + +fsmount_arrays :=3D $(beauty_outdir)/fsmount_arrays.c +fsmount_tbls :=3D $(srctree)/tools/perf/trace/beauty/fsmount.sh + +$(fsmount_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsmount_tbls) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(fsmount_tbls)' $(beauty_uapi_linux_di= r) > $@ + +fspick_arrays :=3D $(beauty_outdir)/fspick_arrays.c +fspick_tbls :=3D $(srctree)/tools/perf/trace/beauty/fspick.sh + +$(fspick_arrays): $(beauty_uapi_linux_dir)/mount.h $(fspick_tbls) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(fspick_tbls)' $(beauty_uapi_linux_dir= ) > $@ + +fsconfig_arrays :=3D $(beauty_outdir)/fsconfig_arrays.c +fsconfig_tbls :=3D $(srctree)/tools/perf/trace/beauty/fsconfig.sh + +$(fsconfig_arrays): $(beauty_uapi_linux_dir)/mount.h $(fsconfig_tbls) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(fsconfig_tbls)' $(beauty_uapi_linux_d= ir) > $@ + +pkey_alloc_access_rights_array :=3D $(beauty_outdir)/pkey_alloc_access_rig= hts_array.c +asm_generic_hdr_dir :=3D $(srctree)/tools/include/uapi/asm-generic/ +pkey_alloc_access_rights_tbl :=3D $(srctree)/tools/perf/trace/beauty/pkey_= alloc_access_rights.sh + +$(pkey_alloc_access_rights_array): $(asm_generic_hdr_dir)/mman-common.h $(= pkey_alloc_access_rights_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(pkey_alloc_access_rights_tbl)' $(asm_= generic_hdr_dir) > $@ + +sndrv_ctl_ioctl_array :=3D $(beauty_ioctl_outdir)/sndrv_ctl_ioctl_array.c +sndrv_ctl_hdr_dir :=3D $(srctree)/tools/include/uapi/sound +sndrv_ctl_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/sndrv_ctl_ioct= l.sh + +$(sndrv_ctl_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_ctl_io= ctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(sndrv_ctl_ioctl_tbl)' $(beauty_uapi_s= ound_dir) > $@ + +sndrv_pcm_ioctl_array :=3D $(beauty_ioctl_outdir)/sndrv_pcm_ioctl_array.c +sndrv_pcm_hdr_dir :=3D $(srctree)/tools/include/uapi/sound +sndrv_pcm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/sndrv_pcm_ioct= l.sh + +$(sndrv_pcm_ioctl_array): $(beauty_uapi_sound_dir)/asound.h $(sndrv_pcm_io= ctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(sndrv_pcm_ioctl_tbl)' $(beauty_uapi_s= ound_dir) > $@ + +kcmp_type_array :=3D $(beauty_outdir)/kcmp_type_array.c +kcmp_hdr_dir :=3D $(srctree)/tools/include/uapi/linux/ +kcmp_type_tbl :=3D $(srctree)/tools/perf/trace/beauty/kcmp_type.sh + +$(kcmp_type_array): $(kcmp_hdr_dir)/kcmp.h $(kcmp_type_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(kcmp_type_tbl)' $(kcmp_hdr_dir) > $@ + +kvm_ioctl_array :=3D $(beauty_ioctl_outdir)/kvm_ioctl_array.c +kvm_hdr_dir :=3D $(srctree)/tools/include/uapi/linux +kvm_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/kvm_ioctl.sh + +$(kvm_ioctl_array): $(kvm_hdr_dir)/kvm.h $(kvm_ioctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(kvm_ioctl_tbl)' $(kvm_hdr_dir) > $@ + +socket_arrays :=3D $(beauty_outdir)/socket.c +socket_tbl :=3D $(srctree)/tools/perf/trace/beauty/socket.sh + +$(socket_arrays): $(linux_uapi_dir)/in.h $(beauty_linux_dir)/socket.h $(so= cket_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(socket_tbl)' $(linux_uapi_dir) $(beau= ty_linux_dir) > $@ + +sockaddr_arrays :=3D $(beauty_outdir)/sockaddr.c +sockaddr_tbl :=3D $(srctree)/tools/perf/trace/beauty/sockaddr.sh + +$(sockaddr_arrays): $(beauty_linux_dir)/socket.h $(sockaddr_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(sockaddr_tbl)' $(beauty_linux_dir) > = $@ + +vhost_virtio_ioctl_array :=3D $(beauty_ioctl_outdir)/vhost_virtio_ioctl_ar= ray.c +vhost_virtio_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/vhost_virti= o_ioctl.sh + +$(vhost_virtio_ioctl_array): $(beauty_uapi_linux_dir)/vhost.h $(vhost_virt= io_ioctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(vhost_virtio_ioctl_tbl)' $(beauty_uap= i_linux_dir) > $@ + +perf_ioctl_array :=3D $(beauty_ioctl_outdir)/perf_ioctl_array.c +perf_hdr_dir :=3D $(srctree)/tools/include/uapi/linux +perf_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/perf_ioctl.sh + +$(perf_ioctl_array): $(perf_hdr_dir)/perf_event.h $(perf_ioctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(perf_ioctl_tbl)' $(perf_hdr_dir) > $@ + +madvise_behavior_array :=3D $(beauty_outdir)/madvise_behavior_array.c +madvise_hdr_dir :=3D $(srctree)/tools/include/uapi/asm-generic/ +madvise_behavior_tbl :=3D $(srctree)/tools/perf/trace/beauty/madvise_behav= ior.sh + +$(madvise_behavior_array): $(madvise_hdr_dir)/mman-common.h $(madvise_beha= vior_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(madvise_behavior_tbl)' $(madvise_hdr_= dir) > $@ + +mmap_flags_array :=3D $(beauty_outdir)/mmap_flags_array.c +mmap_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mmap_flags.sh + +$(mmap_flags_array): $(linux_uapi_dir)/mman.h $(asm_generic_uapi_dir)/mman= .h $(asm_generic_uapi_dir)/mman-common.h $(mmap_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(mmap_flags_tbl)' $(linux_uapi_dir) $(= asm_generic_uapi_dir) $(arch_asm_uapi_dir) > $@ + +mremap_flags_array :=3D $(beauty_outdir)/mremap_flags_array.c +mremap_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mremap_flags.sh + +$(mremap_flags_array): $(linux_uapi_dir)/mman.h $(mremap_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(mremap_flags_tbl)' $(linux_uapi_dir) = > $@ + +mount_flags_array :=3D $(beauty_outdir)/mount_flags_array.c +mount_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/mount_flags.sh + +$(mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(mount_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(mount_flags_tbl)' $(beauty_uapi_linux= _dir) > $@ + +move_mount_flags_array :=3D $(beauty_outdir)/move_mount_flags_array.c +move_mount_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/move_mount_fl= ags.sh + +$(move_mount_flags_array): $(beauty_uapi_linux_dir)/mount.h $(move_mount_f= lags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(move_mount_flags_tbl)' $(beauty_uapi_= linux_dir) > $@ + +mmap_prot_array :=3D $(beauty_outdir)/mmap_prot_array.c +mmap_prot_tbl :=3D $(srctree)/tools/perf/trace/beauty/mmap_prot.sh + +$(mmap_prot_array): $(asm_generic_uapi_dir)/mman.h $(asm_generic_uapi_dir)= /mman-common.h $(mmap_prot_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(mmap_prot_tbl)' $(asm_generic_uapi_di= r) $(arch_asm_uapi_dir) > $@ + +prctl_option_array :=3D $(beauty_outdir)/prctl_option_array.c +prctl_option_tbl :=3D $(srctree)/tools/perf/trace/beauty/prctl_option.sh + +$(prctl_option_array): $(beauty_uapi_linux_dir)/prctl.h $(prctl_option_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(prctl_option_tbl)' $(beauty_uapi_linu= x_dir) > $@ + +usbdevfs_ioctl_array :=3D $(beauty_ioctl_outdir)/usbdevfs_ioctl_array.c +usbdevfs_ioctl_tbl :=3D $(srctree)/tools/perf/trace/beauty/usbdevfs_ioctl.= sh + +$(usbdevfs_ioctl_array): $(beauty_uapi_linux_dir)/usbdevice_fs.h $(usbdevf= s_ioctl_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(usbdevfs_ioctl_tbl)' $(beauty_uapi_li= nux_dir) > $@ + +x86_arch_prctl_code_array :=3D $(beauty_outdir)/x86_arch_prctl_code_array.c +x86_arch_prctl_code_tbl :=3D $(srctree)/tools/perf/trace/beauty/x86_arch_p= rctl.sh + +$(x86_arch_prctl_code_array): $(beauty_x86_arch_asm_uapi_dir)/prctl.h $(x8= 6_arch_prctl_code_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(x86_arch_prctl_code_tbl)' $(beauty_x8= 6_arch_asm_uapi_dir) > $@ + + +rename_flags_array :=3D $(beauty_outdir)/rename_flags_array.c +rename_flags_tbl :=3D $(srctree)/tools/perf/trace/beauty/rename_flags.sh + +$(rename_flags_array): $(beauty_uapi_linux_dir)/fs.h $(rename_flags_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(rename_flags_tbl)' $(beauty_uapi_linu= x_dir) > $@ + + +statx_mask_array :=3D $(beauty_outdir)/statx_mask_array.c +statx_mask_tbl :=3D $(srctree)/tools/perf/trace/beauty/statx_mask.sh + +$(statx_mask_array): $(beauty_uapi_linux_dir)/stat.h $(statx_mask_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(statx_mask_tbl)' $(beauty_uapi_linux_= dir) > $@ + +sync_file_range_arrays :=3D $(beauty_outdir)/sync_file_range_arrays.c +sync_file_range_tbls :=3D $(srctree)/tools/perf/trace/beauty/sync_file_ran= ge.sh + +$(sync_file_range_arrays): $(beauty_uapi_linux_dir)/fs.h $(sync_file_range= _tbls) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(sync_file_range_tbls)' $(beauty_uapi_= linux_dir) > $@ + +$(OUTPUT)trace/beauty/syscalltbl.o: $(syscall_array) +$(OUTPUT)trace/beauty/fsconfig.o: $(fsconfig_arrays) +$(OUTPUT)trace/beauty/clone.o: $(clone_flags_array) +$(OUTPUT)trace/beauty/fs_at_flags.o: $(fs_at_flags_array) +$(OUTPUT)trace/beauty/fsmount.o: $(fsmount_arrays) +$(OUTPUT)trace/beauty/fspick.o: $(fspick_arrays) +$(OUTPUT)trace/beauty/ioctl.o: $(drm_ioctl_array) $(sndrv_pcm_ioctl_array)= $(sndrv_ctl_ioctl_array) $(kvm_ioctl_array) $(vhost_virtio_ioctl_array) $(= perf_ioctl_array) $(usbdevfs_ioctl_array) +$(OUTPUT)trace/beauty/kcmp.o: $(kcmp_type_array) +$(OUTPUT)trace/beauty/mmap.o: $(mmap_prot_array) $(mmap_flags_array) $(mre= map_flags_array) $(madvise_behavior_array) +$(OUTPUT)trace/beauty/mount_flags.o: $(mount_flags_array) +$(OUTPUT)trace/beauty/move_mount.o: $(move_mount_flags_array) +$(OUTPUT)trace/beauty/pkey_alloc.o: $(pkey_alloc_access_rights_array) +$(OUTPUT)trace/beauty/prctl.o: $(prctl_option_array) +$(OUTPUT)trace/beauty/renameat.o: $(rename_flags_array) +$(OUTPUT)trace/beauty/sockaddr.o: $(sockaddr_arrays) +$(OUTPUT)trace/beauty/socket.o: $(socket_arrays) +$(OUTPUT)trace/beauty/statx.o: $(statx_mask_array) +$(OUTPUT)trace/beauty/sync_file_range.o: $(sync_file_range_arrays) +$(OUTPUT)trace/beauty/arch_prctl.o: $(x86_arch_prctl_code_array) + +arch_errno_name_array :=3D $(beauty_outdir)/arch_errno_name_array.c +arch_errno_hdr_dir :=3D $(srctree)/tools +arch_errno_tbl :=3D $(srctree)/tools/perf/trace/beauty/arch_errno_names.sh + +$(arch_errno_name_array): $(arch_errno_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(arch_errno_tbl)' '$(patsubst -%,,$(CC= ))' $(arch_errno_hdr_dir) > $@ + +$(OUTPUT)trace/beauty/arch_errno_names.o: $(arch_errno_name_array) diff --git a/tools/perf/trace/beauty/arch_errno_names.c b/tools/perf/trace/= beauty/arch_errno_names.c index ede031c3a9e0..156c6537e747 100644 --- a/tools/perf/trace/beauty/arch_errno_names.c +++ b/tools/perf/trace/beauty/arch_errno_names.c @@ -1 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "util/env.h" #include "trace/beauty/generated/arch_errno_name_array.c" diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace= /beauty/arch_errno_names.sh index b22890b8d272..d48d8561a7bb 100755 --- a/tools/perf/trace/beauty/arch_errno_names.sh +++ b/tools/perf/trace/beauty/arch_errno_names.sh @@ -57,7 +57,7 @@ create_arch_errno_table_func() archlist=3D"$1" default=3D"$2" =20 - printf 'static arch_syscalls__strerrno_t *\n' + printf 'arch_syscalls__strerrno_t *\n' printf 'arch_syscalls__strerrno_function(const char *arch)\n' printf '{\n' for arch in $archlist; do diff --git a/tools/perf/trace/beauty/beauty.h b/tools/perf/trace/beauty/bea= uty.h index 0a07ad158f87..931c4a80fea9 100644 --- a/tools/perf/trace/beauty/beauty.h +++ b/tools/perf/trace/beauty/beauty.h @@ -35,6 +35,8 @@ bool strarray__strtoul(struct strarray *sa, char *bf, siz= e_t size, u64 *ret); bool strarray__strtoul_flags(struct strarray *sa, char *bf, size_t size, u= 64 *ret); =20 struct trace; +bool trace__show_zeros(const struct trace *trace); +struct machine *trace__host(const struct trace *trace); struct thread; =20 struct file { @@ -265,4 +267,62 @@ size_t open__scnprintf_flags(unsigned long flags, char= *bf, size_t size, bool sh void syscall_arg__set_ret_scnprintf(struct syscall_arg *arg, size_t (*ret_scnprintf)(char *bf, size_t size, struct syscall_arg = *arg)); =20 +extern struct strarray strarray__fsconfig_cmds; + +size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, struct = syscall_arg *arg); +#define SCA_EFD_FLAGS syscall_arg__scnprintf_eventfd_flags + +size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct sysca= ll_arg *arg); +#define SCA_FUTEX_OP syscall_arg__scnprintf_futex_op + +size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, struct sys= call_arg *arg); +#define SCA_FUTEX_VAL3 syscall_arg__scnprintf_futex_val3 + +size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, struct sysc= all_arg *arg); +#define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot + +extern struct strarray strarray__mmap_flags; + +size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, struct sys= call_arg *arg); +#define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags + +size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, struct s= yscall_arg *arg); +#define SCA_MREMAP_FLAGS syscall_arg__scnprintf_mremap_flags + +size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size, stru= ct syscall_arg *arg); +#define SCA_MADV_BHV syscall_arg__scnprintf_madvise_behavior + +size_t syscall_arg__scnprintf_mode_t(char *bf, size_t size, struct syscall= _arg *arg); +#define SCA_MODE_T syscall_arg__scnprintf_mode_t + +size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size, struct sysc= all_arg *arg); +#define SCA_MSG_FLAGS syscall_arg__scnprintf_msg_flags + +size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size, struct sys= call_arg *arg); +#define SCA_PERF_FLAGS syscall_arg__scnprintf_perf_flags + +size_t syscall_arg__scnprintf_perf_event_attr(char *bf, size_t size, struc= t syscall_arg *arg); +#define SCA_PERF_ATTR syscall_arg__scnprintf_perf_event_attr +#define SCA_PERF_ATTR_FROM_USER(argname) \ + { .scnprintf =3D SCA_PERF_ATTR, \ + .from_user =3D true, } + +size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size, struct s= yscall_arg *arg); +#define SCA_SCHED_POLICY syscall_arg__scnprintf_sched_policy + +size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, struct sys= call_arg *arg); +#define SCA_SECCOMP_OP syscall_arg__scnprintf_seccomp_op + +size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size, struct = syscall_arg *arg); +#define SCA_SECCOMP_FLAGS syscall_arg__scnprintf_seccomp_flags + +size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscall= _arg *arg); +#define SCA_SIGNUM syscall_arg__scnprintf_signum + +size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, struct sy= scall_arg *arg); +#define SCA_SK_TYPE syscall_arg__scnprintf_socket_type + +size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size, struct= syscall_arg *arg); +#define SCA_WAITID_OPTIONS syscall_arg__scnprintf_waitid_options + #endif /* _PERF_TRACE_BEAUTY_H */ diff --git a/tools/perf/trace/beauty/eventfd.c b/tools/perf/trace/beauty/ev= entfd.c index 4bab106213c6..18b661282834 100644 --- a/tools/perf/trace/beauty/eventfd.c +++ b/tools/perf/trace/beauty/eventfd.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #ifndef EFD_SEMAPHORE #define EFD_SEMAPHORE 1 #endif @@ -11,7 +13,7 @@ #define EFD_CLOEXEC 02000000 #endif =20 -static size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, = struct syscall_arg *arg) +size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, struct = syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "EFD_"; @@ -35,5 +37,3 @@ static size_t syscall_arg__scnprintf_eventfd_flags(char *= bf, size_t size, struct =20 return printed; } - -#define SCA_EFD_FLAGS syscall_arg__scnprintf_eventfd_flags diff --git a/tools/perf/trace/beauty/fsconfig.c b/tools/perf/trace/beauty/f= sconfig.c new file mode 100644 index 000000000000..98aa05315673 --- /dev/null +++ b/tools/perf/trace/beauty/fsconfig.c @@ -0,0 +1,5 @@ +// SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" +#include "trace/beauty/generated/fsconfig_arrays.c" + +DEFINE_STRARRAY(fsconfig_cmds, "FSCONFIG_"); diff --git a/tools/perf/trace/beauty/futex_op.c b/tools/perf/trace/beauty/f= utex_op.c index 00365156782b..05d2111e504b 100644 --- a/tools/perf/trace/beauty/futex_op.c +++ b/tools/perf/trace/beauty/futex_op.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" #include =20 #ifndef FUTEX_WAIT_BITSET @@ -17,7 +18,7 @@ #define FUTEX_CLOCK_REALTIME 256 #endif =20 -static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struc= t syscall_arg *arg) +size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct sysca= ll_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "FUTEX_"; @@ -59,5 +60,3 @@ static size_t syscall_arg__scnprintf_futex_op(char *bf, s= ize_t size, struct sysc =20 return printed; } - -#define SCA_FUTEX_OP syscall_arg__scnprintf_futex_op diff --git a/tools/perf/trace/beauty/futex_val3.c b/tools/perf/trace/beauty= /futex_val3.c index 9114f7620571..fe4e82741ffc 100644 --- a/tools/perf/trace/beauty/futex_val3.c +++ b/tools/perf/trace/beauty/futex_val3.c @@ -1,11 +1,12 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" #include =20 #ifndef FUTEX_BITSET_MATCH_ANY #define FUTEX_BITSET_MATCH_ANY 0xffffffff #endif =20 -static size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, str= uct syscall_arg *arg) +size_t syscall_arg__scnprintf_futex_val3(char *bf, size_t size, struct sys= call_arg *arg) { const char *prefix =3D "FUTEX_BITSET_"; unsigned int bitset =3D arg->val; @@ -15,5 +16,3 @@ static size_t syscall_arg__scnprintf_futex_val3(char *bf,= size_t size, struct sy =20 return scnprintf(bf, size, "%#xd", bitset); } - -#define SCA_FUTEX_VAL3 syscall_arg__scnprintf_futex_val3 diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c index 3c5e97b93dd5..c8a4cd49c845 100644 --- a/tools/perf/trace/beauty/mmap.c +++ b/tools/perf/trace/beauty/mmap.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 #include +#include "trace/beauty/beauty.h" =20 #include "trace/beauty/generated/mmap_prot_array.c" static DEFINE_STRARRAY(mmap_prot, "PROT_"); @@ -8,8 +9,7 @@ static size_t mmap__scnprintf_prot(unsigned long prot, char= *bf, size_t size, bo { return strarray__scnprintf_flags(&strarray__mmap_prot, bf, size, sh= ow_prefix, prot); } - -static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, stru= ct syscall_arg *arg) +size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, struct sysc= all_arg *arg) { unsigned long prot =3D arg->val; =20 @@ -19,18 +19,18 @@ static size_t syscall_arg__scnprintf_mmap_prot(char *bf= , size_t size, struct sys return mmap__scnprintf_prot(prot, bf, size, arg->show_string_prefix); } =20 -#define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot + =20 #include "trace/beauty/generated/mmap_flags_array.c" -static DEFINE_STRARRAY(mmap_flags, "MAP_"); +DEFINE_STRARRAY(mmap_flags, "MAP_"); =20 static size_t mmap__scnprintf_flags(unsigned long flags, char *bf, size_t = size, bool show_prefix) { return strarray__scnprintf_flags(&strarray__mmap_flags, bf, size, s= how_prefix, flags); } =20 -static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, - struct syscall_arg *arg) +size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, + struct syscall_arg *arg) { unsigned long flags =3D arg->val; =20 @@ -40,7 +40,7 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf,= size_t size, return mmap__scnprintf_flags(flags, bf, size, arg->show_string_prefix); } =20 -#define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags + =20 #include "trace/beauty/generated/mremap_flags_array.c" static DEFINE_STRARRAY(mremap_flags, "MREMAP_"); @@ -50,7 +50,7 @@ static size_t mremap__scnprintf_flags(unsigned long flags= , char *bf, size_t size return strarray__scnprintf_flags(&strarray__mremap_flags, bf, size,= show_prefix, flags); } =20 -static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, s= truct syscall_arg *arg) +size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, struct s= yscall_arg *arg) { unsigned long flags =3D arg->val; =20 @@ -60,7 +60,7 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *b= f, size_t size, struct return mremap__scnprintf_flags(flags, bf, size, arg->show_string_prefix); } =20 -#define SCA_MREMAP_FLAGS syscall_arg__scnprintf_mremap_flags + =20 static size_t madvise__scnprintf_behavior(int behavior, char *bf, size_t s= ize) { @@ -73,10 +73,8 @@ static size_t madvise__scnprintf_behavior(int behavior, = char *bf, size_t size) return scnprintf(bf, size, "%#", behavior); } =20 -static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t siz= e, - struct syscall_arg *arg) +size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size, + struct syscall_arg *arg) { return madvise__scnprintf_behavior(arg->val, bf, size); } - -#define SCA_MADV_BHV syscall_arg__scnprintf_madvise_behavior diff --git a/tools/perf/trace/beauty/mode_t.c b/tools/perf/trace/beauty/mod= e_t.c index 29a8fadfb7f9..9304b0bf3094 100644 --- a/tools/perf/trace/beauty/mode_t.c +++ b/tools/perf/trace/beauty/mode_t.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include #include #include @@ -20,7 +22,7 @@ #define S_IXUGO (S_IXUSR|S_IXGRP|S_IXOTH) #endif =20 -static size_t syscall_arg__scnprintf_mode_t(char *bf, size_t size, struct = syscall_arg *arg) +size_t syscall_arg__scnprintf_mode_t(char *bf, size_t size, struct syscall= _arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "S_"; @@ -67,5 +69,3 @@ static size_t syscall_arg__scnprintf_mode_t(char *bf, siz= e_t size, struct syscal =20 return printed; } - -#define SCA_MODE_T syscall_arg__scnprintf_mode_t diff --git a/tools/perf/trace/beauty/msg_flags.c b/tools/perf/trace/beauty/= msg_flags.c index 2da581ff0c80..be7f82677cbf 100644 --- a/tools/perf/trace/beauty/msg_flags.c +++ b/tools/perf/trace/beauty/msg_flags.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include #include =20 @@ -27,8 +29,8 @@ # define MSG_CMSG_CLOEXEC 0x40000000 #endif =20 -static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size, - struct syscall_arg *arg) +size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size, + struct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "MSG_"; @@ -72,5 +74,3 @@ static size_t syscall_arg__scnprintf_msg_flags(char *bf, = size_t size, =20 return printed; } - -#define SCA_MSG_FLAGS syscall_arg__scnprintf_msg_flags diff --git a/tools/perf/trace/beauty/open_flags.c b/tools/perf/trace/beauty= /open_flags.c index 78f6566ef110..c2c7769e6595 100644 --- a/tools/perf/trace/beauty/open_flags.c +++ b/tools/perf/trace/beauty/open_flags.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include #include #include diff --git a/tools/perf/trace/beauty/perf_event_open.c b/tools/perf/trace/b= eauty/perf_event_open.c index 9f1ed989c775..c1c7445dcff9 100644 --- a/tools/perf/trace/beauty/perf_event_open.c +++ b/tools/perf/trace/beauty/perf_event_open.c @@ -1,4 +1,8 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" +#include "util/evsel_fprintf.h" +#include + #ifndef PERF_FLAG_FD_NO_GROUP # define PERF_FLAG_FD_NO_GROUP (1UL << 0) #endif @@ -15,8 +19,8 @@ # define PERF_FLAG_FD_CLOEXEC (1UL << 3) /* O_CLOEXEC */ #endif =20 -static size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size, - struct syscall_arg *arg) +size_t syscall_arg__scnprintf_perf_flags(char *bf, size_t size, + struct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "PERF_"; @@ -43,7 +47,7 @@ static size_t syscall_arg__scnprintf_perf_flags(char *bf,= size_t size, return printed; } =20 -#define SCA_PERF_FLAGS syscall_arg__scnprintf_perf_flags + =20 struct attr_fprintf_args { size_t size, printed; @@ -76,19 +80,14 @@ static size_t perf_event_attr___scnprintf(struct perf_e= vent_attr *attr, char *bf =20 static size_t syscall_arg__scnprintf_augmented_perf_event_attr(struct sysc= all_arg *arg, char *bf, size_t size) { - return perf_event_attr___scnprintf((void *)arg->augmented.args->value, bf= , size, arg->trace->show_zeros); + return perf_event_attr___scnprintf((void *)arg->augmented.args->value, bf= , size, + trace__show_zeros(arg->trace)); } =20 -static size_t syscall_arg__scnprintf_perf_event_attr(char *bf, size_t size= , struct syscall_arg *arg) +size_t syscall_arg__scnprintf_perf_event_attr(char *bf, size_t size, struc= t syscall_arg *arg) { if (arg->augmented.args) return syscall_arg__scnprintf_augmented_perf_event_attr(arg, bf, size); =20 return scnprintf(bf, size, "%#lx", arg->val); } - -#define SCA_PERF_ATTR syscall_arg__scnprintf_perf_event_attr -// 'argname' is just documentational at this point, to remove the previous= comment with that info -#define SCA_PERF_ATTR_FROM_USER(argname) \ - { .scnprintf =3D SCA_PERF_ATTR, \ - .from_user =3D true, } diff --git a/tools/perf/trace/beauty/pid.c b/tools/perf/trace/beauty/pid.c index 8f9c9950f8ba..cca4a3a5d9bd 100644 --- a/tools/perf/trace/beauty/pid.c +++ b/tools/perf/trace/beauty/pid.c @@ -1,11 +1,14 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" +#include "util/machine.h" +#include "util/thread.h" =20 size_t syscall_arg__scnprintf_pid(char *bf, size_t size, struct syscall_ar= g *arg) { int pid =3D arg->val; struct trace *trace =3D arg->trace; size_t printed =3D scnprintf(bf, size, "%d", pid); - struct thread *thread =3D machine__findnew_thread(trace->host, pid, pid); + struct thread *thread =3D machine__findnew_thread(trace__host(trace), pid= , pid); =20 if (thread !=3D NULL) { if (!thread__comm_set(thread)) diff --git a/tools/perf/trace/beauty/sched_policy.c b/tools/perf/trace/beau= ty/sched_policy.c index 68aa59eeed8d..3fb6d9e0fae9 100644 --- a/tools/perf/trace/beauty/sched_policy.c +++ b/tools/perf/trace/beauty/sched_policy.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include =20 /* @@ -14,8 +16,8 @@ #define SCHED_RESET_ON_FORK 0x40000000 #endif =20 -static size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size, - struct syscall_arg *arg) +size_t syscall_arg__scnprintf_sched_policy(char *bf, size_t size, + struct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SCHED_"; @@ -46,5 +48,3 @@ static size_t syscall_arg__scnprintf_sched_policy(char *b= f, size_t size, =20 return printed; } - -#define SCA_SCHED_POLICY syscall_arg__scnprintf_sched_policy diff --git a/tools/perf/trace/beauty/seccomp.c b/tools/perf/trace/beauty/se= ccomp.c index 637722e2796b..f345c66c1bfa 100644 --- a/tools/perf/trace/beauty/seccomp.c +++ b/tools/perf/trace/beauty/seccomp.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #ifndef SECCOMP_SET_MODE_STRICT #define SECCOMP_SET_MODE_STRICT 0 #endif @@ -6,7 +8,7 @@ #define SECCOMP_SET_MODE_FILTER 1 #endif =20 -static size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, str= uct syscall_arg *arg) +size_t syscall_arg__scnprintf_seccomp_op(char *bf, size_t size, struct sys= call_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SECCOMP_SET_MODE_"; @@ -24,14 +26,14 @@ static size_t syscall_arg__scnprintf_seccomp_op(char *b= f, size_t size, struct sy return printed; } =20 -#define SCA_SECCOMP_OP syscall_arg__scnprintf_seccomp_op + =20 #ifndef SECCOMP_FILTER_FLAG_TSYNC #define SECCOMP_FILTER_FLAG_TSYNC 1 #endif =20 -static size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size, - struct syscall_arg *arg) +size_t syscall_arg__scnprintf_seccomp_flags(char *bf, size_t size, + struct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SECCOMP_FILTER_FLAG_"; @@ -51,5 +53,3 @@ static size_t syscall_arg__scnprintf_seccomp_flags(char *= bf, size_t size, =20 return printed; } - -#define SCA_SECCOMP_FLAGS syscall_arg__scnprintf_seccomp_flags diff --git a/tools/perf/trace/beauty/signum.c b/tools/perf/trace/beauty/sig= num.c index 21220c56500a..6817e9febab9 100644 --- a/tools/perf/trace/beauty/signum.c +++ b/tools/perf/trace/beauty/signum.c @@ -1,7 +1,9 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include =20 -static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct = syscall_arg *arg) +size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscall= _arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SIG"; @@ -53,5 +55,3 @@ static size_t syscall_arg__scnprintf_signum(char *bf, siz= e_t size, struct syscal =20 return scnprintf(bf, size, "%#x", sig); } - -#define SCA_SIGNUM syscall_arg__scnprintf_signum diff --git a/tools/perf/trace/beauty/socket_type.c b/tools/perf/trace/beaut= y/socket_type.c index bed8d5761ca8..059e3041d338 100644 --- a/tools/perf/trace/beauty/socket_type.c +++ b/tools/perf/trace/beauty/socket_type.c @@ -1,4 +1,6 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include #include =20 @@ -18,7 +20,7 @@ #define SOCK_TYPE_MASK 0xf #endif =20 -static size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, st= ruct syscall_arg *arg) +size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, struct sy= scall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "SOCK_"; @@ -59,5 +61,3 @@ static size_t syscall_arg__scnprintf_socket_type(char *bf= , size_t size, struct s =20 return printed; } - -#define SCA_SK_TYPE syscall_arg__scnprintf_socket_type diff --git a/tools/perf/util/syscalltbl.c b/tools/perf/trace/beauty/syscall= tbl.c similarity index 100% rename from tools/perf/util/syscalltbl.c rename to tools/perf/trace/beauty/syscalltbl.c diff --git a/tools/perf/util/syscalltbl.h b/tools/perf/trace/beauty/syscall= tbl.h similarity index 100% rename from tools/perf/util/syscalltbl.h rename to tools/perf/trace/beauty/syscalltbl.h diff --git a/tools/perf/trace/beauty/tracepoints/Build b/tools/perf/trace/b= eauty/tracepoints/Build index e35087fdd108..9924ad24a6f1 100644 --- a/tools/perf/trace/beauty/tracepoints/Build +++ b/tools/perf/trace/beauty/tracepoints/Build @@ -1,2 +1,23 @@ perf-y +=3D x86_irq_vectors.o perf-y +=3D x86_msr.o + +beauty_outdir :=3D $(OUTPUT)trace/beauty/generated +beauty_arch_asm_dir :=3D $(srctree)/tools/perf/trace/beauty/arch/x86/inclu= de/asm/ +x86_arch_asm_dir :=3D $(srctree)/tools/arch/x86/include/asm/ + +x86_arch_irq_vectors_array :=3D $(beauty_outdir)/x86_arch_irq_vectors_arra= y.c +x86_arch_irq_vectors_tbl :=3D $(srctree)/tools/perf/trace/beauty/tracepoin= ts/x86_irq_vectors.sh + +$(x86_arch_irq_vectors_array): $(beauty_arch_asm_dir)/irq_vectors.h $(x86_= arch_irq_vectors_tbl) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(x86_arch_irq_vectors_tbl)' $(beauty_a= rch_asm_dir) > $@ + +x86_arch_MSRs_array :=3D $(beauty_outdir)/x86_arch_MSRs_array.c +x86_arch_MSRs_tbl :=3D $(srctree)/tools/perf/trace/beauty/tracepoints/x86_= msr.sh + +$(x86_arch_MSRs_array): $(x86_arch_asm_dir)/msr-index.h $(x86_arch_MSRs_tb= l) + $(call rule_mkdir) + $(Q)$(call echo-cmd,gen)$(SHELL) '$(x86_arch_MSRs_tbl)' $(x86_arch_asm_di= r) > $@ + +$(OUTPUT)trace/beauty/tracepoints/x86_irq_vectors.o: $(x86_arch_irq_vector= s_array) +$(OUTPUT)trace/beauty/tracepoints/x86_msr.o: $(x86_arch_MSRs_array) diff --git a/tools/perf/trace/beauty/waitid_options.c b/tools/perf/trace/be= auty/waitid_options.c index d4d10b33ba0e..78ead5df985a 100644 --- a/tools/perf/trace/beauty/waitid_options.c +++ b/tools/perf/trace/beauty/waitid_options.c @@ -1,9 +1,11 @@ // SPDX-License-Identifier: LGPL-2.1 +#include "trace/beauty/beauty.h" + #include #include =20 -static size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size, - struct syscall_arg *arg) +size_t syscall_arg__scnprintf_waitid_options(char *bf, size_t size, + struct syscall_arg *arg) { bool show_prefix =3D arg->show_string_prefix; const char *prefix =3D "W"; @@ -25,5 +27,3 @@ static size_t syscall_arg__scnprintf_waitid_options(char = *bf, size_t size, =20 return printed; } - -#define SCA_WAITID_OPTIONS syscall_arg__scnprintf_waitid_options diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 70cc91d00804..abc9a2926e85 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -75,7 +75,7 @@ perf-util-y +=3D sample.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 @@ -441,3 +441,5 @@ $(OUTPUT)%.pylint_log: % $(Q)$(call echo-cmd,test)pylint "$<" > $@ || (cat $@ && rm $@ && false) =20 perf-util-y +=3D $(PYLINT_TEST_LOGS) + + diff --git a/tools/perf/util/bpf-trace-summary.c b/tools/perf/util/bpf-trac= e-summary.c index cf6e1e4402d5..9a31dbf06cbb 100644 --- a/tools/perf/util/bpf-trace-summary.c +++ b/tools/perf/util/bpf-trace-summary.c @@ -6,7 +6,7 @@ #include =20 #include "dwarf-regs.h" /* for EM_HOST */ -#include "syscalltbl.h" +#include "trace/beauty/syscalltbl.h" #include "util/cgroup.h" #include "util/hashmap.h" #include "util/trace.h" diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 1e54e2c86360..20953ef7b9d8 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -635,10 +635,6 @@ const char *perf_env__arch(struct perf_env *env) return normalize_arch(arch_name); } =20 -#if defined(HAVE_LIBTRACEEVENT) -#include "trace/beauty/arch_errno_names.c" -#endif - const char *perf_env__arch_strerrno(struct perf_env *env __maybe_unused, i= nt err __maybe_unused) { #if defined(HAVE_LIBTRACEEVENT) diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index c7052ac1f856..739d884fc236 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -189,6 +189,7 @@ void cpu_cache_level__free(struct cpu_cache_level *cach= e); =20 const char *perf_env__arch(struct perf_env *env); const char *perf_env__arch_strerrno(struct perf_env *env, int err); +arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *ar= ch); const char *perf_env__cpuid(struct perf_env *env); const char *perf_env__raw_arch(struct perf_env *env); int perf_env__nr_cpus_avail(struct perf_env *env); --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.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 7CD603DC4BD for ; Fri, 15 May 2026 17:39:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866750; cv=none; b=jqhSGHoMes9nR4es8H0vlZ6jHg9/fHQRdidzuqoUjk2fY9BmdDpD9szStZ6147wnAYZ5fkpdv7k5dcPHAgmAi3S5qNOg0zx1qsCVIM9retValWkdyDPq8XshfbfEi/NdHTjEYJKdg6zmfMIKWvID+JvVHcQiPTAQ5N8bQsrsb9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866750; c=relaxed/simple; bh=/7TyOYbdEe9k68HYyv7dCCFzh+d6Q52A6z+ebAC5RwQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=e+7WH2ZN7oUnpHiejGjIqRwX8Fcng5U/f/Tf8BNbg327pHLp/yxDJMvoanXscoK6oaE28XUaKM4XvSOxRqcGFqYxhUs5WNkxyU5Cn8fN5OXOcqyapQ2kQLFj+/2gcO0PPpGCVHkiiv12VYQ/TfeqjvzBR2UhaSL0uFo3//WAPwQ= 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=l87vSOwC; arc=none smtp.client-ip=74.125.82.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="l87vSOwC" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2f3ec2e8d07so501479eec.1 for ; Fri, 15 May 2026 10:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866748; x=1779471548; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5GIfuekLiG6d1t2FIig7OwOH7cYz1r1KvcU67M955lU=; b=l87vSOwChOnynPHwAZ0//AVIc+e66cee+/h72nnOxkkaw9YUEE+bDuBuUXGtvyRZQK amguNpHg+AjdS50rVTCl66SoO1Ho7v8Ez/WgVm8Id9ZG+da31mtecBjk96eCV2k0vVlm QuMWLsIED+f5ICot5ZpFjmaK7wUZ2K3zufGWpa7w22HMrY/Jed0k/4ErOBrGbfi83bYV XAUx0zutQ2Mln7SYSlo4GxnSZ70ptiGpXvZO0KKNqKWeKsq0gcTlbMrpQYFVeITBq/Nc sFDHIlOq0URaS2U3Snah/eI/KOQjp4WR4cZvGkwsGP9cps9g+vLDAp764jC1gWakSd4x AY9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866748; x=1779471548; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5GIfuekLiG6d1t2FIig7OwOH7cYz1r1KvcU67M955lU=; b=aEo7W0ghL9TdioRPuIFCbdJNdHCon7lahp53owMdDdtwyL3gRNV1y4JqJruvtRJ41/ nk1cWLioFFdVaF7EnOY+yL+2kafrggG/0OFdkhMsbuo878dFLGMzKF/1jONsSouhCcm5 meSOmuo+FDzBAkV+RhwP/pxnDReM3XG3C6JIDXX2yDuXBFclK3PPUAhfQxUS7wiupgUz ELOCBdge8rLpr68/BV+bc4DrtpEqOvNca+cQVyxRzacNg3yGgkeu5Zwm+ow4i4CZVO3Q UmnmB8jhrMZU0Q10Y8V+OuOFTw2KaKPrw7pD8FPNPZkzRXC0Gi18a3TapuZ9vHGluc1O SivA== X-Forwarded-Encrypted: i=1; AFNElJ8wLui6t+noUrKSZsfipsOkSeMDKXpKYD14zeNCGQiHe2L7J8F0vTfgsZ56Yt+IFYiq/RHuY8gHXcykiDg=@vger.kernel.org X-Gm-Message-State: AOJu0YzIk0jkVPhyririKy+VxiYlkdzgVNuva2g8K1hMueMENR4qsN/N jG8r1a+zLzsu37bjOuyJ78DcE2H7YnJC/1tyhrFmDZaoXQuJdx/gYPeRug9mIspPv7M09EDXlz5 Y0BO9DVrT0Q== X-Received: from dlbvv13.prod.google.com ([2002:a05:7022:5f0d:b0:128:cfd6:a3c6]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7023:b11:b0:12a:6ab7:3f73 with SMTP id a92af1059eb24-1350463608fmr2307586c88.0.1778866747426; Fri, 15 May 2026 10:39:07 -0700 (PDT) Date: Fri, 15 May 2026 10:38:40 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-4-irogers@google.com> Subject: [PATCH v4 03/14] perf build: Decouple pmu-events from prepare umbrella target From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, the $(LIBPMU_EVENTS_IN) sub-make depends on the massive "prepare" umbrella target. Because "prepare" depends on external libraries (libapi, libperf, etc.) as well as dozens of generated headers, make completely serializes the launch of the pmu-events sub-make behind some of those unrelated prerequisites. Since pmu-events is a large compilation unit, unblock its startup by binding it directly to only $(LIBPERF) instead of prepare. This allows background python generation scripts to overlap simultaneously with the rest of the build. Testing a parallel build (make -j28 clean all) shows improvements: Before: real 0m27.642s user 2m32.356s sys 0m26.683s After: real 0m22.254s user 2m32.810s sys 0m24.646s This reclaims over 5 full seconds of build latency (~19.5% overall reduction) by elevating average CPU concurrency from ~5.5 active cores up to ~8 active cores. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index c81797ceec42..c66af4c825fd 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -550,7 +550,7 @@ build :=3D -f $(srctree)/tools/build/Makefile.build dir= =3D. obj $(PERF_IN): prepare FORCE $(Q)$(MAKE) $(build)=3Dperf =20 -$(LIBPMU_EVENTS_IN): FORCE prepare +$(LIBPMU_EVENTS_IN): FORCE $(LIBPERF) $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=3Dpmu-events obj= =3Dpmu-events =20 $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.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 6C58F40315E for ; Fri, 15 May 2026 17:39:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866751; cv=none; b=LfhdvAGj1JVAPeZVSYJg6ZaQ/565+AvB49KeCdLp9p5stn1FTFLjuVh5sbCx+/F9azLUThWImGC5WdL7Ch9J4WJCyzvHHHMxIhcKsLdSRDtyAybIwPl9iNpQSZeOxb+7XHU6/lh/UOhZwtlw/g2ybDouo3pOS185MmJSba7xlTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866751; c=relaxed/simple; bh=xokYndru7r5U27QA5IiJ9grDU4CmNf+aSc8fRA9ncZg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EpGOSx6la/b/EkyvOtx9kmmCtvXLAyKjsqngPC9SVATXNOyNdrKq95O+YxRZQaYbAdehyONCxb8XlwdiAKnDMTMkIh55QVcdpG7jZSOG87L2+mqHQ0s4X/27oTCrqG3QXPYMKpObqkA7P1l0UZZFBeSjBGn733hIJdPidvlkh2Q= 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=bJT3P5MW; arc=none smtp.client-ip=74.125.82.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="bJT3P5MW" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2f3ec2e8d07so501969eec.1 for ; Fri, 15 May 2026 10:39:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866749; x=1779471549; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=r68S8jxOjdQsq88pAcfrL0Nqp+mR1s52o0SNFT5DPPA=; b=bJT3P5MWq5IUVOIZVfadHuA7plL+CevtkA7x5sCn4z3OmPI1rwgG6139uUINWMQsB5 skA8dNGmksd05Y/5zdRF9iQzA6MJYw8maJLepmGenxDrr4qfa/26N4F4AMlRsD+j4bS2 GAcHfMNXe/VKKAVXi6dEu0D/qvJgmA1lkWtlnQaSQBoHM0lGS19DUbKdBFucnYnK9E+j VntDKwlJLY2AqIVfSH802ZY9p6pFkhZ1s9mTRMykwDH4Pf+6gim+saqU6no/Qiq3NWET Mfxce+ok4VA8EYXU6xgP++eeiK3ZKsw++QzmEwvlX/LAiFY0skbKSXQWeqwY8qTAIGgA ogCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866749; x=1779471549; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r68S8jxOjdQsq88pAcfrL0Nqp+mR1s52o0SNFT5DPPA=; b=WQC5f72Yc1+ze/QE8BnZulmAiTqnsoqtlkkqpK9zDIoSmdYBH7bo6u5xmXAIoXnLfm Gpwvxl2EunQt3ssl31iKs5qWInRq0ve0Hrmi8hbOrq7w5WBv+Moon4mFrs5zgD2geppP hi1utDy7RLNHB70KuAAUqKcqbyTO2OKPz6Aw1ctqmNHC6HodAy63ECSkZhILSHpNlarO 09euQGWTuhJp95sBbaucVRQqsZnw6YjdgEwPPB0/IsWFQVJmDGfZv0aJhf1gL5pM6409 1eT0dbaM9rapsoA4oUNUjD6ZbxVbZkdWPTl0lItwjhcWuaoGletVZIKJAZvnWUEJ4J26 vgpA== X-Forwarded-Encrypted: i=1; AFNElJ8Ae+DjYUByWyEPM1NSauk8jDABXL0WQp2qFHm9L9qGXaWqtoLFlqHNLIMY6ae+EDCX1Z99L/4+6BYMNfI=@vger.kernel.org X-Gm-Message-State: AOJu0YzbuNM7PLmU1FKuwCdVfy23/EbvEyZC5aAVQ/83RBQ5AsCiGsXf RjdCIFOdaHaMqOG3VsSQiYKvgGN5FvYL0sVm07X6KQ1RsPhNAjOt6gno7VTkV7lhPrj52tJFw7t JNeFst3ZD9g== X-Received: from dybia10.prod.google.com ([2002:a05:7301:30a:b0:2da:3d44:ddce]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:724f:b0:2ed:27a3:eae2 with SMTP id 5a478bee46e88-30398189fa8mr2946651eec.15.1778866749283; Fri, 15 May 2026 10:39:09 -0700 (PDT) Date: Fri, 15 May 2026 10:38:41 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-5-irogers@google.com> Subject: [PATCH v4 04/14] perf build: Remove empty archheaders target From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove empty target that doesn't do anything. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index c66af4c825fd..24581941e912 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -627,7 +627,7 @@ endif __build-dir =3D $(subst $(OUTPUT),,$(dir $@)) build-dir =3D $(or $(__build-dir),.) =20 -prepare: $(OUTPUT)PERF-VERSION-FILE archheaders \ +prepare: $(OUTPUT)PERF-VERSION-FILE \ arm64-sysreg-defs \ $(LIBAPI) \ $(LIBPERF) \ @@ -1070,7 +1070,7 @@ FORCE: .PHONY: all install clean config-clean strip install-gtk .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_sh= ell .PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope FORCE prepare -.PHONY: archheaders python_perf_target +.PHONY: python_perf_target =20 endif # force_fixdep =20 --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.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 5815F3DDDB3 for ; Fri, 15 May 2026 17:39:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866754; cv=none; b=ZNRw0v6hLUmZ7VzGeYqpcuiepmePNd6iWvmmppXetGdQAeLNYlao1fqOmBZKmD1ncrNuq+be4QiGXk25HgqekuSRzeATfaYFQYNpm3Jaf3JdTcUmnZvm8PlVGbZo5SRI9yey9/c4/fBLIuIrxYnQQ9M83D/2TPGJFj3cc9Cc2x4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866754; c=relaxed/simple; bh=E8WgP2OPYV84m7NlyA7UDb/+f9ZTgE9HuPA2z3Pd1uA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GCgqO51lF+hWEdSgyT4MgmvHXeVg9MRkwdbD/bamJLGwrsubH9UeV25J9I0+fK8kW+SO/944nzWVf1GiKuH0QiqS2W4t2tU6rse9hH4ZvV+Ai7GureLlUptOapGzcSUdRhA9A3Z4Xij6LC6nVbU7wT5g3IrsXnMCbhC3f9PwsZo= 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=R7bJRIeA; arc=none smtp.client-ip=74.125.82.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="R7bJRIeA" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ee1da7a13fso88901eec.1 for ; Fri, 15 May 2026 10:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866751; x=1779471551; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ySSlk3AGnoYm7eQWOUje//dSZFFdDolZN9BqzUX7+o4=; b=R7bJRIeAYhDvol4+747o5uc/KvyRTBR1Sxo7sSaCydjBOItoAakY+b81gTkAW04All 5vxCK+shvwSSfH/gX/mY9sZ/m/EasG+38UDzecPgUaF9LurKGaZXfuOzf5K21QLM+sGQ X9e9Q7UfMRpLqHK4lK5Li/s+3RtT087re7eUZPdMq7pp+Acw4023uwqxB0KiG8uj6E+a BJFHeLMVhZoOjHMuynypqqCjO0N3bKRD/596k0PwKgOuTRhQkWj4xIywz/3zG5i4UvX4 9S1at71b6S4yj3g4vSZ+S1nJRST6L8uu18pSHeJMU2BLqpSRTvrEWU/gZ+Xb+rTRmNDy 5WWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866751; x=1779471551; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ySSlk3AGnoYm7eQWOUje//dSZFFdDolZN9BqzUX7+o4=; b=nNckg4G217UFSKuZYp5Zi9kDPq1uyR85VyxIowmAoI+3hNmQWDn8QzbABwOEXVRPwd a6vx8G7umMoS9D+eQIloz5oZ7w/zFz0eZS5ksHzZfZ1o+D1ec0pdLm5mGMgcCbsIG70Z 0k3+LW0VeZp5L8LIh07HTF86qS9wfC8fNMY1iqIFWSNTVBOxpAHrHqcUWhKbEMzuf4Me hytdXNK6L0WjJc+A0blx+x3DyO4dWKXPFxwwkGWJ2+GTuRH8OSuDEz9+LfSL7BCtQy6t gD+ReLwgIbmRpLHnWNvsmn/WRs6mCQIRzjqb+SsSuH1SBPpxy6AQvOEYqjd45Lh2/5gY ktXw== X-Forwarded-Encrypted: i=1; AFNElJ8TZdRX+PtONl06lfAgkwh5wxhPwYv3MyEm2t8X3PTquJKKwB1hJHqaBJ5JQumW2ScauSogmlZa1o+zeO4=@vger.kernel.org X-Gm-Message-State: AOJu0YyA5bLmer7ds10cO2sla588N7JcaN0zBRgFfgG+fNXUVWlq4ZQ7 /3Se/rt5FEqFWqPMVlyaCG3WfYIa5Db7EC8CUitW2ZID/E1SsPgGKQpbA+b/PY9xj0J9UrTnuoV 3W5u1eqKqKw== X-Received: from dybgs18.prod.google.com ([2002:a05:7301:2092:b0:2d9:3459:1de6]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:818b:b0:2da:45f8:1b41 with SMTP id 5a478bee46e88-30398618bdbmr2553697eec.19.1778866751183; Fri, 15 May 2026 10:39:11 -0700 (PDT) Date: Fri, 15 May 2026 10:38:42 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-6-irogers@google.com> Subject: [PATCH v4 05/14] perf build: Move BPF skeleton generation out of Makefile.perf From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, the top-level Makefile.perf defines a massive global bpf-skel umbrella target that pre-compiles all 12+ BPF skeletons (%.skel.h) upfront before launching sub-makes. This forces unrelated sub-makes to serialize behind bpftool and clang BPF target evaluations, causing parallel build bottlenecks. Furthermore, bench_uprobe.bpf.c lived inside util/bpf_skel/, breaking conceptual directory encapsulation since it is consumed purely by bench/uprobe.c. Refactor the BPF skeletons to better achieve directory isolation: 1. Move tools/perf/util/bpf_skel/bench_uprobe.bpf.c directly into tools/perf/bench/bpf_skel/. 2. Extract the skeleton generation infrastructure out of Makefile.perf into a shared inclusion file tools/perf/bpf_skel.mak. 3. Include bpf_skel.mak locally inside tools/perf/util/Build and tools/perf/bench/Build and bind precise local prerequisites. 4. Safely synchronize the shared bpftool bootstrap and vmlinux.h targets via the conditional prepare: umbrella to avoid parallel sub-make races, while evaluating the actual skeletons completely locally on demand. A later patch will move these targets into bpf_skel.mak. 5. Export CLANG from the global Makefile to ensure accurate tool propagation. 6. Clean up Makefile.perf by stripping the global bpf-skel umbrella target and its SKELETONS list. While removing code from Makefile.perf generally helps build performance, the impact here is minimal. The main motivation for the change is to better encapsulate things in the build and simplify Makefile.perf that has around 50 lines removed. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 59 ++----------------- tools/perf/bench/Build | 6 ++ .../bpf_skel/bench_uprobe.bpf.c | 0 tools/perf/bench/uprobe.c | 2 +- tools/perf/bpf_skel.mak | 54 +++++++++++++++++ tools/perf/util/Build | 15 ++++- 6 files changed, 79 insertions(+), 57 deletions(-) rename tools/perf/{util =3D> bench}/bpf_skel/bench_uprobe.bpf.c (100%) create mode 100644 tools/perf/bpf_skel.mak diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 24581941e912..373eae7fb72a 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -274,7 +274,7 @@ ifeq ($(PYLINT),1) PYLINT :=3D $(shell which pylint 2> /dev/null) endif =20 -export srctree OUTPUT RM CC CXX RUSTC LD AR CFLAGS CXXFLAGS RUST_FLAGS V B= ISON FLEX AWK +export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT =20 include $(srctree)/tools/build/Makefile.include @@ -632,8 +632,7 @@ prepare: $(OUTPUT)PERF-VERSION-FILE \ $(LIBAPI) \ $(LIBPERF) \ $(LIBSUBCMD) \ - $(LIBSYMBOL) \ - bpf-skel + $(LIBSYMBOL) =20 ifdef LIBBPF_STATIC prepare: $(LIBBPF) @@ -914,44 +913,13 @@ python-clean: =20 SKEL_OUT :=3D $(abspath $(OUTPUT)util/bpf_skel) SKEL_TMP_OUT :=3D $(abspath $(SKEL_OUT)/.tmp) -SKELETONS :=3D $(SKEL_OUT)/bpf_prog_profiler.skel.h -SKELETONS +=3D $(SKEL_OUT)/bperf_leader.skel.h $(SKEL_OUT)/bperf_follower.= skel.h -SKELETONS +=3D $(SKEL_OUT)/bperf_cgroup.skel.h $(SKEL_OUT)/func_latency.sk= el.h -SKELETONS +=3D $(SKEL_OUT)/off_cpu.skel.h $(SKEL_OUT)/lock_contention.skel= .h -SKELETONS +=3D $(SKEL_OUT)/kwork_trace.skel.h $(SKEL_OUT)/sample_filter.sk= el.h -SKELETONS +=3D $(SKEL_OUT)/kwork_top.skel.h $(SKEL_OUT)/syscall_summary.sk= el.h -SKELETONS +=3D $(SKEL_OUT)/bench_uprobe.skel.h -SKELETONS +=3D $(SKEL_OUT)/augmented_raw_syscalls.skel.h =20 $(SKEL_TMP_OUT) $(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBS= UBCMD_OUTPUT) $(LIBSYMBOL_OUTPUT): $(Q)$(MKDIR) -p $@ =20 ifeq ($(CONFIG_PERF_BPF_SKEL),y) +prepare: $(BPFTOOL) $(SKEL_OUT)/vmlinux.h BPFTOOL :=3D $(SKEL_TMP_OUT)/bootstrap/bpftool -# Get Clang's default includes on this system, as opposed to those seen by -# '--target=3Dbpf'. This fixes "missing" files on some architectures/distr= os, -# such as asm/byteorder.h, asm/socket.h, asm/sockios.h, sys/cdefs.h etc. -# -# Use '-idirafter': Don't interfere with include mechanics except where the -# build would have failed anyways. -define get_sys_includes -$(shell $(1) $(2) -v -E - &1 \ - | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/= .*\)|-idirafter \1|p }') \ -$(shell $(1) $(2) -dM -E - $@ - -bpf-skel: $(SKELETONS) - -.PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o - -else # CONFIG_PERF_BPF_SKEL - -bpf-skel: - endif # CONFIG_PERF_BPF_SKEL =20 bpf-skel-clean: - $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS) $(SKE= L_OUT)/vmlinux.h + $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKEL_OUT)/*.skel= .h $(SKEL_OUT)/vmlinux.h $(OUTPUT)bench/bpf_skel/*.skel.h $(OUTPUT)bench/bp= f_skel/.tmp =20 pmu-events-clean: ifeq ($(OUTPUT),) diff --git a/tools/perf/bench/Build b/tools/perf/bench/Build index b558ab98719f..67b76fe20ba6 100644 --- a/tools/perf/bench/Build +++ b/tools/perf/bench/Build @@ -24,3 +24,9 @@ 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-bench-$(CONFIG_NUMA) +=3D numa.o + +ifeq ($(CONFIG_PERF_BPF_SKEL),y) +include $(srctree)/tools/perf/bpf_skel.mak + +$(OUTPUT)bench/uprobe.o: $(SKEL_OUT)/bench_uprobe.skel.h +endif diff --git a/tools/perf/util/bpf_skel/bench_uprobe.bpf.c b/tools/perf/bench= /bpf_skel/bench_uprobe.bpf.c similarity index 100% rename from tools/perf/util/bpf_skel/bench_uprobe.bpf.c rename to tools/perf/bench/bpf_skel/bench_uprobe.bpf.c diff --git a/tools/perf/bench/uprobe.c b/tools/perf/bench/uprobe.c index 89697ff788ef..616873bca243 100644 --- a/tools/perf/bench/uprobe.c +++ b/tools/perf/bench/uprobe.c @@ -44,7 +44,7 @@ static const char * const bench_uprobe_usage[] =3D { }; =20 #ifdef HAVE_BPF_SKEL -#include "bpf_skel/bench_uprobe.skel.h" +#include "bench/bpf_skel/bench_uprobe.skel.h" =20 #define bench_uprobe__attach_uprobe(prog) \ skel->links.prog =3D bpf_program__attach_uprobe_opts(/*prog=3D*/skel->pro= gs.prog, \ diff --git a/tools/perf/bpf_skel.mak b/tools/perf/bpf_skel.mak new file mode 100644 index 000000000000..aa04d8b3ee07 --- /dev/null +++ b/tools/perf/bpf_skel.mak @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: GPL-2.0 +# Shared BPF Skeleton Generator Rules + +include $(srctree)/tools/scripts/Makefile.include + +# Shared foundational tooling always lives in util/bpf_skel +SKEL_TOOL_OUT :=3D $(abspath $(OUTPUT)util/bpf_skel) +SKEL_TOOL_TMP_OUT :=3D $(abspath $(SKEL_TOOL_OUT)/.tmp) + +# Component specific output lives in $(dir)/bpf_skel +SKEL_OUT :=3D $(abspath $(OUTPUT)$(dir)/bpf_skel) +SKEL_TMP_OUT :=3D $(abspath $(SKEL_OUT)/.tmp) + +ifeq ($(CONFIG_PERF_BPF_SKEL),y) +BPFTOOL :=3D $(SKEL_TOOL_TMP_OUT)/bootstrap/bpftool +VMLINUX_H :=3D $(SKEL_TOOL_OUT)/vmlinux.h + +define get_sys_includes +$(shell $(1) $(2) -v -E - &1 \ + | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/= .*\)|-idirafter \1|p }') \ +$(shell $(1) $(2) -dM -E - $@ + +.PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o +endif # CONFIG_PERF_BPF_SKEL diff --git a/tools/perf/util/Build b/tools/perf/util/Build index abc9a2926e85..40c258ac99b9 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -442,4 +442,17 @@ $(OUTPUT)%.pylint_log: % =20 perf-util-y +=3D $(PYLINT_TEST_LOGS) =20 - +ifeq ($(CONFIG_PERF_BPF_SKEL),y) +include $(srctree)/tools/perf/bpf_skel.mak + +$(OUTPUT)util/bpf_ftrace.o: $(SKEL_OUT)/func_latency.skel.h +$(OUTPUT)util/bpf-filter.o: $(SKEL_OUT)/sample_filter.skel.h +$(OUTPUT)util/bpf_kwork_top.o: $(SKEL_OUT)/kwork_top.skel.h +$(OUTPUT)util/bpf_off_cpu.o: $(SKEL_OUT)/off_cpu.skel.h +$(OUTPUT)util/bpf-trace-summary.o: $(SKEL_OUT)/syscall_summary.skel.h +$(OUTPUT)util/bpf_counter_cgroup.o: $(SKEL_OUT)/bperf_cgroup.skel.h +$(OUTPUT)util/bpf_trace_augment.o: $(SKEL_OUT)/augmented_raw_syscalls.skel= .h +$(OUTPUT)util/bpf_counter.o: $(SKEL_OUT)/bpf_prog_profiler.skel.h $(SKEL_O= UT)/bperf_leader.skel.h $(SKEL_OUT)/bperf_follower.skel.h +$(OUTPUT)util/bpf_lock_contention.o: $(SKEL_OUT)/lock_contention.skel.h +$(OUTPUT)util/bpf_kwork.o: $(SKEL_OUT)/kwork_trace.skel.h +endif --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.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 4C7C33DE456 for ; Fri, 15 May 2026 17:39:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866756; cv=none; b=eGfhOsgJjQ2qSCytdbiDraCbN/snOPQoThs9MP7KqcogqY8CkEgummQddTThuCrsWfk+RSCGpTw21MXN6b8wUl8LS4pTWCEaTVOdh6w/DgMt1abasTzJOT3Oe3ySlcAleMw9FbXuciACiys9yctqJo9UnEH7/tZk+xPSIAPKQbk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866756; c=relaxed/simple; bh=iX/pomdbV09fUUx5qN/QkCwv4mZZgoReI8KSf6RgqUs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WpWmtg/HpEoKztVZSQQ2jQm3CWMe35LPn4ZOU84ajlCSKGlVtsNw2BIbKoeXe9kGM4PfYERy22vVNMngJ6l3b9DCHSUeuc62ByMmspyjrVJQ1wMvrKwibA3SCnPcdYf5hbCjUgi9+T8ar4X2m0a2FfVc0i6FHSlktPOmCYBdgVI= 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=pQy6d8zB; arc=none smtp.client-ip=74.125.82.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="pQy6d8zB" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ef37c3f773so71096eec.1 for ; Fri, 15 May 2026 10:39:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866753; x=1779471553; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=jfCl4yhDEQPzWh5om3NIawhO9j1SZgFCQ0pogc9oRc0=; b=pQy6d8zBqy/Pfru1Y2VKF6dSANqG/758jopAsDyljB044Wp/OmXA/yMzNoS2QD7Z3n 6GoYsSk1w+exMj7Uf1FXY181OLq8ys715ZgHe1t914F6RtKx69FPTjh4Vk0bdfd+mbRr BmCsZhvYZW7kL9Wg1u54zVGXjRUKMI5CM4sP0MSH7dxCdT3Q91eNKb61enXcr1E76szS CQjLa7C7QCul585Fz6OI87sFT3R0BsFpONxaLFz6r2c4JtZ9FQnMS5kqv8yqh5poHQ0z bPGHRHePElobFfdYpoodBm9rFmpzd7yvx87L+ZNSTtjDWL5EoX+ypQiZzIm9wrPULlzP Bzqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866753; x=1779471553; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jfCl4yhDEQPzWh5om3NIawhO9j1SZgFCQ0pogc9oRc0=; b=X9NsoeTuIwIIMAAouZs+K5bNQRBBWoqBSYlFj4VmAye/BlwzsqIJ0fEpo/sd+DHP3A i5FW57MtHvLbygxS308+xH/1LLZCIz2SFIfWsgAY6ArxSGNKNm/AGsZ54UppbWBajRNq pb/OHnaF02BN3ypumHCxEjxI8+jNyvLp6Zl464ayCn7kfbm/PqEZlncAoENeSsaRhzWw 8DZoRlMqejzMNVWiuIgArWWDu8CzFuwK42RO1ADbjfg1ecvueVCusEPANUtMBPrmOryw zJQ80WOo3thCBK3viNuLt3neQIUN90CEuBigKEg7FKKjbKno2CTX0WHgtnmSXqpUef99 BxxQ== X-Forwarded-Encrypted: i=1; AFNElJ9RcIUal/bfvlyCDhMAR+HiyqpU2Ga3Xh6Js9f5tzuiXodxFXyHT5A2fs4SgibpetQdek1xICc2spg9+KY=@vger.kernel.org X-Gm-Message-State: AOJu0YzJPMGAoXxPSjByBr3APA+eqK/ZK2mK1X+BeXaxOWPDTkOUYW7m faQWImgSvbcG3pZfbiGDwecHIYIzi7KOEJtkkrDB4BBfCUa6jUQCA1X/KOJ1gEB24ixN6W4fJyw kgwr2KtD6AQ== X-Received: from dyw7.prod.google.com ([2002:a05:7300:8807:b0:302:542a:8cad]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:600c:b0:2dd:6937:79d5 with SMTP id 5a478bee46e88-303982b788dmr2341883eec.8.1778866753104; Fri, 15 May 2026 10:39:13 -0700 (PDT) Date: Fri, 15 May 2026 10:38:43 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-7-irogers@google.com> Subject: [PATCH v4 06/14] perf build: Encapsulate vmlinux.h and bpftool in bpf_skel.mak From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, bpftool and vmlinux.h are prerequisites of the top-level prepare target in Makefile.perf. This unnecessarily blocks the massive parallel C compilation of libraries (perf-util, perf-ui, pmu-events) during the initial startup phase. Move all bpftool and vmlinux.h generation rules down into tools/perf/bpf_skel.mak to encapsulate BPF tooling completely within the skeleton framework. Remove them entirely from prepare to unblock immediate parallel build execution. To prevent parallel sub-makes (perf-util and perf-bench) from racing to build shared prerequisites concurrently, while maintaining strict directory encapsulation without top-level inclusions, serialize bench after the util static archive finishes using an order-only prerequisite: $(LIBPERF_BENCH_IN): FORCE prepare | $(LIBPERF_UTIL) Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 2 +- tools/perf/Makefile.perf | 61 +++++--------------------------------- tools/perf/bpf_skel.mak | 47 +++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 06d7a3f9990c..bc1111c88226 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -736,7 +736,7 @@ ifeq ($(BUILD_BPF_SKEL),1) endif =20 ifndef GEN_VMLINUX_H - VMLINUX_H=3D$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h + VMLINUX_H_FILE=3D$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h endif =20 dwarf-post-unwind :=3D 1 diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 373eae7fb72a..ec0e91bedce1 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -274,7 +274,7 @@ ifeq ($(PYLINT),1) PYLINT :=3D $(shell which pylint 2> /dev/null) endif =20 -export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF +export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF READELF export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT =20 include $(srctree)/tools/build/Makefile.include @@ -324,7 +324,7 @@ else FEATURE_DUMP_EXPORT :=3D $(realpath $(FEATURES_DUMP)) endif =20 -export prefix bindir sharedir sysconfdir DESTDIR +export prefix bindir sharedir sysconfdir DESTDIR VMLINUX_H_FILE =20 # sparse is architecture-neutral, which means that we need to tell it # explicitly what architecture to check for. Fix this up for yours.. @@ -556,7 +556,9 @@ $(LIBPMU_EVENTS_IN): FORCE $(LIBPERF) $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 -$(LIBPERF_BENCH_IN): FORCE prepare +# The $(LIBPERF_UTIL) dependency is to ensure bpftool and vmlinux.h +# aren't racily built for bench/bpf_skel/bench_uprobe.bpf.c +$(LIBPERF_BENCH_IN): FORCE prepare | $(LIBPERF_UTIL) $(Q)$(MAKE) $(build)=3Dperf-bench =20 $(LIBPERF_BENCH): $(LIBPERF_BENCH_IN) @@ -911,60 +913,11 @@ $(INSTALL_DOC_TARGETS): python-clean: $(python-clean) =20 -SKEL_OUT :=3D $(abspath $(OUTPUT)util/bpf_skel) -SKEL_TMP_OUT :=3D $(abspath $(SKEL_OUT)/.tmp) - -$(SKEL_TMP_OUT) $(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBS= UBCMD_OUTPUT) $(LIBSYMBOL_OUTPUT): +$(LIBAPI_OUTPUT) $(LIBBPF_OUTPUT) $(LIBPERF_OUTPUT) $(LIBSUBCMD_OUTPUT) $(= LIBSYMBOL_OUTPUT): $(Q)$(MKDIR) -p $@ =20 -ifeq ($(CONFIG_PERF_BPF_SKEL),y) -prepare: $(BPFTOOL) $(SKEL_OUT)/vmlinux.h -BPFTOOL :=3D $(SKEL_TMP_OUT)/bootstrap/bpftool - -$(BPFTOOL): | $(SKEL_TMP_OUT) - $(Q)CFLAGS=3D $(MAKE) -C ../bpf/bpftool \ - OUTPUT=3D$(SKEL_TMP_OUT)/ bootstrap - -# Paths to search for a kernel to generate vmlinux.h from. -VMLINUX_BTF_ELF_PATHS ?=3D $(if $(O),$(O)/vmlinux) \ - $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ - ../../vmlinux \ - /boot/vmlinux-$(shell uname -r) - -# Paths to BTF information. -VMLINUX_BTF_BTF_PATHS ?=3D /sys/kernel/btf/vmlinux - -# Filter out kernels that don't exist or without a BTF section. -VMLINUX_BTF_ELF_ABSPATHS ?=3D $(abspath $(wildcard $(VMLINUX_BTF_ELF_PATHS= ))) -VMLINUX_BTF_PATHS ?=3D $(shell for file in $(VMLINUX_BTF_ELF_ABSPATHS); \ - do \ - if [ -f $$file ] && ($(READELF) -S "$$file" | grep -q .BTF); \ - then \ - echo "$$file"; \ - fi; \ - done) \ - $(wildcard $(VMLINUX_BTF_BTF_PATHS)) - -# Select the first as the source of vmlinux.h. -VMLINUX_BTF ?=3D $(firstword $(VMLINUX_BTF_PATHS)) - -ifeq ($(VMLINUX_H),) - ifeq ($(VMLINUX_BTF),) - $(error Missing bpftool input for generating vmlinux.h) - endif -endif - -$(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) $(VMLINUX_H) -ifeq ($(VMLINUX_H),) - $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ -else - $(Q)cp "$(VMLINUX_H)" $@ -endif - -endif # CONFIG_PERF_BPF_SKEL - bpf-skel-clean: - $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKEL_OUT)/*.skel= .h $(SKEL_OUT)/vmlinux.h $(OUTPUT)bench/bpf_skel/*.skel.h $(OUTPUT)bench/bp= f_skel/.tmp + $(Q)$(MAKE) -f bpf_skel.mak clean =20 pmu-events-clean: ifeq ($(OUTPUT),) diff --git a/tools/perf/bpf_skel.mak b/tools/perf/bpf_skel.mak index aa04d8b3ee07..30924ad140c4 100644 --- a/tools/perf/bpf_skel.mak +++ b/tools/perf/bpf_skel.mak @@ -35,6 +35,47 @@ ifneq ($(WERROR),0) CLANG_OPTIONS +=3D -Werror endif =20 +$(BPFTOOL): + $(Q)mkdir -p $(SKEL_TOOL_TMP_OUT) + $(Q)CFLAGS=3D $(MAKE) -C ../bpf/bpftool OUTPUT=3D$(SKEL_TOOL_TMP_OUT)/ bo= otstrap + +# Paths to search for a kernel to generate vmlinux.h from. +VMLINUX_BTF_ELF_PATHS ?=3D $(if $(O),$(O)/vmlinux) \ + $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ + ../../vmlinux \ + /boot/vmlinux-$(shell uname -r) + +# Paths to BTF information. +VMLINUX_BTF_BTF_PATHS ?=3D /sys/kernel/btf/vmlinux + +# Filter out kernels that don't exist or without a BTF section. +VMLINUX_BTF_ELF_ABSPATHS ?=3D $(abspath $(wildcard $(VMLINUX_BTF_ELF_PATHS= ))) +VMLINUX_BTF_PATHS ?=3D $(shell for file in $(VMLINUX_BTF_ELF_ABSPATHS); \ + do \ + if [ -f $$file ] && ($(READELF) -S "$$file" | grep -q .BTF); \ + then \ + echo "$$file"; \ + fi; \ + done) \ + $(wildcard $(VMLINUX_BTF_BTF_PATHS)) + +# Select the first as the source of vmlinux.h. +VMLINUX_BTF ?=3D $(firstword $(VMLINUX_BTF_PATHS)) + +ifeq ($(VMLINUX_H_FILE),) + ifeq ($(VMLINUX_BTF),) + $(error Missing bpftool input for generating vmlinux.h) + endif +endif + +$(VMLINUX_H): $(VMLINUX_BTF) $(BPFTOOL) $(VMLINUX_H_FILE) + $(call rule_mkdir) +ifeq ($(VMLINUX_H_FILE),) + $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ +else + $(Q)cp "$(VMLINUX_H_FILE)" $@ +endif + # Consolidated Pattern rule for $(dir)/bpf_skel/ $(SKEL_TMP_OUT)/%.bpf.o: $(srctree)/tools/perf/$(dir)/bpf_skel/%.bpf.c $(L= IBBPF) $(VMLINUX_H) $(OUTPUT)PERF-VERSION-FILE util/bpf_skel/perf_version.h $(call rule_mkdir) @@ -51,4 +92,10 @@ $(SKEL_OUT)/%.skel.h: $(SKEL_TMP_OUT)/%.bpf.o $(BPFTOOL) $(Q)$(BPFTOOL) gen skeleton $< > $@ =20 .PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o + endif # CONFIG_PERF_BPF_SKEL + +clean: + $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TOOL_TMP_OUT) $(OUTPUT)benc= h/bpf_skel/.tmp $(SKEL_TOOL_OUT)/*.skel.h $(OUTPUT)bench/bpf_skel/*.skel.h = $(SKEL_TOOL_OUT)/vmlinux.h + +.PHONY: clean --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.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 6E0D33DE44D for ; Fri, 15 May 2026 17:39:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866758; cv=none; b=XRWqkb54nEz4TFgbUAG/l+AHdsi2pUmNnItFi+u/UYfZHRoc4yKoPDP98+9Y3t5VJZX84oq3J6DdXZ4dP7SjTSGarTJQrEab9M+K1qihHEUJzI+T9PMZYBKw+H5hof6Get7FcdpaPePP1PhfBsuoAkX/Rz3o/EPzevZNU23FV28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866758; c=relaxed/simple; bh=+U/Ns4U0n1I6K6DVg25733xbH6/xIUj21YSyt3UqYhY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BFs35ACUN+7oWz4DDNiysWZz8IgmsfuNHL3s4aAhnF5j8G99veD3MhgA0aZMhetY4i0X308TIc4oO2nj+kOjzJdu6dtyUm6mwWYdvlfxdLrKr3/p4HktbbQEaTH04mdKs7wj1jE3O5tLOxjLt0gUMeooFhmrot7JRcmLYJwPxj0= 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=tfWA5TMJ; arc=none smtp.client-ip=74.125.82.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="tfWA5TMJ" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ee5b73c5f2so648726eec.0 for ; Fri, 15 May 2026 10:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866756; x=1779471556; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=MCHaIawCxnCGNrWb/mE/uud5GJuFlh4Rbz9NZTl4E9Y=; b=tfWA5TMJ6FzeJxvetzGn8eUYc84wxYOXYIJdHDucU30rwGNRX2s2TmEEs+sTuNDSc7 whqKR8m+l0Hj/diZoAEMW1XtawV++ICv7XTXsBBdxfLTrvtz9LaaBu1IAWl3mefm6AlU /W5GmhYjkI7C4ZJBRsQly/DJmfQ6Ldm3iZ9iiL5MgtO61MeM5y0/taky+At6dlJg1I9g VjQVVuOoTP5gnhSjpw76E6Z7PDIPwpnlYMaKOkU91Wu+I/VMCx8SVOb+NcxsoIkhBOv5 oX7YnS+cbOv1WOOKfRX2Na7fVQBKSsn/h9J977OqJYBx20kAJNjXOfP3uIQ54mJEcaNh nNdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866756; x=1779471556; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MCHaIawCxnCGNrWb/mE/uud5GJuFlh4Rbz9NZTl4E9Y=; b=lWSUX5AzgDoAzgOLle1TNie4yH3JIiO97f5i/e0wqzRsNphQH74RB7+hw1jSo/yLag xebRqpq0DccIelkVAd5+Ap83m+QR2IoIh3+6+uCCp3/XkS6s9y7/Z0gchCx9ljGAFDCi RdynsX5HfaLKsxoxIK87XJluSAoQOKwOCspBKwHsrjaNI/wydtm9L8MDrwbPJqFNacEE n8gAJzhifAHOmh7SO+GlSAk0wuMVApTRMa9z+v62NDQn+f1EPFWBUHqw4JDpYdVbSg8x vImOzeYhTPSZJ5HTN5btoFgXdn+PeL+erfOcRQfZjnOqSCmLfWPEyq57bARhukWpMZWJ 8aHA== X-Forwarded-Encrypted: i=1; AFNElJ8LnUyyQ2s0IpzycVJtGX47i6qAoIz8XgH1RlEO7NvaA3WEVJvNnANYza/WxY0y1nsj65HOGitTqU5jw5g=@vger.kernel.org X-Gm-Message-State: AOJu0YxUjegwcW23pHOgJGzZt8I6DEDDlDk6vMD3Lz8nSeNd9FX17ppa 63yGxGGbxon/MCYOsy90raSdP5hzE2WzPFnI9dFu4NLLw/moP5zux9QbOcjnWAsD8CGa9TsrTlD IN7bzwgowIA== X-Received: from dybkf34.prod.google.com ([2002:a05:7301:3aa2:b0:2f7:1410:b095]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:6429:b0:2ed:e15:c927 with SMTP id 5a478bee46e88-303986e075amr2730763eec.35.1778866755149; Fri, 15 May 2026 10:39:15 -0700 (PDT) Date: Fri, 15 May 2026 10:38:44 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-8-irogers@google.com> Subject: [PATCH v4 07/14] perf build: Pre-generate BPF skeleton tooling during umbrella prepare phase From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, BPF skeleton generation rules (bpf_skel.mak) are evaluated as part of util/Build. However, because LIBPERF_UTIL_IN explicitly depends on the top-level static libbpf archive, Make completely blocked the execution of bpftool bootstrap and skeleton generation until libbpf finished compiling midway through the build. Since bpftool bootstrap compiles its own independent copy of libbpf.a, it does not depend on the top-level libbpf target. Decouple early skeleton tooling generation by attaching bpf-skel-prepare to the umbrella prepare target, exporting CONFIG_PERF_BPF_SKEL to ensure accurate feature propagation. This allows Make to compile bpftool and dump vmlinux.h in the background at build startup, eliminating the initial sub-make startup bottleneck before BPF object compilation while keeping 100% of tooling rules perfectly encapsulated in bpf_skel.mak. Provide an empty fallback target to ensure builds succeed when BPF skeletons are disabled. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 8 ++++++-- tools/perf/bpf_skel.mak | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index ec0e91bedce1..876065a02de6 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -275,7 +275,7 @@ ifeq ($(PYLINT),1) endif =20 export srctree OUTPUT RM CC CXX RUSTC CLANG LD AR CFLAGS CXXFLAGS RUST_FLA= GS V BISON FLEX AWK LIBBPF READELF -export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT +export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK MYPY PYLINT CONFIG_PERF_= BPF_SKEL =20 include $(srctree)/tools/build/Makefile.include =20 @@ -629,8 +629,12 @@ endif __build-dir =3D $(subst $(OUTPUT),,$(dir $@)) build-dir =3D $(or $(__build-dir),.) =20 +bpf-skel-prepare: + $(Q)$(MAKE) -f bpf_skel.mak bpf-skel-prepare + prepare: $(OUTPUT)PERF-VERSION-FILE \ arm64-sysreg-defs \ + bpf-skel-prepare \ $(LIBAPI) \ $(LIBPERF) \ $(LIBSUBCMD) \ @@ -971,7 +975,7 @@ FORCE: =20 .PHONY: all install clean config-clean strip install-gtk .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_sh= ell -.PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope FORCE prepare +.PHONY: .FORCE-PERF-VERSION-FILE TAGS tags cscope FORCE prepare bpf-skel-p= repare .PHONY: python_perf_target =20 endif # force_fixdep diff --git a/tools/perf/bpf_skel.mak b/tools/perf/bpf_skel.mak index 30924ad140c4..7704e7e635d8 100644 --- a/tools/perf/bpf_skel.mak +++ b/tools/perf/bpf_skel.mak @@ -15,6 +15,10 @@ ifeq ($(CONFIG_PERF_BPF_SKEL),y) BPFTOOL :=3D $(SKEL_TOOL_TMP_OUT)/bootstrap/bpftool VMLINUX_H :=3D $(SKEL_TOOL_OUT)/vmlinux.h =20 +.PHONY: bpf-skel-prepare +bpf-skel-prepare: $(BPFTOOL) $(VMLINUX_H) + @: + define get_sys_includes $(shell $(1) $(2) -v -E - &1 \ | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/= .*\)|-idirafter \1|p }') \ @@ -93,6 +97,10 @@ $(SKEL_OUT)/%.skel.h: $(SKEL_TMP_OUT)/%.bpf.o $(BPFTOOL) =20 .PRECIOUS: $(SKEL_TMP_OUT)/%.bpf.o =20 +else # CONFIG_PERF_BPF_SKEL +.PHONY: bpf-skel-prepare +bpf-skel-prepare: + @: endif # CONFIG_PERF_BPF_SKEL =20 clean: --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 D9E4B3E8347 for ; Fri, 15 May 2026 17:39:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866759; cv=none; b=sPkFwYs17itNOK6+5j1iPKbSRyvIFhecWCjyviVqC/mx8mdIJRJ6Ep8IFE5QlQW11QMONNEoXYO24FW2HihgG0KBDuuBqWql9hiCaXy3OLx9xp8heaqCCG6VlCg1tWdgmzy2X+FhubBmo75pqeqsnwoRVc46fXqvF9FlTx0spjk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866759; c=relaxed/simple; bh=l5QKav5wmqSVNvurZfB75hgd7Q4yiRfMQ7JC8EnR+0M=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ncZa4MrnDTDNLO7cL6gsIXM31b3INDmYPqjqQxM5C5OLxGdCoWWPL9H1+EEphMEx11O3NLqRYPsxynvHeWDtfnJ/1bGADZSYBm94OMygq1a1Xa9lQHTTtJT9kByumCKtN7BV9rVxWfz+woft1OFOF5GDRc+FVtjPyzoRzjatCSg= 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=oU1lW+Ws; arc=none smtp.client-ip=74.125.82.74 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="oU1lW+Ws" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-1353bfdbf99so230857c88.0 for ; Fri, 15 May 2026 10:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866757; x=1779471557; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5Ko4k/zOsIwJVmScnIi9Okmp0zWky5zOptE9t4gyo8w=; b=oU1lW+Ws5YBcwmQ83/HvJl7AXXDCP6vLKZ+Rye6qwmaeEobu5qWrEcPZBM+YghLTzI suMqv2aZTVpIoRavC8dTRXkIga6eI+NvLJgIC4931gEtFJ2f4ZAB8Ev+SNNmQgUxNnX4 vDf8raCz5uSCIsJuujxJmpoMltrNA2VUdxDgiSWfvOuPgDag5oiguDwv2nfAlbLzAIIs 1ku3NAcOPsC5Nr4hP9Uwz8fRQJ0dXRZOBzk2nNMRjJfEi7n8agrnaqn78Pjy1mFzlv9f aGQ9rW0BL+RzAnZuAEe0VYKxTj2uauKIfwXLHk7eZkKAPe+lwcYklWtSJLgbcwBkwDoh WTqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866757; x=1779471557; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5Ko4k/zOsIwJVmScnIi9Okmp0zWky5zOptE9t4gyo8w=; b=Ckf1eNBaV7xJrhZtoaoCxIWFmnaltdsBP9eudFzh3yVvOheOZlEydDDWQ4UVatulhw 431uw0+nvaLWYe7NLbarDwX5mwUDVp/ELgtaGkvqRq3Syn0gd8luuZap6QBjOc4WXo+S gzKZwH4c2fSAKf1jbigIjrQH4JtxNPH+WHHoLijCuYKsrAeQG6/p9qKhEFJtf3JlNh4f nNcL+GgO4I8TWh9fcAX6XQhgCUIuZppPznyOaNAgLL0tXDejYidojJbGRicov5QWTvB8 DalFSqX9CPzcu8N/bKWS7Fkw2H/bPwifcA1Sgw8O6tqLTreW4wmXMhoA91L7c0kxgACV 8QXw== X-Forwarded-Encrypted: i=1; AFNElJ/yzA2yHA0JMQoUu0HyflOuzY3PsNa36OluWTroRyHV+91bMO24d0FZ+odxnxh5vKV7FUMML1loSxtnhw8=@vger.kernel.org X-Gm-Message-State: AOJu0Yzd3Im/3+wL+YN0ePHQKcsV4zwgJDFUiuISzqIpva4UoSZmXUWK 8iUfTDgTaInZ3f5ox8pUCSeBqIYEGNpOcPwO/ceMa+IqprJ0VCg1LNlWUKnHBn/3loVj1v9mfW1 cVTezBBAspw== X-Received: from dlbui2.prod.google.com ([2002:a05:7022:3d02:b0:12a:9ef0:93ed]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:fb09:b0:12a:72af:83d1 with SMTP id a92af1059eb24-135046255femr2542223c88.11.1778866756863; Fri, 15 May 2026 10:39:16 -0700 (PDT) Date: Fri, 15 May 2026 10:38:45 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-9-irogers@google.com> Subject: [PATCH v4 08/14] perf build: Move libsymbol dependency out of prepare step From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The prepare step is a large serialization point before parallel sub-makes build the perf tool. The libsymbol headers are used in the bench and util libraries. Move the libsymbol dependency out of the prepare step and into the dependencies for those targets to avoid it being a source of serialization in the prepare step. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 876065a02de6..96a68723109f 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -558,7 +558,7 @@ $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) =20 # The $(LIBPERF_UTIL) dependency is to ensure bpftool and vmlinux.h # aren't racily built for bench/bpf_skel/bench_uprobe.bpf.c -$(LIBPERF_BENCH_IN): FORCE prepare | $(LIBPERF_UTIL) +$(LIBPERF_BENCH_IN): FORCE prepare $(LIBSYMBOL) | $(LIBPERF_UTIL) $(Q)$(MAKE) $(build)=3Dperf-bench =20 $(LIBPERF_BENCH): $(LIBPERF_BENCH_IN) @@ -576,7 +576,7 @@ $(LIBPERF_UI_IN): FORCE prepare $(LIBPERF_UI): $(LIBPERF_UI_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 -$(LIBPERF_UTIL_IN): FORCE prepare +$(LIBPERF_UTIL_IN): FORCE prepare $(LIBSYMBOL) $(Q)$(MAKE) $(build)=3Dperf-util =20 $(LIBPERF_UTIL): $(LIBPERF_UTIL_IN) @@ -637,8 +637,7 @@ prepare: $(OUTPUT)PERF-VERSION-FILE \ bpf-skel-prepare \ $(LIBAPI) \ $(LIBPERF) \ - $(LIBSUBCMD) \ - $(LIBSYMBOL) + $(LIBSUBCMD) =20 ifdef LIBBPF_STATIC prepare: $(LIBBPF) --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.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 A81B63F39CB for ; Fri, 15 May 2026 17:39:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866761; cv=none; b=LV94huB8ldKhcesXxYwZVm2QYXZGJzj0qquBqxr1OQ9UusWwqSfkvrMmhF+OSpIEgVHfc9nxFmQvpfVCpmUi233BgYoN81st/keGFxOwx2TynIi7dihpDegYB64EnLZoDUk7GbZQybcGDEAnGDLVABY0b6TaMpesk7DCDDIbbZA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866761; c=relaxed/simple; bh=o/K4kgugTGSk6IivctS3woOeRJortswYl5L/8mR0x6I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JQURjU6tzwY+lQjnenwCPajCCVPO+JuuvurujlJOsqBTtvioaUNAEO2K8nlPIpwMFgEb9Guu1374zX6Lj82vDZvfCBHJ/5NN3GjhMsEw0CSDh+khPbpjMcsQEWv/ZCumLBWcr9Gw2xv5K+8TKpenj0ZjM2JhDWRY6q7ihREQ6rY= 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=RjmBQ/nd; arc=none smtp.client-ip=74.125.82.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="RjmBQ/nd" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2f5943ca81aso662203eec.0 for ; Fri, 15 May 2026 10:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866759; x=1779471559; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=mgPMCywWzI9T8eglAxB7fkblHJQb+JFJwFxoaBxPkU8=; b=RjmBQ/ndIcuk0+tP5ypIdpP5yIOXBIVQqXOhnzRrBhmq4O1ZfrtRswnY6snlmC4Y/2 Ug4nnHe1LX6rkFuxQgvU72Tkzm8sGatQeV78KM7mNyvE9a+qYENdE7qRQeoG0a/1jn4C 28MtXQ8Ms9uPNgGFjCs7NuAWf7TOGbXZxLA5wK+beoOFcPY0qWbLiwJ3E23kgLHV53kg bYyJXJ/4N855Hj0Gs/1wJIbusZ4BtHAoI/9E8t2pgG+nOjIRZHEZmQ31+C2EzUw5Z0fk xwdtgg+r+UarP6BC+Qos3BaE39RIVWQCYd9yTX+Cqjn+krAdepVdIn5IvKWS/d6cW31B 9FTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866759; x=1779471559; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mgPMCywWzI9T8eglAxB7fkblHJQb+JFJwFxoaBxPkU8=; b=l8B6w5uPkwIjfVqP9kWPkuczIVp4yYWU8/OUSqXORNhW5nc0qoJJtnENn4SkUhUd0t 1uwR+o23HXTe5kZ+n5SDdn4SMORsxJYbDzaxNWW5lK9y2Y6FeOFiSkeCKMyum2MLLraS 8G+wJXFA26ezVdr3/ml/pYF3rX53LYKLPzf9WeDieJhkUSblBclc+yV/ehs+mcBeiZmJ gDe6mdBMYVCSyHgXIZGuupwGBdRrEHtxlqqAhg/8I6S3r081w2bK9QVodS70Z0vN9h4+ QboQMqbgJQcSpWrbTkQva47meb5+ISqnLWtW2fCS/R8Lr5Y7TvhLn+8Braxmj3QCscfg gFeg== X-Forwarded-Encrypted: i=1; AFNElJ/xHxKIePbpMEh1sqoV95OSH4Z5GsndT8gX/ayQgEi4AJntBuIyAs+ulrnoJzeXvFg33KdjcVQ3hiL3B/o=@vger.kernel.org X-Gm-Message-State: AOJu0Yw60lBRLsEpTX1XX+jsGcn1E2EpjCwE3kD+ri4T8IQdfGkSkUix I/hsT9ymBRbV58EQ98EXEke0wHXMPlHhTriS1ufgQsMNr9dSPNrDwokgu8TMm9D3k79Ucip17lT axVZo3jWc0A== X-Received: from dyek35.prod.google.com ([2002:a05:7300:6423:b0:2e2:26bc:21c2]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:ac90:b0:2ff:9d6b:4f31 with SMTP id 5a478bee46e88-3039812b389mr2310822eec.6.1778866758473; Fri, 15 May 2026 10:39:18 -0700 (PDT) Date: Fri, 15 May 2026 10:38:46 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-10-irogers@google.com> Subject: [PATCH v4 09/14] perf build: Remove redundant libbpf feature check for static builds From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" By default, the perf tool compiles and statically links against its own internal copy of libbpf (tools/lib/bpf/libbpf.a), setting LIBBPF_STATIC=3D1. Despite this static linkage, Makefile.config unconditionally executed $(call feature_check,libbpf), which forced a synchronous sub-make fork during AST parsing to detect dynamic system libbpf libraries. As noted in the internal Makefile comments, this check was executed purely so that running `make VF=3D1` would display the detection status of system libbpf. During standard builds without LIBBPF_DYNAMIC=3D1, the detection result was entirely ignored. Wrap the libbpf feature check inside LIBBPF_DYNAMIC=3D1 so Make avoids the redundant sub-make fork overhead during standard static builds. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index bc1111c88226..fbe7fa83b0bb 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -587,10 +587,8 @@ ifndef NO_LIBELF =20 ifndef NO_LIBBPF ifeq ($(feature-bpf), 1) - # detecting libbpf without LIBBPF_DYNAMIC, so make VF=3D1 shows libb= pf detection status - $(call feature_check,libbpf) - ifdef LIBBPF_DYNAMIC + $(call feature_check,libbpf) ifeq ($(feature-libbpf), 1) EXTLIBS +=3D -lbpf CFLAGS +=3D -DHAVE_LIBBPF_SUPPORT --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (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 7E9EA3F39FD for ; Fri, 15 May 2026 17:39:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866763; cv=none; b=TdPN5Qbkocmar0Vj+Q057cYjTH92a/2auqdRbnChPsWcf8FYXsbj4eTpwBT5IXQyYY/PSHvN99t7s4yHLBb36ul+Gzvp2YaQAdtGHPoutVVAHMCEb6VRvdII3uL+Cw0xCY9Bb8sNEky/sFNrVcuJ8JcxHjYQFdu+UKvfvAQPxAY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866763; c=relaxed/simple; bh=YNZMnwp36O+5m9Gs5CHfzAd/xLtfl/djByV/FzOnEFY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XYmhW48zq1WYbXcc4N0M3PDm+I9eA7IEFN31gaCTpycixAWLLZuz2wi9rO8/vtpMXFdo0nkprDDJ/FVZ0ohtkvSVNeXRTBKzqKu7w/XbT+DqqPE8bpANrWOK/N0EXAxSX5np16dd0Nh5sjtyjzG/9bMnF/Pd0xFHYhhJOvzHpUI= 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=O9UqC8vS; arc=none smtp.client-ip=74.125.82.73 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="O9UqC8vS" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-13537722193so254585c88.0 for ; Fri, 15 May 2026 10:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866761; x=1779471561; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=YuWrkD0BVu1tmlnEr1DinCWOGt+Ctx4gpJp+Vh/5zAI=; b=O9UqC8vS1qWNTIALynOkVF3MjlUWn+yGQrw1yye7CoBZ/fSXg9TjwwjOION0VZ14LG S6QJED3otBxSP7dD3abe0I3pswS2K2sgMSTaTCZp93zyt/wAOx0wWuqx10JQfOY1FvZl 6Tvfv3ngoHPAFw0xeHRgTT2HMJeUYWi8E4e4VaURJXrR05vMZRyUEOTDPCcys6gg5Mw0 9r6XVsEnjNATreOKkwLgzN4as6Un3w0IAwj9uBLtmEfZL/3FjSS4aeZpg9v9QieWBTPL rl9Otkrf5EeuwoX3Ir/Zv/2rNWr+gdW6wBwgCqgbe7ocYjnvJoIAeNm8J+VuDUR5lkM6 CVPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866761; x=1779471561; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YuWrkD0BVu1tmlnEr1DinCWOGt+Ctx4gpJp+Vh/5zAI=; b=KHZewh1XU0wwo37+AZndHQoKCiF0FBCBWD8wVW1G6L6Ed0cckhovz+NhAT8YKYEOMY kVHG853t61K5tn3fdt7GB+TFypeGXe1THcZ7GWWILSJlxIXvN2nVyiIwvKJUftc95ZBz WXgtxzkTGmfppqfpiz++s+7N4j7Uq16+Lq92gxU24Dz4swBLQ4VKS87p982qLh81nKmE OHtxcpdVSiNvl4avxXKowkUtEhDJ6uZBQK7v7H9JFaGz6YEYCOb9PUomGSNvgILOiEuB eiHAEGK1f0FFOjavs3RmnIuSCUIYZq7jGLZAb30zrk9uQHy3WQjFk6OCA/axZ1SgpyVb /nmg== X-Forwarded-Encrypted: i=1; AFNElJ8G/5EuTuRUgVbG4yZbZLNsjO921/0jFq9lB0tmdMkNN82xLP7jyRl1uQcUJaca3UfdkUSssxw+UrFA7Tw=@vger.kernel.org X-Gm-Message-State: AOJu0Yzd3WZo4HWRtk3VFZWPQMfy8L0ibGFE//0rvs4Ak70chA81leTZ JcTFQC9W6NR/MOjy+SDyvneW98DH3UQKRdre6G2JMmWnnnSysGhaWfWoZGrXeU8DYjdm1zlt9fj zDU/L7hVahQ== X-Received: from dlbrl27.prod.google.com ([2002:a05:7022:f51b:b0:134:a84d:d459]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:388a:b0:12d:e126:b7c8 with SMTP id a92af1059eb24-13504416318mr2198425c88.13.1778866760223; Fri, 15 May 2026 10:39:20 -0700 (PDT) Date: Fri, 15 May 2026 10:38:47 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-11-irogers@google.com> Subject: [PATCH v4 10/14] perf pmu-events: Split big_c_string storage into standalone compilation unit From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, jevents.py emits both the massive 2.8 MB big_c_string literal and tens of thousands of compact_pmu_event struct arrays into a single pmu-events.c compilation unit. Compiling this giant file takes ~2.2 seconds on a single CPU core during Kbuild startup. Refactor jevents.py to emit big_c_string into a dedicated pmu-events-string.c compilation unit. This allows Kbuild to compile pmu-events.o and pmu-events-string.o simultaneously in parallel across two separate CPU cores, preserving 100% string deduplication and zero dynamic ELF relocations while cutting C compilation latency in half. Add pmu-events-string.c to tools/perf/.gitignore to ensure in-tree Kbuild runs do not leave untracked generated files in the working directory. To guarantee 100% backward compatibility with GNU Make 4.0+ (avoiding the Make 4.3+ grouped target &: syntax which causes older Make versions like 4.2.1 to spawn multiple concurrent jevents.py processes during parallel builds), implement a robust dependency chaining pattern: $(PMU_EVENTS_C): $(JEVENTS_DEPS) $(PMU_EVENTS_STRING_C): $(PMU_EVENTS_C) @: This ensures jevents.py is invoked exactly once. If jevents.py aborts early, Make's .DELETE_ON_ERROR: purges pmu-events.c, guaranteeing that subsequent Make invocations correctly re-execute the script and overwrite pmu-events-string.c, keeping the build fully self-correcting. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/.gitignore | 1 + tools/perf/Makefile.perf | 4 ++-- tools/perf/pmu-events/Build | 16 +++++++++++++++- tools/perf/pmu-events/jevents.py | 21 +++++++++++++++++---- tools/perf/pmu-events/pmu-events.h | 2 ++ 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/tools/perf/.gitignore b/tools/perf/.gitignore index 0f9451a6e39c..3b968c5158b8 100644 --- a/tools/perf/.gitignore +++ b/tools/perf/.gitignore @@ -38,6 +38,7 @@ arch/*/include/generated/ trace/beauty/generated/ pmu-events/arch/common/common/legacy-cache.json pmu-events/pmu-events.c +pmu-events/pmu-events-string.c pmu-events/jevents pmu-events/metric_test.log pmu-events/empty-pmu-events.log diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 96a68723109f..b8a81c9749a8 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -925,7 +925,7 @@ bpf-skel-clean: pmu-events-clean: ifeq ($(OUTPUT),) $(call QUIET_CLEAN, pmu-events) $(RM) \ - pmu-events/pmu-events.c \ + pmu-events/pmu-events*.c \ pmu-events/metric_test.log \ pmu-events/test-empty-pmu-events.c \ pmu-events/empty-pmu-events.log @@ -933,7 +933,7 @@ ifeq ($(OUTPUT),) -name 'extra-metricgroups.json' -delete else # When an OUTPUT directory is present, clean up the copied pmu-events= /arch directory. $(call QUIET_CLEAN, pmu-events) $(RM) -r $(OUTPUT)pmu-events/arch \ - $(OUTPUT)pmu-events/pmu-events.c \ + $(OUTPUT)pmu-events/pmu-events*.c \ $(OUTPUT)pmu-events/metric_test.log \ $(OUTPUT)pmu-events/test-empty-pmu-events.c \ $(OUTPUT)pmu-events/empty-pmu-events.log diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index dc1df2d57ddc..00ae173cdb5c 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -1,7 +1,12 @@ EMPTY_PMU_EVENTS_C =3D pmu-events/empty-pmu-events.c # pmu-events.c will be generated by jevents.py or copied from EMPTY_PMU_EV= ENTS_C PMU_EVENTS_C =3D $(OUTPUT)pmu-events/pmu-events.c +PMU_EVENTS_STRING_C =3D $(OUTPUT)pmu-events/pmu-events-string.c + pmu-events-y +=3D pmu-events.o +ifneq ($(NO_JEVENTS),1) +pmu-events-y +=3D pmu-events-string.o +endif =20 # pmu-events.c file is generated in the OUTPUT directory so it needs a # separate rule to depend on it properly @@ -9,6 +14,10 @@ $(OUTPUT)pmu-events/pmu-events.o: $(PMU_EVENTS_C) $(call rule_mkdir) $(call if_changed_dep,cc_o_c) =20 +$(OUTPUT)pmu-events/pmu-events-string.o: $(PMU_EVENTS_STRING_C) + $(call rule_mkdir) + $(call if_changed_dep,cc_o_c) + # Message for $(call echo-cmd,cp), possibly remove the src file from # the destination to save space in the build log. quiet_cmd_cp =3D COPY $(patsubst %$<,%,$@) <- $< @@ -118,6 +127,7 @@ CUR_OUT_JSON :=3D $(shell [ -d $(OUT_DIR) ] && find $(O= UT_DIR) -type f) =20 # Things in the OUTPUT directory but shouldn't be there as computed by # OUT_JSON and GEN_JSON. + ORPHAN_FILES :=3D $(filter-out $(OUT_JSON) $(GEN_JSON),$(CUR_OUT_JSON)) =20 # Message for $(call echo-cmd,mkd). There is already a mkdir message @@ -224,6 +234,10 @@ endif # and inputs are dependencies. $(PMU_EVENTS_C): $(JEVENTS_DEPS) $(call rule_mkdir) - $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS= _MODEL) $(OUT_DIR) $@ + $(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS= _MODEL) \ + $(OUT_DIR) $(PMU_EVENTS_C) $(PMU_EVENTS_STRING_C) + +$(PMU_EVENTS_STRING_C): $(PMU_EVENTS_C) + $(Q)test -f $@ || { rm -f $<; $(MAKE) -f $(srctree)/tools/build/Makefile.= build dir=3Dpmu-events obj=3Dpmu-events; } =20 endif # ifeq ($(NO_JEVENTS),1) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 3a1bcdcdc685..6adf4b30e1ba 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -1422,6 +1422,8 @@ such as "arm/cortex-a34".''', ) ap.add_argument( 'output_file', type=3Dargparse.FileType('w', encoding=3D'utf-8'), na= rgs=3D'?', default=3Dsys.stdout) + ap.add_argument( + 'output_string_file', type=3Dargparse.FileType('w', encoding=3D'utf-= 8'), nargs=3D'?', default=3DNone) _args =3D ap.parse_args() =20 _args.output_file.write(f""" @@ -1463,10 +1465,19 @@ struct pmu_table_entry { ftw(arch_path, [], preprocess_one_file) =20 _bcs.compute() - _args.output_file.write('static const char *const big_c_string =3D\n') - for s in _bcs.big_string: - _args.output_file.write(s) - _args.output_file.write(';\n\n') + if not _args.output_string_file: + _args.output_file.write('static const char *const big_c_string =3D\n') + for s in _bcs.big_string: + _args.output_file.write(s) + _args.output_file.write(';\n\n') + else: + _args.output_string_file.write('/* SPDX-License-Identifier: GPL-2.0 */= \n') + _args.output_string_file.write('/* Autogenerated by jevents.py */\n') + _args.output_string_file.write('#include \n') + _args.output_string_file.write('const char big_c_string[] =3D\n') + for s in _bcs.big_string: + _args.output_string_file.write(s) + _args.output_string_file.write(';\n') for arch in archs: arch_path =3D f'{_args.starting_dir}/{arch}' ftw(arch_path, [], process_one_file) @@ -1476,6 +1487,8 @@ struct pmu_table_entry { print_mapping_table(archs) print_system_mapping_table() print_metricgroups() + if _args.output_string_file: + _args.output_string_file.close() =20 if __name__ =3D=3D '__main__': main() diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu= -events.h index d3b24014c6ff..fb4eb5b7ec16 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -141,4 +141,6 @@ int pmu_for_each_sys_metric(pmu_metric_iter_fn fn, void= *data); =20 const char *describe_metricgroup(const char *group); =20 +extern const char big_c_string[]; + #endif --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 7306B3F8EBE for ; Fri, 15 May 2026 17:39:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866767; cv=none; b=eoZ3WvKFpkqqf+tQF/LE7fUmzMGTlV42VE65B5VM/nc2HsHmk/vcQqs7BLvtKUAGU7/5IGdxVzLeHCpHi5YedhrONXuRdHBUpRyfl+eXXWSA0PaP+mwD5J+PeyfkCqxy0gVtKLuweppgSrbiyi7Z02vZfU0wGq8PrpMXIOYPP/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866767; c=relaxed/simple; bh=U58pP/TUmRrk7WCcL0YF9O+OAMrzJoeqkNgvOhKzQbE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ajkZ5QmQIy11fz9Yl0bL+2sMwTqwCw2KY6kPsbv1uECZbkCDXdZkLFAnr3k2bZtSWhSgbtFXCgIQmP2Q0T5rBfEb5xE3OQ8rsDOKtbcfN08cw6hKBbe/gaWo5G1ql0UoBnKAUsNtqp4Rt15b1wO4nx7zCssihK+/HNHt40uqYM8= 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=mXHskHyc; arc=none smtp.client-ip=74.125.82.74 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="mXHskHyc" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-1353bfdbf99so231995c88.0 for ; Fri, 15 May 2026 10:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866763; x=1779471563; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=irFN3XgCmY9gu3BjMAXRUYXhqbzy4e2MoZtkaX0rD38=; b=mXHskHycjSNQBMoJfXr+qWH908oqwHtMjQ5OnMTvVp+6isuESWDjk9U+/YtXl5ZKMH nkuTNO5ODr1hwNLW5ZHW9xv0ts97eZjQOgYAjGpDKMoE3Mhh1hV82x5bLTmAVzjbXpAi hycyomXFwIS+SiFeZ7voEyWHedBME0eZcg6SDRpql4T6cFLqiIbKsfvmg5Z9LPqJPunf WmHOtOqn92h2vXLY4xydclpfnDTaUMs9T3KPxoMSdXZtlSFSwjRBB3FP/ARrSdC/dnhW Vw7Hb947IgnClOAsdmTv2zZloG8X0nh1DXkWS7/pWsUOReuMnaQvqRWoTWOjJ15/MNGx V3tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866763; x=1779471563; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=irFN3XgCmY9gu3BjMAXRUYXhqbzy4e2MoZtkaX0rD38=; b=LQJ7q4AlXDZtLHN1Ot8EnBPg2tCvBLcq3L+wDDeXpbXUYiqF9OLI7IgJ0TuAF4aZYB 9OwaV5tDDd8vBRlU+MzuBlzq8ElN+BL70Q7ELIyGEztTTrJzPEyQyXQf08zjiCLR7EXB YOryc3/NpAM53+kqx59iCzAy6+yiD2G0WjBnhMN/syLuKIbuUMADmUsWu2s2N14wikT3 5lu8rcOMdpGqM/S/QpnlgZq+5w0eJMqRcu8llOJpnT/lGXQbmoIa2wkqXkMrea0uCI10 jdhErpHyWA5A5ah6H1bOKiylq7n7MdxbXjn+fH2awx6zpFxU3J4p+2ILIgxInXvBbkhE l8aw== X-Forwarded-Encrypted: i=1; AFNElJ+EnBm715bOt1wg2eBMJppMM/Aj5xnZOtWS25f0TBaUZ9ITN2InoCZJQu0y6+Qnxkk+EmPaoLyJyTGme1s=@vger.kernel.org X-Gm-Message-State: AOJu0YwQKZhLqVpAy8b5W8OHTfhYKoMlZ8ckdU6WOZnM5MQZErv5A0Q/ RVh5EZzalz6pbxFpEaCFvMBtVZRZwDqk+EdIIepSio/6jfd2f7uLUH3XIxgPKezEAoTayzxcy83 AmBa9+4TO2w== X-Received: from dlea18-n2.prod.google.com ([2002:a05:701b:4212:20b0:12c:211d:3e86]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:2590:b0:130:6936:dcde with SMTP id a92af1059eb24-13504625963mr2532796c88.14.1778866762327; Fri, 15 May 2026 10:39:22 -0700 (PDT) Date: Fri, 15 May 2026 10:38:48 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-12-irogers@google.com> Subject: [PATCH v4 11/14] perf pmu-events: Parallelize JSON and metric pre-computation in jevents.py From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, jevents.py parses hundreds of JSON event and metric files sequentially across all CPU architectures during Kbuild startup, taking ~3.3 seconds of pure single-core execution time. Refactor jevents.py to pre-populate its internal JSON AST cache in parallel across all available CPU cores using ProcessPoolExecutor. Define the worker process initializer _init_worker at the top-level module scope to guarantee flawless pickling and standard event mapping inheritance under spawn multiprocessing semantics (avoiding AttributeError crashes when spawn is used instead of fork). This accelerates jevents.py execution by over 11x (from 3.3s down to ~290ms), fully reclaiming multi-core concurrency during the build generation phase. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 36 ++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.py index 6adf4b30e1ba..ebacb056524f 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -457,8 +457,8 @@ class JsonEvent: return f'{{ { _bcs.offsets[s] } }}, /* {fix_comment(s)} */\n' =20 =20 -@lru_cache(maxsize=3DNone) -def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]: +_json_cache =3D {} +def _read_json_events_impl(path: str, topic: str) -> Sequence[JsonEvent]: """Read json events from the specified file.""" try: events =3D json.load(open(path), object_hook=3DJsonEvent) @@ -474,12 +474,16 @@ def read_json_events(path: str, topic: str) -> Sequen= ce[JsonEvent]: if updates: for event in events: if event.metric_name in updates: - # print(f'Updated {event.metric_name} from\n"{event.metric_expr}"\= n' - # f'to\n"{updates[event.metric_name]}"') event.metric_expr =3D updates[event.metric_name] =20 return events =20 +def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]: + key =3D (path, topic) + if key not in _json_cache: + _json_cache[key] =3D _read_json_events_impl(path, topic) + return _json_cache[key] + def preprocess_arch_std_files(archpath: str) -> None: """Read in all architecture standard events.""" global _arch_std_events @@ -1381,6 +1385,14 @@ const char *describe_metricgroup(const char *group) } """) =20 +def _parallel_read_json_events(task: Tuple[str, str]) -> Tuple[str, str, S= equence[JsonEvent]]: + path, topic =3D task + return path, topic, _read_json_events_impl(path, topic) + +def _init_worker(std_events: dict) -> None: + global _arch_std_events + _arch_std_events =3D std_events + def main() -> None: global _args =20 @@ -1459,9 +1471,25 @@ struct pmu_table_entry { raise IOError(f'Missing architecture directory \'{_args.arch}\'') =20 archs.sort() + import concurrent.futures + tasks =3D [] + def collect_json(parents: Sequence[str], item: os.DirEntry) -> None: + if len(parents) =3D=3D 0: + return + if item.is_file() and item.name.endswith('.json') and not item.name.en= dswith('metricgroups.json'): + tasks.append((item.path, get_topic(item.name))) + for arch in archs: arch_path =3D f'{_args.starting_dir}/{arch}' preprocess_arch_std_files(arch_path) + ftw(arch_path, [], collect_json) + + with concurrent.futures.ProcessPoolExecutor(initializer=3D_init_worker, = initargs=3D(_arch_std_events,)) as executor: + for path, topic, events in executor.map(_parallel_read_json_events, ta= sks): + _json_cache[(path, topic)] =3D events + + for arch in archs: + arch_path =3D f'{_args.starting_dir}/{arch}' ftw(arch_path, [], preprocess_one_file) =20 _bcs.compute() --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (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 C5E463F39FC for ; Fri, 15 May 2026 17:39:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866767; cv=none; b=jaPtpb4VI7l/yHzGMsIat+VvGND8rclWqWmsh/k7QjV2E1U/1Q9MEVd8jnHgH03I1Xuewy5j+FnfOrgJY4WcNzdbO2YQPFmRq2mEqA9Amr99JEs1bP2LVR6g9ybLet7IvdB4PDM0/AFUweUc05LIpPv5vePFjq6TCkEFmo4WoJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866767; c=relaxed/simple; bh=UO8COcfsaqz02sjdD6/7eGxdxivUik5cN2WpzQTquMs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bFt6A/6BgA3s6Nk2y7DKAEwUsB74htDw+fyFieb1TKbVeaWT0qr+73TL2xGryPjRuwMoxwUoOWhIUskVqhMOfMYuaUG3PevmbPhiDTq2WFqJ3fGX7r4PyQEfk197bUDyZ7HA/9R3Aasav3n0G/jSmS/uMcmGHFUiBTbi/+ry4SY= 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=iz3DoYic; arc=none smtp.client-ip=74.125.82.73 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="iz3DoYic" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-13536592ebeso259548c88.0 for ; Fri, 15 May 2026 10:39:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866765; x=1779471565; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=elI3dCv9to9+reTrmH7gWaOOH/Cw1KfhvnnriZ/0VzQ=; b=iz3DoYicMd8gb4mTbQZ6CpfKw02+ghudu9zxGsjY4Wh7S3N5oCAce0fu+bwR2dpBUd yhD/tq+J3BlKtYIas9RR4raE4lkIG1vQH5ZGixAULLNiwNjlia4Y6cB6DMhazYeHCJtn mVEc0uv31H1eycoidZb18IWOpX9gEdn/rAzKMTT33V11ixLqa4PpkwE+zmkZ1d+YSp5q 7dVR8Kb16bl9ezvtlhtWg1OyQLyD2U4597nDhpU3fQqK8CnW+bnhg/NWTBHhGuLBhPMI drwswap8C+6N6+9wbYvXWFBMb813PXgeLDOyqZ64nWqbtZMqOOvD1kHCtnVtnU5VPGZ1 tr4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866765; x=1779471565; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=elI3dCv9to9+reTrmH7gWaOOH/Cw1KfhvnnriZ/0VzQ=; b=CkINtPmATaMx0j9XXEg1AedsXhlSMb1bVdrsdyMOlptv4zbfl4SloFYTl2TaDJZH5h krw/pPjNSJJhKab9P+FntN/8VKaPi5FSt0EWUEX2A0EyT9owASfCxSjLWyj+MeRfjDPz dfKYnqLH/Q273esEi39hrjzE80Fk6R4ATrwcNE7LJIsmyqdZvc5S73lmXd4nSmyNXdpH zKGoElwKuQA9hMT1+BsP54YgQs7L8w0hAsx6MymoccoeLoFOOF/ZlUCcZzbnPa+n6pTr 8a0XcorWktFO/AmFVpQqcMjp10exdt+BSskeYlDQKBi+N7GIQ5rRcAkfeH/QB8FRO9fv +G4A== X-Forwarded-Encrypted: i=1; AFNElJ++Uxu05N4XB7bML3tEybmCIsp6yhYIK9JHS8fdOQIhEV/BFVZYlf68QVFbii0UuPD2URIwftRR0/92OKw=@vger.kernel.org X-Gm-Message-State: AOJu0YyVYEWCdw4fPHycxpbBGMf1XGjyuUc9nYMKyiBuSssJPR4+wj4n AX7FaBdu1m8Ctd98WrM2MgP1LhbPUrTtIHZTxKfW1ZlT/P90WUQnKdamBNUn/vV0AAkaKWv3dlf pmCPb7pgnJA== X-Received: from dlbvg5.prod.google.com ([2002:a05:7022:7f05:b0:134:74a7:dae]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6992:b0:132:83e6:41 with SMTP id a92af1059eb24-13504c5dbb8mr2157263c88.13.1778866764333; Fri, 15 May 2026 10:39:24 -0700 (PDT) Date: Fri, 15 May 2026 10:38:49 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-13-irogers@google.com> Subject: [PATCH v4 12/14] perf build: Prefix SCRIPTS with output directory to fix continuous rebuilds From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In Makefile.perf, ALL_PROGRAMS includes SCRIPTS (perf-archive, perf-iostat). However, unlike PROGRAMS and DLFILTERS, SCRIPTS was not prefixed with $(OUTPUT). During out-of-tree builds (or when O=3D is specified), Make checked for the unprefixed target 'tools/perf/perf-archive'. Since the actual script was installed into $(OUTPUT)perf-archive, Make concluded the target was missing and continuously re-executed the script installation rule on every single incremental build. Prefix SCRIPTS with $(OUTPUT) and update the static pattern rule to ensure Kbuild correctly tracks generated script prerequisites during incremental builds. Tested-by: James Clark Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index b8a81c9749a8..fc92d6ceac5b 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -405,7 +405,7 @@ python-clean :=3D $(call QUIET_CLEAN, python) $(RM) -r = $(PYTHON_EXTBUILD) $(OUTPUT # Use the detected configuration -include $(OUTPUT).config-detected =20 -SCRIPTS =3D $(patsubst %.sh,%,$(SCRIPT_SH)) +SCRIPTS =3D $(addprefix $(OUTPUT),$(patsubst %.sh,%,$(SCRIPT_SH))) =20 PROGRAMS +=3D $(OUTPUT)perf =20 @@ -592,8 +592,8 @@ $(GTK_IN): FORCE prepare $(OUTPUT)libperf-gtk.so: $(GTK_IN) $(PERFLIBS) $(QUIET_LINK)$(CC) -o $@ -shared $(LDFLAGS) $(filter %.o,$^) $(GTK_LIBS) =20 -$(SCRIPTS) : % : %.sh - $(QUIET_GEN)$(INSTALL) '$@.sh' '$(OUTPUT)$@' +$(SCRIPTS) : $(OUTPUT)% : %.sh + $(QUIET_GEN)$(INSTALL) '$<' '$@' =20 $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE $(Q)$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT) --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.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 E1B293FD95D for ; Fri, 15 May 2026 17:39:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866769; cv=none; b=G4gia7O3Fydl3oWHeB3pjRTuBzD4ASlE3fk5qsehdWqdMpfiUIxCytFug2hzOL2ZsIPpGTOpHEJy+QHuN2kSofynr6TyHclgN3MzDMeHZhs2OAZOeLtVaBK5LGneMoi6QZ7Y7bH2dC4ZjJkuTQ0fQcHo0Un3O9/jni2IvInpSQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866769; c=relaxed/simple; bh=d9v/zn7cN98XwEUIkQ6fYLdXscu8Z2OxVtkl8nN1TR0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BH2jV524q+MvsZ660lJ2W2H/ODWLonECr6Ajn1BUFU96PUUn29aYI1pJirz07bbeqbjCUO7HFxCn8cdljbziS5Z4rhoPZaGt/SbFIoPp6LFC+Fk0/VcXQgAOOj6sosHL4pQh8OrLDSha3FS59vOcnv06Sv8qEbxF5NggwWCY7j8= 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=FN7J1Ns0; arc=none smtp.client-ip=74.125.82.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="FN7J1Ns0" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ef37c3f773so71313eec.1 for ; Fri, 15 May 2026 10:39:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866767; x=1779471567; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nlTZqfiM34zuT+HUy2FopVDxuCmyQZqh3GdY28jLLgQ=; b=FN7J1Ns0GvL2nI9nrY5So4hRAbxqAGSEgQmIKkEUg8krTxbZchPpYe2pn47zYDkT6Y VVbe4yK1D00NRtFs5FJt3ljj67HXnDCfmgbDRHUw3d3PeHAuFdYHZVcYizay38ScRJLP 3BCSdOwnbnZUtzRvwmPTLv2PIWCKb/9ZieqSvGGBSj/q+3ya9MyQ/LNUPZjA2XaPsftK pfi9o7pUBue1oDSFCjNMGvnMrvBcibV09qT8kAxzcWQ0LakfUPW7aQzEkPSeUBWBIMz8 mXme4EupSMSLXvshV50N9ZTZUHfj+ke4gh9pXyqbfoOTL6Ip2p75psV0hg9toG71u1EC QEDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866767; x=1779471567; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nlTZqfiM34zuT+HUy2FopVDxuCmyQZqh3GdY28jLLgQ=; b=XTCCOSvPyAKnNlV9i23R6SDduBf85jVagYHzJKDbIPQSSjA8KD+mnVLulheyhfszIL 8ajY2jz2cytbQ35IZsXjQ75yzO8avF4aKrosWj2WjPBbiPMLuBl197LQxhYN/vB0KWdI WjwgHDQ1gglxDbviTxkoVHtw4cMYyLHgOs4l2itv3ZqLgnLKIXlwSIv7T8cNoyjWdFxF unl9a6JwjZhPiONBj6/o3xIrN5ld6mRjSxGooPaj4pWVrG76zUe8//sL2PcIImsgbYWv abBI6HGNsBRVnBsdkokH58ary26nCBW/y7ScOBT12Tu7WBkFCRmBpn/KA3oLk0kYYIj+ k3dg== X-Forwarded-Encrypted: i=1; AFNElJ+3y+Yfo5opTn0CdGZno1c40ecL1qJIEvPMHY5v/IKkHPcMuULvdng7P10dCXaiKwE5gecsbQHIgQWO7Nc=@vger.kernel.org X-Gm-Message-State: AOJu0Yy6N/57wIqB0KspDcKJcqiKjVYpDquaNhYgujS9i8f1A4++pozc 78z3Rz8lS3rIGHp/cm88UkqPgQ6YGU0ZMMh4tYI0g2QJj4/+kftADzs/0AUUt0z59xqbCPdQ/fn SuidPqTCJEg== X-Received: from dybrq18.prod.google.com ([2002:a05:7301:4692:b0:2f9:af7:5047]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:693c:2c97:b0:2d2:d7b7:5c61 with SMTP id 5a478bee46e88-303982bd1afmr2473894eec.14.1778866766407; Fri, 15 May 2026 10:39:26 -0700 (PDT) Date: Fri, 15 May 2026 10:38:50 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-14-irogers@google.com> Subject: [PATCH v4 13/14] perf pmu-events: Convert recursive shell assignments and macros to Make built-ins From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In pmu-events/Build, ZENS, ARMS, and INTELS were assigned using recursive assignment (=3D), and model_name/vendor_name were evaluated using shell macros (echo ... | sed ...). Because these variables were expanded inside the COPY_RULE dependency evaluation loop across hundreds of PMU JSON files and inside every metric generation recipe, Kbuild continuously re-executed 'ls', 'grep', and 'sed' shell forks thousands of times during AST parsing and execution. Convert ZENS, ARMS, and INTELS to simply expanded variables (:=3D) and replace model_name/vendor_name with pure GNU Make string functions. This guarantees Make executes directory probing shell forks exactly once when the Build file is parsed and evaluates path macros purely in memory, completely eliminating over 7,800 redundant sub-processes during build startup. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/pmu-events/Build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build index 00ae173cdb5c..793a549b82e0 100644 --- a/tools/perf/pmu-events/Build +++ b/tools/perf/pmu-events/Build @@ -56,12 +56,12 @@ $(LEGACY_CACHE_JSON): $(LEGACY_CACHE_PY) # Python to generate architectural metrics GEN_METRIC_DEPS :=3D pmu-events/metric.py pmu-events/common_metrics.py # Functions to extract the model from an extra-metrics.json or extra-metri= cgroups.json path. -model_name =3D $(shell echo $(1)|sed -e 's@.\+/\(.*\)/extra-metric.*\.json= @\1@') -vendor_name =3D $(shell echo $(1)|sed -e 's@.\+/\(.*\)/[^/]*/extra-metric.= *\.json@\1@') +model_name =3D $(notdir $(patsubst %/,%,$(dir $(1)))) +vendor_name =3D $(notdir $(patsubst %/,%,$(dir $(patsubst %/,%,$(dir $(1))= )))) =20 ifeq ($(JEVENTS_ARCH),$(filter $(JEVENTS_ARCH),x86 all)) # Generate AMD Json -ZENS =3D $(shell ls -d pmu-events/arch/x86/amdzen*) +ZENS :=3D $(shell ls -d pmu-events/arch/x86/amdzen*) ZEN_METRICS =3D $(foreach x,$(ZENS),$(OUTPUT)$(x)/extra-metrics.json) ZEN_METRICGROUPS =3D $(foreach x,$(ZENS),$(OUTPUT)$(x)/extra-metricgroups.= json) GEN_JSON +=3D $(ZEN_METRICS) $(ZEN_METRICGROUPS) @@ -78,7 +78,7 @@ endif =20 ifeq ($(JEVENTS_ARCH),$(filter $(JEVENTS_ARCH),arm64 all)) # Generate ARM Json -ARMS =3D $(shell ls -d pmu-events/arch/arm64/arm/*|grep -v cmn) +ARMS :=3D $(shell ls -d pmu-events/arch/arm64/arm/*|grep -v cmn) ARM_METRICS =3D $(foreach x,$(ARMS),$(OUTPUT)$(x)/extra-metrics.json) ARM_METRICGROUPS =3D $(foreach x,$(ARMS),$(OUTPUT)$(x)/extra-metricgroups.= json) GEN_JSON +=3D $(ARM_METRICS) $(ARM_METRICGROUPS) @@ -95,7 +95,7 @@ endif =20 ifeq ($(JEVENTS_ARCH),$(filter $(JEVENTS_ARCH),x86 all)) # Generate Intel Json -INTELS =3D $(shell ls -d pmu-events/arch/x86/*|grep -v amdzen|grep -v mapf= ile.csv) +INTELS :=3D $(shell ls -d pmu-events/arch/x86/*|grep -v amdzen|grep -v map= file.csv) INTEL_METRICS =3D $(foreach x,$(INTELS),$(OUTPUT)$(x)/extra-metrics.json) INTEL_METRICGROUPS =3D $(foreach x,$(INTELS),$(OUTPUT)$(x)/extra-metricgro= ups.json) GEN_JSON +=3D $(INTEL_METRICS) $(INTEL_METRICGROUPS) --=20 2.54.0.563.g4f69b47b94-goog From nobody Mon May 25 08:11:41 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 BE64D4EA366 for ; Fri, 15 May 2026 17:39:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866771; cv=none; b=finKkNMPqaOoctDpDJ2X9hI2jozCKQgeYIffAqjYvG8yY4thDkEZSB6snGjVHjXLpvsFKzx9K6VZxBRteCIDZbps9C8DMDGhqcmpMRWAyevBOHBHihmpFHhqV6ylHVPtRXGdFYCse/phMGU0cholcmD+c6r9DciEBwaWG9Aoi3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778866771; c=relaxed/simple; bh=KgYhLbj+7JbYPwwwjNkDDjdOGe6Kx8xfZHNose5DOpk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nyCl1e67EqjU4D/fujrGC1n31GtaTDrOmTYIURMz+sdiNX69SUNwwA0zWs0PgK2Gn46PdOK+9o5YuyOi4I0CXHA0beqbxd3z274GBOBBUAbnOc0H5Uoy1q18AVUvz1b27Db+BKpjK55c+ZZ66AwPH59pTKUbjBzwBvvOYzjRKYg= 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=viYLInzO; arc=none smtp.client-ip=74.125.82.74 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="viYLInzO" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-13509e2e47bso1499c88.1 for ; Fri, 15 May 2026 10:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778866769; x=1779471569; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=a7UhuB240zbvecKzTnCZgue1l2Usf38vhdVC8tHlI64=; b=viYLInzOqOsDx2euBxu5WfpxoDI09RTrF9JDDtIWRAmXuRESZf4jHUkBMRuvi0W9KH X+9U+8VCmDvgz292OUCeqbKoex529fmpqhEhT98dEllRZv12ZgJvCeonvJcJpmWH1RzP kclOC138iu5NABkn867TT35Zr6AwzNcIYbSgXwIvWK9t0p4VcNSH0iZOWppBeuXatSE9 AYuzP/qjK6alH9Bei06gEqSiPEoNqRWP0LoIqDWJH7ruZ39F/o8TLsX6k2aSjP3m+1Un hhaFcISrMVgZ3EUZYNUWG+B193jGl+VgXhT8+0dDHHFpAiB1R15ExMDfaIj1QTqd4t/X +Tug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778866769; x=1779471569; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=a7UhuB240zbvecKzTnCZgue1l2Usf38vhdVC8tHlI64=; b=PS7XwewOzS6OKYg4q/uKd24ShzFrZ4f4HzqYg9vNeusRsVitEvp7Ot500XjFch7AvU 9JG5anDd9bu0iXWFpUOrHnzd4byjM9zifQ/wLbwE1Jsvk+gask1VAis0236onmHWWu4V JUGIChfOO1OiJ+7i0kn7xdP+zZCOzptxJ2fY5OlU+E8mN2aY1IFIqLCgPeL72tsQxkkG E/FHRbuAjcc83WaSIj0YU5FAaHYxPfbArW5QmgkqfuqA6EHL/0HVIgVIOp5FEAv4zg6/ nzsWloWfeE+BhENMVICiyWDFM7guvH8rJZxuxWF/+qpkuxhU4+E3RL9ttp/Uim0wFFDd 6trA== X-Forwarded-Encrypted: i=1; AFNElJ9YA623kqpL1cuNL4SBulQPUYmiWetkwMQH77NgWBmGERpo09g4ARpSyElxKCLM0W2g2o9o0yqA2YsOPGw=@vger.kernel.org X-Gm-Message-State: AOJu0YzuJdcZt7ZJsJ1brQB6GvLTh53W1oitlSH6ILnkxymzkOefz60c yEVybBJaZpRAm6TFWF829pUY7Jnk6eAOG+vsXV9RxE9kdUCsZXF2TSDftMuVVGBT3+JsPV6nU7m rclUmMJn8NQ== X-Received: from dlww12.prod.google.com ([2002:a05:7022:ea2c:b0:135:243d:296b]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:307:b0:134:fc89:367c with SMTP id a92af1059eb24-13504c54b7dmr2057801c88.7.1778866768574; Fri, 15 May 2026 10:39:28 -0700 (PDT) Date: Fri, 15 May 2026 10:38:51 -0700 In-Reply-To: <20260515173852.1378571-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515173852.1378571-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515173852.1378571-15-irogers@google.com> Subject: [PATCH v4 14/14] perf build: Convert llvm-config shell queries to simply expanded variables From: Ian Rogers To: irogers@google.com, acme@kernel.org, james.clark@linaro.org, namhyung@kernel.org Cc: 9erthalion6@gmail.com, adrian.hunter@intel.com, alex@ghiti.fr, alexandre.chartre@oracle.com, andrii@kernel.org, ankur.a.arora@oracle.com, aou@eecs.berkeley.edu, bpf@vger.kernel.org, collin.funk1@gmail.com, costa.shul@redhat.com, daniel@iogearbox.net, dapeng1.mi@linux.intel.com, dsterba@suse.com, eddyz87@gmail.com, howardchu95@gmail.com, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, martin.lau@linux.dev, memxor@gmail.com, mingo@redhat.com, mmayer@broadcom.com, nathan@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, qmo@kernel.org, ricky.ringler@proton.me, song@kernel.org, swapnil.sapkal@amd.com, terrelln@fb.com, tglozar@redhat.com, thomas.falcon@intel.com, yonghong.song@linux.dev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In Makefile.config, CFLAGS, CXXFLAGS, LIBLLVM, and EXTLIBS were assigned using recursive expansion or appended with raw $(shell $(LLVM_CONFIG) ...) calls. Because these variables were expanded during dependency evaluation across every single object file compilation rule, Kbuild continuously re-executed llvm-config forks nearly 200 times during incremental builds. Convert llvm-config shell queries to simply expanded variables (:=3D) to ensure Make evaluates LLVM compiler flags and library paths exactly once when Makefile.config is parsed, eliminating ~185 redundant sub-processes during build startup. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index fbe7fa83b0bb..7a61da082c0b 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -951,11 +951,14 @@ ifndef NO_LIBLLVM $(call feature_check,llvm-perf) ifeq ($(feature-llvm-perf), 1) CFLAGS +=3D -DHAVE_LIBLLVM_SUPPORT - CFLAGS +=3D $(shell $(LLVM_CONFIG) --cflags) - CXXFLAGS +=3D -DHAVE_LIBLLVM_SUPPORT - CXXFLAGS +=3D $(shell $(LLVM_CONFIG) --cxxflags) - LIBLLVM =3D $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) = --system-libs) - EXTLIBS +=3D -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM) + LLVM_CFLAGS :=3D $(shell $(LLVM_CONFIG) --cflags 2>/dev/null) + LLVM_CXXFLAGS :=3D $(shell $(LLVM_CONFIG) --cxxflags 2>/dev/null) + LLVM_LIBLLVM :=3D $(shell $(LLVM_CONFIG) --libs all 2>/dev/null) $(she= ll $(LLVM_CONFIG) --system-libs 2>/dev/null) + LLVM_LIBDIR :=3D $(shell $(LLVM_CONFIG) --libdir 2>/dev/null) + CFLAGS +=3D $(LLVM_CFLAGS) + CXXFLAGS +=3D -DHAVE_LIBLLVM_SUPPORT $(LLVM_CXXFLAGS) + LIBLLVM :=3D $(LLVM_LIBLLVM) + EXTLIBS +=3D -L$(LLVM_LIBDIR) $(LIBLLVM) EXTLIBS +=3D -lstdc++ $(call detected,CONFIG_LIBLLVM) else --=20 2.54.0.563.g4f69b47b94-goog