| Message ID | 20221129192924.1580537-1-irogers@google.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp532357wrr;
Tue, 29 Nov 2022 11:41:03 -0800 (PST)
X-Google-Smtp-Source:
AA0mqf4khqV+gqdwzWWjqOe3GvPIvTYc8MrvN33JDbXLHyrMZjuLYDDASsnTlibjfqtk58KdP42A
X-Received: by 2002:a17:90b:3e8b:b0:1fb:825c:af8a with SMTP id
rj11-20020a17090b3e8b00b001fb825caf8amr21913176pjb.104.1669750862959;
Tue, 29 Nov 2022 11:41:02 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1669750862; cv=none;
d=google.com; s=arc-20160816;
b=Rh8cVtFyAejgTyLWe6Zq88pLCblQjbcjEZUvzeM35x3C9sejpdTTNQSLm0rpycpQ1n
nC5CfrwAU6Tbs41TVz6HQohh1qeUcDUxdrJoSeEZeFNSX4fsyjCg+1Z6yN50UQv4JCP0
TA9TjT4RMVBTGQ9tPNTbvtHKG//Z0WwxoGQ319gS8DU0PUg8uqCCcgPo3quQkKD6DrGt
kguXdCXLtaf0239FYSNqZetvGBvdOxFrSPF0jkZcu2AvHUDIqrqFYqHUykm1AjglxAK+
FQLQD6DS3sIdaxaae2Rotd6ZEtNT+uLNbe1LdtefrusH9J45wluX1oJyTXb10cAOsfWl
KUxQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:cc:to:from:subject:mime-version:message-id:date
:dkim-signature;
bh=0IUlOBzNYwGwCi/kB8Fps4nNnJDZbsGKlmWKEqCDmL4=;
b=0TrlXfy3cNpmUapwOqlCysXuB6GDTzh/yWjBURvFea6+o4fMTeWIZqiPU0QpGZ8lyH
ZNfF5UZU888PMV1Z/izfeLKlbhLzJzf/H3ABVKG8E43W4cZNp63MD8mF80BiRhSC+RDJ
gTFPLfeJsztlleisPlgphFmT/3cc06LBPMpnSR9azHJgF49xXuvyoqMPekxveMBi/0mq
Ixptu/m1Ponu/ut19W+ZK//7novlgT4OnkgJGwXp/UleiLeUFHyFQ69EAxFlbrSK+FX9
IzVGvKe+FjAQ3APprOiNWwGKNeyfWJzeCm77MdKUw2C9m/IWkIggu2cL9QcGpLR4rSSu
fHqg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@google.com header.s=20210112 header.b=XvfjvKZW;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
c18-20020aa78c12000000b00573a320155fsi14113217pfd.34.2022.11.29.11.40.49;
Tue, 29 Nov 2022 11:41:02 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@google.com header.s=20210112 header.b=XvfjvKZW;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S236274AbiK2Tap (ORCPT <rfc822;rbbytesnap@gmail.com> + 99 others);
Tue, 29 Nov 2022 14:30:45 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43754 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S236947AbiK2TaY (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 29 Nov 2022 14:30:24 -0500
Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com
[IPv6:2607:f8b0:4864:20::b4a])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9283825D2
for <linux-kernel@vger.kernel.org>;
Tue, 29 Nov 2022 11:29:34 -0800 (PST)
Received: by mail-yb1-xb4a.google.com with SMTP id
n16-20020a25da10000000b006f2b5bc99f9so12186325ybf.11
for <linux-kernel@vger.kernel.org>;
Tue, 29 Nov 2022 11:29:34 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=google.com; s=20210112;
h=cc:to:from:subject:mime-version:message-id:date:from:to:cc:subject
:date:message-id:reply-to;
bh=0IUlOBzNYwGwCi/kB8Fps4nNnJDZbsGKlmWKEqCDmL4=;
b=XvfjvKZWRz3BpkA0IL/xKRzPSSQ0ZNVzAKAZwUyMZTFds48yAOihgfktestrOPCJIG
5g3Z2g9OzLAOUqkmej5idDjZa8WFQJ2XzhSqKsbP63Bm3EGjgX+nGmuiB0BN0q4JyPFp
51035iIhlvXvBLbMP+V9tvW2cOexrSnsm+Ogh78MtAezWX5UBLaU+HDC/uHDFXFRARqE
6mFhSwMQcDTHCXaz7fzxV6O1YE4TDyZYpfuYDYJcqegrb3GZVxK5ESl6DAlQ5j6f7CE4
WdsB7MIoGBsYPG+kLF3nd7hGmS9QD2GMbeXI8LgSr80S+HBLyum+k0sT1QCAXyAGX8IA
BhOQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=cc:to:from:subject:mime-version:message-id:date:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=0IUlOBzNYwGwCi/kB8Fps4nNnJDZbsGKlmWKEqCDmL4=;
b=FzNMrCpByTEI2KCluntTwWrI0rmya63SYTQamhzwajI8kWwcMqrBssAJrkgzY97qS+
9wiu5njKewyu49ICFQ2VxkG0I/Ye3wWm+fBsMXEkgnaNpd5Hc5VfNxfU49hbnuY8I3vn
g/UYeQl97cVbcsltnqwQVjHzUmFwEOVXFiiD5bLh7D/VhIiyWQvP1RFRRy8P0q5D7SVN
OXmJQoU66RGeeXhhr5NF+therCUYEB/sfZ7eqMC1j4EwccNjQmm6iAhO/TmXsP+UFSjg
q+ikpyS0/xYWqbRh/s0bSauQOtB7g6y+TUCwBEtvCBB48uf3gZNmHtNaewGv0dbYusxE
camw==
X-Gm-Message-State: ANoB5plru5vHIK/iA0Qt/UPK4Y8f5zL+C6lkdTu/CNYrbKgjHb1szcBk
I3NIA+IYs6T5ddsG35rPxguu9fWnPSI7
X-Received: from irogers.svl.corp.google.com
([2620:15c:2d4:203:788c:ccf4:3670:3362])
(user=irogers job=sendgmr) by 2002:a25:8e82:0:b0:6d2:70d5:3ed0 with SMTP id
q2-20020a258e82000000b006d270d53ed0mr56790224ybl.457.1669750173767; Tue, 29
Nov 2022 11:29:33 -0800 (PST)
Date: Tue, 29 Nov 2022 11:29:24 -0800
Message-Id: <20221129192924.1580537-1-irogers@google.com>
Mime-Version: 1.0
X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog
Subject: [PATCH] perf build: Fixes for LIBTRACEEVENT_DYNAMIC
From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Stephane Eranian <eranian@google.com>,
Ian Rogers <irogers@google.com>
Content-Type: text/plain; charset="UTF-8"
X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1750860680909996991?=
X-GMAIL-MSGID: =?utf-8?q?1750860680909996991?=
|
| Series |
perf build: Fixes for LIBTRACEEVENT_DYNAMIC
|
|
Commit Message
Ian Rogers
Nov. 29, 2022, 7:29 p.m. UTC
If LIBTRACEEVENT_DYNAMIC is enabled then avoid the install step for
the plugins. If disabled correct DESTDIR so that the plugins are
installed under <lib>/traceevent/plugins.
Fixes: ef019df01e20 ("perf build: Install libtraceevent locally when building")
Reported-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/Makefile.perf | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
Comments
On Tue, Nov 29, 2022 at 11:29:24AM -0800, Ian Rogers wrote: > If LIBTRACEEVENT_DYNAMIC is enabled then avoid the install step for > the plugins. If disabled correct DESTDIR so that the plugins are > installed under <lib>/traceevent/plugins. > > Fixes: ef019df01e20 ("perf build: Install libtraceevent locally when building") > Reported-by: Alexander Gordeev <agordeev@linux.ibm.com> > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/Makefile.perf | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > index a17a6ea85e81..f4cd946fe91a 100644 > --- a/tools/perf/Makefile.perf > +++ b/tools/perf/Makefile.perf > @@ -884,7 +884,7 @@ $(LIBTRACEEVENT_DYNAMIC_LIST): libtraceevent_plugins > > install-traceevent-plugins: libtraceevent_plugins > $(Q)$(MAKE) -C $(LIBTRACEEVENT_PLUGINS_DIR) O=$(LIBTRACEEVENT_PLUGINS_OUTPUT) \ > - DESTDIR=$(LIBTRACEEVENT_PLUGINS_DESTDIR) prefix= \ > + DESTDIR=$(DESTDIR_SQ) prefix= \ > $(LIBTRACEEVENT_FLAGS) install > endif > > @@ -1093,7 +1093,11 @@ install-tests: all install-gtk > $(INSTALL) tests/shell/coresight/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight' > $(Q)$(MAKE) -C tests/shell/coresight install-tests > > -install-bin: install-tools install-tests install-traceevent-plugins > +install-bin: install-tools install-tests > + > +ifndef LIBTRACEEVENT_DYNAMIC > +install-bin: install-traceevent-plugins > +endif > > install: install-bin try-install-man > > -- > 2.38.1.584.g0f3c55d4c2-goog Tested-by: Alexander Gordeev <agordeev@linux.ibm.com>
Em Tue, Nov 29, 2022 at 11:29:24AM -0800, Ian Rogers escreveu: > If LIBTRACEEVENT_DYNAMIC is enabled then avoid the install step for > the plugins. If disabled correct DESTDIR so that the plugins are > installed under <lib>/traceevent/plugins. > > Fixes: ef019df01e20 ("perf build: Install libtraceevent locally when building") > Reported-by: Alexander Gordeev <agordeev@linux.ibm.com> > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/Makefile.perf | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > index a17a6ea85e81..f4cd946fe91a 100644 > --- a/tools/perf/Makefile.perf > +++ b/tools/perf/Makefile.perf > @@ -884,7 +884,7 @@ $(LIBTRACEEVENT_DYNAMIC_LIST): libtraceevent_plugins > > install-traceevent-plugins: libtraceevent_plugins > $(Q)$(MAKE) -C $(LIBTRACEEVENT_PLUGINS_DIR) O=$(LIBTRACEEVENT_PLUGINS_OUTPUT) \ > - DESTDIR=$(LIBTRACEEVENT_PLUGINS_DESTDIR) prefix= \ > + DESTDIR=$(DESTDIR_SQ) prefix= \ > $(LIBTRACEEVENT_FLAGS) install > endif > > @@ -1093,7 +1093,11 @@ install-tests: all install-gtk > $(INSTALL) tests/shell/coresight/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight' > $(Q)$(MAKE) -C tests/shell/coresight install-tests > > -install-bin: install-tools install-tests install-traceevent-plugins > +install-bin: install-tools install-tests > + > +ifndef LIBTRACEEVENT_DYNAMIC > +install-bin: install-traceevent-plugins > +endif > > install: install-bin try-install-man After applying this: ⬢[acme@toolbox perf]$ alias m alias m='perf stat -e cycles:u,instructions:u make -k BUILD_BPF_SKEL=1 CORESIGHT=1 O=/tmp/build/perf -C tools/perf install-bin && git status && perf test python' ⬢[acme@toolbox perf]$ ⬢[acme@toolbox perf]$ m make: Entering directory '/var/home/acme/git/perf/tools/perf' BUILD: Doing 'make -j32' parallel build Warning: Kernel ABI header at 'tools/arch/x86/include/asm/msr-index.h' differs from latest version at 'arch/x86/include/asm/msr-index.h' diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h Warning: Kernel ABI header at 'tools/arch/arm64/include/uapi/asm/perf_regs.h' differs from latest version at 'arch/arm64/include/uapi/asm/perf_regs.h' diff -u tools/arch/arm64/include/uapi/asm/perf_regs.h arch/arm64/include/uapi/asm/perf_regs.h Warning: Kernel ABI header at 'tools/arch/arm64/include/asm/cputype.h' differs from latest version at 'arch/arm64/include/asm/cputype.h' diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h Warning: Kernel ABI header at 'tools/perf/arch/powerpc/entry/syscalls/syscall.tbl' differs from latest version at 'arch/powerpc/kernel/syscalls/syscall.tbl' diff -u tools/perf/arch/powerpc/entry/syscalls/syscall.tbl arch/powerpc/kernel/syscalls/syscall.tbl INSTALL libsubcmd_headers INSTALL traceevent_headers INSTALL libapi_headers INSTALL libperf_headers INSTALL libsymbol_headers INSTALL libbpf_headers CC /tmp/build/perf/builtin-annotate.o CC /tmp/build/perf/builtin-diff.o CC /tmp/build/perf/builtin-evlist.o CC /tmp/build/perf/builtin-sched.o CC /tmp/build/perf/builtin-buildid-list.o CC /tmp/build/perf/builtin-buildid-cache.o CC /tmp/build/perf/builtin-record.o INSTALL trace_plugins GEN /tmp/build/perf/python/perf.so CC /tmp/build/perf/builtin-report.o install: cannot create directory ‘/lib64/traceevent’: Permission denied CC /tmp/build/perf/builtin-stat.o install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory install: cannot create directory ‘/lib64/traceevent’: Permission denied CC /tmp/build/perf/builtin-timechart.o install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory install: cannot create directory ‘/lib64/traceevent’: Permission denied CC /tmp/build/perf/builtin-top.o install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory install: cannot create directory ‘/lib64/traceevent’: Permission denied CC /tmp/build/perf/builtin-script.o install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory install: cannot create directory ‘/lib64/traceevent’: Permission denied CC /tmp/build/perf/builtin-kmem.o install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory CC /tmp/build/perf/builtin-lock.o install: cannot create directory ‘/lib64/traceevent’: Permission denied CC /tmp/build/perf/builtin-kvm.o install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory install: cannot create directory ‘/lib64/traceevent’: Permission denied CC /tmp/build/perf/builtin-inject.o install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory CC /tmp/build/perf/builtin-mem.o install: cannot create directory ‘/lib64/traceevent’: Permission denied install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory CC /tmp/build/perf/builtin-c2c.o install: cannot create directory ‘/lib64/traceevent’: Permission denied install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory CC /tmp/build/perf/builtin-kwork.o install: cannot create directory ‘/lib64/traceevent’: Permission denied CC /tmp/build/perf/builtin-trace.o install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory install: cannot create directory ‘/lib64/traceevent’: Permission denied install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory install: cannot create directory ‘/lib64/traceevent’: Permission denied install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory make[3]: *** [Makefile:211: install] Error 1 make[2]: *** [Makefile.perf:886: install-traceevent-plugins] Error 2 make[2]: *** Waiting for unfinished jobs.... CC /tmp/build/perf/scripts/perl/Perf-Trace-Util/Context.o CC /tmp/build/perf/scripts/python/Perf-Trace-Util/Context.o CC /tmp/build/perf/bench/synthesize.o CC /tmp/build/perf/bench/inject-buildid.o CC /tmp/build/perf/ui/browsers/header.o CC /tmp/build/perf/tests/evsel-tp-sched.o CC /tmp/build/perf/arch/x86/util/intel-pt.o CC /tmp/build/perf/arch/x86/util/intel-bts.o LD /tmp/build/perf/scripts/python/Perf-Trace-Util/perf-in.o LD /tmp/build/perf/bench/perf-in.o LD /tmp/build/perf/ui/browsers/perf-in.o CC /tmp/build/perf/tests/code-reading.o CC /tmp/build/perf/tests/sample-parsing.o LD /tmp/build/perf/arch/x86/util/perf-in.o CC /tmp/build/perf/tests/topology.o LD /tmp/build/perf/ui/perf-in.o CC /tmp/build/perf/util/build-id.o CC /tmp/build/perf/tests/time-utils-test.o CC /tmp/build/perf/util/event.o CC /tmp/build/perf/tests/demangle-java-test.o CC /tmp/build/perf/tests/demangle-ocaml-test.o LD /tmp/build/perf/arch/x86/perf-in.o CC /tmp/build/perf/util/evsel.o CC /tmp/build/perf/util/evsel_fprintf.o LD /tmp/build/perf/arch/perf-in.o LD /tmp/build/perf/tests/perf-in.o CC /tmp/build/perf/util/header.o CC /tmp/build/perf/util/session.o CC /tmp/build/perf/util/s390-sample-raw.o CC /tmp/build/perf/util/amd-sample-raw.o CC /tmp/build/perf/util/ordered-events.o CC /tmp/build/perf/util/thread.o CC /tmp/build/perf/util/trace-event-parse.o CC /tmp/build/perf/util/trace-event-read.o CC /tmp/build/perf/util/trace-event-info.o CC /tmp/build/perf/util/trace-event-scripting.o CC /tmp/build/perf/util/trace-event.o CC /tmp/build/perf/util/sort.o CC /tmp/build/perf/util/hist.o CC /tmp/build/perf/util/stat.o CC /tmp/build/perf/util/synthetic-events.o CC /tmp/build/perf/util/auxtrace.o CC /tmp/build/perf/util/intel-pt.o CC /tmp/build/perf/util/intel-bts.o CC /tmp/build/perf/util/arm-spe.o CC /tmp/build/perf/util/hisi-ptt.o CC /tmp/build/perf/util/s390-cpumsf.o CC /tmp/build/perf/util/scripting-engines/trace-event-perl.o CC /tmp/build/perf/util/cs-etm.o CC /tmp/build/perf/util/scripting-engines/trace-event-python.o CC /tmp/build/perf/util/dlfilter.o CC /tmp/build/perf/util/time-utils.o CC /tmp/build/perf/util/bpf_off_cpu.o CC /tmp/build/perf/util/probe-file.o CC /tmp/build/perf/util/probe-event.o LD /tmp/build/perf/util/scripting-engines/perf-in.o CC /tmp/build/perf/util/unwind-libunwind-local.o CC /tmp/build/perf/util/unwind-libunwind.o CC /tmp/build/perf/util/data-convert-bt.o CC /tmp/build/perf/util/data-convert-json.o LD /tmp/build/perf/scripts/perl/Perf-Trace-Util/perf-in.o CC /tmp/build/perf/util/jitdump.o LD /tmp/build/perf/scripts/perf-in.o CC /tmp/build/perf/util/bpf-event.o LD /tmp/build/perf/util/perf-in.o LD /tmp/build/perf/perf-in.o make[1]: *** [Makefile.perf:240: sub-make] Error 2 make: *** [Makefile:113: install-bin] Error 2 make: Leaving directory '/var/home/acme/git/perf/tools/perf' Performance counter stats for 'make -k BUILD_BPF_SKEL=1 CORESIGHT=1 O=/tmp/build/perf -C tools/perf install-bin': 9,363,188,016 cycles:u 17,153,393,661 instructions:u # 1.83 insn per cycle 2.837743632 seconds time elapsed 2.316326000 seconds user 2.136834000 seconds sys ⬢[acme@toolbox perf]$
On Mon, Dec 5, 2022 at 4:57 AM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > Em Tue, Nov 29, 2022 at 11:29:24AM -0800, Ian Rogers escreveu: > > If LIBTRACEEVENT_DYNAMIC is enabled then avoid the install step for > > the plugins. If disabled correct DESTDIR so that the plugins are > > installed under <lib>/traceevent/plugins. > > > > Fixes: ef019df01e20 ("perf build: Install libtraceevent locally when building") > > Reported-by: Alexander Gordeev <agordeev@linux.ibm.com> > > Signed-off-by: Ian Rogers <irogers@google.com> > > --- > > tools/perf/Makefile.perf | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > > index a17a6ea85e81..f4cd946fe91a 100644 > > --- a/tools/perf/Makefile.perf > > +++ b/tools/perf/Makefile.perf > > @@ -884,7 +884,7 @@ $(LIBTRACEEVENT_DYNAMIC_LIST): libtraceevent_plugins > > > > install-traceevent-plugins: libtraceevent_plugins > > $(Q)$(MAKE) -C $(LIBTRACEEVENT_PLUGINS_DIR) O=$(LIBTRACEEVENT_PLUGINS_OUTPUT) \ > > - DESTDIR=$(LIBTRACEEVENT_PLUGINS_DESTDIR) prefix= \ > > + DESTDIR=$(DESTDIR_SQ) prefix= \ > > $(LIBTRACEEVENT_FLAGS) install > > endif > > > > @@ -1093,7 +1093,11 @@ install-tests: all install-gtk > > $(INSTALL) tests/shell/coresight/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight' > > $(Q)$(MAKE) -C tests/shell/coresight install-tests > > > > -install-bin: install-tools install-tests install-traceevent-plugins > > +install-bin: install-tools install-tests > > + > > +ifndef LIBTRACEEVENT_DYNAMIC > > +install-bin: install-traceevent-plugins > > +endif > > > > install: install-bin try-install-man > > After applying this: > > ⬢[acme@toolbox perf]$ alias m > alias m='perf stat -e cycles:u,instructions:u make -k BUILD_BPF_SKEL=1 CORESIGHT=1 O=/tmp/build/perf -C tools/perf install-bin && git status && perf test python' > ⬢[acme@toolbox perf]$ > > ⬢[acme@toolbox perf]$ m > make: Entering directory '/var/home/acme/git/perf/tools/perf' > BUILD: Doing 'make -j32' parallel build > Warning: Kernel ABI header at 'tools/arch/x86/include/asm/msr-index.h' differs from latest version at 'arch/x86/include/asm/msr-index.h' > diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h > Warning: Kernel ABI header at 'tools/arch/arm64/include/uapi/asm/perf_regs.h' differs from latest version at 'arch/arm64/include/uapi/asm/perf_regs.h' > diff -u tools/arch/arm64/include/uapi/asm/perf_regs.h arch/arm64/include/uapi/asm/perf_regs.h > Warning: Kernel ABI header at 'tools/arch/arm64/include/asm/cputype.h' differs from latest version at 'arch/arm64/include/asm/cputype.h' > diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h > Warning: Kernel ABI header at 'tools/perf/arch/powerpc/entry/syscalls/syscall.tbl' differs from latest version at 'arch/powerpc/kernel/syscalls/syscall.tbl' > diff -u tools/perf/arch/powerpc/entry/syscalls/syscall.tbl arch/powerpc/kernel/syscalls/syscall.tbl > > INSTALL libsubcmd_headers > INSTALL traceevent_headers > INSTALL libapi_headers > INSTALL libperf_headers > INSTALL libsymbol_headers > INSTALL libbpf_headers > CC /tmp/build/perf/builtin-annotate.o > CC /tmp/build/perf/builtin-diff.o > CC /tmp/build/perf/builtin-evlist.o > CC /tmp/build/perf/builtin-sched.o > CC /tmp/build/perf/builtin-buildid-list.o > CC /tmp/build/perf/builtin-buildid-cache.o > CC /tmp/build/perf/builtin-record.o > INSTALL trace_plugins > GEN /tmp/build/perf/python/perf.so > CC /tmp/build/perf/builtin-report.o > install: cannot create directory ‘/lib64/traceevent’: Permission denied > CC /tmp/build/perf/builtin-stat.o > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > install: cannot create directory ‘/lib64/traceevent’: Permission denied > CC /tmp/build/perf/builtin-timechart.o > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > install: cannot create directory ‘/lib64/traceevent’: Permission denied > CC /tmp/build/perf/builtin-top.o > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > install: cannot create directory ‘/lib64/traceevent’: Permission denied > CC /tmp/build/perf/builtin-script.o > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > install: cannot create directory ‘/lib64/traceevent’: Permission denied > CC /tmp/build/perf/builtin-kmem.o > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > CC /tmp/build/perf/builtin-lock.o > install: cannot create directory ‘/lib64/traceevent’: Permission denied > CC /tmp/build/perf/builtin-kvm.o > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > install: cannot create directory ‘/lib64/traceevent’: Permission denied > CC /tmp/build/perf/builtin-inject.o > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > CC /tmp/build/perf/builtin-mem.o > install: cannot create directory ‘/lib64/traceevent’: Permission denied > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > CC /tmp/build/perf/builtin-c2c.o > install: cannot create directory ‘/lib64/traceevent’: Permission denied > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > CC /tmp/build/perf/builtin-kwork.o > install: cannot create directory ‘/lib64/traceevent’: Permission denied > CC /tmp/build/perf/builtin-trace.o > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > install: cannot create directory ‘/lib64/traceevent’: Permission denied > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > install: cannot create directory ‘/lib64/traceevent’: Permission denied > install: cannot create regular file '/lib64/traceevent/plugins': No such file or directory > make[3]: *** [Makefile:211: install] Error 1 > make[2]: *** [Makefile.perf:886: install-traceevent-plugins] Error 2 > make[2]: *** Waiting for unfinished jobs.... > CC /tmp/build/perf/scripts/perl/Perf-Trace-Util/Context.o > CC /tmp/build/perf/scripts/python/Perf-Trace-Util/Context.o > CC /tmp/build/perf/bench/synthesize.o > CC /tmp/build/perf/bench/inject-buildid.o > CC /tmp/build/perf/ui/browsers/header.o > CC /tmp/build/perf/tests/evsel-tp-sched.o > CC /tmp/build/perf/arch/x86/util/intel-pt.o > CC /tmp/build/perf/arch/x86/util/intel-bts.o > LD /tmp/build/perf/scripts/python/Perf-Trace-Util/perf-in.o > LD /tmp/build/perf/bench/perf-in.o > LD /tmp/build/perf/ui/browsers/perf-in.o > CC /tmp/build/perf/tests/code-reading.o > CC /tmp/build/perf/tests/sample-parsing.o > LD /tmp/build/perf/arch/x86/util/perf-in.o > CC /tmp/build/perf/tests/topology.o > LD /tmp/build/perf/ui/perf-in.o > CC /tmp/build/perf/util/build-id.o > CC /tmp/build/perf/tests/time-utils-test.o > CC /tmp/build/perf/util/event.o > CC /tmp/build/perf/tests/demangle-java-test.o > CC /tmp/build/perf/tests/demangle-ocaml-test.o > LD /tmp/build/perf/arch/x86/perf-in.o > CC /tmp/build/perf/util/evsel.o > CC /tmp/build/perf/util/evsel_fprintf.o > LD /tmp/build/perf/arch/perf-in.o > LD /tmp/build/perf/tests/perf-in.o > CC /tmp/build/perf/util/header.o > CC /tmp/build/perf/util/session.o > CC /tmp/build/perf/util/s390-sample-raw.o > CC /tmp/build/perf/util/amd-sample-raw.o > CC /tmp/build/perf/util/ordered-events.o > CC /tmp/build/perf/util/thread.o > CC /tmp/build/perf/util/trace-event-parse.o > CC /tmp/build/perf/util/trace-event-read.o > CC /tmp/build/perf/util/trace-event-info.o > CC /tmp/build/perf/util/trace-event-scripting.o > CC /tmp/build/perf/util/trace-event.o > CC /tmp/build/perf/util/sort.o > CC /tmp/build/perf/util/hist.o > CC /tmp/build/perf/util/stat.o > CC /tmp/build/perf/util/synthetic-events.o > CC /tmp/build/perf/util/auxtrace.o > CC /tmp/build/perf/util/intel-pt.o > CC /tmp/build/perf/util/intel-bts.o > CC /tmp/build/perf/util/arm-spe.o > CC /tmp/build/perf/util/hisi-ptt.o > CC /tmp/build/perf/util/s390-cpumsf.o > CC /tmp/build/perf/util/scripting-engines/trace-event-perl.o > CC /tmp/build/perf/util/cs-etm.o > CC /tmp/build/perf/util/scripting-engines/trace-event-python.o > CC /tmp/build/perf/util/dlfilter.o > CC /tmp/build/perf/util/time-utils.o > CC /tmp/build/perf/util/bpf_off_cpu.o > CC /tmp/build/perf/util/probe-file.o > CC /tmp/build/perf/util/probe-event.o > LD /tmp/build/perf/util/scripting-engines/perf-in.o > CC /tmp/build/perf/util/unwind-libunwind-local.o > CC /tmp/build/perf/util/unwind-libunwind.o > CC /tmp/build/perf/util/data-convert-bt.o > CC /tmp/build/perf/util/data-convert-json.o > LD /tmp/build/perf/scripts/perl/Perf-Trace-Util/perf-in.o > CC /tmp/build/perf/util/jitdump.o > LD /tmp/build/perf/scripts/perf-in.o > CC /tmp/build/perf/util/bpf-event.o > LD /tmp/build/perf/util/perf-in.o > LD /tmp/build/perf/perf-in.o > make[1]: *** [Makefile.perf:240: sub-make] Error 2 > make: *** [Makefile:113: install-bin] Error 2 > make: Leaving directory '/var/home/acme/git/perf/tools/perf' > > Performance counter stats for 'make -k BUILD_BPF_SKEL=1 CORESIGHT=1 O=/tmp/build/perf -C tools/perf install-bin': > > 9,363,188,016 cycles:u > 17,153,393,661 instructions:u # 1.83 insn per cycle > > 2.837743632 seconds time elapsed > > 2.316326000 seconds user > 2.136834000 seconds sys > > > ⬢[acme@toolbox perf]$ Thanks the following fixes it: ``` --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -884,7 +884,7 @@ $(LIBTRACEEVENT_DYNAMIC_LIST): libtraceevent_plugins install-traceevent-plugins: libtraceevent_plugins $(Q)$(MAKE) -C $(LIBTRACEEVENT_PLUGINS_DIR) O=$(LIBTRACEEVENT_PLUGINS_OUTPUT) \ - DESTDIR=$(DESTDIR_SQ) prefix= \ + DESTDIR=$(DESTDIR_SQ)$(prefix) prefix= \ $(LIBTRACEEVENT_FLAGS) install endif ``` I'll rebase on tmp.perf/core and send the outstanding patches. Thanks, Ian
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index a17a6ea85e81..f4cd946fe91a 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -884,7 +884,7 @@ $(LIBTRACEEVENT_DYNAMIC_LIST): libtraceevent_plugins install-traceevent-plugins: libtraceevent_plugins $(Q)$(MAKE) -C $(LIBTRACEEVENT_PLUGINS_DIR) O=$(LIBTRACEEVENT_PLUGINS_OUTPUT) \ - DESTDIR=$(LIBTRACEEVENT_PLUGINS_DESTDIR) prefix= \ + DESTDIR=$(DESTDIR_SQ) prefix= \ $(LIBTRACEEVENT_FLAGS) install endif @@ -1093,7 +1093,11 @@ install-tests: all install-gtk $(INSTALL) tests/shell/coresight/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight' $(Q)$(MAKE) -C tests/shell/coresight install-tests -install-bin: install-tools install-tests install-traceevent-plugins +install-bin: install-tools install-tests + +ifndef LIBTRACEEVENT_DYNAMIC +install-bin: install-traceevent-plugins +endif install: install-bin try-install-man