From nobody Wed Dec 17 20:58:44 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A172217C7D8 for ; Tue, 25 Jun 2024 18:42:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340956; cv=none; b=q+UeVZsVGjvQcwQqd9Sp8fimTFzDOwHcpBC9rPIWBpQvL0dBKbCKG/RzaZ8qrXIN5Lzz9sATpj6wWVbzMT7IKuwyQw+ChJ95snGsQjPz0e9oz7E831YPM/IdgWQJodfiyK0WYzvZwNhOE+WTT7sT+NV1JBasQP+s4tZN3xMS3AI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340956; c=relaxed/simple; bh=AGF2g3tEA7zbe6kDn2NaGFb8pt75qgtrYCw6tl/k2BE=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=HB6OiRwysqHgdLweY+cjheTh1xBT47N+3Oa9F9tX+YMwbvAgaE2o9QzhwpABQ8O6SKsaybDVoFmmf4Wrk9vy0mEqIDVNc+wRDd7x/OWYNfF9Du9N6xr0Pw6QhfaMwTdGrvcSWaVQyo+5EG5q/Thhxld2AewUZ499L7hy5GQTxx4= 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=DBRBNvDP; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DBRBNvDP" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-62f43c95de4so133674467b3.3 for ; Tue, 25 Jun 2024 11:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719340954; x=1719945754; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=VV5nTHz7JpmXL00HnuBhzQFlSeI21ZYNHe64ER+6Mts=; b=DBRBNvDPUtW1x6hXMhBWdqkw+AkD5Gxc58tkSZVWV/9aE8rIPzK3GlYWsJwY4pfkwA Dw21+60h4fz7fel3hZfDqQBW8xh+6H4xIemophdwHoawncML1u6u5t6WV8dZTtBg4jDa NeEuGj/+N1juS0TrzeztK/cnvQ4J68q8mEOAsY410G7UuQmWU4TBUGCtfWw5iXJzrs0j FnFImnJ2GiXZbmmbH9x3dpTS1aslvJRh1t/cwCK5gmn3N+7STslMdShtT8bPcl79Xt3P /wSnaU4otGPsxGVCcSxppVL3hQJC8IdFDuT6CifXr1H5bkZB8dWY3THqE3V3+VajArTm yzZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719340954; x=1719945754; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VV5nTHz7JpmXL00HnuBhzQFlSeI21ZYNHe64ER+6Mts=; b=xTk36PK45nqcG76Fv8Fo1tg3jjl7ttuDUsq09NjeoNe57f0Aep4oRKDyUbzgSv2lXc uMcxCk+xQxl//YZfic9yd0HHEmEyCdNDVypW4bFCdKaIsl/kpPIBOnGi/wwYS+uDZU35 jqlea198dA+sLaSZ76XhiYycfs5+52QOhyU85d2QISWZ/mlxhxpx/qpC7hlxO3qEXHLk Acb/nkldm0gIFmCD+k66T/sGrjL/5C3ioCpNhtQj9Zs1OQYvLvG0HOEhftW4C4Mpgu+V Qt50k31IpYbd2xBF9IqMa/eshulIGSPtBjDrTseN+LCTK+H9m0bbmY74JEmq+X5LXIDk c7Rw== X-Forwarded-Encrypted: i=1; AJvYcCUDIzx5SiBQnIldx42EVkwWHkZwTXafOom5Lbg1xSLQaRhzODSlMxrNWjKHPIVJbul6IoJZxxjo6Mg1+9YlfbwU6YtYhFcDyizWaGqc X-Gm-Message-State: AOJu0YzjxU5l5xhvA/Ec0ssjqDbMnKUFCm3Yn/qg24mh6am+DIfwl2j1 4Km8Qcy9PNXtM1qOdId2L0AFc7y55XyWmXBlnflfYFc0fKkf0A9EqX0YIckOgUs2qS3pnVfm4qK ZtKgAzQ== X-Google-Smtp-Source: AGHT+IErVDS4+BQzyqM0Y2ip5PBZLqG9tNZcT6fn1gaXhPTz07VhyD+wZQTwxXPfyoMPvV6/dX+SSWlNQ9BM X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:690c:6201:b0:627:de8e:736d with SMTP id 00721157ae682-6429c6dcf86mr302617b3.6.1719340953696; Tue, 25 Jun 2024 11:42:33 -0700 (PDT) Date: Tue, 25 Jun 2024 11:42:18 -0700 In-Reply-To: <20240625184224.929018-1-irogers@google.com> Message-Id: <20240625184224.929018-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625184224.929018-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v4 1/7] perf build: Add '*.a' to clean targets From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Andrei Vagin , Kees Cook , Oliver Upton , Ze Gao , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix some excessively long lines by deploying '\'. Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 5c35c0d89306..acc41a6717db 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -1201,12 +1201,19 @@ endif # CONFIG_PERF_BPF_SKEL bpf-skel-clean: $(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS) $(SKE= L_OUT)/vmlinux.h =20 -clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-cl= ean $(LIBPERF)-clean arm64-sysreg-defs-clean fixdep-clean python-clean bpf-= skel-clean tests-coresight-targets-clean - $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive = $(OUTPUT)perf-iostat $(LANG_BINDINGS) - $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete= -o -name '\.*.d' -delete -o -name '*.shellcheck_log' -delete +clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-cl= ean $(LIBPERF)-clean \ + arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean \ + tests-coresight-targets-clean + $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive \ + $(OUTPUT)perf-iostat $(LANG_BINDINGS) + $(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '*.a' -delete -o \ + -name '\.*.cmd' -delete -o -name '\.*.d' -delete -o -name '*.shellcheck_= log' -delete $(Q)$(RM) $(OUTPUT).config-detected - $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso= 32 perf-read-vdsox32 $(OUTPUT)$(LIBJVMTI).so - $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo= $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTP= UT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \ + $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso= 32 \ + perf-read-vdsox32 $(OUTPUT)$(LIBJVMTI).so + $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo= \ + $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE \ + $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \ $(OUTPUT)util/intel-pt-decoder/inat-tables.c \ $(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c \ $(OUTPUT)pmu-events/pmu-events.c \ --=20 2.45.2.741.gdbec12cfda-goog From nobody Wed Dec 17 20:58:44 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E991517CA0C for ; Tue, 25 Jun 2024 18:42:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340958; cv=none; b=sVUgt90u8kkbhG3O8HRlCw/9zxfekEoMFF2EoyUSQnmxd6YD1H2f+VBt6jflZkLmBxThSbpRaeXLgfZniUQDYn2wXfutJVbzHubII919Cs2nAKQYVkKdDdC9pzebms2tnZJdrPSNE405xDbE5PIzLtKbtefp8pPDcWXCMyu9ta0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340958; c=relaxed/simple; bh=XCcoFDUSO68+IaAjxY0zcTXTu1PIqW7TvqckZysWY14=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=QvMZ2Ld2wS5Ie52YprGQ27HMYgJjnMxLennfiW2g3yaiOhUSL3AOuYa5zNSaG54TECKKQCFET81Np4QLwBUG4Xejqm9FObuz+0ta+41jrqGfiOYRZObMiH+ncrtcv6Wn2YqnaQgKGTnMhR+B5p0Osj9Z8T/i9UhZBRc0KzdJSKc= 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=S+OSqN1j; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="S+OSqN1j" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-64501d163b4so58368337b3.1 for ; Tue, 25 Jun 2024 11:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719340956; x=1719945756; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=nNKhk3i6ZR127Ku5IVQOBYSjQPa/zZMsU20LfXii9LU=; b=S+OSqN1j/qvLashEyPjdZQmX6vF2cMZQLGy60cP6tIa/Dh/F9fzmujZAiAi2XlFatY gRoV0AGob/tLQXN9ZHSFfsCtpPejfiNqWlFa+PYLVB7WsW9qktApwN2+JncHgfPlZULV RPW92UXJk6TqagseLh5qW3cwTmN8PpwWrrkJjiG+habfNLmLzVlM8WpzXA8/uBO5ffI/ +3P8knhTcPryVAYvAVVatDBz+5EGinLM9egAoFW04XZQC4k9pb7U0i+wwHXXa3CP2cw5 5OuCfF6vtzEiCSEUlPoMA6c9ckEPGsHaDwmWXzyHWd/fXiE+4l80LtKf6oXDXRoIZQwj r38w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719340956; x=1719945756; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nNKhk3i6ZR127Ku5IVQOBYSjQPa/zZMsU20LfXii9LU=; b=vV185WuAJNiGi33kFA9JcZXr7E96RnYNBT1Azc5/9CPEEwIKBJEWuY/h2C9jsRmVJJ /S3XhHkJPQg8Preo+VcaHHwYf3WiR3FJmKiwrgbJxJpaNLVHB7EsmIAhfwis1GoF2nVD 16rZ53UNNmcBr9gI8Nufb1v1Jla7IAmxGL4skwXVycYdnrS52uL8u69W1+3RUl4dSuSU 1Vtp3gVg/ks3NQJ6vL0r7e8U3kIUYBUPBtHCkTmEIKEe6CN4T85/KzbYdkX5URgbjWPw z2ev+T6HNMjAq6FKCTIbwi5a3+evGDl7jLz7giDu5MBNBKsdqjBVkQgki2zBQWAtNo// f6PA== X-Forwarded-Encrypted: i=1; AJvYcCVIIbRqRUjqySKLzNofwffkx20Rb3e8Y1IN6i6mbLmROnQNroT8Z75x5ggQ4Wq6yrWc5EQObS3bAqVPm8nCx7+YDrH9EPzbZgbKhp57 X-Gm-Message-State: AOJu0Yy2wM+Vryu7Fvfsw3glxykauyMi8XhSi2nmTsXYeysVyIXrYS6B AJjkLl4FCYVfkLqi4M2Jbc6TwDTptx7O96jbrmz7enWfWOCikTcc4XYwigQk0zvGuwesvucP950 jzTMVEQ== X-Google-Smtp-Source: AGHT+IE2knK+SqiP/3MRcV2ZoKoDhmC7Z51zU81w59tOSVa7+OtakO9/inMolJXvN6wS2iet4Qv6IJqkT1eX X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:690c:6f08:b0:62a:2a39:ccd9 with SMTP id 00721157ae682-643ad9aa0bfmr5402067b3.6.1719340955895; Tue, 25 Jun 2024 11:42:35 -0700 (PDT) Date: Tue, 25 Jun 2024 11:42:19 -0700 In-Reply-To: <20240625184224.929018-1-irogers@google.com> Message-Id: <20240625184224.929018-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625184224.929018-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v4 2/7] perf ui: Make ui its own library From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Andrei Vagin , Kees Cook , Oliver Upton , Ze Gao , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the ui code its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 2 +- tools/perf/Makefile.perf | 10 ++++++++++ tools/perf/ui/Build | 18 +++++++++--------- tools/perf/ui/browsers/Build | 14 +++++++------- tools/perf/ui/tui/Build | 8 ++++---- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index b0cb7ad8e6ac..16ed1357202b 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -55,7 +55,7 @@ CFLAGS_builtin-report.o +=3D -DDOCDIR=3D"BUILD_STR($(s= rcdir_SQ)/Documentation)" =20 perf-y +=3D util/ perf-y +=3D arch/ -perf-y +=3D ui/ +perf-ui-y +=3D ui/ perf-y +=3D scripts/ =20 gtk-y +=3D ui/gtk/ diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index acc41a6717db..c5a027381c55 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -425,10 +425,14 @@ endif =20 export PERL_PATH =20 +LIBPERF_UI_IN :=3D $(OUTPUT)perf-ui-in.o +LIBPERF_UI :=3D $(OUTPUT)libperf-ui.a + PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYMBOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif +PERFLIBS +=3D $(LIBPERF_UI) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -729,6 +733,12 @@ $(PERF_IN): prepare FORCE $(PMU_EVENTS_IN): FORCE prepare $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=3Dpmu-events obj= =3Dpmu-events =20 +$(LIBPERF_UI_IN): FORCE prepare + $(Q)$(MAKE) $(build)=3Dperf-ui + +$(LIBPERF_UI): $(LIBPERF_UI_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \ $(PERF_IN) $(PMU_EVENTS_IN) $(LIBS) -o $@ diff --git a/tools/perf/ui/Build b/tools/perf/ui/Build index 6b6d7143a37b..d2ecd9290600 100644 --- a/tools/perf/ui/Build +++ b/tools/perf/ui/Build @@ -1,12 +1,12 @@ -perf-y +=3D setup.o -perf-y +=3D helpline.o -perf-y +=3D progress.o -perf-y +=3D util.o -perf-y +=3D hist.o -perf-y +=3D stdio/hist.o +perf-ui-y +=3D setup.o +perf-ui-y +=3D helpline.o +perf-ui-y +=3D progress.o +perf-ui-y +=3D util.o +perf-ui-y +=3D hist.o +perf-ui-y +=3D stdio/hist.o =20 CFLAGS_setup.o +=3D -DLIBDIR=3D"BUILD_STR($(LIBDIR))" =20 -perf-$(CONFIG_SLANG) +=3D browser.o -perf-$(CONFIG_SLANG) +=3D browsers/ -perf-$(CONFIG_SLANG) +=3D tui/ +perf-ui-$(CONFIG_SLANG) +=3D browser.o +perf-ui-$(CONFIG_SLANG) +=3D browsers/ +perf-ui-$(CONFIG_SLANG) +=3D tui/ diff --git a/tools/perf/ui/browsers/Build b/tools/perf/ui/browsers/Build index 2608b5da3167..a07489e44765 100644 --- a/tools/perf/ui/browsers/Build +++ b/tools/perf/ui/browsers/Build @@ -1,7 +1,7 @@ -perf-y +=3D annotate.o -perf-y +=3D annotate-data.o -perf-y +=3D hists.o -perf-y +=3D map.o -perf-y +=3D scripts.o -perf-y +=3D header.o -perf-y +=3D res_sample.o +perf-ui-y +=3D annotate.o +perf-ui-y +=3D annotate-data.o +perf-ui-y +=3D hists.o +perf-ui-y +=3D map.o +perf-ui-y +=3D scripts.o +perf-ui-y +=3D header.o +perf-ui-y +=3D res_sample.o diff --git a/tools/perf/ui/tui/Build b/tools/perf/ui/tui/Build index f916df33a1a7..2ac058ad1a61 100644 --- a/tools/perf/ui/tui/Build +++ b/tools/perf/ui/tui/Build @@ -1,4 +1,4 @@ -perf-y +=3D setup.o -perf-y +=3D util.o -perf-y +=3D helpline.o -perf-y +=3D progress.o +perf-ui-y +=3D setup.o +perf-ui-y +=3D util.o +perf-ui-y +=3D helpline.o +perf-ui-y +=3D progress.o --=20 2.45.2.741.gdbec12cfda-goog From nobody Wed Dec 17 20:58:44 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61E9817D357 for ; Tue, 25 Jun 2024 18:42:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340960; cv=none; b=Yp0X8yBDkEW+Kx5Sad09V2n48ZgMjsyK/oHlAAo2QQiZl4WS9DaffPCdWTCwnYuMlNul2tLLyfHln7bf8zFxaIRLu09nKqLEfDJgXH1/V4Um3uxO16GjCtNBhuAu7BKNxxtIK/2k0BvGRYIbS5gWsOVmqzNpZcPDALLghCg4P4Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340960; c=relaxed/simple; bh=bwtLI3Jcufku622sK4AUh1VaGsI4g/AsTLwYxdou9H8=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=fuPi+OPlPhHROXeXKh2uzLrHEEXbzrcFvcYqUi8BwzSNdaVbs/1RvWPpIFtPpEvLR+Ph9nl7kWH2ZbNKCMmAQt8XRFy4xwEkHDd9hR4A4w1wqIOXM8vywuJMS/6Vi9lC/AzfJecEjZNImB3C0+EM3mpb2aLMR4oh5YU+eM3YuF4= 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=4KUxqcKg; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="4KUxqcKg" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-645180f6a74so52516377b3.1 for ; Tue, 25 Jun 2024 11:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719340958; x=1719945758; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=9jtxp0mR0wazQJ0QHy8snlQ9f7IXPyviJrJGWoRkeF4=; b=4KUxqcKg6P4bcyAUdySNkAnS0ZUAAQDTNrXANSl3XTdjkTrs0EKnsuS3Y+Saa/R530 YvMfsMQI0ESj5rKaovQDEUw2G/W6Xz2E2qHaYi511oVPwas38qgtdv4uTSZlk992IZqK difuMWbkx0lmMsgV51heggiFZZojW2GSO4nRXqVTjBtgtun+5AftnWXSDEZnIYL7j0G/ 9SEkPB25qpnh1kHcLUJKcucnuFvKDgNt8w6ASyDVRLXSq8KEdwoNDvhx4c/QCE4ni57Z IjldeaEVvPO+/60mdMZgQqsqXmcQ8KBZ/WBCNOATD81y12Cx6bNWYzOYVa42FP8uHeMq tGMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719340958; x=1719945758; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9jtxp0mR0wazQJ0QHy8snlQ9f7IXPyviJrJGWoRkeF4=; b=rtwRLjjER2D2Y4k5KqBc2UoNSgz6RNnutT+6zOWMljfdFyCz7ex5g2Xe6rNB9YgW3/ KqIXf2uzckTlWmoZXkfQTHrmCbee4DaXz98pEZossTb0QuxVQ/J78RrgqSdKLSq4tY9t HIGdDxCtVIDsPP85GMM1dLANLuY9E/1QUpi8YB5nJPOJku5ev4333TjBQM5po00zACqw eogVpf0XAwwE0A2rR5DD+jXbS+2gesJRoVZtMFFSO4v3dftORZfV08EXstZExWwNgCJ3 XDLI4UPEOaA/UrnEEDNBCJdnHOw+IgdKgyoOO/ILIrvpAO+Xe3RAw+bSt3f4ccdPAImj IyjQ== X-Forwarded-Encrypted: i=1; AJvYcCXaHa4HFMFx3yflMnwADKNHYWuxNo6abwRBW+mPuNFENg4VDAWCvFvI0fqoWw31HVscmjRAPpibojMNerZeO5YDnBb8dw3ZmId/yYCT X-Gm-Message-State: AOJu0YzpLHzXLIT5dEFV4VjZ7xNaTuCMdbYsQ2iGUPBpHm/IYCYjIdhI vCa59Suw6J24y8XUgcjZxiM2vEKMkCnsdtcCkAxfW8/AApN42ScewgY06ehqKFwzVuUak2jyxr2 aXUX42w== X-Google-Smtp-Source: AGHT+IGjuQZsjVspt/MHABb4YY4H60Ya3QAHqJAi+cDbppR5HkDLLag+kmSJL3BP67+xNJsE1rfFPw/a/cKu X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:6902:1205:b0:dfa:8ed1:8f1b with SMTP id 3f1490d57ef6-e0303fd438amr464660276.1.1719340958246; Tue, 25 Jun 2024 11:42:38 -0700 (PDT) Date: Tue, 25 Jun 2024 11:42:20 -0700 In-Reply-To: <20240625184224.929018-1-irogers@google.com> Message-Id: <20240625184224.929018-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625184224.929018-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v4 3/7] perf pmu-events: Make pmu-events a library From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Andrei Vagin , Kees Cook , Oliver Upton , Ze Gao , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make pmu-events into a library so it may be linked against things like the python module and not built from source. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.perf | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index c5a027381c55..9640c6ae1837 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -428,11 +428,14 @@ export PERL_PATH LIBPERF_UI_IN :=3D $(OUTPUT)perf-ui-in.o LIBPERF_UI :=3D $(OUTPUT)libperf-ui.a =20 +LIBPMU_EVENTS_IN :=3D $(OUTPUT)pmu-events/pmu-events-in.o +LIBPMU_EVENTS :=3D $(OUTPUT)libpmu-events.a + PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYMBOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif -PERFLIBS +=3D $(LIBPERF_UI) +PERFLIBS +=3D $(LIBPERF_UI) $(LIBPMU_EVENTS) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -721,8 +724,6 @@ strip: $(PROGRAMS) $(OUTPUT)perf $(STRIP) $(STRIP_OPTS) $(PROGRAMS) $(OUTPUT)perf =20 PERF_IN :=3D $(OUTPUT)perf-in.o - -PMU_EVENTS_IN :=3D $(OUTPUT)pmu-events/pmu-events-in.o export NO_JEVENTS =20 build :=3D -f $(srctree)/tools/build/Makefile.build dir=3D. obj @@ -730,18 +731,21 @@ build :=3D -f $(srctree)/tools/build/Makefile.build d= ir=3D. obj $(PERF_IN): prepare FORCE $(Q)$(MAKE) $(build)=3Dperf =20 -$(PMU_EVENTS_IN): FORCE prepare +$(LIBPMU_EVENTS_IN): FORCE prepare $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=3Dpmu-events obj= =3Dpmu-events =20 +$(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(LIBPERF_UI_IN): FORCE prepare $(Q)$(MAKE) $(build)=3Dperf-ui =20 $(LIBPERF_UI): $(LIBPERF_UI_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 -$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN) +$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \ - $(PERF_IN) $(PMU_EVENTS_IN) $(LIBS) -o $@ + $(PERF_IN) $(LIBS) -o $@ =20 $(GTK_IN): FORCE prepare $(Q)$(MAKE) $(build)=3Dgtk --=20 2.45.2.741.gdbec12cfda-goog From nobody Wed Dec 17 20:58:44 2025 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A80C17D889 for ; Tue, 25 Jun 2024 18:42:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340964; cv=none; b=eobE3gMwV27E/FjUCA8CstPwKuGjWx9aN5333tGBFLRVuOnrs9+cz34SotRDp6TTpN7mj6gROgQuG2iWMhPUvhGVHLC1tngHPkgIDvZMMYekqe/14/IYuMWLGVi/sJ2IOZPfUFZQxcuKnuihV8zhGMXXsb9GO8OszJZ+EQcwNwA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340964; c=relaxed/simple; bh=N5E4meGJMW6NrkK2/H6Z1wvt8B2rm7TZLxu23z7djY0=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=LFERza6Y0zEr/wuHMEa8JrotWWOaymaHzL4dT4OwVBs3M8NREJwbhzr70vbAfxQV7bxgWg/4YwvkGmYEQKw6E2dMoJ1kHGPdc3YKTKdQ+KvgmzPiUoGF4z7mt4lMKAWwHsvVyV5WTWpctIRoGMS15PF5sV3Di/8M1XEqWnNabxI= 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=e4F+GP/t; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="e4F+GP/t" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dff16daff8dso11720161276.2 for ; Tue, 25 Jun 2024 11:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719340960; x=1719945760; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=INYs1zZMYGf3GJdIHQS7QZYH+KY4EsCuofnbdRJz94s=; b=e4F+GP/tRoExrZLAG7mNljpJYZJJBwwYjWQsrRu3IlXGCVj08mRXPQGut82h9SpXYV pVkNxBY6+F0nmKHpsLF7dIUSr5nPcAwhVW3Qjh8xAgcPXGzy4d+N1pNzPQsJxEPtrNtk wfTmLNbUDIAL8YjxSLktal1z0+iunW0Zz6dd6tnUSe6ACSb5WJQFSJRPmpgjMH8Ot7h+ pM3+dykTis777fS5JH6ttR5VSTbjlb8y/Q35oSviXkL3klYeF3E+i+vV91gCIVA3Dp8r OTr8Xm0miNdFO80pCpOa73raT5gPBP7Ung/X4Ke/KIK+LrzfVo5kZFPFk/GXdYh4poi0 5PEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719340960; x=1719945760; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=INYs1zZMYGf3GJdIHQS7QZYH+KY4EsCuofnbdRJz94s=; b=gUX6aAnBBkO/QIwCsz7Y/AyoHPFvRCpj9jwK5n3icIf0p0k+L8BgbnLvCp+UW+n9xF DDYwkgg1gkg1/sWA4F94iP8ofNy1xZD/2MTaU7fhE+yEkEgr8x8FP6dcNML3plSQPUPf Ky3GEQLriP+9NgDZF2FhE6Mc7wf81ngzCh4ARWzGbGAlM+q0FbGwr30AbuR4ctOePeno lb7utXS3Kk36dB8C0mii35ex913ll4pQNa0L+Yw79x6IruMWhvWj9EzUWmQEMPwRJa7J T9fhf2XrheW4s2dCkMSwVWoZVin0loWy/lKF2XvBox2pm5YY507gLXplzKdwpRRnsTrt 6WVg== X-Forwarded-Encrypted: i=1; AJvYcCVNOpFgslQE6z99d+oUZtER7TPetEQaMRhSUaVh3xw8H8tNnKQokukEMhAPOUMkYocNs8KM06LWcBHiLr3DvCSdSdwq15/piBhIwZXF X-Gm-Message-State: AOJu0YwhUwlCTOGgeIHUJIQwaTrI6E20+n0GVk6TykC7wN1HEoUsgKit crXwvgT+bqGfN6EPoxa9SrzwRh2JT9WxxzcIxsqcjz7CSMYm5ZGrUNW8s/BPu0xR76UHI/H+PiM SoyaoYg== X-Google-Smtp-Source: AGHT+IEDJJpW7nj928BZNqsml+71dbrBWuqMhVc05Zpdb0T3rGzmmxbvKXWlJVG6rJhqASBjrqJwdX7LWTuX X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:6902:704:b0:dfb:22ca:1efd with SMTP id 3f1490d57ef6-e0303fce998mr332330276.9.1719340960593; Tue, 25 Jun 2024 11:42:40 -0700 (PDT) Date: Tue, 25 Jun 2024 11:42:21 -0700 In-Reply-To: <20240625184224.929018-1-irogers@google.com> Message-Id: <20240625184224.929018-5-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625184224.929018-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v4 4/7] perf test: Make tests its own library From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Andrei Vagin , Kees Cook , Oliver Upton , Ze Gao , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the tests code its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 3 +- tools/perf/Makefile.perf | 11 ++- tools/perf/arch/Build | 1 + tools/perf/arch/arm/Build | 2 +- tools/perf/arch/arm/tests/Build | 8 +- tools/perf/arch/arm64/Build | 2 +- tools/perf/arch/arm64/tests/Build | 8 +- tools/perf/arch/powerpc/Build | 2 +- tools/perf/arch/powerpc/tests/Build | 6 +- tools/perf/arch/x86/Build | 4 +- tools/perf/arch/x86/tests/Build | 20 ++-- tools/perf/tests/Build | 140 ++++++++++++++-------------- tools/perf/tests/workloads/Build | 12 +-- 13 files changed, 115 insertions(+), 104 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index 16ed1357202b..fddd45ab35b4 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -36,7 +36,7 @@ endif perf-$(CONFIG_LIBELF) +=3D builtin-probe.o =20 perf-y +=3D bench/ -perf-y +=3D tests/ +perf-test-y +=3D tests/ =20 perf-y +=3D perf.o =20 @@ -55,6 +55,7 @@ CFLAGS_builtin-report.o +=3D -DDOCDIR=3D"BUILD_STR($(s= rcdir_SQ)/Documentation)" =20 perf-y +=3D util/ perf-y +=3D arch/ +perf-test-y +=3D arch/ perf-ui-y +=3D ui/ perf-y +=3D scripts/ =20 diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 9640c6ae1837..9fa69dd0b472 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -425,6 +425,9 @@ endif =20 export PERL_PATH =20 +LIBPERF_TEST_IN :=3D $(OUTPUT)perf-test-in.o +LIBPERF_TEST :=3D $(OUTPUT)libperf-test.a + LIBPERF_UI_IN :=3D $(OUTPUT)perf-ui-in.o LIBPERF_UI :=3D $(OUTPUT)libperf-ui.a =20 @@ -435,7 +438,7 @@ PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYM= BOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif -PERFLIBS +=3D $(LIBPERF_UI) $(LIBPMU_EVENTS) +PERFLIBS +=3D $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVENTS) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -737,6 +740,12 @@ $(LIBPMU_EVENTS_IN): FORCE prepare $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 +$(LIBPERF_TEST_IN): FORCE prepare + $(Q)$(MAKE) $(build)=3Dperf-test + +$(LIBPERF_TEST): $(LIBPERF_TEST_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(LIBPERF_UI_IN): FORCE prepare $(Q)$(MAKE) $(build)=3Dperf-ui =20 diff --git a/tools/perf/arch/Build b/tools/perf/arch/Build index 688818844c11..6dd68c17924c 100644 --- a/tools/perf/arch/Build +++ b/tools/perf/arch/Build @@ -1,2 +1,3 @@ perf-y +=3D common.o perf-y +=3D $(SRCARCH)/ +perf-test-y +=3D $(SRCARCH)/ diff --git a/tools/perf/arch/arm/Build b/tools/perf/arch/arm/Build index 36222e64bbf7..6b4fdec52122 100644 --- a/tools/perf/arch/arm/Build +++ b/tools/perf/arch/arm/Build @@ -1,2 +1,2 @@ perf-y +=3D util/ -perf-$(CONFIG_DWARF_UNWIND) +=3D tests/ +perf-test-$(CONFIG_DWARF_UNWIND) +=3D tests/ diff --git a/tools/perf/arch/arm/tests/Build b/tools/perf/arch/arm/tests/Bu= ild index bc8e97380c82..599efa545727 100644 --- a/tools/perf/arch/arm/tests/Build +++ b/tools/perf/arch/arm/tests/Build @@ -1,5 +1,5 @@ -perf-y +=3D regs_load.o -perf-y +=3D dwarf-unwind.o -perf-y +=3D vectors-page.o +perf-test-y +=3D regs_load.o +perf-test-y +=3D dwarf-unwind.o +perf-test-y +=3D vectors-page.o =20 -perf-y +=3D arch-tests.o +perf-test-y +=3D arch-tests.o diff --git a/tools/perf/arch/arm64/Build b/tools/perf/arch/arm64/Build index a7dd46a5b678..58b2d965ed86 100644 --- a/tools/perf/arch/arm64/Build +++ b/tools/perf/arch/arm64/Build @@ -1,2 +1,2 @@ perf-y +=3D util/ -perf-y +=3D tests/ +perf-test-y +=3D tests/ diff --git a/tools/perf/arch/arm64/tests/Build b/tools/perf/arch/arm64/test= s/Build index e337c09e7f56..d44c9de92d42 100644 --- a/tools/perf/arch/arm64/tests/Build +++ b/tools/perf/arch/arm64/tests/Build @@ -1,5 +1,5 @@ -perf-y +=3D regs_load.o -perf-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o +perf-test-y +=3D regs_load.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o =20 -perf-y +=3D arch-tests.o -perf-y +=3D cpuid-match.o +perf-test-y +=3D arch-tests.o +perf-test-y +=3D cpuid-match.o diff --git a/tools/perf/arch/powerpc/Build b/tools/perf/arch/powerpc/Build index a7dd46a5b678..58b2d965ed86 100644 --- a/tools/perf/arch/powerpc/Build +++ b/tools/perf/arch/powerpc/Build @@ -1,2 +1,2 @@ perf-y +=3D util/ -perf-y +=3D tests/ +perf-test-y +=3D tests/ diff --git a/tools/perf/arch/powerpc/tests/Build b/tools/perf/arch/powerpc/= tests/Build index 3526ab0af9f9..275026950645 100644 --- a/tools/perf/arch/powerpc/tests/Build +++ b/tools/perf/arch/powerpc/tests/Build @@ -1,4 +1,4 @@ -perf-$(CONFIG_DWARF_UNWIND) +=3D regs_load.o -perf-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D regs_load.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o =20 -perf-y +=3D arch-tests.o +perf-test-y +=3D arch-tests.o diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build index ed37013b4289..132cf8beaca2 100644 --- a/tools/perf/arch/x86/Build +++ b/tools/perf/arch/x86/Build @@ -1,5 +1,5 @@ perf-y +=3D util/ -perf-y +=3D tests/ +perf-test-y +=3D tests/ =20 ifdef SHELLCHECK SHELL_TESTS :=3D entry/syscalls/syscalltbl.sh @@ -13,4 +13,4 @@ $(OUTPUT)%.shellcheck_log: % $(call rule_mkdir) $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) =20 -perf-y +=3D $(TEST_LOGS) +perf-test-y +=3D $(TEST_LOGS) diff --git a/tools/perf/arch/x86/tests/Build b/tools/perf/arch/x86/tests/Bu= ild index c1e3b7d39554..3227053f3355 100644 --- a/tools/perf/arch/x86/tests/Build +++ b/tools/perf/arch/x86/tests/Build @@ -1,15 +1,15 @@ -perf-$(CONFIG_DWARF_UNWIND) +=3D regs_load.o -perf-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D regs_load.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o =20 -perf-y +=3D arch-tests.o -perf-y +=3D sample-parsing.o -perf-y +=3D hybrid.o -perf-$(CONFIG_AUXTRACE) +=3D intel-pt-test.o +perf-test-y +=3D arch-tests.o +perf-test-y +=3D sample-parsing.o +perf-test-y +=3D hybrid.o +perf-test-$(CONFIG_AUXTRACE) +=3D intel-pt-test.o ifeq ($(CONFIG_EXTRA_TESTS),y) -perf-$(CONFIG_AUXTRACE) +=3D insn-x86.o +perf-test-$(CONFIG_AUXTRACE) +=3D insn-x86.o endif -perf-$(CONFIG_X86_64) +=3D bp-modify.o -perf-y +=3D amd-ibs-via-core-pmu.o +perf-test-$(CONFIG_X86_64) +=3D bp-modify.o +perf-test-y +=3D amd-ibs-via-core-pmu.o =20 ifdef SHELLCHECK SHELL_TESTS :=3D gen-insn-x86-dat.sh @@ -23,4 +23,4 @@ $(OUTPUT)%.shellcheck_log: % $(call rule_mkdir) $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) =20 -perf-y +=3D $(TEST_LOGS) +perf-test-y +=3D $(TEST_LOGS) diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index c7f9d9676095..5671ee530019 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -1,82 +1,82 @@ # SPDX-License-Identifier: GPL-2.0 =20 -perf-y +=3D builtin-test.o -perf-y +=3D tests-scripts.o -perf-y +=3D parse-events.o -perf-y +=3D dso-data.o -perf-y +=3D attr.o -perf-y +=3D vmlinux-kallsyms.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall-all-cpus.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall-tp-fields.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D mmap-basic.o -perf-y +=3D perf-record.o -perf-y +=3D evsel-roundtrip-name.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D evsel-tp-sched.o -perf-y +=3D fdarray.o -perf-y +=3D pmu.o -perf-y +=3D pmu-events.o -perf-y +=3D hists_common.o -perf-y +=3D hists_link.o -perf-y +=3D hists_filter.o -perf-y +=3D hists_output.o -perf-y +=3D hists_cumulate.o -perf-y +=3D python-use.o -perf-y +=3D bp_signal.o -perf-y +=3D bp_signal_overflow.o -perf-y +=3D bp_account.o -perf-y +=3D wp.o -perf-y +=3D task-exit.o -perf-y +=3D sw-clock.o -perf-y +=3D mmap-thread-lookup.o -perf-y +=3D thread-maps-share.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D switch-tracking.o -perf-y +=3D keep-tracking.o -perf-y +=3D code-reading.o -perf-y +=3D sample-parsing.o -perf-y +=3D parse-no-sample-id-all.o -perf-y +=3D kmod-path.o -perf-y +=3D thread-map.o -perf-y +=3D topology.o -perf-y +=3D mem.o -perf-y +=3D cpumap.o -perf-y +=3D stat.o -perf-y +=3D event_update.o -perf-y +=3D event-times.o -perf-y +=3D expr.o -perf-y +=3D backward-ring-buffer.o -perf-y +=3D sdt.o -perf-y +=3D is_printable_array.o -perf-y +=3D bitmap.o -perf-y +=3D perf-hooks.o -perf-y +=3D unit_number__scnprintf.o -perf-y +=3D mem2node.o -perf-y +=3D maps.o -perf-y +=3D time-utils-test.o -perf-y +=3D genelf.o -perf-y +=3D api-io.o -perf-y +=3D demangle-java-test.o -perf-y +=3D demangle-ocaml-test.o -perf-y +=3D pfm.o -perf-y +=3D parse-metric.o -perf-y +=3D pe-file-parsing.o -perf-y +=3D expand-cgroup.o -perf-y +=3D perf-time-to-tsc.o -perf-y +=3D dlfilter-test.o -perf-y +=3D sigtrap.o -perf-y +=3D event_groups.o -perf-y +=3D symbols.o -perf-y +=3D util.o +perf-test-y +=3D builtin-test.o +perf-test-y +=3D tests-scripts.o +perf-test-y +=3D parse-events.o +perf-test-y +=3D dso-data.o +perf-test-y +=3D attr.o +perf-test-y +=3D vmlinux-kallsyms.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall-all-cpus.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall-tp-fields.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D mmap-basic.o +perf-test-y +=3D perf-record.o +perf-test-y +=3D evsel-roundtrip-name.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D evsel-tp-sched.o +perf-test-y +=3D fdarray.o +perf-test-y +=3D pmu.o +perf-test-y +=3D pmu-events.o +perf-test-y +=3D hists_common.o +perf-test-y +=3D hists_link.o +perf-test-y +=3D hists_filter.o +perf-test-y +=3D hists_output.o +perf-test-y +=3D hists_cumulate.o +perf-test-y +=3D python-use.o +perf-test-y +=3D bp_signal.o +perf-test-y +=3D bp_signal_overflow.o +perf-test-y +=3D bp_account.o +perf-test-y +=3D wp.o +perf-test-y +=3D task-exit.o +perf-test-y +=3D sw-clock.o +perf-test-y +=3D mmap-thread-lookup.o +perf-test-y +=3D thread-maps-share.o +perf-test-$(CONFIG_LIBTRACEEVENT) +=3D switch-tracking.o +perf-test-y +=3D keep-tracking.o +perf-test-y +=3D code-reading.o +perf-test-y +=3D sample-parsing.o +perf-test-y +=3D parse-no-sample-id-all.o +perf-test-y +=3D kmod-path.o +perf-test-y +=3D thread-map.o +perf-test-y +=3D topology.o +perf-test-y +=3D mem.o +perf-test-y +=3D cpumap.o +perf-test-y +=3D stat.o +perf-test-y +=3D event_update.o +perf-test-y +=3D event-times.o +perf-test-y +=3D expr.o +perf-test-y +=3D backward-ring-buffer.o +perf-test-y +=3D sdt.o +perf-test-y +=3D is_printable_array.o +perf-test-y +=3D bitmap.o +perf-test-y +=3D perf-hooks.o +perf-test-y +=3D unit_number__scnprintf.o +perf-test-y +=3D mem2node.o +perf-test-y +=3D maps.o +perf-test-y +=3D time-utils-test.o +perf-test-y +=3D genelf.o +perf-test-y +=3D api-io.o +perf-test-y +=3D demangle-java-test.o +perf-test-y +=3D demangle-ocaml-test.o +perf-test-y +=3D pfm.o +perf-test-y +=3D parse-metric.o +perf-test-y +=3D pe-file-parsing.o +perf-test-y +=3D expand-cgroup.o +perf-test-y +=3D perf-time-to-tsc.o +perf-test-y +=3D dlfilter-test.o +perf-test-y +=3D sigtrap.o +perf-test-y +=3D event_groups.o +perf-test-y +=3D symbols.o +perf-test-y +=3D util.o =20 ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) -perf-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o +perf-test-$(CONFIG_DWARF_UNWIND) +=3D dwarf-unwind.o endif =20 CFLAGS_attr.o +=3D -DBINDIR=3D"BUILD_STR($(bindir_SQ))" -DPYTHON= =3D"BUILD_STR($(PYTHON_WORD))" CFLAGS_python-use.o +=3D -DPYTHONPATH=3D"BUILD_STR($(OUTPUT)python)" -DP= YTHON=3D"BUILD_STR($(PYTHON_WORD))" CFLAGS_dwarf-unwind.o +=3D -fno-optimize-sibling-calls =20 -perf-y +=3D workloads/ +perf-test-y +=3D workloads/ =20 ifdef SHELLCHECK SHELL_TESTS :=3D $(shell find tests/shell -executable -type f -name '*.s= h') @@ -90,4 +90,4 @@ $(OUTPUT)%.shellcheck_log: % $(call rule_mkdir) $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) =20 -perf-y +=3D $(TEST_LOGS) +perf-test-y +=3D $(TEST_LOGS) diff --git a/tools/perf/tests/workloads/Build b/tools/perf/tests/workloads/= Build index a1f34d5861e3..48bf0d3b0f3d 100644 --- a/tools/perf/tests/workloads/Build +++ b/tools/perf/tests/workloads/Build @@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 =20 -perf-y +=3D noploop.o -perf-y +=3D thloop.o -perf-y +=3D leafloop.o -perf-y +=3D sqrtloop.o -perf-y +=3D brstack.o -perf-y +=3D datasym.o +perf-test-y +=3D noploop.o +perf-test-y +=3D thloop.o +perf-test-y +=3D leafloop.o +perf-test-y +=3D sqrtloop.o +perf-test-y +=3D brstack.o +perf-test-y +=3D datasym.o =20 CFLAGS_sqrtloop.o =3D -g -O0 -fno-inline -U_FORTIFY_SOURCE CFLAGS_leafloop.o =3D -g -O0 -fno-inline -fno-omit-frame-pointer -= U_FORTIFY_SOURCE --=20 2.45.2.741.gdbec12cfda-goog From nobody Wed Dec 17 20:58:44 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92F5E17D8A4 for ; Tue, 25 Jun 2024 18:42:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340966; cv=none; b=AkMeblF+SKI7ygv1uZe8vo3K2IULXCOfz6H0S+OzvpBv01PWw06/KejeM2/8VSmeHZ+MSlgX/VJZLB0iTAtmGSkovHkXka5MExFbIHod7UFnmbccKyXwvHkx332Sb3qu4Lrcph1zgtCKt4s+8jl7No2xNL/v/Ijjjhg/NRIA3ow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340966; c=relaxed/simple; bh=2e1EB2J3C8Egr2O0Wpv7tQqwFPOyq60QZb+RTxrA24g=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=rBDJNDbLs5FHXgjB9gt6iftPnw9s4OEhDOf8yjsLEL7mJS0yvjFFVHADOrMXhipilBVAt0F3womxdChLD05IltShn2awD8hjaEt/UBeCcnsrQlddvNq8NSok99mI1ZNkKAXbz4sNAzltabUpyDVuBX3MZnEY2q4KKgvKv90VZNY= 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=IIriMboB; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="IIriMboB" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-631b498f981so106574457b3.0 for ; Tue, 25 Jun 2024 11:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719340963; x=1719945763; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=9lVzQaHUCF35to8PiObGttFlDy1f8wM6DLCbP51DQFE=; b=IIriMboB7IOammS2kDaLBITFLiJZrcvvUketZYp1yDGg8ng4AXXSkVViqvUIDmWuXk BIwv60jsIZ9D19qeDwUgwosmjmZ7LGrnY0r0LroVJMUyAQcU63DyeALkCbTIFgLOWz4I IarMay8aXH6AJ30LgW3pYgryXNyNYUAmkA/B98uVLXqPXmfe7WR3LCjClMEjTTj/ppBK zfu7cWgXuQJChxXxZFzR8pO2vQYioBgcyKPx2BcL0KPvNWS8/r+JWd+PyZe/3BqIt989 rqhT0A9uclCSCaYKc4Y7zAYpSYDWSRD0Z9PwRoAnFFWubfs8J9afXxh73tQmN/EYvrDI uu5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719340963; x=1719945763; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9lVzQaHUCF35to8PiObGttFlDy1f8wM6DLCbP51DQFE=; b=obR5QregT5czOjz9WGvzmxcu1dTwE9djGCVAjGykUgm+ZOSRNOEN4dOaHWEEtiB/Xk 3tfYttu9YOaqJQZUFF5Z9pCt+eLfvGXLDwEIGsGL8HYNYCyjoLivwJ+u0/byCkkbOOfU 2WNbYqk95LIdkPEvvO90u5XkEDf0KHUhrNfvNbHAEMhokK3DFG/KkTxhoJa+mL22/bnO 7/Iy7GqVKEgvBm8bx9QmWnzcAgIky25CqpkhfX6xmUfCQdVw86tUc72XzhfLb0xlMZ3F xVsRSpNL4MXHoGu0eigBMGoxnL+13CfzhuYGlRlfqWzFDBjogCSQ0dq3XQNCt8J4omwk kG0Q== X-Forwarded-Encrypted: i=1; AJvYcCXV3W92ysgquTLGhNmsHn5xWsfFLeDOmf0S7gQzRyHAT7ysNnHkBHLSj9gLTLA/hB6J+9XUmoqn24tYVWVKENaDCpns5jt8tjl29Doq X-Gm-Message-State: AOJu0Yw7JH8MMMbbbUbLCEKWI1RGlOGqCZyuhCjulBk2zoO5y7mOOXJW 9PlAuLgIhqw5DM/hIKEvYFi0aovQWOnIS4jQOULTQv3rU1+gYq4hRWGHtmofnm4I22OcqJDcOjd Qp8ls1Q== X-Google-Smtp-Source: AGHT+IGb4WvYG8oSQuAsDGDPIMZiRFgDGgnyHkXxbBpNxJfxsSnnlV4mi1wBu9EEjrP1vlTnC7YwXTJljkI+ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:690c:3506:b0:61b:e103:804d with SMTP id 00721157ae682-645e60af794mr214947b3.0.1719340962575; Tue, 25 Jun 2024 11:42:42 -0700 (PDT) Date: Tue, 25 Jun 2024 11:42:22 -0700 In-Reply-To: <20240625184224.929018-1-irogers@google.com> Message-Id: <20240625184224.929018-6-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625184224.929018-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v4 5/7] perf bench: Make bench its own library From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Andrei Vagin , Kees Cook , Oliver Upton , Ze Gao , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the benchmark code into a library so it may be linked against things like the python module to avoid compiling code twice. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 4 ++-- tools/perf/Makefile.perf | 11 +++++++++- tools/perf/bench/Build | 46 ++++++++++++++++++++-------------------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index fddd45ab35b4..2787f5630ff7 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -1,4 +1,4 @@ -perf-y +=3D builtin-bench.o +perf-bench-y +=3D builtin-bench.o perf-y +=3D builtin-annotate.o perf-y +=3D builtin-config.o perf-y +=3D builtin-diff.o @@ -35,7 +35,7 @@ endif =20 perf-$(CONFIG_LIBELF) +=3D builtin-probe.o =20 -perf-y +=3D bench/ +perf-bench-y +=3D bench/ perf-test-y +=3D tests/ =20 perf-y +=3D perf.o diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 9fa69dd0b472..4a3c000b9845 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -425,6 +425,9 @@ endif =20 export PERL_PATH =20 +LIBPERF_BENCH_IN :=3D $(OUTPUT)perf-bench-in.o +LIBPERF_BENCH :=3D $(OUTPUT)libperf-bench.a + LIBPERF_TEST_IN :=3D $(OUTPUT)perf-test-in.o LIBPERF_TEST :=3D $(OUTPUT)libperf-test.a =20 @@ -438,7 +441,7 @@ PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYM= BOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif -PERFLIBS +=3D $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVENTS) +PERFLIBS +=3D $(LIBPERF_BENCH) $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVEN= TS) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -740,6 +743,12 @@ $(LIBPMU_EVENTS_IN): FORCE prepare $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 +$(LIBPERF_BENCH_IN): FORCE prepare + $(Q)$(MAKE) $(build)=3Dperf-bench + +$(LIBPERF_BENCH): $(LIBPERF_BENCH_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(LIBPERF_TEST_IN): FORCE prepare $(Q)$(MAKE) $(build)=3Dperf-test =20 diff --git a/tools/perf/bench/Build b/tools/perf/bench/Build index c2ab30907ae7..279ab2ab4abe 100644 --- a/tools/perf/bench/Build +++ b/tools/perf/bench/Build @@ -1,25 +1,25 @@ -perf-y +=3D sched-messaging.o -perf-y +=3D sched-pipe.o -perf-y +=3D sched-seccomp-notify.o -perf-y +=3D syscall.o -perf-y +=3D mem-functions.o -perf-y +=3D futex-hash.o -perf-y +=3D futex-wake.o -perf-y +=3D futex-wake-parallel.o -perf-y +=3D futex-requeue.o -perf-y +=3D futex-lock-pi.o -perf-y +=3D epoll-wait.o -perf-y +=3D epoll-ctl.o -perf-y +=3D synthesize.o -perf-y +=3D kallsyms-parse.o -perf-y +=3D find-bit-bench.o -perf-y +=3D inject-buildid.o -perf-y +=3D evlist-open-close.o -perf-y +=3D breakpoint.o -perf-y +=3D pmu-scan.o -perf-y +=3D uprobe.o +perf-bench-y +=3D sched-messaging.o +perf-bench-y +=3D sched-pipe.o +perf-bench-y +=3D sched-seccomp-notify.o +perf-bench-y +=3D syscall.o +perf-bench-y +=3D mem-functions.o +perf-bench-y +=3D futex-hash.o +perf-bench-y +=3D futex-wake.o +perf-bench-y +=3D futex-wake-parallel.o +perf-bench-y +=3D futex-requeue.o +perf-bench-y +=3D futex-lock-pi.o +perf-bench-y +=3D epoll-wait.o +perf-bench-y +=3D epoll-ctl.o +perf-bench-y +=3D synthesize.o +perf-bench-y +=3D kallsyms-parse.o +perf-bench-y +=3D find-bit-bench.o +perf-bench-y +=3D inject-buildid.o +perf-bench-y +=3D evlist-open-close.o +perf-bench-y +=3D breakpoint.o +perf-bench-y +=3D pmu-scan.o +perf-bench-y +=3D uprobe.o =20 -perf-$(CONFIG_X86_64) +=3D mem-memcpy-x86-64-asm.o -perf-$(CONFIG_X86_64) +=3D mem-memset-x86-64-asm.o +perf-bench-$(CONFIG_X86_64) +=3D mem-memcpy-x86-64-asm.o +perf-bench-$(CONFIG_X86_64) +=3D mem-memset-x86-64-asm.o =20 -perf-$(CONFIG_NUMA) +=3D numa.o +perf-bench-$(CONFIG_NUMA) +=3D numa.o --=20 2.45.2.741.gdbec12cfda-goog From nobody Wed Dec 17 20:58:44 2025 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F420517C7B4 for ; Tue, 25 Jun 2024 18:42:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340968; cv=none; b=nXlPBvYBFF710CLC6Jn8VqN/gaM9LBqF81P0SYQ9mWrulIXjkpSPLul1a5DVVoyiqJ+K5Fk80JHe+o5/tHTMFWJfIemgtiIolnwin0RvvVp+9n7t/8BMbDilt9RanGX52hC8PkQhHGkPT/d4g4gRhYtkwtbw2JlZQ6A9G10juxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340968; c=relaxed/simple; bh=thwPGDljXgnRSWdDOL+t4VhcOZp8MvwzAbb/znOGi6I=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=fgA/rt+Kr0iDBzJghu7YS9TGzAAi7X0kPmeCkkNbzWGxrVoVWjzaN9oFyoyweC+iy+hcAh/fz0k/Ex5WFWhYnG7q0Hc4LgbQrw7pBdn7Kvyc1EDclg72UmfgDqUn2DkKsvI6Nz99ov9xvXMmIHz1OOd/Hho4oaOEX3KhcEHVtNo= 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=Ety42ZIX; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ety42ZIX" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dfa7a8147c3so12361020276.3 for ; Tue, 25 Jun 2024 11:42:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719340965; x=1719945765; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=RK3JzW9xM39N/w1V/oeqY/ONEk8wOZil6KLzX7W64sM=; b=Ety42ZIX+bPLZi9sqbsjlwVkXXsl0CG1ExRt0MP8MpDjsIgbvEqEwgCKLXhZu8D5xL kN2xwbS/OV+EWEuF6efp7bdaGMyO/7rNpC56ONENiA9x/ruhMnSlvlFqGMt1EeSRU8pn xMchL/qsRNpu7e8jMDSAffBeAiMBHkXRecgwIWLDQPXeuekZ9CyQj14Lrljcrc/qzSOK mqgL267RNwRaDcaTbhYypcWoWf2Zso2a4tMCAQzpMtCgafPVqL6yAQBn+1LBAwdCvhqP 7SVKaYjenf361SiL+iZzt9z8Aa23fhxt7+6waFm4z/DB2MxMC9b4OpjvMEd3NIl154T7 6ObA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719340965; x=1719945765; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RK3JzW9xM39N/w1V/oeqY/ONEk8wOZil6KLzX7W64sM=; b=iEuw4G4SBHFnepD2sOf28IijBfxJ+69awDeZgSZ0N3QVGaVGOHU7Z46iLFJqZ3G4M0 sBCG9bQjhK1wjE4PwiY4gDWo1RRK1PRd0yM3vguwKoPKXE+Y0ENRFPkTMPt4c/saAlwG 3Fr3T7ode8fM4k3t6CRiYVFwrR+RoUYX6hnArckD/tMhVTz5nnb4JNw0v3EFdW5NTcUa RcZw/qL1VIeQR+rrzxaFblGG0wZAHuGNRGiUTBaDAYNNB9KfzXRvYOv0Xqp6NUWqEvkT /lLmewI6X01fgKN3DQ7fmM5hz7BtRDGwY/Wjtk8+JCXtuXsC0ZraBCYqPj1eoUx+2EQK muTQ== X-Forwarded-Encrypted: i=1; AJvYcCVF9+z+WLO4lyYxQiKCTyxaUpUhrNjg0a1PGYKuqDR5xpbhG95QjPBUoyxjY24w4hJ/WgKFbCiaKz2Yu7q3oq+SjZP9lSVP7BKFiNBt X-Gm-Message-State: AOJu0YxfKF+Tvjl0gCH1I4HuA7a3UazzFhcxMTWuareiYmYcu7Ibycal bvwccHt0T/9laEgj+Mw9qmiYpt96Osg+xxqKH2cugBs0fUl42OxY18uQLeyFOIk4COszMYYhSZM jB1U+bg== X-Google-Smtp-Source: AGHT+IEu9Y/iIndDDKGcnyvhKDIotMepMmyq2b0vK1QhmUZkv+GzHI+Kx0rGYUcM3ktcOGcxnCCndjgPvBox X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:6902:1082:b0:dda:c57c:b69b with SMTP id 3f1490d57ef6-e0303d3d277mr348521276.0.1719340965110; Tue, 25 Jun 2024 11:42:45 -0700 (PDT) Date: Tue, 25 Jun 2024 11:42:23 -0700 In-Reply-To: <20240625184224.929018-1-irogers@google.com> Message-Id: <20240625184224.929018-7-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625184224.929018-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v4 6/7] perf util: Make util its own library From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Andrei Vagin , Kees Cook , Oliver Upton , Ze Gao , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the util directory into its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. For convenience: arch/common.c scripts/perl/Perf-Trace-Util/Context.c scripts/python/Perf-Trace-Util/Context.c are made part of this library. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 5 +- tools/perf/Makefile.perf | 12 +- tools/perf/arch/Build | 4 +- tools/perf/arch/arm/Build | 2 +- tools/perf/arch/arm/util/Build | 10 +- tools/perf/arch/arm64/Build | 2 +- tools/perf/arch/arm64/util/Build | 20 +- tools/perf/arch/csky/Build | 2 +- tools/perf/arch/csky/util/Build | 6 +- tools/perf/arch/loongarch/Build | 2 +- tools/perf/arch/loongarch/util/Build | 8 +- tools/perf/arch/mips/Build | 2 +- tools/perf/arch/mips/util/Build | 6 +- tools/perf/arch/powerpc/Build | 2 +- tools/perf/arch/powerpc/util/Build | 24 +- tools/perf/arch/riscv/Build | 2 +- tools/perf/arch/riscv/util/Build | 8 +- tools/perf/arch/s390/Build | 2 +- tools/perf/arch/s390/util/Build | 16 +- tools/perf/arch/sh/Build | 2 +- tools/perf/arch/sh/util/Build | 2 +- tools/perf/arch/sparc/Build | 2 +- tools/perf/arch/sparc/util/Build | 2 +- tools/perf/arch/x86/Build | 2 +- tools/perf/arch/x86/util/Build | 42 +- tools/perf/arch/xtensa/Build | 2 +- tools/perf/scripts/Build | 4 +- tools/perf/scripts/perl/Perf-Trace-Util/Build | 2 +- .../perf/scripts/python/Perf-Trace-Util/Build | 2 +- tools/perf/util/Build | 394 +++++++++--------- tools/perf/util/arm-spe-decoder/Build | 2 +- tools/perf/util/cs-etm-decoder/Build | 2 +- tools/perf/util/hisi-ptt-decoder/Build | 2 +- tools/perf/util/intel-pt-decoder/Build | 2 +- tools/perf/util/perf-regs-arch/Build | 18 +- tools/perf/util/scripting-engines/Build | 4 +- 36 files changed, 316 insertions(+), 305 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index 2787f5630ff7..1d4957957d75 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -53,11 +53,12 @@ CFLAGS_builtin-trace.o +=3D -DSTRACE_GROUPS_DIR=3D"B= UILD_STR($(STRACE_GROUPS_DIR_ CFLAGS_builtin-report.o +=3D -DTIPDIR=3D"BUILD_STR($(tipdir_SQ))" CFLAGS_builtin-report.o +=3D -DDOCDIR=3D"BUILD_STR($(srcdir_SQ)/Documen= tation)" =20 -perf-y +=3D util/ +perf-util-y +=3D util/ +perf-util-y +=3D arch/ perf-y +=3D arch/ perf-test-y +=3D arch/ perf-ui-y +=3D ui/ -perf-y +=3D scripts/ +perf-util-y +=3D scripts/ =20 gtk-y +=3D ui/gtk/ =20 diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 4a3c000b9845..ff03f0431013 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -434,6 +434,9 @@ LIBPERF_TEST :=3D $(OUTPUT)libperf-test.a LIBPERF_UI_IN :=3D $(OUTPUT)perf-ui-in.o LIBPERF_UI :=3D $(OUTPUT)libperf-ui.a =20 +LIBPERF_UTIL_IN :=3D $(OUTPUT)perf-util-in.o +LIBPERF_UTIL :=3D $(OUTPUT)libperf-util.a + LIBPMU_EVENTS_IN :=3D $(OUTPUT)pmu-events/pmu-events-in.o LIBPMU_EVENTS :=3D $(OUTPUT)libpmu-events.a =20 @@ -441,7 +444,8 @@ PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYM= BOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif -PERFLIBS +=3D $(LIBPERF_BENCH) $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVEN= TS) +PERFLIBS +=3D $(LIBPERF_BENCH) $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPERF_UTI= L) +PERFLIBS +=3D $(LIBPMU_EVENTS) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -761,6 +765,12 @@ $(LIBPERF_UI_IN): FORCE prepare $(LIBPERF_UI): $(LIBPERF_UI_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 +$(LIBPERF_UTIL_IN): FORCE prepare + $(Q)$(MAKE) $(build)=3Dperf-util + +$(LIBPERF_UTIL): $(LIBPERF_UTIL_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \ $(PERF_IN) $(LIBS) -o $@ diff --git a/tools/perf/arch/Build b/tools/perf/arch/Build index 6dd68c17924c..f0d96a13445c 100644 --- a/tools/perf/arch/Build +++ b/tools/perf/arch/Build @@ -1,3 +1,3 @@ -perf-y +=3D common.o -perf-y +=3D $(SRCARCH)/ +perf-util-y +=3D common.o perf-test-y +=3D $(SRCARCH)/ +perf-util-y +=3D $(SRCARCH)/ diff --git a/tools/perf/arch/arm/Build b/tools/perf/arch/arm/Build index 6b4fdec52122..317425aa3712 100644 --- a/tools/perf/arch/arm/Build +++ b/tools/perf/arch/arm/Build @@ -1,2 +1,2 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-$(CONFIG_DWARF_UNWIND) +=3D tests/ diff --git a/tools/perf/arch/arm/util/Build b/tools/perf/arch/arm/util/Build index 37fc63708966..e6dd7cd79ebd 100644 --- a/tools/perf/arch/arm/util/Build +++ b/tools/perf/arch/arm/util/Build @@ -1,8 +1,8 @@ -perf-y +=3D perf_regs.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o =20 -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-$(CONFIG_AUXTRACE) +=3D pmu.o auxtrace.o cs-etm.o +perf-util-$(CONFIG_AUXTRACE) +=3D pmu.o auxtrace.o cs-etm.o diff --git a/tools/perf/arch/arm64/Build b/tools/perf/arch/arm64/Build index 58b2d965ed86..12ebc65ea7a3 100644 --- a/tools/perf/arch/arm64/Build +++ b/tools/perf/arch/arm64/Build @@ -1,2 +1,2 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-y +=3D tests/ diff --git a/tools/perf/arch/arm64/util/Build b/tools/perf/arch/arm64/util/= Build index 78ef7115be3d..343ef7589a77 100644 --- a/tools/perf/arch/arm64/util/Build +++ b/tools/perf/arch/arm64/util/Build @@ -1,14 +1,14 @@ -perf-y +=3D header.o -perf-y +=3D machine.o -perf-y +=3D perf_regs.o -perf-y +=3D tsc.o -perf-y +=3D pmu.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-y +=3D header.o +perf-util-y +=3D machine.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D tsc.o +perf-util-y +=3D pmu.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-$(CONFIG_AUXTRACE) +=3D ../../arm/util/pmu.o \ +perf-util-$(CONFIG_AUXTRACE) +=3D ../../arm/util/pmu.o \ ../../arm/util/auxtrace.o \ ../../arm/util/cs-etm.o \ arm-spe.o mem-events.o hisi-ptt.o diff --git a/tools/perf/arch/csky/Build b/tools/perf/arch/csky/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/csky/Build +++ b/tools/perf/arch/csky/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/csky/util/Build b/tools/perf/arch/csky/util/Bu= ild index 7d3050134ae0..99d83f41bf43 100644 --- a/tools/perf/arch/csky/util/Build +++ b/tools/perf/arch/csky/util/Build @@ -1,4 +1,4 @@ -perf-y +=3D perf_regs.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/loongarch/Build b/tools/perf/arch/loongarch/Bu= ild index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/loongarch/Build +++ b/tools/perf/arch/loongarch/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/loongarch/util/Build b/tools/perf/arch/loongar= ch/util/Build index d776125a2d06..2386ebbf6dd4 100644 --- a/tools/perf/arch/loongarch/util/Build +++ b/tools/perf/arch/loongarch/util/Build @@ -1,5 +1,5 @@ -perf-y +=3D perf_regs.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/mips/Build b/tools/perf/arch/mips/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/mips/Build +++ b/tools/perf/arch/mips/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/mips/util/Build b/tools/perf/arch/mips/util/Bu= ild index 51c8900a9a10..e4644f1e68a0 100644 --- a/tools/perf/arch/mips/util/Build +++ b/tools/perf/arch/mips/util/Build @@ -1,3 +1,3 @@ -perf-y +=3D perf_regs.o -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-y +=3D perf_regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o diff --git a/tools/perf/arch/powerpc/Build b/tools/perf/arch/powerpc/Build index 58b2d965ed86..12ebc65ea7a3 100644 --- a/tools/perf/arch/powerpc/Build +++ b/tools/perf/arch/powerpc/Build @@ -1,2 +1,2 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-y +=3D tests/ diff --git a/tools/perf/arch/powerpc/util/Build b/tools/perf/arch/powerpc/u= til/Build index 1d323f3a3322..6c588ecdf3bd 100644 --- a/tools/perf/arch/powerpc/util/Build +++ b/tools/perf/arch/powerpc/util/Build @@ -1,14 +1,14 @@ -perf-y +=3D header.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-y +=3D perf_regs.o -perf-y +=3D mem-events.o -perf-y +=3D pmu.o -perf-y +=3D sym-handling.o -perf-y +=3D evsel.o -perf-y +=3D event.o +perf-util-y +=3D header.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D mem-events.o +perf-util-y +=3D pmu.o +perf-util-y +=3D sym-handling.o +perf-util-y +=3D evsel.o +perf-util-y +=3D event.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_DWARF) +=3D skip-callchain-idx.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D skip-callchain-idx.o =20 -perf-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/riscv/Build b/tools/perf/arch/riscv/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/riscv/Build +++ b/tools/perf/arch/riscv/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/riscv/util/Build b/tools/perf/arch/riscv/util/= Build index 603dbb5ae4dc..65ec3c66a375 100644 --- a/tools/perf/arch/riscv/util/Build +++ b/tools/perf/arch/riscv/util/Build @@ -1,5 +1,5 @@ -perf-y +=3D perf_regs.o -perf-y +=3D header.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D header.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/s390/Build b/tools/perf/arch/s390/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/s390/Build +++ b/tools/perf/arch/s390/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/s390/util/Build b/tools/perf/arch/s390/util/Bu= ild index fa66f15a14ec..1ac830030ff3 100644 --- a/tools/perf/arch/s390/util/Build +++ b/tools/perf/arch/s390/util/Build @@ -1,11 +1,11 @@ -perf-y +=3D header.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-y +=3D perf_regs.o +perf-util-y +=3D header.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-y +=3D machine.o -perf-y +=3D pmu.o +perf-util-y +=3D machine.o +perf-util-y +=3D pmu.o =20 -perf-$(CONFIG_AUXTRACE) +=3D auxtrace.o +perf-util-$(CONFIG_AUXTRACE) +=3D auxtrace.o diff --git a/tools/perf/arch/sh/Build b/tools/perf/arch/sh/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/sh/Build +++ b/tools/perf/arch/sh/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/sh/util/Build b/tools/perf/arch/sh/util/Build index e813e618954b..32f44fc4ab98 100644 --- a/tools/perf/arch/sh/util/Build +++ b/tools/perf/arch/sh/util/Build @@ -1 +1 @@ -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o diff --git a/tools/perf/arch/sparc/Build b/tools/perf/arch/sparc/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/sparc/Build +++ b/tools/perf/arch/sparc/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/sparc/util/Build b/tools/perf/arch/sparc/util/= Build index e813e618954b..32f44fc4ab98 100644 --- a/tools/perf/arch/sparc/util/Build +++ b/tools/perf/arch/sparc/util/Build @@ -1 +1 @@ -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build index 132cf8beaca2..87d057491343 100644 --- a/tools/perf/arch/x86/Build +++ b/tools/perf/arch/x86/Build @@ -1,4 +1,4 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-y +=3D tests/ =20 ifdef SHELLCHECK diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build index 005907cb97d8..2607ed5c4296 100644 --- a/tools/perf/arch/x86/util/Build +++ b/tools/perf/arch/x86/util/Build @@ -1,24 +1,24 @@ -perf-y +=3D header.o -perf-y +=3D tsc.o -perf-y +=3D pmu.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-y +=3D perf_regs.o -perf-y +=3D topdown.o -perf-y +=3D machine.o -perf-y +=3D event.o -perf-y +=3D evlist.o -perf-y +=3D mem-events.o -perf-y +=3D evsel.o -perf-y +=3D iostat.o -perf-y +=3D env.o +perf-util-y +=3D header.o +perf-util-y +=3D tsc.o +perf-util-y +=3D pmu.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D topdown.o +perf-util-y +=3D machine.o +perf-util-y +=3D event.o +perf-util-y +=3D evlist.o +perf-util-y +=3D mem-events.o +perf-util-y +=3D evsel.o +perf-util-y +=3D iostat.o +perf-util-y +=3D env.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_BPF_PROLOGUE) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_BPF_PROLOGUE) +=3D dwarf-regs.o =20 -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-$(CONFIG_AUXTRACE) +=3D auxtrace.o -perf-$(CONFIG_AUXTRACE) +=3D archinsn.o -perf-$(CONFIG_AUXTRACE) +=3D intel-pt.o -perf-$(CONFIG_AUXTRACE) +=3D intel-bts.o +perf-util-$(CONFIG_AUXTRACE) +=3D auxtrace.o +perf-util-$(CONFIG_AUXTRACE) +=3D archinsn.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-bts.o diff --git a/tools/perf/arch/xtensa/Build b/tools/perf/arch/xtensa/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/xtensa/Build +++ b/tools/perf/arch/xtensa/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/scripts/Build b/tools/perf/scripts/Build index 7d8e2e57faac..46f0c6f76dbf 100644 --- a/tools/perf/scripts/Build +++ b/tools/perf/scripts/Build @@ -1,4 +1,4 @@ ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_LIBPERL) +=3D perl/Perf-Trace-Util/ + perf-util-$(CONFIG_LIBPERL) +=3D perl/Perf-Trace-Util/ endif -perf-$(CONFIG_LIBPYTHON) +=3D python/Perf-Trace-Util/ +perf-util-$(CONFIG_LIBPYTHON) +=3D python/Perf-Trace-Util/ diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Build b/tools/perf/scr= ipts/perl/Perf-Trace-Util/Build index cc76be005d5e..9b0e5a8b5070 100644 --- a/tools/perf/scripts/perl/Perf-Trace-Util/Build +++ b/tools/perf/scripts/perl/Perf-Trace-Util/Build @@ -1,4 +1,4 @@ -perf-y +=3D Context.o +perf-util-y +=3D Context.o =20 CFLAGS_Context.o +=3D $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-stric= t-prototypes -Wno-bad-function-cast -Wno-declaration-after-statement -Wno-s= witch-enum CFLAGS_Context.o +=3D -Wno-unused-parameter -Wno-nested-externs -Wno-undef diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Build b/tools/perf/s= cripts/python/Perf-Trace-Util/Build index 5b0b5ff7e14a..be3710c61320 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/Build +++ b/tools/perf/scripts/python/Perf-Trace-Util/Build @@ -1,4 +1,4 @@ -perf-y +=3D Context.o +perf-util-y +=3D Context.o =20 # -Wno-declaration-after-statement: The python headers have mixed code wit= h declarations (decls after asserts, for instance) CFLAGS_Context.o +=3D $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-str= ict-prototypes -Wno-unused-parameter -Wno-nested-externs -Wno-declaration-a= fter-statement diff --git a/tools/perf/util/Build b/tools/perf/util/Build index da64efd8718f..0f18fe81ef0b 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -1,181 +1,181 @@ include $(srctree)/tools/scripts/Makefile.include include $(srctree)/tools/scripts/utilities.mak =20 -perf-y +=3D arm64-frame-pointer-unwind-support.o -perf-y +=3D addr_location.o -perf-y +=3D annotate.o -perf-y +=3D block-info.o -perf-y +=3D block-range.o -perf-y +=3D build-id.o -perf-y +=3D cacheline.o -perf-y +=3D config.o -perf-y +=3D copyfile.o -perf-y +=3D ctype.o -perf-y +=3D db-export.o -perf-y +=3D disasm.o -perf-y +=3D env.o -perf-y +=3D event.o -perf-y +=3D evlist.o -perf-y +=3D sideband_evlist.o -perf-y +=3D evsel.o -perf-y +=3D evsel_fprintf.o -perf-y +=3D perf_event_attr_fprintf.o -perf-y +=3D evswitch.o -perf-y +=3D find_bit.o -perf-y +=3D get_current_dir_name.o -perf-y +=3D levenshtein.o -perf-y +=3D mmap.o -perf-y +=3D memswap.o -perf-y +=3D parse-events.o -perf-y +=3D print-events.o -perf-y +=3D tracepoint.o -perf-y +=3D perf_regs.o -perf-y +=3D perf-regs-arch/ -perf-y +=3D path.o -perf-y +=3D print_binary.o -perf-y +=3D print_insn.o -perf-y +=3D rlimit.o -perf-y +=3D argv_split.o -perf-y +=3D rbtree.o -perf-y +=3D libstring.o -perf-y +=3D bitmap.o -perf-y +=3D hweight.o -perf-y +=3D smt.o -perf-y +=3D strbuf.o -perf-y +=3D string.o -perf-y +=3D strlist.o -perf-y +=3D strfilter.o -perf-y +=3D top.o -perf-y +=3D usage.o -perf-y +=3D dso.o -perf-y +=3D dsos.o -perf-y +=3D symbol.o -perf-y +=3D symbol_fprintf.o -perf-y +=3D map_symbol.o -perf-y +=3D color.o -perf-y +=3D color_config.o -perf-y +=3D metricgroup.o -perf-y +=3D header.o -perf-y +=3D callchain.o -perf-y +=3D values.o -perf-y +=3D debug.o -perf-y +=3D fncache.o -perf-y +=3D machine.o -perf-y +=3D map.o -perf-y +=3D maps.o -perf-y +=3D pstack.o -perf-y +=3D session.o -perf-y +=3D sample-raw.o -perf-y +=3D s390-sample-raw.o -perf-y +=3D amd-sample-raw.o -perf-$(CONFIG_TRACE) +=3D syscalltbl.o -perf-y +=3D ordered-events.o -perf-y +=3D namespaces.o -perf-y +=3D comm.o -perf-y +=3D thread.o -perf-y +=3D threads.o -perf-y +=3D thread_map.o -perf-y +=3D parse-events-flex.o -perf-y +=3D parse-events-bison.o -perf-y +=3D pmu.o -perf-y +=3D pmus.o -perf-y +=3D pmu-flex.o -perf-y +=3D pmu-bison.o -perf-y +=3D svghelper.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-info.o -perf-y +=3D trace-event-scripting.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-parse.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-read.o -perf-y +=3D sort.o -perf-y +=3D hist.o -perf-y +=3D util.o -perf-y +=3D cpumap.o -perf-y +=3D affinity.o -perf-y +=3D cputopo.o -perf-y +=3D cgroup.o -perf-y +=3D target.o -perf-y +=3D rblist.o -perf-y +=3D intlist.o -perf-y +=3D vdso.o -perf-y +=3D counts.o -perf-y +=3D stat.o -perf-y +=3D stat-shadow.o -perf-y +=3D stat-display.o -perf-y +=3D perf_api_probe.o -perf-y +=3D record.o -perf-y +=3D srcline.o -perf-y +=3D srccode.o -perf-y +=3D synthetic-events.o -perf-y +=3D data.o -perf-y +=3D tsc.o -perf-y +=3D cloexec.o -perf-y +=3D call-path.o -perf-y +=3D rwsem.o -perf-y +=3D thread-stack.o -perf-y +=3D spark.o -perf-y +=3D topdown.o -perf-y +=3D iostat.o -perf-y +=3D stream.o -perf-$(CONFIG_AUXTRACE) +=3D auxtrace.o -perf-$(CONFIG_AUXTRACE) +=3D intel-pt-decoder/ -perf-$(CONFIG_AUXTRACE) +=3D intel-pt.o -perf-$(CONFIG_AUXTRACE) +=3D intel-bts.o -perf-$(CONFIG_AUXTRACE) +=3D arm-spe.o -perf-$(CONFIG_AUXTRACE) +=3D arm-spe-decoder/ -perf-$(CONFIG_AUXTRACE) +=3D hisi-ptt.o -perf-$(CONFIG_AUXTRACE) +=3D hisi-ptt-decoder/ -perf-$(CONFIG_AUXTRACE) +=3D s390-cpumsf.o +perf-util-y +=3D arm64-frame-pointer-unwind-support.o +perf-util-y +=3D addr_location.o +perf-util-y +=3D annotate.o +perf-util-y +=3D block-info.o +perf-util-y +=3D block-range.o +perf-util-y +=3D build-id.o +perf-util-y +=3D cacheline.o +perf-util-y +=3D config.o +perf-util-y +=3D copyfile.o +perf-util-y +=3D ctype.o +perf-util-y +=3D db-export.o +perf-util-y +=3D disasm.o +perf-util-y +=3D env.o +perf-util-y +=3D event.o +perf-util-y +=3D evlist.o +perf-util-y +=3D sideband_evlist.o +perf-util-y +=3D evsel.o +perf-util-y +=3D evsel_fprintf.o +perf-util-y +=3D perf_event_attr_fprintf.o +perf-util-y +=3D evswitch.o +perf-util-y +=3D find_bit.o +perf-util-y +=3D get_current_dir_name.o +perf-util-y +=3D levenshtein.o +perf-util-y +=3D mmap.o +perf-util-y +=3D memswap.o +perf-util-y +=3D parse-events.o +perf-util-y +=3D print-events.o +perf-util-y +=3D tracepoint.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D perf-regs-arch/ +perf-util-y +=3D path.o +perf-util-y +=3D print_binary.o +perf-util-y +=3D print_insn.o +perf-util-y +=3D rlimit.o +perf-util-y +=3D argv_split.o +perf-util-y +=3D rbtree.o +perf-util-y +=3D libstring.o +perf-util-y +=3D bitmap.o +perf-util-y +=3D hweight.o +perf-util-y +=3D smt.o +perf-util-y +=3D strbuf.o +perf-util-y +=3D string.o +perf-util-y +=3D strlist.o +perf-util-y +=3D strfilter.o +perf-util-y +=3D top.o +perf-util-y +=3D usage.o +perf-util-y +=3D dso.o +perf-util-y +=3D dsos.o +perf-util-y +=3D symbol.o +perf-util-y +=3D symbol_fprintf.o +perf-util-y +=3D map_symbol.o +perf-util-y +=3D color.o +perf-util-y +=3D color_config.o +perf-util-y +=3D metricgroup.o +perf-util-y +=3D header.o +perf-util-y +=3D callchain.o +perf-util-y +=3D values.o +perf-util-y +=3D debug.o +perf-util-y +=3D fncache.o +perf-util-y +=3D machine.o +perf-util-y +=3D map.o +perf-util-y +=3D maps.o +perf-util-y +=3D pstack.o +perf-util-y +=3D session.o +perf-util-y +=3D sample-raw.o +perf-util-y +=3D s390-sample-raw.o +perf-util-y +=3D amd-sample-raw.o +perf-util-$(CONFIG_TRACE) +=3D syscalltbl.o +perf-util-y +=3D ordered-events.o +perf-util-y +=3D namespaces.o +perf-util-y +=3D comm.o +perf-util-y +=3D thread.o +perf-util-y +=3D threads.o +perf-util-y +=3D thread_map.o +perf-util-y +=3D parse-events-flex.o +perf-util-y +=3D parse-events-bison.o +perf-util-y +=3D pmu.o +perf-util-y +=3D pmus.o +perf-util-y +=3D pmu-flex.o +perf-util-y +=3D pmu-bison.o +perf-util-y +=3D svghelper.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-info.o +perf-util-y +=3D trace-event-scripting.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-parse.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-read.o +perf-util-y +=3D sort.o +perf-util-y +=3D hist.o +perf-util-y +=3D util.o +perf-util-y +=3D cpumap.o +perf-util-y +=3D affinity.o +perf-util-y +=3D cputopo.o +perf-util-y +=3D cgroup.o +perf-util-y +=3D target.o +perf-util-y +=3D rblist.o +perf-util-y +=3D intlist.o +perf-util-y +=3D vdso.o +perf-util-y +=3D counts.o +perf-util-y +=3D stat.o +perf-util-y +=3D stat-shadow.o +perf-util-y +=3D stat-display.o +perf-util-y +=3D perf_api_probe.o +perf-util-y +=3D record.o +perf-util-y +=3D srcline.o +perf-util-y +=3D srccode.o +perf-util-y +=3D synthetic-events.o +perf-util-y +=3D data.o +perf-util-y +=3D tsc.o +perf-util-y +=3D cloexec.o +perf-util-y +=3D call-path.o +perf-util-y +=3D rwsem.o +perf-util-y +=3D thread-stack.o +perf-util-y +=3D spark.o +perf-util-y +=3D topdown.o +perf-util-y +=3D iostat.o +perf-util-y +=3D stream.o +perf-util-$(CONFIG_AUXTRACE) +=3D auxtrace.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-bts.o +perf-util-$(CONFIG_AUXTRACE) +=3D arm-spe.o +perf-util-$(CONFIG_AUXTRACE) +=3D arm-spe-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D hisi-ptt.o +perf-util-$(CONFIG_AUXTRACE) +=3D hisi-ptt-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D s390-cpumsf.o =20 ifdef CONFIG_LIBOPENCSD -perf-$(CONFIG_AUXTRACE) +=3D cs-etm.o -perf-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm.o +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder/ endif -perf-$(CONFIG_AUXTRACE) +=3D cs-etm-base.o - -perf-y +=3D parse-branch-options.o -perf-y +=3D dump-insn.o -perf-y +=3D parse-regs-options.o -perf-y +=3D parse-sublevel-options.o -perf-y +=3D term.o -perf-y +=3D help-unknown-cmd.o -perf-y +=3D dlfilter.o -perf-y +=3D mem-events.o -perf-y +=3D mem-info.o -perf-y +=3D vsprintf.o -perf-y +=3D units.o -perf-y +=3D time-utils.o -perf-y +=3D expr-flex.o -perf-y +=3D expr-bison.o -perf-y +=3D expr.o -perf-y +=3D branch.o -perf-y +=3D mem2node.o -perf-y +=3D clockid.o -perf-y +=3D list_sort.o -perf-y +=3D mutex.o -perf-y +=3D sharded_mutex.o - -perf-$(CONFIG_LIBBPF) +=3D bpf_map.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter_cgroup.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_ftrace.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_off_cpu.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-flex.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-bison.o +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm-base.o + +perf-util-y +=3D parse-branch-options.o +perf-util-y +=3D dump-insn.o +perf-util-y +=3D parse-regs-options.o +perf-util-y +=3D parse-sublevel-options.o +perf-util-y +=3D term.o +perf-util-y +=3D help-unknown-cmd.o +perf-util-y +=3D dlfilter.o +perf-util-y +=3D mem-events.o +perf-util-y +=3D mem-info.o +perf-util-y +=3D vsprintf.o +perf-util-y +=3D units.o +perf-util-y +=3D time-utils.o +perf-util-y +=3D expr-flex.o +perf-util-y +=3D expr-bison.o +perf-util-y +=3D expr.o +perf-util-y +=3D branch.o +perf-util-y +=3D mem2node.o +perf-util-y +=3D clockid.o +perf-util-y +=3D list_sort.o +perf-util-y +=3D mutex.o +perf-util-y +=3D sharded_mutex.o + +perf-util-$(CONFIG_LIBBPF) +=3D bpf_map.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter_cgroup.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_ftrace.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_off_cpu.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-flex.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-bison.o =20 ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_lock_contention.o + perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_lock_contention.o endif =20 ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork.o - perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork_top.o + perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork.o + perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork_top.o endif =20 -perf-$(CONFIG_LIBELF) +=3D symbol-elf.o -perf-$(CONFIG_LIBELF) +=3D probe-file.o -perf-$(CONFIG_LIBELF) +=3D probe-event.o +perf-util-$(CONFIG_LIBELF) +=3D symbol-elf.o +perf-util-$(CONFIG_LIBELF) +=3D probe-file.o +perf-util-$(CONFIG_LIBELF) +=3D probe-event.o =20 ifdef CONFIG_LIBBPF_DYNAMIC hashmap :=3D 1 @@ -185,60 +185,60 @@ ifndef CONFIG_LIBBPF endif =20 ifdef hashmap -perf-y +=3D hashmap.o +perf-util-y +=3D hashmap.o endif =20 ifndef CONFIG_LIBELF -perf-y +=3D symbol-minimal.o +perf-util-y +=3D symbol-minimal.o endif =20 ifndef CONFIG_SETNS -perf-y +=3D setns.o +perf-util-y +=3D setns.o endif =20 -perf-$(CONFIG_DWARF) +=3D probe-finder.o -perf-$(CONFIG_DWARF) +=3D dwarf-aux.o -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_DWARF) +=3D debuginfo.o -perf-$(CONFIG_DWARF) +=3D annotate-data.o +perf-util-$(CONFIG_DWARF) +=3D probe-finder.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-aux.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D debuginfo.o +perf-util-$(CONFIG_DWARF) +=3D annotate-data.o =20 -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind-local.o -perf-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBUNWIND_X86) +=3D libunwind/x86_32.o -perf-$(CONFIG_LIBUNWIND_AARCH64) +=3D libunwind/arm64.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind-local.o +perf-util-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBUNWIND_X86) +=3D libunwind/x86_32.o +perf-util-$(CONFIG_LIBUNWIND_AARCH64) +=3D libunwind/arm64.o =20 ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_LIBBABELTRACE) +=3D data-convert-bt.o + perf-util-$(CONFIG_LIBBABELTRACE) +=3D data-convert-bt.o endif =20 -perf-y +=3D data-convert-json.o +perf-util-y +=3D data-convert-json.o =20 -perf-y +=3D scripting-engines/ +perf-util-y +=3D scripting-engines/ =20 -perf-$(CONFIG_ZLIB) +=3D zlib.o -perf-$(CONFIG_LZMA) +=3D lzma.o -perf-$(CONFIG_ZSTD) +=3D zstd.o +perf-util-$(CONFIG_ZLIB) +=3D zlib.o +perf-util-$(CONFIG_LZMA) +=3D lzma.o +perf-util-$(CONFIG_ZSTD) +=3D zstd.o =20 -perf-$(CONFIG_LIBCAP) +=3D cap.o +perf-util-$(CONFIG_LIBCAP) +=3D cap.o =20 -perf-$(CONFIG_CXX_DEMANGLE) +=3D demangle-cxx.o -perf-y +=3D demangle-ocaml.o -perf-y +=3D demangle-java.o -perf-y +=3D demangle-rust.o +perf-util-$(CONFIG_CXX_DEMANGLE) +=3D demangle-cxx.o +perf-util-y +=3D demangle-ocaml.o +perf-util-y +=3D demangle-java.o +perf-util-y +=3D demangle-rust.o =20 ifdef CONFIG_JITDUMP -perf-$(CONFIG_LIBELF) +=3D jitdump.o -perf-$(CONFIG_LIBELF) +=3D genelf.o -perf-$(CONFIG_DWARF) +=3D genelf_debug.o +perf-util-$(CONFIG_LIBELF) +=3D jitdump.o +perf-util-$(CONFIG_LIBELF) +=3D genelf.o +perf-util-$(CONFIG_DWARF) +=3D genelf_debug.o endif =20 -perf-y +=3D perf-hooks.o +perf-util-y +=3D perf-hooks.o =20 -perf-$(CONFIG_LIBBPF) +=3D bpf-event.o -perf-$(CONFIG_LIBBPF) +=3D bpf-utils.o +perf-util-$(CONFIG_LIBBPF) +=3D bpf-event.o +perf-util-$(CONFIG_LIBBPF) +=3D bpf-utils.o =20 -perf-$(CONFIG_LIBPFM4) +=3D pfm.o +perf-util-$(CONFIG_LIBPFM4) +=3D pfm.o =20 CFLAGS_config.o +=3D -DETC_PERFCONFIG=3D"BUILD_STR($(ETC_PERFCONFIG_SQ))" =20 @@ -403,4 +403,4 @@ $(OUTPUT)%.shellcheck_log: % $(call rule_mkdir) $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) =20 -perf-y +=3D $(TEST_LOGS) +perf-util-y +=3D $(TEST_LOGS) diff --git a/tools/perf/util/arm-spe-decoder/Build b/tools/perf/util/arm-sp= e-decoder/Build index f8dae13fc876..960062b3cb9e 100644 --- a/tools/perf/util/arm-spe-decoder/Build +++ b/tools/perf/util/arm-spe-decoder/Build @@ -1 +1 @@ -perf-$(CONFIG_AUXTRACE) +=3D arm-spe-pkt-decoder.o arm-spe-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D arm-spe-pkt-decoder.o arm-spe-decoder.o diff --git a/tools/perf/util/cs-etm-decoder/Build b/tools/perf/util/cs-etm-= decoder/Build index 216cb17a3322..056d665f7f88 100644 --- a/tools/perf/util/cs-etm-decoder/Build +++ b/tools/perf/util/cs-etm-decoder/Build @@ -1 +1 @@ -perf-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder.o diff --git a/tools/perf/util/hisi-ptt-decoder/Build b/tools/perf/util/hisi-= ptt-decoder/Build index db3db8b75033..3298f7b7e308 100644 --- a/tools/perf/util/hisi-ptt-decoder/Build +++ b/tools/perf/util/hisi-ptt-decoder/Build @@ -1 +1 @@ -perf-$(CONFIG_AUXTRACE) +=3D hisi-ptt-pkt-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D hisi-ptt-pkt-decoder.o diff --git a/tools/perf/util/intel-pt-decoder/Build b/tools/perf/util/intel= -pt-decoder/Build index b41c2e9c6f88..30793d08c6d4 100644 --- a/tools/perf/util/intel-pt-decoder/Build +++ b/tools/perf/util/intel-pt-decoder/Build @@ -1,4 +1,4 @@ -perf-$(CONFIG_AUXTRACE) +=3D intel-pt-pkt-decoder.o intel-pt-insn-decoder.= o intel-pt-log.o intel-pt-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt-pkt-decoder.o intel-pt-insn-dec= oder.o intel-pt-log.o intel-pt-decoder.o =20 inat_tables_script =3D $(srctree)/tools/arch/x86/tools/gen-insn-attr-x86.a= wk inat_tables_maps =3D $(srctree)/tools/arch/x86/lib/x86-opcode-map.txt diff --git a/tools/perf/util/perf-regs-arch/Build b/tools/perf/util/perf-re= gs-arch/Build index d9d596d330a7..be95402aa540 100644 --- a/tools/perf/util/perf-regs-arch/Build +++ b/tools/perf/util/perf-regs-arch/Build @@ -1,9 +1,9 @@ -perf-y +=3D perf_regs_aarch64.o -perf-y +=3D perf_regs_arm.o -perf-y +=3D perf_regs_csky.o -perf-y +=3D perf_regs_loongarch.o -perf-y +=3D perf_regs_mips.o -perf-y +=3D perf_regs_powerpc.o -perf-y +=3D perf_regs_riscv.o -perf-y +=3D perf_regs_s390.o -perf-y +=3D perf_regs_x86.o +perf-util-y +=3D perf_regs_aarch64.o +perf-util-y +=3D perf_regs_arm.o +perf-util-y +=3D perf_regs_csky.o +perf-util-y +=3D perf_regs_loongarch.o +perf-util-y +=3D perf_regs_mips.o +perf-util-y +=3D perf_regs_powerpc.o +perf-util-y +=3D perf_regs_riscv.o +perf-util-y +=3D perf_regs_s390.o +perf-util-y +=3D perf_regs_x86.o diff --git a/tools/perf/util/scripting-engines/Build b/tools/perf/util/scri= pting-engines/Build index 586b94e90f4e..2282fe3772f3 100644 --- a/tools/perf/util/scripting-engines/Build +++ b/tools/perf/util/scripting-engines/Build @@ -1,7 +1,7 @@ ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_LIBPERL) +=3D trace-event-perl.o + perf-util-$(CONFIG_LIBPERL) +=3D trace-event-perl.o endif -perf-$(CONFIG_LIBPYTHON) +=3D trace-event-python.o +perf-util-$(CONFIG_LIBPYTHON) +=3D trace-event-python.o =20 CFLAGS_trace-event-perl.o +=3D $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -= Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow -Wno-nested-externs= -Wno-undef -Wno-switch-default -Wno-bad-function-cast -Wno-declaration-aft= er-statement -Wno-switch-enum =20 --=20 2.45.2.741.gdbec12cfda-goog From nobody Wed Dec 17 20:58:44 2025 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EFB817DE0D for ; Tue, 25 Jun 2024 18:42:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340970; cv=none; b=epHcquNOZVYdJZB3zZ7oe7mhj09kUf+gom0jEAzSaVEC6a8c6no81OIOoLsMqaXv0P3c1bMqJd+idlvh0QEKuSwhHxatsY2HwLOgtGcyKS6nYouO9KNAzwfA7IGayeT3u75y7JKrqRDlPSCVrYedxGNK5V4azWJyidskVW30px8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340970; c=relaxed/simple; bh=3L4VCPu5Gi0E3loQZRfPWXHSalpI7X3sqJEW5i53YJ0=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=pxszntPmETtwDKT2jPnCTUdee7VhyBSRM2QTnso+RRCJmP6gzyfzHTHrN896PhE+IJJ6VwuXHqMq3qE/fDT6ZF08TkYOeLRuimaDjc1peqY/XCtkiUW7nH48gWqfGfD9f37VCRh4rXge07YmCFN6xRrninm6yP3BDKuArPJRNe0= 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=q8mGwibu; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="q8mGwibu" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dfa7a8147c3so12361125276.3 for ; Tue, 25 Jun 2024 11:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719340967; x=1719945767; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Z5WhEzrAKR6etY4+8+J3I2144onDLe33a/pW/pB3BVA=; b=q8mGwibuW8iWsMKlvrXpfpjeM0MKVNYTH+6Se3SvqH0tC7qKEjcjbLXQyzMI8o/l4F 40NXPt9tb0djKakV6qxx2l8DNJ3tJlteKQxnKOJznXRKURkTil6S8+yFYENNVeC7Vly9 GYk535HU1t+M9tVh9qXahQbvTeIvsX57aA8CpauxqaEqVWoYFYrcVZ+z22KDpsA7+z3X ndmG+fpYcI6df5JrK1CAP+LrEu20h6QB3PR7TtasLzuC3At6+G8dd5sGpWfQD0J61fj7 IKfVmqg916COVbHoAAjNtXHyKnOKr3umMIEj4v3DTVDnbqD7zMRe8CMPg5GEGkb6owuZ y1fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719340967; x=1719945767; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z5WhEzrAKR6etY4+8+J3I2144onDLe33a/pW/pB3BVA=; b=k5/muibWY7bwG5nC/CVWtp4wt0MNUqcuPylNxzPPmYKcDjQroHsp+yVf2IadoUtXN4 qvGQLRnIfroyJy49FXl7yTw5rEEKj8PUF64pwzxaoUAApJCsbpkqL4TxCc4g/0MOIiWN K3TbpOWxl7EDuh8yF+P75g16Y3Nt9A54qxxmh5ht3SGE94kwRUrcm0rNV08iAF7Lxf3C iVutVc7qkSezPCzpvntGEf0rG46xVcBVWLzv64eCLyyHW3LVswWWpQ17VSuJZwyjbwt9 9dv/HgLgyAazlfQUmPQ0PFAUIsyOfqMHTFhw7V0SLBGJmQnclIT2ZZtc5+GA5cItVLBi bRxg== X-Forwarded-Encrypted: i=1; AJvYcCVHUDHGsWyNpIMj9zRiMLwXpKysVM7K4Vh1rIftDlIqMmVLWWJ9NI3iEh7ZHzbMXAk00/nCNlYr+G0Ob+c4mRYJEDpmMA2L/Mcs4yhz X-Gm-Message-State: AOJu0YxHIVhIYiTDHbURDs75pf/ZYHMltLrw2HI9EBFGU6c2YFsrjBM8 Go5FCmwUQ5FkZsYMd1e8zSKsRmtw/jVUpeXmT5AUDZJXDb3kW3qI9McBLiju9olOB6qFfli7xd1 i0YKVcg== X-Google-Smtp-Source: AGHT+IHFfDudTcZpYBJ7DaBhhH5rSWVcGGVlqxAdq4qgt3qZon/zWZ6TMzj+Mka5n/0q6UdKITjOTlDeHHoG X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:6902:188a:b0:e02:b7b3:94c4 with SMTP id 3f1490d57ef6-e0303ecc8f1mr355061276.3.1719340967268; Tue, 25 Jun 2024 11:42:47 -0700 (PDT) Date: Tue, 25 Jun 2024 11:42:24 -0700 In-Reply-To: <20240625184224.929018-1-irogers@google.com> Message-Id: <20240625184224.929018-8-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625184224.929018-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v4 7/7] perf python: Switch module to linking libraries from building source From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Andrei Vagin , Kees Cook , Oliver Upton , Ze Gao , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" setup.py was building most perf sources causing setup.py to mimic the Makefile logic as well as flex/bison code to be stubbed out, due to complexity building. By using libraries fewer functions are stubbed out, the build is faster and the Makefile logic is reused which should simplify updating. The libraries are passed through LDFLAGS to avoid complexity in python. Force the -fPIC flag for libbpf.a to ensure it is suitable for linking into the perf python module. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.config | 5 + tools/perf/Makefile.perf | 6 +- tools/perf/util/python.c | 274 +++++++++++++------------------------ tools/perf/util/setup.py | 33 +---- 4 files changed, 110 insertions(+), 208 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 81f73f68d256..5271a4c1d2b3 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -908,6 +908,11 @@ else endif CFLAGS +=3D -DHAVE_LIBPYTHON_SUPPORT $(call detected,CONFIG_LIBPYTHON) + ifeq ($(filter -fPIC,$(CFLAGS)),) + # Building a shared library requires position independent code. + CFLAGS +=3D -fPIC + CXXFLAGS +=3D -fPIC + endif endif endif endif diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index ff03f0431013..4a1a9f09fa09 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -715,9 +715,9 @@ all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BI= NDINGS) $(OTHER_PROGRAMS) # Create python binding output directory if not already present $(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python') =20 -$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): $(PYTHON_EXT_SRCS) $(PYTHO= N_EXT_DEPS) $(LIBPERF) $(LIBSUBCMD) +$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): $(PYTHON_EXT_SRCS) $(PYTHO= N_EXT_DEPS) $(PERFLIBS) $(QUIET_GEN)LDSHARED=3D"$(CC) -pthread -shared" \ - CFLAGS=3D'$(CFLAGS)' LDFLAGS=3D'$(LDFLAGS)' \ + CFLAGS=3D'$(CFLAGS)' LDFLAGS=3D'$(LDFLAGS) $(LIBS)' \ $(PYTHON_WORD) util/setup.py \ --quiet build_ext; \ cp $(PYTHON_EXTBUILD_LIB)perf*.so $(OUTPUT)python/ @@ -933,7 +933,7 @@ $(LIBAPI)-clean: $(LIBBPF): FORCE | $(LIBBPF_OUTPUT) $(Q)$(MAKE) -C $(LIBBPF_DIR) FEATURES_DUMP=3D$(FEATURE_DUMP_EXPORT) \ O=3D OUTPUT=3D$(LIBBPF_OUTPUT)/ DESTDIR=3D$(LIBBPF_DESTDIR) prefix=3D su= bdir=3D \ - $@ install_headers + EXTRA_CFLAGS=3D"-fPIC" $@ install_headers =20 $(LIBBPF)-clean: $(call QUIET_CLEAN, libbpf) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 88f98f2772fb..3be882b2e845 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -10,22 +10,19 @@ #endif #include #include "evlist.h" -#include "callchain.h" #include "evsel.h" #include "event.h" #include "print_binary.h" #include "thread_map.h" #include "trace-event.h" #include "mmap.h" -#include "stat.h" -#include "metricgroup.h" #include "util/bpf-filter.h" #include "util/env.h" -#include "util/pmu.h" -#include "util/pmus.h" -#include "util/symbol_conf.h" +#include "util/kvm-stat.h" +#include "util/kwork.h" +#include "util/lock-contention.h" #include -#include "util.h" +#include "../builtin.h" =20 #if PY_MAJOR_VERSION < 3 #define _PyUnicode_FromString(arg) \ @@ -51,168 +48,6 @@ #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) #endif =20 -struct symbol_conf symbol_conf; - -/* - * Avoid bringing in event parsing. - */ -int parse_event(struct evlist *evlist __maybe_unused, const char *str __ma= ybe_unused) -{ - return 0; -} - -/* - * Provide these two so that we don't have to link against callchain.c and - * start dragging hist.c, etc. - */ -struct callchain_param callchain_param; - -int parse_callchain_record(const char *arg __maybe_unused, - struct callchain_param *param __maybe_unused) -{ - return 0; -} - -/* - * Add these not to drag util/env.c - */ -struct perf_env perf_env; - -const char *perf_env__cpuid(struct perf_env *env __maybe_unused) -{ - return NULL; -} - -// This one is a bit easier, wouldn't drag too much, but leave it as a stu= b we need it here -const char *perf_env__arch(struct perf_env *env __maybe_unused) -{ - return NULL; -} - -/* - * These ones are needed not to drag the PMU bandwagon, jevents generated - * pmu_sys_event_tables, etc and evsel__find_pmu() is used so far just for - * doing per PMU perf_event_attr.exclude_guest handling, not really needed= , so - * far, for the perf python binding known usecases, revisit if this become - * necessary. - */ -struct perf_pmu *evsel__find_pmu(const struct evsel *evsel __maybe_unused) -{ - return NULL; -} - -int perf_pmu__scan_file(const struct perf_pmu *pmu, const char *name, cons= t char *fmt, ...) -{ - return EOF; -} - -const char *perf_pmu__name_from_config(struct perf_pmu *pmu __maybe_unused= , u64 config __maybe_unused) -{ - return NULL; -} - -struct perf_pmu *perf_pmus__find_by_type(unsigned int type __maybe_unused) -{ - return NULL; -} - -int perf_pmus__num_core_pmus(void) -{ - return 1; -} - -bool evsel__is_aux_event(const struct evsel *evsel __maybe_unused) -{ - return false; -} - -bool perf_pmus__supports_extended_type(void) -{ - return false; -} - -/* - * Add this one here not to drag util/metricgroup.c - */ -int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *= cgrp, - struct rblist *new_metric_events, - struct rblist *old_metric_events) -{ - return 0; -} - -/* - * Add this one here not to drag util/trace-event-info.c - */ -char *tracepoint_id_to_name(u64 config) -{ - return NULL; -} - -/* - * XXX: All these evsel destructors need some better mechanism, like a lin= ked - * list of destructors registered when the relevant code indeed is used in= stead - * of having more and more calls in perf_evsel__delete(). -- acme - * - * For now, add some more: - * - * Not to drag the BPF bandwagon... - */ -void bpf_counter__destroy(struct evsel *evsel); -int bpf_counter__install_pe(struct evsel *evsel, int cpu, int fd); -int bpf_counter__disable(struct evsel *evsel); - -void bpf_counter__destroy(struct evsel *evsel __maybe_unused) -{ -} - -int bpf_counter__install_pe(struct evsel *evsel __maybe_unused, int cpu __= maybe_unused, int fd __maybe_unused) -{ - return 0; -} - -int bpf_counter__disable(struct evsel *evsel __maybe_unused) -{ - return 0; -} - -// not to drag util/bpf-filter.c -#ifdef HAVE_BPF_SKEL -int perf_bpf_filter__prepare(struct evsel *evsel __maybe_unused) -{ - return 0; -} - -int perf_bpf_filter__destroy(struct evsel *evsel __maybe_unused) -{ - return 0; -} -#endif - -/* - * Support debug printing even though util/debug.c is not linked. That me= ans - * implementing 'verbose' and 'eprintf'. - */ -int verbose; -int debug_kmaps; -int debug_peo_args; - -int eprintf(int level, int var, const char *fmt, ...); - -int eprintf(int level, int var, const char *fmt, ...) -{ - va_list args; - int ret =3D 0; - - if (var >=3D level) { - va_start(args, fmt); - ret =3D vfprintf(stderr, fmt, args); - va_end(args); - } - - return ret; -} - /* Define PyVarObject_HEAD_INIT for python 2.5 */ #ifndef PyVarObject_HEAD_INIT # define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size, @@ -1513,15 +1348,102 @@ PyMODINIT_FUNC PyInit_perf(void) #endif } =20 -/* - * Dummy, to avoid dragging all the test_attr infrastructure in the python - * binding. - */ -void test_attr__open(struct perf_event_attr *attr, pid_t pid, struct perf_= cpu cpu, - int fd, int group_fd, unsigned long flags) + +/* The following are stubs to avoid dragging in builtin-* objects. */ +/* TODO: move the code out of the builtin-* file into util. */ + +unsigned int scripting_max_stack =3D PERF_MAX_STACK_DEPTH; + +bool kvm_entry_event(struct evsel *evsel __maybe_unused) { + return false; +} + +bool kvm_exit_event(struct evsel *evsel __maybe_unused) +{ + return false; +} + +bool exit_event_begin(struct evsel *evsel __maybe_unused, + struct perf_sample *sample __maybe_unused, + struct event_key *key __maybe_unused) +{ + return false; +} + +bool exit_event_end(struct evsel *evsel __maybe_unused, + struct perf_sample *sample __maybe_unused, + struct event_key *key __maybe_unused) +{ + return false; +} + +void exit_event_decode_key(struct perf_kvm_stat *kvm __maybe_unused, + struct event_key *key __maybe_unused, + char *decode __maybe_unused) +{ +} + +int find_scripts(char **scripts_array __maybe_unused, char **scripts_path= _array __maybe_unused, + int num __maybe_unused, int pathlen __maybe_unused) +{ + return -1; +} + +void perf_stat__set_no_csv_summary(int set __maybe_unused) +{ +} + +void perf_stat__set_big_num(int set __maybe_unused) +{ +} + +int script_spec_register(const char *spec __maybe_unused, struct scripting= _ops *ops __maybe_unused) +{ + return -1; +} + +arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *ar= ch __maybe_unused) +{ + return NULL; +} + +struct kwork_work *perf_kwork_add_work(struct perf_kwork *kwork __maybe_un= used, + struct kwork_class *class __maybe_unused, + struct kwork_work *key __maybe_unused) +{ + return NULL; +} + +void script_fetch_insn(struct perf_sample *sample __maybe_unused, + struct thread *thread __maybe_unused, + struct machine *machine __maybe_unused) +{ +} + +int perf_sample__sprintf_flags(u32 flags __maybe_unused, char *str __maybe= _unused, + size_t sz __maybe_unused) +{ + return -1; +} + +bool match_callstack_filter(struct machine *machine __maybe_unused, u64 *c= allstack __maybe_unused) +{ + return false; +} + +struct lock_stat *lock_stat_find(u64 addr __maybe_unused) +{ + return NULL; +} + +struct lock_stat *lock_stat_findnew(u64 addr __maybe_unused, const char *n= ame __maybe_unused, + int flags __maybe_unused) +{ + return NULL; } =20 -void evlist__free_stats(struct evlist *evlist) +int cmd_inject(int argc __maybe_unused, const char *argv[] __maybe_unused) { + return -1; } diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py index 3107f5aa8c9a..142e9d447ce7 100644 --- a/tools/perf/util/setup.py +++ b/tools/perf/util/setup.py @@ -60,7 +60,7 @@ class install_lib(_install_lib): =20 cflags =3D getenv('CFLAGS', '').split() # switch off several checks (need to be at the end of cflags list) -cflags +=3D ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-pa= rameter', '-Wno-redundant-decls', '-DPYTHON_PERF' ] +cflags +=3D ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-pa= rameter', '-Wno-redundant-decls' ] if cc_is_clang: cflags +=3D ["-Wno-unused-command-line-argument" ] else: @@ -72,36 +72,11 @@ cflags +=3D [ "-Wno-declaration-after-statement" ] src_perf =3D getenv('srctree') + '/tools/perf' build_lib =3D getenv('PYTHON_EXTBUILD_LIB') build_tmp =3D getenv('PYTHON_EXTBUILD_TMP') -libtraceevent =3D getenv('LIBTRACEEVENT') -libapikfs =3D getenv('LIBAPI') -libperf =3D getenv('LIBPERF') - -ext_sources =3D [f.strip() for f in open('util/python-ext-sources') - if len(f.strip()) > 0 and f[0] !=3D '#'] - -extra_libraries =3D [] - -if '-DHAVE_LIBTRACEEVENT' in cflags: - extra_libraries +=3D [ 'traceevent' ] -else: - ext_sources.remove('util/trace-event.c') - ext_sources.remove('util/trace-event-parse.c') - -# use full paths with source files -ext_sources =3D list(map(lambda x: '%s/%s' % (src_perf, x) , ext_sources)) - -if '-DHAVE_LIBNUMA_SUPPORT' in cflags: - extra_libraries +=3D [ 'numa' ] -if '-DHAVE_LIBCAP_SUPPORT' in cflags: - extra_libraries +=3D [ 'cap' ] =20 perf =3D Extension('perf', - sources =3D ext_sources, - include_dirs =3D ['util/include'], - libraries =3D extra_libraries, - extra_compile_args =3D cflags, - extra_objects =3D [ x for x in [libtraceevent, libapikfs, libperf] - if x is not None], + sources =3D [ src_perf + '/util/python.c' ], + include_dirs =3D ['util/include'], + extra_compile_args =3D cflags, ) =20 setup(name=3D'perf', --=20 2.45.2.741.gdbec12cfda-goog