From patchwork Thu Jun 13 23:31:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13697609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1D0E5C27C4F for ; Thu, 13 Jun 2024 23:32:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oLpMaZksARAhpFcS+lUhE3il9t9yj51yP4CfS5sz5/M=; b=QYC+72NqcDfxn9 61yMFxvphkJcQ92oisKSe5D2ZX4orDDvZeVhUTgZv7ihlDYl1i4sFwKdIgldvxoJEn9vB5H7SkPQP AxV+sQF2X1F8q/evE6PQGwXZRXKa/bYBi+cg/XdNzSrwnNNPJTxgOXpCryTAqUbAZxMvUvQy8dEUU a0K7Sj4pv3XACw3VWMkve1SiIiPR5AzN9/4nZiSlrGVQKpbmdx6HI1AKJxEbRvysqQeFLs5nosTu0 IwII4nUONWFQrj69Qb/5M9qTWlYOkEqr3X8I+zt2yY/cMGIUa3YDlaufXrd7Svx+1OkGstdwlIgzB zfQMJMydUNr14/d+WHXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHtvj-00000000m5n-2Hgw; Thu, 13 Jun 2024 23:32:31 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHtv8-00000000leR-3g8m for linux-riscv@lists.infradead.org; Thu, 13 Jun 2024 23:31:57 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-62a1e9807c0so17242097b3.0 for ; Thu, 13 Jun 2024 16:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718321511; x=1718926311; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=VsC80hpqUOVrh72YOJDioHn4WeJ5/uS/HucL7CDuoyM=; b=k/4nscHT/TzGbRmTnGNwp5MPpWy+Bn7frxGSi1nEelnWE1QOhkWs57K4+9tUeIWPVy pL440A/jLcSsT8fdzGCnh2rXfnawOjtMriZ7BlQyJyykc5wdXbFTM96q77W5sUXeud64 Jq9Kl34b8f2lZRygsBtG0PaxCquDa9GKHl4X2zcNj6AXw+gfNceq6rZYc0i86QO4sCkk djYMp6e7oQ2Jv02kvMS5FhkQTt4PeWE0kZUWT3+ostUN21ceB1gT7YkjxxjpT1SzMIVk /kQW3PcxdGC8ltOxbzPGVxBVQT+r2iV9schlVU6A3Q0xI6Jyhj/zgs3PEH9QKw6UqayB VGtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718321511; x=1718926311; 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=VsC80hpqUOVrh72YOJDioHn4WeJ5/uS/HucL7CDuoyM=; b=WPvfXDO5/zTi2O1Xev2IQJpmg4c32fCkfqNu5Y17MiFp6y3oY9vMpOFhgyYv1Wh1re 3WRcvOZiJHD4vomHFy9gkIB0HKQDS75X4FmQiqtYJyX2M7Fg0SJBFK9hed6+zBHWK4On DJ2Bn5e8LTd76ASncpub/KBNA2YIJH88C58+pFKA2dyIFj0B3HNYxcCofgd+FEdBEw1F Qrdxzeb3CBTplJpZ3/QlrGscrtQh13TmaeGN/UcSANmaJ1RXXwl/MBFNCtUlNt2W5sJd +7XZ9R01T/AvQyy1jSnQ6YoYLVUuvLPFBFeLN1z2v/LxxjgYq3Aa0vT19wPQo1MigobR uqjA== X-Forwarded-Encrypted: i=1; AJvYcCXaYGg41qF1MTuVmOMHO1YuTRrgcEOKorBUehtV8Iq7kSvMA1a7uCpgW9DCGdQPTlpMetBFwNIPbACEWbALU7gBZZOJ0QceVVW0o/KrISz8 X-Gm-Message-State: AOJu0Yz5ga5pm1WX4VDKA6gw44FjcsGtXo0M1R1IZlzm1hKAQyJNEIka aKYWm2rU1ZbnbpDqWRGiVI9N6weGlB8b+FTzDdNldH8a0jCf6+ssGQfqp/c1zJ+bbJDvuW6O4Fn st7ZVGw== X-Google-Smtp-Source: AGHT+IFQbqBkASsdg2SlSfv0w0FxeOcJheuzQSPKY3DmVk1q2TSfwkGhF+bycTWG9UalHmuP2wL6xbAMBhcl X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:96dd:26a6:1493:53c8]) (user=irogers job=sendgmr) by 2002:a05:690c:4b12:b0:620:32ea:e1d4 with SMTP id 00721157ae682-632015b69f0mr4076157b3.0.1718321510936; Thu, 13 Jun 2024 16:31:50 -0700 (PDT) Date: Thu, 13 Jun 2024 16:31:19 -0700 In-Reply-To: <20240613233122.3564730-1-irogers@google.com> Message-Id: <20240613233122.3564730-6-irogers@google.com> Mime-Version: 1.0 References: <20240613233122.3564730-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Subject: [PATCH v3 5/8] 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_Roy_Baron?= " , 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240613_163155_041663_C7964281 X-CRM114-Status: GOOD ( 12.63 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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 += builtin-bench.o +perf-bench-y += builtin-bench.o perf-y += builtin-annotate.o perf-y += builtin-config.o perf-y += builtin-diff.o @@ -35,7 +35,7 @@ endif perf-$(CONFIG_LIBELF) += builtin-probe.o -perf-y += bench/ +perf-bench-y += bench/ perf-test-y += tests/ perf-y += 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 export PERL_PATH +LIBPERF_BENCH_IN := $(OUTPUT)perf-bench-in.o +LIBPERF_BENCH := $(OUTPUT)libperf-bench.a + LIBPERF_TEST_IN := $(OUTPUT)perf-test-in.o LIBPERF_TEST := $(OUTPUT)libperf-test.a @@ -438,7 +441,7 @@ PERFLIBS = $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYMBOL) ifdef LIBBPF_STATIC PERFLIBS += $(LIBBPF) endif -PERFLIBS += $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVENTS) +PERFLIBS += $(LIBPERF_BENCH) $(LIBPERF_TEST) $(LIBPERF_UI) $(LIBPMU_EVENTS) # 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 $@ $< +$(LIBPERF_BENCH_IN): FORCE prepare + $(Q)$(MAKE) $(build)=perf-bench + +$(LIBPERF_BENCH): $(LIBPERF_BENCH_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $< + $(LIBPERF_TEST_IN): FORCE prepare $(Q)$(MAKE) $(build)=perf-test 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 += sched-messaging.o -perf-y += sched-pipe.o -perf-y += sched-seccomp-notify.o -perf-y += syscall.o -perf-y += mem-functions.o -perf-y += futex-hash.o -perf-y += futex-wake.o -perf-y += futex-wake-parallel.o -perf-y += futex-requeue.o -perf-y += futex-lock-pi.o -perf-y += epoll-wait.o -perf-y += epoll-ctl.o -perf-y += synthesize.o -perf-y += kallsyms-parse.o -perf-y += find-bit-bench.o -perf-y += inject-buildid.o -perf-y += evlist-open-close.o -perf-y += breakpoint.o -perf-y += pmu-scan.o -perf-y += uprobe.o +perf-bench-y += sched-messaging.o +perf-bench-y += sched-pipe.o +perf-bench-y += sched-seccomp-notify.o +perf-bench-y += syscall.o +perf-bench-y += mem-functions.o +perf-bench-y += futex-hash.o +perf-bench-y += futex-wake.o +perf-bench-y += futex-wake-parallel.o +perf-bench-y += futex-requeue.o +perf-bench-y += futex-lock-pi.o +perf-bench-y += epoll-wait.o +perf-bench-y += epoll-ctl.o +perf-bench-y += synthesize.o +perf-bench-y += kallsyms-parse.o +perf-bench-y += find-bit-bench.o +perf-bench-y += inject-buildid.o +perf-bench-y += evlist-open-close.o +perf-bench-y += breakpoint.o +perf-bench-y += pmu-scan.o +perf-bench-y += uprobe.o -perf-$(CONFIG_X86_64) += mem-memcpy-x86-64-asm.o -perf-$(CONFIG_X86_64) += mem-memset-x86-64-asm.o +perf-bench-$(CONFIG_X86_64) += mem-memcpy-x86-64-asm.o +perf-bench-$(CONFIG_X86_64) += mem-memset-x86-64-asm.o -perf-$(CONFIG_NUMA) += numa.o +perf-bench-$(CONFIG_NUMA) += numa.o