From nobody Wed Dec 17 23:26:28 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92F5E17D8A4 for ; Tue, 25 Jun 2024 18:42:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340966; cv=none; b=AkMeblF+SKI7ygv1uZe8vo3K2IULXCOfz6H0S+OzvpBv01PWw06/KejeM2/8VSmeHZ+MSlgX/VJZLB0iTAtmGSkovHkXka5MExFbIHod7UFnmbccKyXwvHkx332Sb3qu4Lrcph1zgtCKt4s+8jl7No2xNL/v/Ijjjhg/NRIA3ow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719340966; c=relaxed/simple; bh=2e1EB2J3C8Egr2O0Wpv7tQqwFPOyq60QZb+RTxrA24g=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=rBDJNDbLs5FHXgjB9gt6iftPnw9s4OEhDOf8yjsLEL7mJS0yvjFFVHADOrMXhipilBVAt0F3womxdChLD05IltShn2awD8hjaEt/UBeCcnsrQlddvNq8NSok99mI1ZNkKAXbz4sNAzltabUpyDVuBX3MZnEY2q4KKgvKv90VZNY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=IIriMboB; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="IIriMboB" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-631b498f981so106574457b3.0 for ; Tue, 25 Jun 2024 11:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719340963; x=1719945763; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=9lVzQaHUCF35to8PiObGttFlDy1f8wM6DLCbP51DQFE=; b=IIriMboB7IOammS2kDaLBITFLiJZrcvvUketZYp1yDGg8ng4AXXSkVViqvUIDmWuXk BIwv60jsIZ9D19qeDwUgwosmjmZ7LGrnY0r0LroVJMUyAQcU63DyeALkCbTIFgLOWz4I IarMay8aXH6AJ30LgW3pYgryXNyNYUAmkA/B98uVLXqPXmfe7WR3LCjClMEjTTj/ppBK zfu7cWgXuQJChxXxZFzR8pO2vQYioBgcyKPx2BcL0KPvNWS8/r+JWd+PyZe/3BqIt989 rqhT0A9uclCSCaYKc4Y7zAYpSYDWSRD0Z9PwRoAnFFWubfs8J9afXxh73tQmN/EYvrDI uu5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719340963; x=1719945763; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9lVzQaHUCF35to8PiObGttFlDy1f8wM6DLCbP51DQFE=; b=obR5QregT5czOjz9WGvzmxcu1dTwE9djGCVAjGykUgm+ZOSRNOEN4dOaHWEEtiB/Xk 3tfYttu9YOaqJQZUFF5Z9pCt+eLfvGXLDwEIGsGL8HYNYCyjoLivwJ+u0/byCkkbOOfU 2WNbYqk95LIdkPEvvO90u5XkEDf0KHUhrNfvNbHAEMhokK3DFG/KkTxhoJa+mL22/bnO 7/Iy7GqVKEgvBm8bx9QmWnzcAgIky25CqpkhfX6xmUfCQdVw86tUc72XzhfLb0xlMZ3F xVsRSpNL4MXHoGu0eigBMGoxnL+13CfzhuYGlRlfqWzFDBjogCSQ0dq3XQNCt8J4omwk kG0Q== X-Forwarded-Encrypted: i=1; AJvYcCXV3W92ysgquTLGhNmsHn5xWsfFLeDOmf0S7gQzRyHAT7ysNnHkBHLSj9gLTLA/hB6J+9XUmoqn24tYVWVKENaDCpns5jt8tjl29Doq X-Gm-Message-State: AOJu0Yw7JH8MMMbbbUbLCEKWI1RGlOGqCZyuhCjulBk2zoO5y7mOOXJW 9PlAuLgIhqw5DM/hIKEvYFi0aovQWOnIS4jQOULTQv3rU1+gYq4hRWGHtmofnm4I22OcqJDcOjd Qp8ls1Q== X-Google-Smtp-Source: AGHT+IGb4WvYG8oSQuAsDGDPIMZiRFgDGgnyHkXxbBpNxJfxsSnnlV4mi1wBu9EEjrP1vlTnC7YwXTJljkI+ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:690c:3506:b0:61b:e103:804d with SMTP id 00721157ae682-645e60af794mr214947b3.0.1719340962575; Tue, 25 Jun 2024 11:42:42 -0700 (PDT) Date: Tue, 25 Jun 2024 11:42:22 -0700 In-Reply-To: <20240625184224.929018-1-irogers@google.com> Message-Id: <20240625184224.929018-6-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625184224.929018-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v4 5/7] perf bench: Make bench its own library From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Nick Terrell , Andrei Vagin , Kees Cook , Oliver Upton , Ze Gao , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the benchmark code into a library so it may be linked against things like the python module to avoid compiling code twice. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Build | 4 ++-- tools/perf/Makefile.perf | 11 +++++++++- tools/perf/bench/Build | 46 ++++++++++++++++++++-------------------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/tools/perf/Build b/tools/perf/Build index fddd45ab35b4..2787f5630ff7 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -1,4 +1,4 @@ -perf-y +=3D builtin-bench.o +perf-bench-y +=3D builtin-bench.o perf-y +=3D builtin-annotate.o perf-y +=3D builtin-config.o perf-y +=3D builtin-diff.o @@ -35,7 +35,7 @@ endif =20 perf-$(CONFIG_LIBELF) +=3D builtin-probe.o =20 -perf-y +=3D bench/ +perf-bench-y +=3D bench/ perf-test-y +=3D tests/ =20 perf-y +=3D perf.o diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 9fa69dd0b472..4a3c000b9845 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -425,6 +425,9 @@ endif =20 export PERL_PATH =20 +LIBPERF_BENCH_IN :=3D $(OUTPUT)perf-bench-in.o +LIBPERF_BENCH :=3D $(OUTPUT)libperf-bench.a + LIBPERF_TEST_IN :=3D $(OUTPUT)perf-test-in.o LIBPERF_TEST :=3D $(OUTPUT)libperf-test.a =20 @@ -438,7 +441,7 @@ PERFLIBS =3D $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYM= BOL) ifdef LIBBPF_STATIC PERFLIBS +=3D $(LIBBPF) endif -PERFLIBS +=3D $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVENTS) +PERFLIBS +=3D $(LIBPERF_BENCH) $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVEN= TS) =20 # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -740,6 +743,12 @@ $(LIBPMU_EVENTS_IN): FORCE prepare $(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< =20 +$(LIBPERF_BENCH_IN): FORCE prepare + $(Q)$(MAKE) $(build)=3Dperf-bench + +$(LIBPERF_BENCH): $(LIBPERF_BENCH_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(LIBPERF_TEST_IN): FORCE prepare $(Q)$(MAKE) $(build)=3Dperf-test =20 diff --git a/tools/perf/bench/Build b/tools/perf/bench/Build index c2ab30907ae7..279ab2ab4abe 100644 --- a/tools/perf/bench/Build +++ b/tools/perf/bench/Build @@ -1,25 +1,25 @@ -perf-y +=3D sched-messaging.o -perf-y +=3D sched-pipe.o -perf-y +=3D sched-seccomp-notify.o -perf-y +=3D syscall.o -perf-y +=3D mem-functions.o -perf-y +=3D futex-hash.o -perf-y +=3D futex-wake.o -perf-y +=3D futex-wake-parallel.o -perf-y +=3D futex-requeue.o -perf-y +=3D futex-lock-pi.o -perf-y +=3D epoll-wait.o -perf-y +=3D epoll-ctl.o -perf-y +=3D synthesize.o -perf-y +=3D kallsyms-parse.o -perf-y +=3D find-bit-bench.o -perf-y +=3D inject-buildid.o -perf-y +=3D evlist-open-close.o -perf-y +=3D breakpoint.o -perf-y +=3D pmu-scan.o -perf-y +=3D uprobe.o +perf-bench-y +=3D sched-messaging.o +perf-bench-y +=3D sched-pipe.o +perf-bench-y +=3D sched-seccomp-notify.o +perf-bench-y +=3D syscall.o +perf-bench-y +=3D mem-functions.o +perf-bench-y +=3D futex-hash.o +perf-bench-y +=3D futex-wake.o +perf-bench-y +=3D futex-wake-parallel.o +perf-bench-y +=3D futex-requeue.o +perf-bench-y +=3D futex-lock-pi.o +perf-bench-y +=3D epoll-wait.o +perf-bench-y +=3D epoll-ctl.o +perf-bench-y +=3D synthesize.o +perf-bench-y +=3D kallsyms-parse.o +perf-bench-y +=3D find-bit-bench.o +perf-bench-y +=3D inject-buildid.o +perf-bench-y +=3D evlist-open-close.o +perf-bench-y +=3D breakpoint.o +perf-bench-y +=3D pmu-scan.o +perf-bench-y +=3D uprobe.o =20 -perf-$(CONFIG_X86_64) +=3D mem-memcpy-x86-64-asm.o -perf-$(CONFIG_X86_64) +=3D mem-memset-x86-64-asm.o +perf-bench-$(CONFIG_X86_64) +=3D mem-memcpy-x86-64-asm.o +perf-bench-$(CONFIG_X86_64) +=3D mem-memset-x86-64-asm.o =20 -perf-$(CONFIG_NUMA) +=3D numa.o +perf-bench-$(CONFIG_NUMA) +=3D numa.o --=20 2.45.2.741.gdbec12cfda-goog