From nobody Thu Feb 12 12:34:57 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 851C35A7A0 for ; Wed, 12 Jun 2024 18:33:30 +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=1718217212; cv=none; b=VsaDqtwQ6w7GGI8G0eDLBb3iwwPnxyt2bvy/T571m7fZmFVyYiRv5VWVv14ei/ruX366TVbb5MvHaprzM2IDH4ONMnwsKt3eqDloeI9J+rYxhcfOBf+T7JtYa9CQjNJwpWDnA5O84Mm0973STg4PNsfLrlCMUpFJOzPO5ThhPwQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718217212; c=relaxed/simple; bh=xM2OraEzCHPYA1XYxDOu/vQ1lb7fq6Wfuu93T3xy8mk=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=e4VUaTAQ4xk9cdMa62QndSjbTVt0jSiasKuw+h5jTbEO3MH5WlBXiSh0CdySaHYGmQhyZUx6k0H44ERbw/CrEri0Bs4MrWp3hw8WbY9Ksv4UssSud+sh6rWbt3AQOUieVQPLz/Ye+tHoOOSXp30cIs8jhNoe3JhULKtPDkfSIYs= 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=xl43Op6X; 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="xl43Op6X" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6302067d548so3314467b3.0 for ; Wed, 12 Jun 2024 11:33:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718217209; x=1718822009; 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=VGJvGIe1CwvnPYERWz1EPbS43EUUz4nerE4PJ3wm8uk=; b=xl43Op6XK7zi980STBylFDTWGj0pMAX95odZBVnQI/iaf8cWbuaZHXRg/jAJMLv+hs UFariMYZ/EMdrxRXTtc1Kgrmlj0kJnSgkMGix72plsRAj9et8187Jva3ZnCuIXMKFkcA /biBSI6T06Ht6ImUr7O3yhHBf4ij1yQuOP9FELPJJ+ltCmUBRYS0A/To5fZlRvhkRnu9 wdJG7YB7iIx9FAzfmi2oH0glHP/VPE6XTB0aM8tkrCXpQe0t+Ve3/SzcDLG/EVIFzokC Yq+hTUM+zn/YLc9zt9zpwuNXulBdWIF++zhR2pgrcMz3i+LnWGVBVVp1H51YFT8zjXlk B96g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718217209; x=1718822009; 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=VGJvGIe1CwvnPYERWz1EPbS43EUUz4nerE4PJ3wm8uk=; b=Wz0+OMVdS6XeblMXc1xKLRVUfJcxCkeYa49dPLBW7wP0O8YJ//QFyVC0R099XItDqM iqDKgHHs7OgdeT79ekjKurKTV3a9LL/j+KqP0tcA8Nni/hCEYtsonHXHVyxOsBkFG/Oe zN43vehMtZy97aHyVhP4f51YYFkVmzJjUEG5cI/RvD9qSWI4Qnj6nUb+9HdS7K+g3vGb faJjbvzhAjKBXg7RXmZIEhC4xrvigxqnRFxtqCtnjF16jYhb8NrT5diyZghbiMPrywof 0suZXdsSTgNgZyUtygyoyen6HIc7s1PBcrRN1b4WxtUdU8bp/g3mUVUWIF4vVx3TdBcx Y4KQ== X-Forwarded-Encrypted: i=1; AJvYcCWNTOcUjiVyv6uxW2LHR5V1m7rVb50iZX9LUQVhqoeHX+Hh+Njd3FqUB1J6NuNNVeyLD7uy3qeJ30mtN8o1O9I+2A2RnTFG/mHsWUXG X-Gm-Message-State: AOJu0Ywf31zM7hZKFW8HEmlW3JSdH7iunesMtA5WrvF5AfEaYfnD8PDp 0vJiG2L3/HWap+SxbnrvZwWnlQfVy2zoA1CbAEsiV6T6kWtNd7IQnIBmjM0lrgiDEOgvY/2zVQB UGd+m6g== X-Google-Smtp-Source: AGHT+IGXEDI7uql6mJLDFjO1+Fqeh1AyLA9O3UleyCaiFC6kUY86MVaz89Z/OC+PlyfjDDJprAmYcNiyixd1 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:959d:4302:db0e:d12a]) (user=irogers job=sendgmr) by 2002:a05:690c:6605:b0:62c:ea0b:a44e with SMTP id 00721157ae682-62fb97e690dmr7848007b3.2.1718217209459; Wed, 12 Jun 2024 11:33:29 -0700 (PDT) Date: Wed, 12 Jun 2024 11:31:59 -0700 In-Reply-To: <20240612183205.3120248-1-irogers@google.com> Message-Id: <20240612183205.3120248-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: <20240612183205.3120248-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog Subject: [PATCH v1 1/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 , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the ui code its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 2 +- tools/perf/Makefile.perf | 10 ++++++++++ tools/perf/ui/Build | 18 +++++++++--------- tools/perf/ui/browsers/Build | 14 +++++++------- tools/perf/ui/tui/Build | 8 ++++---- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index b0cb7ad8e6ac..16ed1357202b 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -55,7 +55,7 @@ CFLAGS_builtin-report.o +=3D -DDOCDIR=3D"BUILD_STR($(s= rcdir_SQ)/Documentation)" =20 perf-y +=3D util/ perf-y +=3D arch/ -perf-y +=3D ui/ +perf-ui-y +=3D ui/ perf-y +=3D scripts/ =20 gtk-y +=3D ui/gtk/ diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 5c35c0d89306..350b65088fc1 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.505.gda0bf45e8d-goog From nobody Thu Feb 12 12:34:57 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACD5457333 for ; Wed, 12 Jun 2024 18:33:32 +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=1718217214; cv=none; b=B3TlGcVCP8ZBAqtNnPxQMoVUN7xNtcWMXQTViMCIBEILnyG5wuevZGRWvKdOREDfq8QSb6Nmddt+okHGQXGDzOsfTYrkGLdpYVhYnJQkygSIPp0wLwsWSe+s/2qKCxPwBOqgsvoItx6y2VDx5yHqZDehmRvFRn9BK/3isuA00wo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718217214; c=relaxed/simple; bh=NNqeYFueEGmiFs0MppMDPJRfzajeEqe5rFYPlwNa4Qw=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=h3nQ5VcD5fGjjcfYggt/KyjuIJA8i7wZX3p44Ufusf3ja3UXASjj0VCtzlDE/Ojvpc3QKMLCTq0JX3pvbVkL0hJdk293/KH78RfC05+xjbT/INF+Zqbo4P4CxI0BSwWqhxvPxTqOwyw3pC3ki21XDUJEi/TGZ+u0W2M4bUeQcuM= 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=JD9QIzGo; 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="JD9QIzGo" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-627e6fe0303so3051607b3.2 for ; Wed, 12 Jun 2024 11:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718217211; x=1718822011; 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=p5Va0kqcQZC3C24SRwLWszsblcvKrIdDi6DATMgrSLY=; b=JD9QIzGoRfajXPrqApcGe/gP3YVOTvNVWEg/OBLn5Kinqu0TXfOTC50NadlfSiPw8w vSVZKjthcQAeLv22+zLymL1oaYbfft9QHkioisMlqKrpTg1Tk8gaD8Jt7fu8aygq0I6B h+sLiP9xU5jfwnCKtmEG85yXOwDL1zk9ybk9Qi3o3oEvQBtY+icz+c10u8QBhZRa4rw/ 09Mz8lSxw/ivg9gPxGHiSMOJY7yUPWOghEmHLdgB7h0ydjMWApbWG8Uf3uFeZeW3JfO/ ttZm6YX6JBDLhDoJZjLpaD1/RjU/d3teIVpW7p/aaPJeDCS5fFIczx44lwL21wFyFrMy jApQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718217211; x=1718822011; 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=p5Va0kqcQZC3C24SRwLWszsblcvKrIdDi6DATMgrSLY=; b=Na5cnr9L9J1QYVCmzVcMw3oUgaIuROSV57+yoi980szEzhSq3VlY0A2jHmoyGLJZmq 9leGXjn/rdgm02+tydyezDwa4pxei59mBL87BRZJSlnIOCNNTI8KuVl//eCZi+xWnUD2 VVXSkB3PbwS/n6s4cYjia5469vxGntAG05E8LEg0fzHnVjIrHlbGAXGYou6JzPiV18Zs GcUeKTAONEg8Bc8/7BOX1rLgwCICvh8wnOIMmzlpsuyoH9j+cjbGfRYBPjgErMSrwUTf /xpvjF52YmMk2lwbTQmE3zkR36Jxg9I3ZhYXHnElknbxfNH9P5GvStr9VhjISKIvYX73 hcBQ== X-Forwarded-Encrypted: i=1; AJvYcCVc7Gg9ppZXJmD2WvkbWAHu95OpL2Q170XAUN6oztZpGmpqK4mAyY9jkexcENIpyWKZ9BR3esDN9r7jlo5neUDP1Kt1Rv2GudCOS36D X-Gm-Message-State: AOJu0Yxg3wI+xr2kzghdpy91RqaRHUvvkR15BgIWwoLIiHLLHBDE8PgX ZrsIok/ZneUuUqriPUeMvtkU4IxM2ZnC7VL7FJZ4RrI+5dcSSpPMFZuLLHmdmQG8DavBEpE7Lgb 5JXz1Mg== X-Google-Smtp-Source: AGHT+IFUjDHCGs84lPZNlYc/Q/ZUwcsW2T3rfw8kPPl4R6rItL56LbKeXSgs9qEESLh60H5wgpjHWSuTCdXt X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:959d:4302:db0e:d12a]) (user=irogers job=sendgmr) by 2002:a05:6902:2b8a:b0:dfa:849d:3a59 with SMTP id 3f1490d57ef6-dfe68d0a82bmr656820276.13.1718217211451; Wed, 12 Jun 2024 11:33:31 -0700 (PDT) Date: Wed, 12 Jun 2024 11:32:00 -0700 In-Reply-To: <20240612183205.3120248-1-irogers@google.com> Message-Id: <20240612183205.3120248-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: <20240612183205.3120248-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog Subject: [PATCH v1 2/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 , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make pmu-events into a library so it may be linked against things like the python module and not built from source. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.perf | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 350b65088fc1..ff1ff1e739b7 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.505.gda0bf45e8d-goog From nobody Thu Feb 12 12:34:57 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62E0F7E796 for ; Wed, 12 Jun 2024 18:33:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718217217; cv=none; b=mjboD+j6r8/U9exMb5vLBg4t+lEWaHVMRqigI8RntAl2X+9/0SVMWSj9pdfPCRm1+fJoJFr4N902UfVsNJjwHuJgM0uDqybOgETgXPLugsszt5I+DJneaMTf3ySMM9JINQdYzzzewBCTvgDWXuSQWedDDDtnhljRjmnfpQBHEqM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718217217; c=relaxed/simple; bh=z7Dg8E4G5dU0R1sFjJYOkxs7lVI1xCNIm6t36br8LQ4=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=pPg2Iw69P9zLs2PzP6bL+DVdfgQUsEji4DTlWMQPXgDIhMEu4Cqxz2vi64DhPUixFRKEDxKQTP5O2iF9X6TkOttrhJKbAB3jK6dEC9mf1JRqDBB6m0d/tjtJBHt30Wasbe/cqMva+hAAJWbitdf5NqJsZMSG58VuaEPfHwiYToM= 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=oWqI6kqA; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="oWqI6kqA" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-62fb36d7f5fso3159157b3.1 for ; Wed, 12 Jun 2024 11:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718217214; x=1718822014; 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=GxPZvCvshsGgI3GbDgozZ4RBe0Da3qmyQtu2DbNPLrU=; b=oWqI6kqAD1HtpQgpsj1Nn9AO86LZ7BM1p64hTTPnanyFUcFRKWoJZCLzHDItlZB/i6 eKlSHztyZuaHhqVHQhuYmvr3nykJfH2WBceKdDRyED1LxruybQU4viw6bCHOKcwdkVDK +86vahQ2HfPlD9i3vUY9fetlXhf/2kU8LqhXZtcR+m9aOMku6YZBryyu2LMgwOHPgG7O GIKbgjDaySblvIERJ2QjzyAeNk/dPSrg7+w8ayvDJF8d5caoKjbpT7q26DriAsjDJpvY K/zYUnhw0G7qE+5WX0cg9H92Kb9QAjXLnlF7kf8AUqvZkGrBt9uM79+Ep4mXIxDLuloV POEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718217214; x=1718822014; 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=GxPZvCvshsGgI3GbDgozZ4RBe0Da3qmyQtu2DbNPLrU=; b=brRbcNC/wHhvOohLxn5X8/+H5uKIAR0IbTblVBYeADc6CDBLc75j8VUK0NNQWpyb1f 8kH89NDuE86bhM3rX0o4nnBRtvcr5ymLpsUWPQPxJEnbypbtTXdXOAhy3t7P+lAdRR9W ktJXuWlQp8Z/dkFpHh4azKQp2x7oSu6qHSYcxLeLtF+q31lQDULr+AcELsKbr7cmZWyu Xaj9dS5Qq4E3rCxcubBnZWF7x6fgHsc+OrTaXQjAbk+5wFYBUv1PRl/ZSCb+xNrRIi5H m7HtXy0Ii/SAfBb+V80KAZtKDS2iUZqpBK3JlgpofHKuALUWCjCFPsRu09LYbiPJh/Io EQQw== X-Forwarded-Encrypted: i=1; AJvYcCXPS5gN6LlotUziPS0MWjDhdqHLo8Qh2FWHajutcRIrqv/VmgJnVtek9OrF431rYJ1Clvg9wa8Kceq2YyPiU2tR87as0qQEkaAGvmBz X-Gm-Message-State: AOJu0YwsFEDYgqjwlC37qkl4q2cpBjAfEfLgzlWBteu/7WPwAVjPsExU BCGikvk5PMEcwR6MHjbhd5an58nn1NZJ/7u/ewQg83bx/WNWcfA3K7JkYm+i/VBnbQTjtdmx+Ze 88LEpTQ== X-Google-Smtp-Source: AGHT+IG8abpdBRcwvl2a2ZReTliQbjfcl7t4K9947wsywKzFi3Q5KOHW/1YitCykQGFGfvB4ssIIesKdlInM X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:959d:4302:db0e:d12a]) (user=irogers job=sendgmr) by 2002:a05:6902:1502:b0:dfe:9f52:62b with SMTP id 3f1490d57ef6-dfe9f5213c9mr563311276.1.1718217213882; Wed, 12 Jun 2024 11:33:33 -0700 (PDT) Date: Wed, 12 Jun 2024 11:32:01 -0700 In-Reply-To: <20240612183205.3120248-1-irogers@google.com> Message-Id: <20240612183205.3120248-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: <20240612183205.3120248-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog Subject: [PATCH v1 3/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 , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the tests code its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 3 +- tools/perf/Makefile.perf | 11 ++- tools/perf/arch/Build | 1 + tools/perf/arch/arm/Build | 2 +- tools/perf/arch/arm/tests/Build | 8 +- tools/perf/arch/arm64/Build | 2 +- tools/perf/arch/arm64/tests/Build | 8 +- tools/perf/arch/powerpc/Build | 2 +- tools/perf/arch/powerpc/tests/Build | 6 +- tools/perf/arch/x86/Build | 4 +- tools/perf/arch/x86/tests/Build | 20 ++-- tools/perf/tests/Build | 140 ++++++++++++++-------------- tools/perf/tests/workloads/Build | 12 +-- 13 files changed, 115 insertions(+), 104 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index 16ed1357202b..fddd45ab35b4 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -36,7 +36,7 @@ endif perf-$(CONFIG_LIBELF) +=3D builtin-probe.o =20 perf-y +=3D bench/ -perf-y +=3D tests/ +perf-test-y +=3D tests/ =20 perf-y +=3D perf.o =20 @@ -55,6 +55,7 @@ CFLAGS_builtin-report.o +=3D -DDOCDIR=3D"BUILD_STR($(s= rcdir_SQ)/Documentation)" =20 perf-y +=3D util/ perf-y +=3D arch/ +perf-test-y +=3D arch/ perf-ui-y +=3D ui/ perf-y +=3D scripts/ =20 diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index ff1ff1e739b7..ecf0586e9061 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.505.gda0bf45e8d-goog From nobody Thu Feb 12 12:34:57 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 410A3823AC for ; Wed, 12 Jun 2024 18:33:37 +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=1718217220; cv=none; b=YjnSUWX0RqMzmAESvzeJOcnv05OLVhIbq0kKVtNkslg4dgx8+HIw3S5JRj9VTVZVc/xjml4ZwQB53dud6HT2VrIZj8x8/HuUNFHpZEXhEJo9Igqz41DWWcpBaNnuXpxtY1ilgIEPnsjzGwTtSgOCuc6lH4Hy7425rFZzoSw4f+Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718217220; c=relaxed/simple; bh=GW3F5bRDidIfzFfzx2XH9TZgHygHBWW2YgjI9x1i9kA=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=stpJkg0vAk80CV7KzdeChmWk9TdgioYShhS1fGbYGz4zHhrHYOQB/24GV/QXMWhiAAVyCSC8X4j6rZjjrEup+vl4khD0FxRIlYXMvzoszFIjsi+IgvJ+EsWGqvUPMCsXmT9yUUucLE9yVMWf6mUxLu4a9rf8aB1emzK7S2hURCs= 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=wBAfei2k; 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="wBAfei2k" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dfdddb9b425so244674276.2 for ; Wed, 12 Jun 2024 11:33:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718217216; x=1718822016; 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=hxFca2akLEi/c6aeiWryG3twAj/x8mJ+5CcLXE4nJMw=; b=wBAfei2kL1ZcoeHo2BHZAsPPT1zDP5xxnU6YYpceSEzBFi7SBKeExgVLw0n+LAhgqL ekC+59Nvwt5+iMo05pAagN5j5k+BkZQqUiH1hUcfyLxpi8QTPTSTuzemGfa4/8kdV/2D /21CWctfBEE1zX6ZTbrg/p9pSmGE7LozNvRQg7Kr0WMCep7AWEsnYk6vwwubXp2ft1CF ORBSVxUQIo0qYo9tLnVDk2NMJuksDau5vpMvBmbh08RNRId1YVUbmaW2rLdlTeJEUhpB 8DXegtwm1hB2qCQXlbjiwdIANggpt0Fx0YrTb8X660HCXQvz6W2k/j3yHoqEI8bE8nCt /6vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718217216; x=1718822016; 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=hxFca2akLEi/c6aeiWryG3twAj/x8mJ+5CcLXE4nJMw=; b=FHQTshzgrmPwU5bb/h0+fVifqhYrALYx1lUfHWVU5xALJthiAb4OqCOInpuUeDumHN Cp9HiCMyxRLwTYyYHKWb2ntkHz1J6CHjMxyNsj4KDHBTgxZ4YxiIeHG5uR1piKBzWuCw +eeQV0EXPofW8nkmEDluI6CqkjwP8Zl2Xjx+EHu2Wc88GbuItP6sbwddBhQ5KfFnl8F+ Sn/DDaVinBV0jyUQy+E1WDQ2fLVVvo4oyjjlmlgssIxN4gQdDZjhsTnGnJSlljWgYxtL TrLtO6VOBIBMAgNOC/zMHy3x9jRDkyatdn6oTpgqYPJWAXXahKpMMOy/Jjkj/G6rfWXO kEMA== X-Forwarded-Encrypted: i=1; AJvYcCUiqb498gximWiUHaojTuJ73JLmqKGXB/fK8pzf0or/z2zO14QP5WCJ1lxvfglE6tYBNv+NloplkuB0GGLNfSAFvyFItu2wOaHWFVOc X-Gm-Message-State: AOJu0Yz8BNmpLxx7FkAaevR84HsCum9dUhA/w/bjP+I2APkRg0GhJsBZ vaTv1g31nCWRIe5JYZxIQ86rcMoijRgfpHLlo0axcJRvQLDH6ihUuTonyEm/GZC54cQuCigzYhB IFqCfCg== X-Google-Smtp-Source: AGHT+IHHEhm3YqNyXbkwlJqf7zAbA10K5YtztZ12tlPf+OX1TpaElO1uBuwFIrHE76zPeVUQ691ENdAPSP7k X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:959d:4302:db0e:d12a]) (user=irogers job=sendgmr) by 2002:a05:6902:2b03:b0:dda:c57c:b69b with SMTP id 3f1490d57ef6-dfe62f13456mr822488276.0.1718217216102; Wed, 12 Jun 2024 11:33:36 -0700 (PDT) Date: Wed, 12 Jun 2024 11:32:02 -0700 In-Reply-To: <20240612183205.3120248-1-irogers@google.com> Message-Id: <20240612183205.3120248-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: <20240612183205.3120248-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog Subject: [PATCH v1 4/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 , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the benchmark code into a library so it may be linked against things like the python module to avoid compiling code twice. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 4 ++-- tools/perf/Makefile.perf | 11 +++++++++- tools/perf/bench/Build | 46 ++++++++++++++++++++-------------------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index fddd45ab35b4..2787f5630ff7 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -1,4 +1,4 @@ -perf-y +=3D builtin-bench.o +perf-bench-y +=3D builtin-bench.o perf-y +=3D builtin-annotate.o perf-y +=3D builtin-config.o perf-y +=3D builtin-diff.o @@ -35,7 +35,7 @@ endif =20 perf-$(CONFIG_LIBELF) +=3D builtin-probe.o =20 -perf-y +=3D bench/ +perf-bench-y +=3D bench/ perf-test-y +=3D tests/ =20 perf-y +=3D perf.o diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index ecf0586e9061..f9709718cb83 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.505.gda0bf45e8d-goog From nobody Thu Feb 12 12:34:57 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 67C1E84038 for ; Wed, 12 Jun 2024 18:33: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=1718217225; cv=none; b=gSVJafTQLoQK0jaXKEhJAT7UFk7FM3NToU7os543c70tGzlKjl68kzJ/CycA7AXeX4B8/tgG4hnazszxZLTOpxOdgyx7MIbB70H/LxOU4C4rqDyPh17oTemDzwth95Hq4dhsm8brEC/psyXf90Hn4YEw7R0CoufStUBcCHaPuZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718217225; c=relaxed/simple; bh=IIHjLNytskdvl5FD3/phfxI+gJRBHMGob1RjCTWjGSs=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=NWtQJgyKoxAcZef9ILXi477Dx0My5FCCnaAkBTejA0cki5QCKVVQLEBJnHt62ydbmEvSdx6thUcKXi4QA7hMGu0TYDhgEZpQNiphkYalq7xQyLOy5AmW4qyJVE7McapDuYJ6SadrpORHJ8iqlKRADgJ2RB1U+d+oN5xxmK/9JP0= 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=MywpMCHS; 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="MywpMCHS" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-62fd1655e12so3657667b3.1 for ; Wed, 12 Jun 2024 11:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718217218; x=1718822018; 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=EZ4zNr8IxY7FKdCp/C0H4XplktSDrC2oUuIDyBp9GCk=; b=MywpMCHS0WfQ/qVagXPeY0PMJtyxz6fUJVjQZ2xjMhw0K5fcQyqIlAmAvFy96oiylE w/Yvkw6r6zfIZ//pAWA7Hk09kfs5RtJ5j4mzQJ758v3df8eqyvs5paqKqaGN2+N5Z8tK sVJxBr482GEeocGoYXCMM0LF5z/DzpqEtncbTRa5zzVrNyGksN9keSJC5LvjLqsOJAFy 4cEfw2oiQhcc29JZ4O6bdwPzFhz+xh/67dbIzFbfIJ3YOIRaKzshSgA5QXsIGuc0LxS6 Nq38a8QTmjczYxrk6mLxS7P3WM+gAtcGNf0lQFm+DsXA5fHEvnH9BtCh4pmCvT+l0iI9 c5IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718217218; x=1718822018; 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=EZ4zNr8IxY7FKdCp/C0H4XplktSDrC2oUuIDyBp9GCk=; b=ZG2J+zDjNta/lfsCJp8lW53zraRT+kJSeQggeNt/ni+PRmlB1hoPwpu3HW1qDI+hjj AHyIw+Tflmc/X5o1iX7CJ4MogobPGcKZn4jCVvIWYLEAI0PKUEpAZZIN7M0kJSnJw4d0 vpwYVI4oMZaDIjVvFrEXsvln+cr2HH1svWZ0PvQ+pZurNkDh19M4jT6K1LMkhPLw2A+7 M8u+BtyUAY9j6fGBslD0Yjuc5hO61HmzBqD8XufVnjaHvwXofCOvayb0JSyD470U6f+8 jNrtWW7S0zH2V9TWATBFy5nw2lngtBxSoWpzGgqCS0q75daFgZ9pxDqAF01e5e6clbCC pP+w== X-Forwarded-Encrypted: i=1; AJvYcCUPn19Zi9Vug2oLg6hARBEVbEG/Sz9oBTi5PKXMHQhkCFdapKG15lDRQzbimAFHINcUBkaUBH0DoIbE5aEuZbSdr5RW8hzpddtp2gw9 X-Gm-Message-State: AOJu0YwEdkz/pmzh5T68hh75ShJvZiUPGln8XpyJegL/RZKQidNAucNM dQhIMh2Wpn0CYPUIIYNrGDRpl+EB0q4esPPu09n39ofL+bmYaZxy5Fb5iuaWCNxeUTSw6+9YO7Z bUTH4gQ== X-Google-Smtp-Source: AGHT+IGaZjqF0gCwJMjKdFw2tLPeSJSE0/nirN74Iv6c9/+U76gBof2pWdeXrivFaq0US+0eo6l5GiBFWJff X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:959d:4302:db0e:d12a]) (user=irogers job=sendgmr) by 2002:a05:690c:b09:b0:62c:f6fd:5414 with SMTP id 00721157ae682-62fb9ea6a31mr7561857b3.3.1718217218536; Wed, 12 Jun 2024 11:33:38 -0700 (PDT) Date: Wed, 12 Jun 2024 11:32:03 -0700 In-Reply-To: <20240612183205.3120248-1-irogers@google.com> Message-Id: <20240612183205.3120248-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: <20240612183205.3120248-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog Subject: [PATCH v1 5/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 , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the util directory into its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. For convenience: arch/common.c scripts/perl/Perf-Trace-Util/Context.c scripts/python/Perf-Trace-Util/Context.c are made part of this library. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 5 +- tools/perf/Makefile.perf | 12 +- tools/perf/arch/Build | 3 +- 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/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 +- 35 files changed, 315 insertions(+), 303 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 f9709718cb83..28c2d7ba3c1f 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..237321fcb45b 100644 --- a/tools/perf/arch/Build +++ b/tools/perf/arch/Build @@ -1,3 +1,4 @@ -perf-y +=3D common.o +perf-util-y +=3D common.o perf-y +=3D $(SRCARCH)/ 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/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.505.gda0bf45e8d-goog From nobody Thu Feb 12 12:34:57 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A500684A4B for ; Wed, 12 Jun 2024 18:33:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718217223; cv=none; b=YK+LsTiCjJu+CO7pNKtIoup9Snfgt9xu/oXcgsUFzIQJKcg3peiN+XBhwEVG4ju5BZYE7Xt9MEEV3PFezF4NYGbLPAtmX6O450K7coNMKVBQFH4znlDFkeq7x9wycPI0r8iaxerBigSzuLsWmFrE83ZEp1yn7SRZIpL5r+NJD9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718217223; c=relaxed/simple; bh=pIZhUcoXHyik9pZkUTEunk00EFpUNuHTLWXhNxRFRA8=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=WpZWyvZYz7TdDC7R275eurN6FAfaYNcLfhr+aGc7BEEor6CyBZNK/uip+49catRBgGRoXR47z2ktyTlUs3iBb5Nu3dKfjADrnuhdKUkm8pXS/WFZucnPhHx/0RKkuNQIjFe47PEo9vXh8OuKmoABwxgvYWI6XrfJIv0bK2q7F3Q= 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=sLcKjrqe; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sLcKjrqe" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-62f4a731ad4so3171857b3.1 for ; Wed, 12 Jun 2024 11:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718217220; x=1718822020; 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=uqZ1KGEezj4hUmhWmZJmRX9PTE7HsiBO9PBBQHCwspA=; b=sLcKjrqeF8wSjU3M9IUYEGtqS7eMjqN/vtjS47DbRyIpLofCGEiqamQZn6cp2G/hZX E8wfo8H61aDFkAZNMl4Nya/kZ7yCMY+KHZLSpkUcFVyd+VxN9dNm5uHTVY1J3vJCVWXu C9dKa15sxWJc4NofZ/oE3KfjQ9ia614S+vNwox+hyh5v/oGnwrb+LBnfG5o7u8Fe+kH4 cp3Qnj8wbQsptCKTJvbn1YL1GY+wCqBiqc0EuX0PY/bs6uSi52S6Bp21fp36vUxvGsQz EtNC30DSrNmqvg6VLR5oK2ApTbwpWdelzijvSxyJBd3aqSblmX8ReiUADDJwlxhtnfYR lmXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718217220; x=1718822020; 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=uqZ1KGEezj4hUmhWmZJmRX9PTE7HsiBO9PBBQHCwspA=; b=ZKYTT3bXWfsX5Kcta0/ImELPARDnfkQT9aIdJuWbMjfhTfAZ/al/n9rB9+Tv+GrLmV zR5W03rAiE1Yp6B2f/g4zZCiSNA7IGaXi4b0ozM8Srbwa+V4H+0LYff+zGE2acfh1Lzl N1aEdNXAaqwI22ufMvZcRYQsY1EEjs7ABcHX9wRgUSZedqB18+b5BsOcbzxqzgnyslde ggET8jqwDu3z7beB9wDvIbwDHWVYhQUvt4HOXYVzLlN3d5zK9GW/s8k9pOogI2FXKOPj yOuT9EarITX1VX2qHaP3mQw+30fk7ojl4qHpedBQmpOW+mINN832eFF9t/ncK+Z0fHBN NxjQ== X-Forwarded-Encrypted: i=1; AJvYcCUfZblYVe/xc3tNwcAjEv13+4JPSzji+DbLIQ8zV6MHC255vfTV43mIl609rPuUX3pFVL7iWBL93tcyUo2UDybPndNWpUrfECfIKFIE X-Gm-Message-State: AOJu0YztFWD7lcYjJJLqtRBF7SJAgT4UwPJ/wYrr3PSeu0ELQR9YG9eB UiazMFfTlR3Zj7cXJVj/VG5x3ClroOLr6LqM5N0VyU91b6nfR76T2XF8wEWxjUo9f+B+ziEVT7g x7XXdyA== X-Google-Smtp-Source: AGHT+IFtDmanaEUm9Z5/3+1uhF+2RHkB4c2ke/vKwK3+9makZwnelJN7vBrlMJ9+MeHgHb29ct4yE3BNWl1U X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:959d:4302:db0e:d12a]) (user=irogers job=sendgmr) by 2002:a05:690c:c8e:b0:61b:e524:f91a with SMTP id 00721157ae682-62fbbfeb2a5mr5862037b3.10.1718217220579; Wed, 12 Jun 2024 11:33:40 -0700 (PDT) Date: Wed, 12 Jun 2024 11:32:04 -0700 In-Reply-To: <20240612183205.3120248-1-irogers@google.com> Message-Id: <20240612183205.3120248-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: <20240612183205.3120248-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog Subject: [PATCH v1 6/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 , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" setup.py was building most perf sources causing setup.py to mimic the Makefile logic as well as flex/bison code to be stubbed out, due to complexity building. By using libraries fewer functions are stubbed out, the build is faster and the Makefile logic is reused which should simplify updating. The libraries are passed through LDFLAGS to avoid complexity in python. Force the -fPIC flag for libbpf.a to ensure it is suitable for linking into the perf python module. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.config | 5 + tools/perf/Makefile.perf | 6 +- tools/perf/util/python.c | 271 ++++++++++++++----------------------- tools/perf/util/setup.py | 33 +---- 4 files changed, 110 insertions(+), 205 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 7f1e016a9253..639be696f597 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -910,6 +910,11 @@ else endif CFLAGS +=3D -DHAVE_LIBPYTHON_SUPPORT $(call detected,CONFIG_LIBPYTHON) + ifeq ($(filter -fPIC,$(CFLAGS)),) + # Building a shared library requires position independent code. + CFLAGS +=3D -fPIC + CXXFLAGS +=3D -fPIC + endif endif endif endif diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 28c2d7ba3c1f..6f66d3a7ffb2 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -715,9 +715,9 @@ all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BI= NDINGS) $(OTHER_PROGRAMS) # Create python binding output directory if not already present $(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python') =20 -$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): $(PYTHON_EXT_SRCS) $(PYTHO= N_EXT_DEPS) $(LIBPERF) $(LIBSUBCMD) +$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): $(PYTHON_EXT_SRCS) $(PYTHO= N_EXT_DEPS) $(PERFLIBS) $(QUIET_GEN)LDSHARED=3D"$(CC) -pthread -shared" \ - CFLAGS=3D'$(CFLAGS)' LDFLAGS=3D'$(LDFLAGS)' \ + CFLAGS=3D'$(CFLAGS)' LDFLAGS=3D'$(LDFLAGS) $(LIBS)' \ $(PYTHON_WORD) util/setup.py \ --quiet build_ext; \ cp $(PYTHON_EXTBUILD_LIB)perf*.so $(OUTPUT)python/ @@ -933,7 +933,7 @@ $(LIBAPI)-clean: $(LIBBPF): FORCE | $(LIBBPF_OUTPUT) $(Q)$(MAKE) -C $(LIBBPF_DIR) FEATURES_DUMP=3D$(FEATURE_DUMP_EXPORT) \ O=3D OUTPUT=3D$(LIBBPF_OUTPUT)/ DESTDIR=3D$(LIBBPF_DESTDIR) prefix=3D su= bdir=3D \ - $@ install_headers + EXTRA_CFLAGS=3D"-fPIC" $@ install_headers =20 $(LIBBPF)-clean: $(call QUIET_CLEAN, libbpf) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 0aeb97c11c03..3be882b2e845 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -10,21 +10,19 @@ #endif #include #include "evlist.h" -#include "callchain.h" #include "evsel.h" #include "event.h" #include "print_binary.h" #include "thread_map.h" #include "trace-event.h" #include "mmap.h" -#include "stat.h" -#include "metricgroup.h" #include "util/bpf-filter.h" #include "util/env.h" -#include "util/pmu.h" -#include "util/pmus.h" +#include "util/kvm-stat.h" +#include "util/kwork.h" +#include "util/lock-contention.h" #include -#include "util.h" +#include "../builtin.h" =20 #if PY_MAJOR_VERSION < 3 #define _PyUnicode_FromString(arg) \ @@ -50,166 +48,6 @@ #define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) #endif =20 -/* - * Avoid bringing in event parsing. - */ -int parse_event(struct evlist *evlist __maybe_unused, const char *str __ma= ybe_unused) -{ - return 0; -} - -/* - * Provide these two so that we don't have to link against callchain.c and - * start dragging hist.c, etc. - */ -struct callchain_param callchain_param; - -int parse_callchain_record(const char *arg __maybe_unused, - struct callchain_param *param __maybe_unused) -{ - return 0; -} - -/* - * Add these not to drag util/env.c - */ -struct perf_env perf_env; - -const char *perf_env__cpuid(struct perf_env *env __maybe_unused) -{ - return NULL; -} - -// This one is a bit easier, wouldn't drag too much, but leave it as a stu= b we need it here -const char *perf_env__arch(struct perf_env *env __maybe_unused) -{ - return NULL; -} - -/* - * These ones are needed not to drag the PMU bandwagon, jevents generated - * pmu_sys_event_tables, etc and evsel__find_pmu() is used so far just for - * doing per PMU perf_event_attr.exclude_guest handling, not really needed= , so - * far, for the perf python binding known usecases, revisit if this become - * necessary. - */ -struct perf_pmu *evsel__find_pmu(const struct evsel *evsel __maybe_unused) -{ - return NULL; -} - -int perf_pmu__scan_file(const struct perf_pmu *pmu, const char *name, cons= t char *fmt, ...) -{ - return EOF; -} - -const char *perf_pmu__name_from_config(struct perf_pmu *pmu __maybe_unused= , u64 config __maybe_unused) -{ - return NULL; -} - -struct perf_pmu *perf_pmus__find_by_type(unsigned int type __maybe_unused) -{ - return NULL; -} - -int perf_pmus__num_core_pmus(void) -{ - return 1; -} - -bool evsel__is_aux_event(const struct evsel *evsel __maybe_unused) -{ - return false; -} - -bool perf_pmus__supports_extended_type(void) -{ - return false; -} - -/* - * Add this one here not to drag util/metricgroup.c - */ -int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *= cgrp, - struct rblist *new_metric_events, - struct rblist *old_metric_events) -{ - return 0; -} - -/* - * Add this one here not to drag util/trace-event-info.c - */ -char *tracepoint_id_to_name(u64 config) -{ - return NULL; -} - -/* - * XXX: All these evsel destructors need some better mechanism, like a lin= ked - * list of destructors registered when the relevant code indeed is used in= stead - * of having more and more calls in perf_evsel__delete(). -- acme - * - * For now, add some more: - * - * Not to drag the BPF bandwagon... - */ -void bpf_counter__destroy(struct evsel *evsel); -int bpf_counter__install_pe(struct evsel *evsel, int cpu, int fd); -int bpf_counter__disable(struct evsel *evsel); - -void bpf_counter__destroy(struct evsel *evsel __maybe_unused) -{ -} - -int bpf_counter__install_pe(struct evsel *evsel __maybe_unused, int cpu __= maybe_unused, int fd __maybe_unused) -{ - return 0; -} - -int bpf_counter__disable(struct evsel *evsel __maybe_unused) -{ - return 0; -} - -// not to drag util/bpf-filter.c -#ifdef HAVE_BPF_SKEL -int perf_bpf_filter__prepare(struct evsel *evsel __maybe_unused) -{ - return 0; -} - -int perf_bpf_filter__destroy(struct evsel *evsel __maybe_unused) -{ - return 0; -} -#endif - -/* - * Support debug printing even though util/debug.c is not linked. That me= ans - * implementing 'verbose' and 'eprintf'. - */ -int verbose; -int debug_kmaps; -int debug_peo_args; - -int eprintf(int level, int var, const char *fmt, ...); - -int eprintf(int level, int var, const char *fmt, ...) -{ - va_list args; - int ret =3D 0; - - if (var >=3D level) { - va_start(args, fmt); - ret =3D vfprintf(stderr, fmt, args); - va_end(args); - } - - return ret; -} - /* Define PyVarObject_HEAD_INIT for python 2.5 */ #ifndef PyVarObject_HEAD_INIT # define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size, @@ -1510,15 +1348,102 @@ PyMODINIT_FUNC PyInit_perf(void) #endif } =20 -/* - * Dummy, to avoid dragging all the test_attr infrastructure in the python - * binding. - */ -void test_attr__open(struct perf_event_attr *attr, pid_t pid, struct perf_= cpu cpu, - int fd, int group_fd, unsigned long flags) + +/* The following are stubs to avoid dragging in builtin-* objects. */ +/* TODO: move the code out of the builtin-* file into util. */ + +unsigned int scripting_max_stack =3D PERF_MAX_STACK_DEPTH; + +bool kvm_entry_event(struct evsel *evsel __maybe_unused) { + return false; +} + +bool kvm_exit_event(struct evsel *evsel __maybe_unused) +{ + return false; +} + +bool exit_event_begin(struct evsel *evsel __maybe_unused, + struct perf_sample *sample __maybe_unused, + struct event_key *key __maybe_unused) +{ + return false; +} + +bool exit_event_end(struct evsel *evsel __maybe_unused, + struct perf_sample *sample __maybe_unused, + struct event_key *key __maybe_unused) +{ + return false; +} + +void exit_event_decode_key(struct perf_kvm_stat *kvm __maybe_unused, + struct event_key *key __maybe_unused, + char *decode __maybe_unused) +{ +} + +int find_scripts(char **scripts_array __maybe_unused, char **scripts_path= _array __maybe_unused, + int num __maybe_unused, int pathlen __maybe_unused) +{ + return -1; +} + +void perf_stat__set_no_csv_summary(int set __maybe_unused) +{ +} + +void perf_stat__set_big_num(int set __maybe_unused) +{ +} + +int script_spec_register(const char *spec __maybe_unused, struct scripting= _ops *ops __maybe_unused) +{ + return -1; +} + +arch_syscalls__strerrno_t *arch_syscalls__strerrno_function(const char *ar= ch __maybe_unused) +{ + return NULL; +} + +struct kwork_work *perf_kwork_add_work(struct perf_kwork *kwork __maybe_un= used, + struct kwork_class *class __maybe_unused, + struct kwork_work *key __maybe_unused) +{ + return NULL; +} + +void script_fetch_insn(struct perf_sample *sample __maybe_unused, + struct thread *thread __maybe_unused, + struct machine *machine __maybe_unused) +{ +} + +int perf_sample__sprintf_flags(u32 flags __maybe_unused, char *str __maybe= _unused, + size_t sz __maybe_unused) +{ + return -1; +} + +bool match_callstack_filter(struct machine *machine __maybe_unused, u64 *c= allstack __maybe_unused) +{ + return false; +} + +struct lock_stat *lock_stat_find(u64 addr __maybe_unused) +{ + return NULL; +} + +struct lock_stat *lock_stat_findnew(u64 addr __maybe_unused, const char *n= ame __maybe_unused, + int flags __maybe_unused) +{ + return NULL; } =20 -void evlist__free_stats(struct evlist *evlist) +int cmd_inject(int argc __maybe_unused, const char *argv[] __maybe_unused) { + return -1; } diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py index 3107f5aa8c9a..142e9d447ce7 100644 --- a/tools/perf/util/setup.py +++ b/tools/perf/util/setup.py @@ -60,7 +60,7 @@ class install_lib(_install_lib): =20 cflags =3D getenv('CFLAGS', '').split() # switch off several checks (need to be at the end of cflags list) -cflags +=3D ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-pa= rameter', '-Wno-redundant-decls', '-DPYTHON_PERF' ] +cflags +=3D ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-pa= rameter', '-Wno-redundant-decls' ] if cc_is_clang: cflags +=3D ["-Wno-unused-command-line-argument" ] else: @@ -72,36 +72,11 @@ cflags +=3D [ "-Wno-declaration-after-statement" ] src_perf =3D getenv('srctree') + '/tools/perf' build_lib =3D getenv('PYTHON_EXTBUILD_LIB') build_tmp =3D getenv('PYTHON_EXTBUILD_TMP') -libtraceevent =3D getenv('LIBTRACEEVENT') -libapikfs =3D getenv('LIBAPI') -libperf =3D getenv('LIBPERF') - -ext_sources =3D [f.strip() for f in open('util/python-ext-sources') - if len(f.strip()) > 0 and f[0] !=3D '#'] - -extra_libraries =3D [] - -if '-DHAVE_LIBTRACEEVENT' in cflags: - extra_libraries +=3D [ 'traceevent' ] -else: - ext_sources.remove('util/trace-event.c') - ext_sources.remove('util/trace-event-parse.c') - -# use full paths with source files -ext_sources =3D list(map(lambda x: '%s/%s' % (src_perf, x) , ext_sources)) - -if '-DHAVE_LIBNUMA_SUPPORT' in cflags: - extra_libraries +=3D [ 'numa' ] -if '-DHAVE_LIBCAP_SUPPORT' in cflags: - extra_libraries +=3D [ 'cap' ] =20 perf =3D Extension('perf', - sources =3D ext_sources, - include_dirs =3D ['util/include'], - libraries =3D extra_libraries, - extra_compile_args =3D cflags, - extra_objects =3D [ x for x in [libtraceevent, libapikfs, libperf] - if x is not None], + sources =3D [ src_perf + '/util/python.c' ], + include_dirs =3D ['util/include'], + extra_compile_args =3D cflags, ) =20 setup(name=3D'perf', --=20 2.45.2.505.gda0bf45e8d-goog From nobody Thu Feb 12 12:34:57 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCB7182492 for ; Wed, 12 Jun 2024 18:33:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718217226; cv=none; b=cxSLL/fVWeMJ121RQ3ic8qRV5GIJOS7BNM7XhaZ42hB1gNQfE1GINFxlAZcNtsLuUJTfHOqI5OhyJwMDXqk1Vgu5PtidP2YjpjIjeg/wX33DQ1x6sSxQG/A0kBLjXcC6Fqh8phUiAywWAm9Rnxxtg0EEkNtadCmiaoRNJsLlICw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718217226; c=relaxed/simple; bh=/Y3F4sCd7/hxoSnGLA3j5vPDaNT/PzOL30m0ArVq/VY=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=UkywMKC043ox26JOyKazu6R/pMCFcylS/6Z1q2ZUGK0shWCgGsU8bZHKxGOKjsU7u5ADWHs6tXanbYrcAAJpEgQmwgTAnxUuaODdWahDEpSrfqUEuRXuflsDoZv30wPNR0r+7IHzwgdDIH5DKtQ67mP8K53ipHkvdQmWbo4giI8= 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=rP/sws8v; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rP/sws8v" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6300aeb93dcso3413757b3.0 for ; Wed, 12 Jun 2024 11:33:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718217223; x=1718822023; 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=qcvOQ2AYZ7WMCcNf48y0Z4WIFFdDS7XM+Tp2DrQsPX4=; b=rP/sws8vcz6H1pxHy8tHHDH0Rk57fIR3h3Zo8Qchjpvy5rLlMggauUc1OF79xyXUGQ wfBkC47pVUG+d+2HeRET01bquauFbdzzKTF/hdrD0x2en8s1rvpz2JDrx4usTZzXRUrV P3+cmDWt9u962ezC0pV1xMINUx0InDc4R2R1DbnviG2E7ffRVDydbaT792Dk4nOvcjT8 UQ57n+RF8/mCN33Qcn8WEZYFfbnz66uaFt0zVIINbmM1O+Mb5oWlSHqWMPoudT9d6xQ6 MiaeRTiaomH3yI37BcYDAR2OOUeldVnSqoxaJcutMimYBG896v4VUW2hQ92CuOVr9N8+ gLBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718217223; x=1718822023; 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=qcvOQ2AYZ7WMCcNf48y0Z4WIFFdDS7XM+Tp2DrQsPX4=; b=AAtXH9Yg0YracJgGmmyJ3CwW+wM3sjWjPofGh+zeWuvrPALmg+vgfdDUWtru+PJq/a YqRCBwhfTMAflWlOI0TusD6U51MZtnE+8tNaOyssvf2pMA7XZ7LI3VseYn0LvcZ0dlPz 5chEzfBOj6aneq7Me251e1de4kv/B6VD82Vr1zh+ng2ItsRhZCu+5Ho3Oa/bLAqNZnXt ljeeM1BmU2mWz1ghqSB5CFH38KhF+KlcxDVnFUquL9AXx7r0tYKi1HOp4NcqUr1IC/B2 wFE5CvpL45RZQPQelmeROd9rrk5UFk6XjsJBlKPqF8w93xKZHCiTv2GSQgt4Kzp8LD8E PfxA== X-Forwarded-Encrypted: i=1; AJvYcCXLIulsVYsqcoF3jggE5/mwXjg0okwlXNhzZ5DI9/8sSLviF6HxWPetVqucz6XoL3eeqistqjfksmpxGMVdle5u4WYfzEszOj7gEGSK X-Gm-Message-State: AOJu0Yy/X2KtUpAC7dhBQluNm5vTTQ9+/RXKoM6N72eaKe/rxuV5kkMg 6WfEcKkdMq2HjmX+J3nKS35smelQwo2M0+RV4xb0vNebzJfyqsPoJnCglBSYVSUWW/iGIJPuBe2 hwsGWEQ== X-Google-Smtp-Source: AGHT+IEdZtuxFCkd4xeaZMVA0551v1r2/AOz8THV3+MN9PWe9shK7np3c1wiSt7RmdoT82E3zDdATSpfd0ve X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:959d:4302:db0e:d12a]) (user=irogers job=sendgmr) by 2002:a05:690c:88:b0:62f:22cd:7082 with SMTP id 00721157ae682-62fbb7f3b47mr6200647b3.5.1718217222801; Wed, 12 Jun 2024 11:33:42 -0700 (PDT) Date: Wed, 12 Jun 2024 11:32:05 -0700 In-Reply-To: <20240612183205.3120248-1-irogers@google.com> Message-Id: <20240612183205.3120248-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: <20240612183205.3120248-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog Subject: [PATCH v1 7/7] perf python: Clean up build dependencies From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Ravi Bangoria , Kees Cook , Andrei Vagin , Athira Jajeev , Oliver Upton , Ze Gao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, coresight@lists.linaro.org, rust-for-linux@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The python build now depends on libraries and doesn't use python-ext-sources except for the util/python.c dependency. Switch to just directly depending on that file and util/setup.py. This allows the removal of python-ext-sources. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.perf | 10 +----- tools/perf/util/python-ext-sources | 53 ------------------------------ 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 tools/perf/util/python-ext-sources diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 6f66d3a7ffb2..918b851b2e0d 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -380,14 +380,6 @@ python-clean :=3D $(call QUIET_CLEAN, python) $(RM) -r= $(PYTHON_EXTBUILD) $(OUTPUT # Use the detected configuration -include $(OUTPUT).config-detected =20 -ifeq ($(CONFIG_LIBTRACEEVENT),y) - PYTHON_EXT_SRCS :=3D $(shell grep -v ^\# util/python-ext-sources) -else - PYTHON_EXT_SRCS :=3D $(shell grep -v ^\#\\\|util/trace-event.c\\\|util/t= race-event-parse.c util/python-ext-sources) -endif - -PYTHON_EXT_DEPS :=3D util/python-ext-sources util/setup.py $(LIBAPI) - SCRIPTS =3D $(patsubst %.sh,%,$(SCRIPT_SH)) =20 PROGRAMS +=3D $(OUTPUT)perf @@ -715,7 +707,7 @@ all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BI= NDINGS) $(OTHER_PROGRAMS) # Create python binding output directory if not already present $(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python') =20 -$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): $(PYTHON_EXT_SRCS) $(PYTHO= N_EXT_DEPS) $(PERFLIBS) +$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): util/python.c util/setup.p= y $(PERFLIBS) $(QUIET_GEN)LDSHARED=3D"$(CC) -pthread -shared" \ CFLAGS=3D'$(CFLAGS)' LDFLAGS=3D'$(LDFLAGS) $(LIBS)' \ $(PYTHON_WORD) util/setup.py \ diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ex= t-sources deleted file mode 100644 index 1bec945f4838..000000000000 --- a/tools/perf/util/python-ext-sources +++ /dev/null @@ -1,53 +0,0 @@ -# -# List of files needed by perf python extension -# -# Each source file must be placed on its own line so that it can be -# processed by Makefile and util/setup.py accordingly. -# - -util/python.c -../lib/ctype.c -util/cap.c -util/evlist.c -util/evsel.c -util/evsel_fprintf.c -util/perf_event_attr_fprintf.c -util/cpumap.c -util/memswap.c -util/mmap.c -util/namespaces.c -../lib/bitmap.c -../lib/find_bit.c -../lib/list_sort.c -../lib/hweight.c -../lib/string.c -../lib/vsprintf.c -util/thread_map.c -util/util.c -util/cgroup.c -util/parse-branch-options.c -util/rblist.c -util/counts.c -util/print_binary.c -util/strlist.c -util/trace-event.c -util/trace-event-parse.c -../lib/rbtree.c -util/string.c -util/symbol_fprintf.c -util/units.c -util/affinity.c -util/rwsem.c -util/hashmap.c -util/perf_regs.c -util/fncache.c -util/rlimit.c -util/perf-regs-arch/perf_regs_aarch64.c -util/perf-regs-arch/perf_regs_arm.c -util/perf-regs-arch/perf_regs_csky.c -util/perf-regs-arch/perf_regs_loongarch.c -util/perf-regs-arch/perf_regs_mips.c -util/perf-regs-arch/perf_regs_powerpc.c -util/perf-regs-arch/perf_regs_riscv.c -util/perf-regs-arch/perf_regs_s390.c -util/perf-regs-arch/perf_regs_x86.c --=20 2.45.2.505.gda0bf45e8d-goog