From nobody Wed Dec 17 23:53:52 2025 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 96B5717F506 for ; Tue, 25 Jun 2024 21:41: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=1719351698; cv=none; b=nfgInlpdi/LryyBrB5c/aZp0NoV1Tmv26zAlAFbs5G1V5wCfvTdEedEt4g2pTPwASkN7x/Ug2EfeU2G0uJl4janpPvb7fQfP1NX6gr2j/fWSRbUGBvAr3kDeZ/L4tabv8f7DRCj4k47EZE0xE0rHkVHXFoGAlD7UfPXDM+Ex6aU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719351698; c=relaxed/simple; bh=thwPGDljXgnRSWdDOL+t4VhcOZp8MvwzAbb/znOGi6I=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=MhXqORh8/DmBVmPzyWq27N8Il2ORDNYVZAXMALOOZkIJKnXuN59PZVhUnwHgWpo1qnMmDk29Q6MNj2vcSmuIuuOkr/OrQuhVvIc4tsKxBnBcS+TTItxzUuYq4Z0n2oKJX+PiLDeAA+m9d59HhUU7CYnB7gnLiTtxxatDf3wNMyE= 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=JIyLRVfS; 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="JIyLRVfS" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-62f46f56353so104359447b3.3 for ; Tue, 25 Jun 2024 14:41:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719351695; x=1719956495; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=RK3JzW9xM39N/w1V/oeqY/ONEk8wOZil6KLzX7W64sM=; b=JIyLRVfSM0woMG+DOewkDEp6hNyIuGqat1Xd1cGDxp4Kws/5sIJVnwtXnP3lHCCltP Vaeq1qY4Vb2rgQWR5yCOv0IkLmmT6VtRAo37qHnUEV7G2gphWjGWzfuvME4UxTH9uFxw 4eko3ARoXPIlAdWMGow1IXBudALFP+E2/ngrEWBRyh28IXLedOG+Pr79zvggAahsc96R oU4s94G4zOobV5CpkaATibkG0lriGpgaABBPyn7bghMQKKr4XRP0YslZggW1ZChYAcnT nUVsz5rHbT5suq9VrzStIBcz3wOlWt3Rehx7ZO8aL+lFYvBlt9Ap6Z/XRHs8ISWBDwtQ L1yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719351695; x=1719956495; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RK3JzW9xM39N/w1V/oeqY/ONEk8wOZil6KLzX7W64sM=; b=mkF+sbCK7Wxg6AwDR6UMDUNLvjjCvXlMrGUoredWUzW/tdlslif9nAq1eC/w+B8XIX CP4JnvdIQhIwGaTJ/zF1jzkFWT41YstYA1Aqoi2FGFclTEI2N0OFjT69xkcTT2WL8IZ+ jXf8Xo56iqru4O/54stPFJ6zh2VJmlAgIST6nDrOq6g8hEtlWX9joNhqi57VlVg1kqDi JbuaGi39wYuz/u1F4jKk7GaRU3/Yg8c4/wF/N1X65vpgzE7Qyi/qHRp/EAyyRzZ1jfC7 /yldFyxO4gtAahMyNAB9WEiwAY4Z0+Oxth5GjYp7QTSIPgSqfK/yQ3QfqUsvui/00b/X G65g== X-Forwarded-Encrypted: i=1; AJvYcCX/P/1il6KNpf3W/f5V/wT+GcIdRCcecfcWhxC5uzfZlytjdmdbjXYo56a5gWZBx4kDRImlcKLNqccpbbUogorXm7O6uoubcqqyfm2p X-Gm-Message-State: AOJu0YyNInW5NsPhge/rUWorxWwXS2kUglvU+3SBi27Z/ps+avVAo+75 zK9R+lWX+YTsNu7FwWCSjAxRMM3sBwWw0Xb8q37r04j5LU9gLjVBy0G7uUYqUW30W8a3P42MAnu 29X3jZA== X-Google-Smtp-Source: AGHT+IEa4Xxqmjr2ntkjsN583JQPjlc2fg0OgO/kE+vbQSwB6AY81hKIjTflfOwXAD6wiyOP2lyDV7c72DVI X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:23a1:25b9:2412:56de]) (user=irogers job=sendgmr) by 2002:a05:690c:3809:b0:62c:67f4:4c4 with SMTP id 00721157ae682-6434308827bmr339467b3.7.1719351694466; Tue, 25 Jun 2024 14:41:34 -0700 (PDT) Date: Tue, 25 Jun 2024 14:41:15 -0700 In-Reply-To: <20240625214117.953777-1-irogers@google.com> Message-Id: <20240625214117.953777-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: <20240625214117.953777-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v5 6/8] perf util: Make util its own library From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Andrei Vagin , Kees Cook , Oliver Upton , Ze Gao , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the util directory into its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. For convenience: arch/common.c scripts/perl/Perf-Trace-Util/Context.c scripts/python/Perf-Trace-Util/Context.c are made part of this library. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 5 +- tools/perf/Makefile.perf | 12 +- tools/perf/arch/Build | 4 +- tools/perf/arch/arm/Build | 2 +- tools/perf/arch/arm/util/Build | 10 +- tools/perf/arch/arm64/Build | 2 +- tools/perf/arch/arm64/util/Build | 20 +- tools/perf/arch/csky/Build | 2 +- tools/perf/arch/csky/util/Build | 6 +- tools/perf/arch/loongarch/Build | 2 +- tools/perf/arch/loongarch/util/Build | 8 +- tools/perf/arch/mips/Build | 2 +- tools/perf/arch/mips/util/Build | 6 +- tools/perf/arch/powerpc/Build | 2 +- tools/perf/arch/powerpc/util/Build | 24 +- tools/perf/arch/riscv/Build | 2 +- tools/perf/arch/riscv/util/Build | 8 +- tools/perf/arch/s390/Build | 2 +- tools/perf/arch/s390/util/Build | 16 +- tools/perf/arch/sh/Build | 2 +- tools/perf/arch/sh/util/Build | 2 +- tools/perf/arch/sparc/Build | 2 +- tools/perf/arch/sparc/util/Build | 2 +- tools/perf/arch/x86/Build | 2 +- tools/perf/arch/x86/util/Build | 42 +- tools/perf/arch/xtensa/Build | 2 +- tools/perf/scripts/Build | 4 +- tools/perf/scripts/perl/Perf-Trace-Util/Build | 2 +- .../perf/scripts/python/Perf-Trace-Util/Build | 2 +- tools/perf/util/Build | 394 +++++++++--------- tools/perf/util/arm-spe-decoder/Build | 2 +- tools/perf/util/cs-etm-decoder/Build | 2 +- tools/perf/util/hisi-ptt-decoder/Build | 2 +- tools/perf/util/intel-pt-decoder/Build | 2 +- tools/perf/util/perf-regs-arch/Build | 18 +- tools/perf/util/scripting-engines/Build | 4 +- 36 files changed, 316 insertions(+), 305 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index 2787f5630ff7..1d4957957d75 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -53,11 +53,12 @@ CFLAGS_builtin-trace.o +=3D -DSTRACE_GROUPS_DIR=3D"B= UILD_STR($(STRACE_GROUPS_DIR_ CFLAGS_builtin-report.o +=3D -DTIPDIR=3D"BUILD_STR($(tipdir_SQ))" CFLAGS_builtin-report.o +=3D -DDOCDIR=3D"BUILD_STR($(srcdir_SQ)/Documen= tation)" =20 -perf-y +=3D util/ +perf-util-y +=3D util/ +perf-util-y +=3D arch/ perf-y +=3D arch/ perf-test-y +=3D arch/ perf-ui-y +=3D ui/ -perf-y +=3D scripts/ +perf-util-y +=3D scripts/ =20 gtk-y +=3D ui/gtk/ =20 diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 4a3c000b9845..ff03f0431013 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -434,6 +434,9 @@ LIBPERF_TEST :=3D $(OUTPUT)libperf-test.a LIBPERF_UI_IN :=3D $(OUTPUT)perf-ui-in.o LIBPERF_UI :=3D $(OUTPUT)libperf-ui.a =20 +LIBPERF_UTIL_IN :=3D $(OUTPUT)perf-util-in.o +LIBPERF_UTIL :=3D $(OUTPUT)libperf-util.a + LIBPMU_EVENTS_IN :=3D $(OUTPUT)pmu-events/pmu-events-in.o LIBPMU_EVENTS :=3D $(OUTPUT)libpmu-events.a =20 @@ -441,7 +444,8 @@ PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYM= BOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif -PERFLIBS +=3D $(LIBPERF_BENCH) $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVEN= TS) +PERFLIBS +=3D $(LIBPERF_BENCH) $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPERF_UTI= L) +PERFLIBS +=3D $(LIBPMU_EVENTS) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -761,6 +765,12 @@ $(LIBPERF_UI_IN): FORCE prepare $(LIBPERF_UI): $(LIBPERF_UI_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 +$(LIBPERF_UTIL_IN): FORCE prepare + $(Q)$(MAKE) $(build)=3Dperf-util + +$(LIBPERF_UTIL): $(LIBPERF_UTIL_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \ $(PERF_IN) $(LIBS) -o $@ diff --git a/tools/perf/arch/Build b/tools/perf/arch/Build index 6dd68c17924c..f0d96a13445c 100644 --- a/tools/perf/arch/Build +++ b/tools/perf/arch/Build @@ -1,3 +1,3 @@ -perf-y +=3D common.o -perf-y +=3D $(SRCARCH)/ +perf-util-y +=3D common.o perf-test-y +=3D $(SRCARCH)/ +perf-util-y +=3D $(SRCARCH)/ diff --git a/tools/perf/arch/arm/Build b/tools/perf/arch/arm/Build index 6b4fdec52122..317425aa3712 100644 --- a/tools/perf/arch/arm/Build +++ b/tools/perf/arch/arm/Build @@ -1,2 +1,2 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-$(CONFIG_DWARF_UNWIND) +=3D tests/ diff --git a/tools/perf/arch/arm/util/Build b/tools/perf/arch/arm/util/Build index 37fc63708966..e6dd7cd79ebd 100644 --- a/tools/perf/arch/arm/util/Build +++ b/tools/perf/arch/arm/util/Build @@ -1,8 +1,8 @@ -perf-y +=3D perf_regs.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o =20 -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-$(CONFIG_AUXTRACE) +=3D pmu.o auxtrace.o cs-etm.o +perf-util-$(CONFIG_AUXTRACE) +=3D pmu.o auxtrace.o cs-etm.o diff --git a/tools/perf/arch/arm64/Build b/tools/perf/arch/arm64/Build index 58b2d965ed86..12ebc65ea7a3 100644 --- a/tools/perf/arch/arm64/Build +++ b/tools/perf/arch/arm64/Build @@ -1,2 +1,2 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-y +=3D tests/ diff --git a/tools/perf/arch/arm64/util/Build b/tools/perf/arch/arm64/util/= Build index 78ef7115be3d..343ef7589a77 100644 --- a/tools/perf/arch/arm64/util/Build +++ b/tools/perf/arch/arm64/util/Build @@ -1,14 +1,14 @@ -perf-y +=3D header.o -perf-y +=3D machine.o -perf-y +=3D perf_regs.o -perf-y +=3D tsc.o -perf-y +=3D pmu.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-y +=3D header.o +perf-util-y +=3D machine.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D tsc.o +perf-util-y +=3D pmu.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-$(CONFIG_AUXTRACE) +=3D ../../arm/util/pmu.o \ +perf-util-$(CONFIG_AUXTRACE) +=3D ../../arm/util/pmu.o \ ../../arm/util/auxtrace.o \ ../../arm/util/cs-etm.o \ arm-spe.o mem-events.o hisi-ptt.o diff --git a/tools/perf/arch/csky/Build b/tools/perf/arch/csky/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/csky/Build +++ b/tools/perf/arch/csky/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/csky/util/Build b/tools/perf/arch/csky/util/Bu= ild index 7d3050134ae0..99d83f41bf43 100644 --- a/tools/perf/arch/csky/util/Build +++ b/tools/perf/arch/csky/util/Build @@ -1,4 +1,4 @@ -perf-y +=3D perf_regs.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/loongarch/Build b/tools/perf/arch/loongarch/Bu= ild index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/loongarch/Build +++ b/tools/perf/arch/loongarch/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/loongarch/util/Build b/tools/perf/arch/loongar= ch/util/Build index d776125a2d06..2386ebbf6dd4 100644 --- a/tools/perf/arch/loongarch/util/Build +++ b/tools/perf/arch/loongarch/util/Build @@ -1,5 +1,5 @@ -perf-y +=3D perf_regs.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/mips/Build b/tools/perf/arch/mips/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/mips/Build +++ b/tools/perf/arch/mips/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/mips/util/Build b/tools/perf/arch/mips/util/Bu= ild index 51c8900a9a10..e4644f1e68a0 100644 --- a/tools/perf/arch/mips/util/Build +++ b/tools/perf/arch/mips/util/Build @@ -1,3 +1,3 @@ -perf-y +=3D perf_regs.o -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-y +=3D perf_regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o diff --git a/tools/perf/arch/powerpc/Build b/tools/perf/arch/powerpc/Build index 58b2d965ed86..12ebc65ea7a3 100644 --- a/tools/perf/arch/powerpc/Build +++ b/tools/perf/arch/powerpc/Build @@ -1,2 +1,2 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-y +=3D tests/ diff --git a/tools/perf/arch/powerpc/util/Build b/tools/perf/arch/powerpc/u= til/Build index 1d323f3a3322..6c588ecdf3bd 100644 --- a/tools/perf/arch/powerpc/util/Build +++ b/tools/perf/arch/powerpc/util/Build @@ -1,14 +1,14 @@ -perf-y +=3D header.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-y +=3D perf_regs.o -perf-y +=3D mem-events.o -perf-y +=3D pmu.o -perf-y +=3D sym-handling.o -perf-y +=3D evsel.o -perf-y +=3D event.o +perf-util-y +=3D header.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D mem-events.o +perf-util-y +=3D pmu.o +perf-util-y +=3D sym-handling.o +perf-util-y +=3D evsel.o +perf-util-y +=3D event.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_DWARF) +=3D skip-callchain-idx.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D skip-callchain-idx.o =20 -perf-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/riscv/Build b/tools/perf/arch/riscv/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/riscv/Build +++ b/tools/perf/arch/riscv/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/riscv/util/Build b/tools/perf/arch/riscv/util/= Build index 603dbb5ae4dc..65ec3c66a375 100644 --- a/tools/perf/arch/riscv/util/Build +++ b/tools/perf/arch/riscv/util/Build @@ -1,5 +1,5 @@ -perf-y +=3D perf_regs.o -perf-y +=3D header.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D header.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/s390/Build b/tools/perf/arch/s390/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/s390/Build +++ b/tools/perf/arch/s390/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/s390/util/Build b/tools/perf/arch/s390/util/Bu= ild index fa66f15a14ec..1ac830030ff3 100644 --- a/tools/perf/arch/s390/util/Build +++ b/tools/perf/arch/s390/util/Build @@ -1,11 +1,11 @@ -perf-y +=3D header.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-y +=3D perf_regs.o +perf-util-y +=3D header.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-y +=3D perf_regs.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-y +=3D machine.o -perf-y +=3D pmu.o +perf-util-y +=3D machine.o +perf-util-y +=3D pmu.o =20 -perf-$(CONFIG_AUXTRACE) +=3D auxtrace.o +perf-util-$(CONFIG_AUXTRACE) +=3D auxtrace.o diff --git a/tools/perf/arch/sh/Build b/tools/perf/arch/sh/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/sh/Build +++ b/tools/perf/arch/sh/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/sh/util/Build b/tools/perf/arch/sh/util/Build index e813e618954b..32f44fc4ab98 100644 --- a/tools/perf/arch/sh/util/Build +++ b/tools/perf/arch/sh/util/Build @@ -1 +1 @@ -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o diff --git a/tools/perf/arch/sparc/Build b/tools/perf/arch/sparc/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/sparc/Build +++ b/tools/perf/arch/sparc/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/arch/sparc/util/Build b/tools/perf/arch/sparc/util/= Build index e813e618954b..32f44fc4ab98 100644 --- a/tools/perf/arch/sparc/util/Build +++ b/tools/perf/arch/sparc/util/Build @@ -1 +1 @@ -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build index 132cf8beaca2..87d057491343 100644 --- a/tools/perf/arch/x86/Build +++ b/tools/perf/arch/x86/Build @@ -1,4 +1,4 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ perf-test-y +=3D tests/ =20 ifdef SHELLCHECK diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build index 005907cb97d8..2607ed5c4296 100644 --- a/tools/perf/arch/x86/util/Build +++ b/tools/perf/arch/x86/util/Build @@ -1,24 +1,24 @@ -perf-y +=3D header.o -perf-y +=3D tsc.o -perf-y +=3D pmu.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-y +=3D perf_regs.o -perf-y +=3D topdown.o -perf-y +=3D machine.o -perf-y +=3D event.o -perf-y +=3D evlist.o -perf-y +=3D mem-events.o -perf-y +=3D evsel.o -perf-y +=3D iostat.o -perf-y +=3D env.o +perf-util-y +=3D header.o +perf-util-y +=3D tsc.o +perf-util-y +=3D pmu.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D topdown.o +perf-util-y +=3D machine.o +perf-util-y +=3D event.o +perf-util-y +=3D evlist.o +perf-util-y +=3D mem-events.o +perf-util-y +=3D evsel.o +perf-util-y +=3D iostat.o +perf-util-y +=3D env.o =20 -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_BPF_PROLOGUE) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_BPF_PROLOGUE) +=3D dwarf-regs.o =20 -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 -perf-$(CONFIG_AUXTRACE) +=3D auxtrace.o -perf-$(CONFIG_AUXTRACE) +=3D archinsn.o -perf-$(CONFIG_AUXTRACE) +=3D intel-pt.o -perf-$(CONFIG_AUXTRACE) +=3D intel-bts.o +perf-util-$(CONFIG_AUXTRACE) +=3D auxtrace.o +perf-util-$(CONFIG_AUXTRACE) +=3D archinsn.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-bts.o diff --git a/tools/perf/arch/xtensa/Build b/tools/perf/arch/xtensa/Build index e4e5f33c84d8..e63eabc2c8f4 100644 --- a/tools/perf/arch/xtensa/Build +++ b/tools/perf/arch/xtensa/Build @@ -1 +1 @@ -perf-y +=3D util/ +perf-util-y +=3D util/ diff --git a/tools/perf/scripts/Build b/tools/perf/scripts/Build index 7d8e2e57faac..46f0c6f76dbf 100644 --- a/tools/perf/scripts/Build +++ b/tools/perf/scripts/Build @@ -1,4 +1,4 @@ ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_LIBPERL) +=3D perl/Perf-Trace-Util/ + perf-util-$(CONFIG_LIBPERL) +=3D perl/Perf-Trace-Util/ endif -perf-$(CONFIG_LIBPYTHON) +=3D python/Perf-Trace-Util/ +perf-util-$(CONFIG_LIBPYTHON) +=3D python/Perf-Trace-Util/ diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Build b/tools/perf/scr= ipts/perl/Perf-Trace-Util/Build index cc76be005d5e..9b0e5a8b5070 100644 --- a/tools/perf/scripts/perl/Perf-Trace-Util/Build +++ b/tools/perf/scripts/perl/Perf-Trace-Util/Build @@ -1,4 +1,4 @@ -perf-y +=3D Context.o +perf-util-y +=3D Context.o =20 CFLAGS_Context.o +=3D $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-stric= t-prototypes -Wno-bad-function-cast -Wno-declaration-after-statement -Wno-s= witch-enum CFLAGS_Context.o +=3D -Wno-unused-parameter -Wno-nested-externs -Wno-undef diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Build b/tools/perf/s= cripts/python/Perf-Trace-Util/Build index 5b0b5ff7e14a..be3710c61320 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/Build +++ b/tools/perf/scripts/python/Perf-Trace-Util/Build @@ -1,4 +1,4 @@ -perf-y +=3D Context.o +perf-util-y +=3D Context.o =20 # -Wno-declaration-after-statement: The python headers have mixed code wit= h declarations (decls after asserts, for instance) CFLAGS_Context.o +=3D $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-str= ict-prototypes -Wno-unused-parameter -Wno-nested-externs -Wno-declaration-a= fter-statement diff --git a/tools/perf/util/Build b/tools/perf/util/Build index da64efd8718f..0f18fe81ef0b 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -1,181 +1,181 @@ include $(srctree)/tools/scripts/Makefile.include include $(srctree)/tools/scripts/utilities.mak =20 -perf-y +=3D arm64-frame-pointer-unwind-support.o -perf-y +=3D addr_location.o -perf-y +=3D annotate.o -perf-y +=3D block-info.o -perf-y +=3D block-range.o -perf-y +=3D build-id.o -perf-y +=3D cacheline.o -perf-y +=3D config.o -perf-y +=3D copyfile.o -perf-y +=3D ctype.o -perf-y +=3D db-export.o -perf-y +=3D disasm.o -perf-y +=3D env.o -perf-y +=3D event.o -perf-y +=3D evlist.o -perf-y +=3D sideband_evlist.o -perf-y +=3D evsel.o -perf-y +=3D evsel_fprintf.o -perf-y +=3D perf_event_attr_fprintf.o -perf-y +=3D evswitch.o -perf-y +=3D find_bit.o -perf-y +=3D get_current_dir_name.o -perf-y +=3D levenshtein.o -perf-y +=3D mmap.o -perf-y +=3D memswap.o -perf-y +=3D parse-events.o -perf-y +=3D print-events.o -perf-y +=3D tracepoint.o -perf-y +=3D perf_regs.o -perf-y +=3D perf-regs-arch/ -perf-y +=3D path.o -perf-y +=3D print_binary.o -perf-y +=3D print_insn.o -perf-y +=3D rlimit.o -perf-y +=3D argv_split.o -perf-y +=3D rbtree.o -perf-y +=3D libstring.o -perf-y +=3D bitmap.o -perf-y +=3D hweight.o -perf-y +=3D smt.o -perf-y +=3D strbuf.o -perf-y +=3D string.o -perf-y +=3D strlist.o -perf-y +=3D strfilter.o -perf-y +=3D top.o -perf-y +=3D usage.o -perf-y +=3D dso.o -perf-y +=3D dsos.o -perf-y +=3D symbol.o -perf-y +=3D symbol_fprintf.o -perf-y +=3D map_symbol.o -perf-y +=3D color.o -perf-y +=3D color_config.o -perf-y +=3D metricgroup.o -perf-y +=3D header.o -perf-y +=3D callchain.o -perf-y +=3D values.o -perf-y +=3D debug.o -perf-y +=3D fncache.o -perf-y +=3D machine.o -perf-y +=3D map.o -perf-y +=3D maps.o -perf-y +=3D pstack.o -perf-y +=3D session.o -perf-y +=3D sample-raw.o -perf-y +=3D s390-sample-raw.o -perf-y +=3D amd-sample-raw.o -perf-$(CONFIG_TRACE) +=3D syscalltbl.o -perf-y +=3D ordered-events.o -perf-y +=3D namespaces.o -perf-y +=3D comm.o -perf-y +=3D thread.o -perf-y +=3D threads.o -perf-y +=3D thread_map.o -perf-y +=3D parse-events-flex.o -perf-y +=3D parse-events-bison.o -perf-y +=3D pmu.o -perf-y +=3D pmus.o -perf-y +=3D pmu-flex.o -perf-y +=3D pmu-bison.o -perf-y +=3D svghelper.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-info.o -perf-y +=3D trace-event-scripting.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-parse.o -perf-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-read.o -perf-y +=3D sort.o -perf-y +=3D hist.o -perf-y +=3D util.o -perf-y +=3D cpumap.o -perf-y +=3D affinity.o -perf-y +=3D cputopo.o -perf-y +=3D cgroup.o -perf-y +=3D target.o -perf-y +=3D rblist.o -perf-y +=3D intlist.o -perf-y +=3D vdso.o -perf-y +=3D counts.o -perf-y +=3D stat.o -perf-y +=3D stat-shadow.o -perf-y +=3D stat-display.o -perf-y +=3D perf_api_probe.o -perf-y +=3D record.o -perf-y +=3D srcline.o -perf-y +=3D srccode.o -perf-y +=3D synthetic-events.o -perf-y +=3D data.o -perf-y +=3D tsc.o -perf-y +=3D cloexec.o -perf-y +=3D call-path.o -perf-y +=3D rwsem.o -perf-y +=3D thread-stack.o -perf-y +=3D spark.o -perf-y +=3D topdown.o -perf-y +=3D iostat.o -perf-y +=3D stream.o -perf-$(CONFIG_AUXTRACE) +=3D auxtrace.o -perf-$(CONFIG_AUXTRACE) +=3D intel-pt-decoder/ -perf-$(CONFIG_AUXTRACE) +=3D intel-pt.o -perf-$(CONFIG_AUXTRACE) +=3D intel-bts.o -perf-$(CONFIG_AUXTRACE) +=3D arm-spe.o -perf-$(CONFIG_AUXTRACE) +=3D arm-spe-decoder/ -perf-$(CONFIG_AUXTRACE) +=3D hisi-ptt.o -perf-$(CONFIG_AUXTRACE) +=3D hisi-ptt-decoder/ -perf-$(CONFIG_AUXTRACE) +=3D s390-cpumsf.o +perf-util-y +=3D arm64-frame-pointer-unwind-support.o +perf-util-y +=3D addr_location.o +perf-util-y +=3D annotate.o +perf-util-y +=3D block-info.o +perf-util-y +=3D block-range.o +perf-util-y +=3D build-id.o +perf-util-y +=3D cacheline.o +perf-util-y +=3D config.o +perf-util-y +=3D copyfile.o +perf-util-y +=3D ctype.o +perf-util-y +=3D db-export.o +perf-util-y +=3D disasm.o +perf-util-y +=3D env.o +perf-util-y +=3D event.o +perf-util-y +=3D evlist.o +perf-util-y +=3D sideband_evlist.o +perf-util-y +=3D evsel.o +perf-util-y +=3D evsel_fprintf.o +perf-util-y +=3D perf_event_attr_fprintf.o +perf-util-y +=3D evswitch.o +perf-util-y +=3D find_bit.o +perf-util-y +=3D get_current_dir_name.o +perf-util-y +=3D levenshtein.o +perf-util-y +=3D mmap.o +perf-util-y +=3D memswap.o +perf-util-y +=3D parse-events.o +perf-util-y +=3D print-events.o +perf-util-y +=3D tracepoint.o +perf-util-y +=3D perf_regs.o +perf-util-y +=3D perf-regs-arch/ +perf-util-y +=3D path.o +perf-util-y +=3D print_binary.o +perf-util-y +=3D print_insn.o +perf-util-y +=3D rlimit.o +perf-util-y +=3D argv_split.o +perf-util-y +=3D rbtree.o +perf-util-y +=3D libstring.o +perf-util-y +=3D bitmap.o +perf-util-y +=3D hweight.o +perf-util-y +=3D smt.o +perf-util-y +=3D strbuf.o +perf-util-y +=3D string.o +perf-util-y +=3D strlist.o +perf-util-y +=3D strfilter.o +perf-util-y +=3D top.o +perf-util-y +=3D usage.o +perf-util-y +=3D dso.o +perf-util-y +=3D dsos.o +perf-util-y +=3D symbol.o +perf-util-y +=3D symbol_fprintf.o +perf-util-y +=3D map_symbol.o +perf-util-y +=3D color.o +perf-util-y +=3D color_config.o +perf-util-y +=3D metricgroup.o +perf-util-y +=3D header.o +perf-util-y +=3D callchain.o +perf-util-y +=3D values.o +perf-util-y +=3D debug.o +perf-util-y +=3D fncache.o +perf-util-y +=3D machine.o +perf-util-y +=3D map.o +perf-util-y +=3D maps.o +perf-util-y +=3D pstack.o +perf-util-y +=3D session.o +perf-util-y +=3D sample-raw.o +perf-util-y +=3D s390-sample-raw.o +perf-util-y +=3D amd-sample-raw.o +perf-util-$(CONFIG_TRACE) +=3D syscalltbl.o +perf-util-y +=3D ordered-events.o +perf-util-y +=3D namespaces.o +perf-util-y +=3D comm.o +perf-util-y +=3D thread.o +perf-util-y +=3D threads.o +perf-util-y +=3D thread_map.o +perf-util-y +=3D parse-events-flex.o +perf-util-y +=3D parse-events-bison.o +perf-util-y +=3D pmu.o +perf-util-y +=3D pmus.o +perf-util-y +=3D pmu-flex.o +perf-util-y +=3D pmu-bison.o +perf-util-y +=3D svghelper.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-info.o +perf-util-y +=3D trace-event-scripting.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-parse.o +perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-read.o +perf-util-y +=3D sort.o +perf-util-y +=3D hist.o +perf-util-y +=3D util.o +perf-util-y +=3D cpumap.o +perf-util-y +=3D affinity.o +perf-util-y +=3D cputopo.o +perf-util-y +=3D cgroup.o +perf-util-y +=3D target.o +perf-util-y +=3D rblist.o +perf-util-y +=3D intlist.o +perf-util-y +=3D vdso.o +perf-util-y +=3D counts.o +perf-util-y +=3D stat.o +perf-util-y +=3D stat-shadow.o +perf-util-y +=3D stat-display.o +perf-util-y +=3D perf_api_probe.o +perf-util-y +=3D record.o +perf-util-y +=3D srcline.o +perf-util-y +=3D srccode.o +perf-util-y +=3D synthetic-events.o +perf-util-y +=3D data.o +perf-util-y +=3D tsc.o +perf-util-y +=3D cloexec.o +perf-util-y +=3D call-path.o +perf-util-y +=3D rwsem.o +perf-util-y +=3D thread-stack.o +perf-util-y +=3D spark.o +perf-util-y +=3D topdown.o +perf-util-y +=3D iostat.o +perf-util-y +=3D stream.o +perf-util-$(CONFIG_AUXTRACE) +=3D auxtrace.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-bts.o +perf-util-$(CONFIG_AUXTRACE) +=3D arm-spe.o +perf-util-$(CONFIG_AUXTRACE) +=3D arm-spe-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D hisi-ptt.o +perf-util-$(CONFIG_AUXTRACE) +=3D hisi-ptt-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D s390-cpumsf.o =20 ifdef CONFIG_LIBOPENCSD -perf-$(CONFIG_AUXTRACE) +=3D cs-etm.o -perf-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder/ +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm.o +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder/ endif -perf-$(CONFIG_AUXTRACE) +=3D cs-etm-base.o - -perf-y +=3D parse-branch-options.o -perf-y +=3D dump-insn.o -perf-y +=3D parse-regs-options.o -perf-y +=3D parse-sublevel-options.o -perf-y +=3D term.o -perf-y +=3D help-unknown-cmd.o -perf-y +=3D dlfilter.o -perf-y +=3D mem-events.o -perf-y +=3D mem-info.o -perf-y +=3D vsprintf.o -perf-y +=3D units.o -perf-y +=3D time-utils.o -perf-y +=3D expr-flex.o -perf-y +=3D expr-bison.o -perf-y +=3D expr.o -perf-y +=3D branch.o -perf-y +=3D mem2node.o -perf-y +=3D clockid.o -perf-y +=3D list_sort.o -perf-y +=3D mutex.o -perf-y +=3D sharded_mutex.o - -perf-$(CONFIG_LIBBPF) +=3D bpf_map.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter_cgroup.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_ftrace.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_off_cpu.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-flex.o -perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-bison.o +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm-base.o + +perf-util-y +=3D parse-branch-options.o +perf-util-y +=3D dump-insn.o +perf-util-y +=3D parse-regs-options.o +perf-util-y +=3D parse-sublevel-options.o +perf-util-y +=3D term.o +perf-util-y +=3D help-unknown-cmd.o +perf-util-y +=3D dlfilter.o +perf-util-y +=3D mem-events.o +perf-util-y +=3D mem-info.o +perf-util-y +=3D vsprintf.o +perf-util-y +=3D units.o +perf-util-y +=3D time-utils.o +perf-util-y +=3D expr-flex.o +perf-util-y +=3D expr-bison.o +perf-util-y +=3D expr.o +perf-util-y +=3D branch.o +perf-util-y +=3D mem2node.o +perf-util-y +=3D clockid.o +perf-util-y +=3D list_sort.o +perf-util-y +=3D mutex.o +perf-util-y +=3D sharded_mutex.o + +perf-util-$(CONFIG_LIBBPF) +=3D bpf_map.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_counter_cgroup.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_ftrace.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_off_cpu.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-flex.o +perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf-filter-bison.o =20 ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_lock_contention.o + perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_lock_contention.o endif =20 ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork.o - perf-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork_top.o + perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork.o + perf-util-$(CONFIG_PERF_BPF_SKEL) +=3D bpf_kwork_top.o endif =20 -perf-$(CONFIG_LIBELF) +=3D symbol-elf.o -perf-$(CONFIG_LIBELF) +=3D probe-file.o -perf-$(CONFIG_LIBELF) +=3D probe-event.o +perf-util-$(CONFIG_LIBELF) +=3D symbol-elf.o +perf-util-$(CONFIG_LIBELF) +=3D probe-file.o +perf-util-$(CONFIG_LIBELF) +=3D probe-event.o =20 ifdef CONFIG_LIBBPF_DYNAMIC hashmap :=3D 1 @@ -185,60 +185,60 @@ ifndef CONFIG_LIBBPF endif =20 ifdef hashmap -perf-y +=3D hashmap.o +perf-util-y +=3D hashmap.o endif =20 ifndef CONFIG_LIBELF -perf-y +=3D symbol-minimal.o +perf-util-y +=3D symbol-minimal.o endif =20 ifndef CONFIG_SETNS -perf-y +=3D setns.o +perf-util-y +=3D setns.o endif =20 -perf-$(CONFIG_DWARF) +=3D probe-finder.o -perf-$(CONFIG_DWARF) +=3D dwarf-aux.o -perf-$(CONFIG_DWARF) +=3D dwarf-regs.o -perf-$(CONFIG_DWARF) +=3D debuginfo.o -perf-$(CONFIG_DWARF) +=3D annotate-data.o +perf-util-$(CONFIG_DWARF) +=3D probe-finder.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-aux.o +perf-util-$(CONFIG_DWARF) +=3D dwarf-regs.o +perf-util-$(CONFIG_DWARF) +=3D debuginfo.o +perf-util-$(CONFIG_DWARF) +=3D annotate-data.o =20 -perf-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o -perf-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind-local.o -perf-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o -perf-$(CONFIG_LIBUNWIND_X86) +=3D libunwind/x86_32.o -perf-$(CONFIG_LIBUNWIND_AARCH64) +=3D libunwind/arm64.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind-local.o +perf-util-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o +perf-util-$(CONFIG_LIBUNWIND_X86) +=3D libunwind/x86_32.o +perf-util-$(CONFIG_LIBUNWIND_AARCH64) +=3D libunwind/arm64.o =20 ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_LIBBABELTRACE) +=3D data-convert-bt.o + perf-util-$(CONFIG_LIBBABELTRACE) +=3D data-convert-bt.o endif =20 -perf-y +=3D data-convert-json.o +perf-util-y +=3D data-convert-json.o =20 -perf-y +=3D scripting-engines/ +perf-util-y +=3D scripting-engines/ =20 -perf-$(CONFIG_ZLIB) +=3D zlib.o -perf-$(CONFIG_LZMA) +=3D lzma.o -perf-$(CONFIG_ZSTD) +=3D zstd.o +perf-util-$(CONFIG_ZLIB) +=3D zlib.o +perf-util-$(CONFIG_LZMA) +=3D lzma.o +perf-util-$(CONFIG_ZSTD) +=3D zstd.o =20 -perf-$(CONFIG_LIBCAP) +=3D cap.o +perf-util-$(CONFIG_LIBCAP) +=3D cap.o =20 -perf-$(CONFIG_CXX_DEMANGLE) +=3D demangle-cxx.o -perf-y +=3D demangle-ocaml.o -perf-y +=3D demangle-java.o -perf-y +=3D demangle-rust.o +perf-util-$(CONFIG_CXX_DEMANGLE) +=3D demangle-cxx.o +perf-util-y +=3D demangle-ocaml.o +perf-util-y +=3D demangle-java.o +perf-util-y +=3D demangle-rust.o =20 ifdef CONFIG_JITDUMP -perf-$(CONFIG_LIBELF) +=3D jitdump.o -perf-$(CONFIG_LIBELF) +=3D genelf.o -perf-$(CONFIG_DWARF) +=3D genelf_debug.o +perf-util-$(CONFIG_LIBELF) +=3D jitdump.o +perf-util-$(CONFIG_LIBELF) +=3D genelf.o +perf-util-$(CONFIG_DWARF) +=3D genelf_debug.o endif =20 -perf-y +=3D perf-hooks.o +perf-util-y +=3D perf-hooks.o =20 -perf-$(CONFIG_LIBBPF) +=3D bpf-event.o -perf-$(CONFIG_LIBBPF) +=3D bpf-utils.o +perf-util-$(CONFIG_LIBBPF) +=3D bpf-event.o +perf-util-$(CONFIG_LIBBPF) +=3D bpf-utils.o =20 -perf-$(CONFIG_LIBPFM4) +=3D pfm.o +perf-util-$(CONFIG_LIBPFM4) +=3D pfm.o =20 CFLAGS_config.o +=3D -DETC_PERFCONFIG=3D"BUILD_STR($(ETC_PERFCONFIG_SQ))" =20 @@ -403,4 +403,4 @@ $(OUTPUT)%.shellcheck_log: % $(call rule_mkdir) $(Q)$(call echo-cmd,test)shellcheck -a -S warning "$<" > $@ || (cat $@ &&= rm $@ && false) =20 -perf-y +=3D $(TEST_LOGS) +perf-util-y +=3D $(TEST_LOGS) diff --git a/tools/perf/util/arm-spe-decoder/Build b/tools/perf/util/arm-sp= e-decoder/Build index f8dae13fc876..960062b3cb9e 100644 --- a/tools/perf/util/arm-spe-decoder/Build +++ b/tools/perf/util/arm-spe-decoder/Build @@ -1 +1 @@ -perf-$(CONFIG_AUXTRACE) +=3D arm-spe-pkt-decoder.o arm-spe-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D arm-spe-pkt-decoder.o arm-spe-decoder.o diff --git a/tools/perf/util/cs-etm-decoder/Build b/tools/perf/util/cs-etm-= decoder/Build index 216cb17a3322..056d665f7f88 100644 --- a/tools/perf/util/cs-etm-decoder/Build +++ b/tools/perf/util/cs-etm-decoder/Build @@ -1 +1 @@ -perf-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D cs-etm-decoder.o diff --git a/tools/perf/util/hisi-ptt-decoder/Build b/tools/perf/util/hisi-= ptt-decoder/Build index db3db8b75033..3298f7b7e308 100644 --- a/tools/perf/util/hisi-ptt-decoder/Build +++ b/tools/perf/util/hisi-ptt-decoder/Build @@ -1 +1 @@ -perf-$(CONFIG_AUXTRACE) +=3D hisi-ptt-pkt-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D hisi-ptt-pkt-decoder.o diff --git a/tools/perf/util/intel-pt-decoder/Build b/tools/perf/util/intel= -pt-decoder/Build index b41c2e9c6f88..30793d08c6d4 100644 --- a/tools/perf/util/intel-pt-decoder/Build +++ b/tools/perf/util/intel-pt-decoder/Build @@ -1,4 +1,4 @@ -perf-$(CONFIG_AUXTRACE) +=3D intel-pt-pkt-decoder.o intel-pt-insn-decoder.= o intel-pt-log.o intel-pt-decoder.o +perf-util-$(CONFIG_AUXTRACE) +=3D intel-pt-pkt-decoder.o intel-pt-insn-dec= oder.o intel-pt-log.o intel-pt-decoder.o =20 inat_tables_script =3D $(srctree)/tools/arch/x86/tools/gen-insn-attr-x86.a= wk inat_tables_maps =3D $(srctree)/tools/arch/x86/lib/x86-opcode-map.txt diff --git a/tools/perf/util/perf-regs-arch/Build b/tools/perf/util/perf-re= gs-arch/Build index d9d596d330a7..be95402aa540 100644 --- a/tools/perf/util/perf-regs-arch/Build +++ b/tools/perf/util/perf-regs-arch/Build @@ -1,9 +1,9 @@ -perf-y +=3D perf_regs_aarch64.o -perf-y +=3D perf_regs_arm.o -perf-y +=3D perf_regs_csky.o -perf-y +=3D perf_regs_loongarch.o -perf-y +=3D perf_regs_mips.o -perf-y +=3D perf_regs_powerpc.o -perf-y +=3D perf_regs_riscv.o -perf-y +=3D perf_regs_s390.o -perf-y +=3D perf_regs_x86.o +perf-util-y +=3D perf_regs_aarch64.o +perf-util-y +=3D perf_regs_arm.o +perf-util-y +=3D perf_regs_csky.o +perf-util-y +=3D perf_regs_loongarch.o +perf-util-y +=3D perf_regs_mips.o +perf-util-y +=3D perf_regs_powerpc.o +perf-util-y +=3D perf_regs_riscv.o +perf-util-y +=3D perf_regs_s390.o +perf-util-y +=3D perf_regs_x86.o diff --git a/tools/perf/util/scripting-engines/Build b/tools/perf/util/scri= pting-engines/Build index 586b94e90f4e..2282fe3772f3 100644 --- a/tools/perf/util/scripting-engines/Build +++ b/tools/perf/util/scripting-engines/Build @@ -1,7 +1,7 @@ ifeq ($(CONFIG_LIBTRACEEVENT),y) - perf-$(CONFIG_LIBPERL) +=3D trace-event-perl.o + perf-util-$(CONFIG_LIBPERL) +=3D trace-event-perl.o endif -perf-$(CONFIG_LIBPYTHON) +=3D trace-event-python.o +perf-util-$(CONFIG_LIBPYTHON) +=3D trace-event-python.o =20 CFLAGS_trace-event-perl.o +=3D $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -= Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow -Wno-nested-externs= -Wno-undef -Wno-switch-default -Wno-bad-function-cast -Wno-declaration-aft= er-statement -Wno-switch-enum =20 --=20 2.45.2.741.gdbec12cfda-goog