From patchwork Mon Mar 31 06:16:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14033170 Received: from fhigh-a8-smtp.messagingengine.com (fhigh-a8-smtp.messagingengine.com [103.168.172.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03BBE610C for ; Mon, 31 Mar 2025 06:17:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743401829; cv=none; b=hP4S1KnPHMpvI/fE1LWmNXc/eszqhuI0FRoByxuKddQ0ouTxBRjHUR38N20/GNBWSKyhGtqhqBujXH0+/OcdWvu6zAFjXKEXRlsJoUiB64IzMtKVgrrg6GRmz8AV2o5tPgKH1dmSWK/qK/cy7xzMUVdBJHZB+ADctySUy2iSDMU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743401829; c=relaxed/simple; bh=+H4rzLWAl9Eq1SJUCraHNViZvq4qWbpSWKV5odBvlNk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jHyT1SL64MJgu11G8rG5JogqpZ3xPqftfdE8Uj657QsykBCfC2tavYV2Dlg8LzzIxWoBINmmxfq9EsMe7ERuYuY5TBUAZbmBOWgyRzFzYAC97dboclYTk0Up8DPTJmHOXhXhbpRrxjr49IVUmFLz5GoeusH7g6gIeK61jzNNzP0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=evj61Ysr; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=sN+GKN6a; arc=none smtp.client-ip=103.168.172.159 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="evj61Ysr"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="sN+GKN6a" Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfhigh.phl.internal (Postfix) with ESMTP id E936F11401CB for ; Mon, 31 Mar 2025 02:17:05 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-07.internal (MEProxy); Mon, 31 Mar 2025 02:17:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1743401825; x=1743488225; bh=tfUIT8pReVWa4T216ICxx6C45Luv7RgWZR1QTehctJo=; b= evj61YsrVs3XP68pCpPPPIJ/WP4Up6/kmtB4uwC2eaBJDf/gHZTn4U6zH4KE00u+ xQREflUpGi0zJF+1YdS49IzxTrf9OukB+0EApZLh4HmqiZkXhjg5ID5kJW5OgMQX l1nTn1vjvAkIypP7EV+LXn2Dwn5ucvvHhg+IZJbnRsehRdvpGG2erqUqZaVd99Sn ShbvvcoaVhLY843tIRAsg3ZekAlFL1nb7PZnfQBK7wULYmJHpsevi3pJz/zwoCdb KtlTLjqxrJlrVjiYH39K76I7A2G8T1uPY/pqYUSdvmmWdfARbo1sdZ8UQLc3JmT8 GSP1a2gaLvoMcNLWb0k8Tg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1743401825; x= 1743488225; bh=tfUIT8pReVWa4T216ICxx6C45Luv7RgWZR1QTehctJo=; b=s N+GKN6aVk2YnPa5UCpi9D1RGNbtWkBZXrjOkZpZEZ34t9rJCPdH8pWNa3XWy6eNO wDxLLYVs5PPBVrhxI8OebeSpGVzA/HzmuO7Ml9ynnef2ZtBQZJ7QFCvUJwg5FKJ1 mjHbPFC+Lsh9vFTEeSuVI1xBK7NkE6mQmrmJwdKddXzW8iOaWBAaG/zKiv9KVypZ TALnR7R/vY6IEbzp6jtG+doNC4twdEfUIe41ETB/57iQ5a9bdd1O79p3QLVmdzX5 muMx6ziHvKrVyNBcXfGEP9mEbVZ3PcY/IAWqw5KoMkejxw6SoSmTLoLNr2iqdo7x 060/9FuVWqIYhU4dRZTgQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeeludejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhff fugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufht vghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuie dujedvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh dpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhi thesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 31 Mar 2025 02:17:05 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id cec9e204 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 31 Mar 2025 06:17:03 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 31 Mar 2025 08:16:44 +0200 Subject: [PATCH 1/5] t/perf: fix benchmarks with alternate repo formats Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250331-pks-meson-benchmarks-v1-1-b2ace85616a3@pks.im> References: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im> In-Reply-To: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 Many of our benchmarks operate on a user-defined repository that we copy over before running the benchmarked logic. To keep unintentional side effects caused by on-disk state at bay we skip copying some files. This includes for example hooks, but also the repo's configuration. It is quite sensible to not copy over the configuration, as it is quite easy to inadvertently carry over configuration that may significantly impact the performance measurements. But we cannot fully ignore the configuration either, as it may contain information about the repository format. This will cause failures when for example using a repository with SHA256 object format or the reftable ref format. Fix the issue by parsing the reference and object formats from the source repository and passing them to git-init(1). Signed-off-by: Patrick Steinhardt --- t/perf/perf-lib.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 8ab6d9c4694..1a9a51ca3cc 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -98,6 +98,8 @@ test_perf_create_repo_from () { source_git="$("$MODERN_GIT" -C "$source" rev-parse --git-dir)" objects_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-path objects)" common_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-common-dir)" + refformat="$("$MODERN_GIT" -C "$source" rev-parse --show-ref-format)" + objectformat="$("$MODERN_GIT" -C "$source" rev-parse --show-object-format)" mkdir -p "$repo/.git" ( cd "$source" && @@ -114,7 +116,7 @@ test_perf_create_repo_from () { ) && ( cd "$repo" && - "$MODERN_GIT" init -q && + "$MODERN_GIT" init -q --ref-format="$refformat" --object-format="$objectformat" && test_perf_do_repo_symlink_config_ && mv .git/hooks .git/hooks-disabled 2>/dev/null && if test -f .git/index.lock From patchwork Mon Mar 31 06:16:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14033169 Received: from fhigh-a8-smtp.messagingengine.com (fhigh-a8-smtp.messagingengine.com [103.168.172.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A11EF81AC8 for ; Mon, 31 Mar 2025 06:17:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743401829; cv=none; b=R3qumdmHRdtcl9Y5LEXAVBH9E0LKzLxjRtPO2RQ8eBi4ihhIShzCWE4UZ9pyOR4r/54s+5Ri1ETYmK9mu6l2KJKYIvP/Tz4RYifVO18sSiuHOaTp4Q1pcGIji3HMtOG9OTDCvfNAzVNgjVym7fMvbGLu8mqxUSgZr8yM/p6AnXM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743401829; c=relaxed/simple; bh=uD7dl4sfd7ZNmM5x0m7AViwf1RkTYkVrAUxvBB51YfQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CvEVW1uaUmaJ1golpm5fjIQvMcNAGvGrydxdsVLg8eYqaDICVX21DzjpOT5gfz3eww4sXFxQ9Am6SVuXtO+7U4P2pVq1RKcldmseggHhQBrOhNK2Nfqaa7jWgFd1YvNYG7N1sy7oBnxhoHhYIR2s9rTzeaxFKwfOvNczSZKHy2E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=c9NNBqbT; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=GpQYyxfS; arc=none smtp.client-ip=103.168.172.159 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="c9NNBqbT"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="GpQYyxfS" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfhigh.phl.internal (Postfix) with ESMTP id BE562114013B for ; Mon, 31 Mar 2025 02:17:06 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Mon, 31 Mar 2025 02:17:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1743401826; x=1743488226; bh=St00EI3Dmv3hm2bCdH/Qr8Jz8TJbsf6tdqk9gEwUZ3U=; b= c9NNBqbT79rUXcQ8Phen8L5/JA314HtzEXIt8iCfRAO/o+PU1uewWFHRIRhK8Pvw lTzpShlaO4hOEUaTXpfZVXFAwmyTdmejhv9IbiBjkW27rz33orEzfZsQj3PamQKW vZLUxZ3cCB3ViZpi6PJ1/3dCNdcDnp2iZZsrUs6NS6bMV+82B8VlbL0vqM8qcE+w Nz42TElADFH34SNb6yYcGbIO7eo4L7iydWYvPRfE1kGJv6OT+3gi3alrKTzdIKGR IOpWbhhr5/RsO+tjzpIRTPMOtN6oHkSnXVTalDOdHO5gFfdGfQT4QP/J4yw15nQO GFrhDOxsf31kGaNyKnn1/g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1743401826; x= 1743488226; bh=St00EI3Dmv3hm2bCdH/Qr8Jz8TJbsf6tdqk9gEwUZ3U=; b=G pQYyxfS/hXEp4BcIkBkSAzBMfpuT9+zdRrL+pnE7DoAPdgwyuMZ/rdWiP+h9MxeV uB1G3aH4YygA1Z1pca2s+Mjl4TfBGivaywCFE5fgWs7ke+HlwhhCK/3WoZDJJmAM SXT8+tHGJMaE7XdZlq4Tk0p4mESaIyEhFnHDVtrWKPqKrWYIevGP0VrCQwvVjTD/ Ntdc+54O+zYW3ZetapppjU2DbDgtBUy6wjZllYufXC2q5slC3qI0RbIznO274Emj s1YuhrMdsghnCEZCSvR/XUd2QuImdMrGY3HdSyeNwn7B47WYox8uKRlu4SFFCcwa Ud1uOOSGaQK7FO4y+Nfxg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeeludejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhff fugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufht vghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuie dujedvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh dpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhi thesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 31 Mar 2025 02:17:06 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id bf8972c1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 31 Mar 2025 06:17:04 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 31 Mar 2025 08:16:45 +0200 Subject: [PATCH 2/5] t/perf: use configured PERL_PATH Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250331-pks-meson-benchmarks-v1-2-b2ace85616a3@pks.im> References: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im> In-Reply-To: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 Our benchmarks use a couple of Perl scripts to compute results. These Perl scripts get executed directly, and as the shebang is hardcoded to "/usr/bin/perl" this will fail on any system where the Perl interpreter is located in a different path. Our build infrastructure already lets users configure the location of Perl, which ultimately gets written into the GIT-BUILD-OPTIONS file. This file is being sourced by "test-lib.sh", and consequently we already have the "PERL_PATH" variable available that contains its configured location. Use "PERL_PATH" to execute Perl scripts, which makes them work on more esoteric systems like NixOS. Signed-off-by: Patrick Steinhardt --- t/perf/perf-lib.sh | 4 ++-- t/perf/run | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 1a9a51ca3cc..4173eee4def 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -276,7 +276,7 @@ test_perf_ () { else test_ok_ "$1" fi - "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result + "$PERL_PATH" "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result rm test_time.* } @@ -324,7 +324,7 @@ test_at_end_hook_ () { if test -z "$GIT_PERF_AGGREGATING_LATER"; then ( cd "$TEST_DIRECTORY"/perf && - ./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $(basename "$0") + "$PERL_PATH" ./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $(basename "$0") ) fi } diff --git a/t/perf/run b/t/perf/run index 486ead21980..073bcb2afff 100755 --- a/t/perf/run +++ b/t/perf/run @@ -192,10 +192,10 @@ run_subsection () { if test -z "$GIT_PERF_SEND_TO_CODESPEED" then - ./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $codespeed_opt "$@" + "$PERL_PATH" ./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $codespeed_opt "$@" else json_res_file=""$TEST_RESULTS_DIR"/$GIT_PERF_SUBSECTION/aggregate.json" - ./aggregate.perl --results-dir="$TEST_RESULTS_DIR" --codespeed "$@" | tee "$json_res_file" + "$PERL_PATH" ./aggregate.perl --results-dir="$TEST_RESULTS_DIR" --codespeed "$@" | tee "$json_res_file" send_data_url="$GIT_PERF_SEND_TO_CODESPEED/result/add/json/" curl -v --request POST --data-urlencode "json=$(cat "$json_res_file")" "$send_data_url" fi From patchwork Mon Mar 31 06:16:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14033171 Received: from fhigh-a8-smtp.messagingengine.com (fhigh-a8-smtp.messagingengine.com [103.168.172.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9068016FF37 for ; Mon, 31 Mar 2025 06:17:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743401830; cv=none; b=O2P7qyKn4nlerHE1dwsAF/Lnpo8uew7ScNL8S6Lx9jZk1FGxiKkr1vGKXBg/zlreTNbY20d1Shg+h6O1oP4y8TsqlQT+Rp3wGBN98Tv+Yc8Ff54qTlCSJcssobG06bV+ZeQhAMbuFeCOsbvOC+Lm6DJ13KnI32Q+iVb1pjp7LK4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743401830; c=relaxed/simple; bh=LjZ2xqFsdw01hpu5RB8LblUjKOINonFiN+AOalTLH6w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HXECGMpEU7ZRoa9Z8rYEEs6M8Oc1hpRfaKBE3BY84tjvyhEtqWzAEv7mCXm84lC5dfRRxWwWOFtOyBGLf0QmN1CJOzKi3/JKgwmKMGHCQdkE20Vru5mI/a84jBut+vC29tSvy7m/tZxTyTUjV+nznndICowrrviDxnmYzcTFOn0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=pHjTJII9; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=s3wko+Mn; arc=none smtp.client-ip=103.168.172.159 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="pHjTJII9"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="s3wko+Mn" Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfhigh.phl.internal (Postfix) with ESMTP id 93C3211401BA for ; Mon, 31 Mar 2025 02:17:07 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Mon, 31 Mar 2025 02:17:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1743401827; x=1743488227; bh=41YHbAIFvgQZapSqNhC8qrl0Npz2TASpe0BaXLuKktE=; b= pHjTJII96G1PIoY3eWsqq5Fhb7zRXHFC5VhzPlVyo/8YYhNlBk4GAClmdkpyfH7v 8UmQjAMYOomLxKEWQo4ooYnO4Ohz4I/PWek/pyXUTjX+gWU/68j9cqsGzApoR+Jw nQ4XgXXQybVSo/DQ+uOUEPpGyO2Z4vlf0NYWOLnm2DKUVDR/6tL0fCzJv3m7WmTT jB8bpA1Z14bB1mrAVJk0NdUDSGKDKuSVMYkCRowlixaUAJqJU3mkKAtlLjASJW27 KD/Bmp/5LSFiqPy35aMl+D5Idpq3CqomuRNjns+reHYG7tG4oaE85zs01gaxKoYR IK99pin52TqQ7fpQzP2vIw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1743401827; x= 1743488227; bh=41YHbAIFvgQZapSqNhC8qrl0Npz2TASpe0BaXLuKktE=; b=s 3wko+Mn6+g9U7K+us0E3vRBaxIzRenWih7fccDdoPofRaZ+Bp59SpeV6p3Qbhe96 /UwQERhEXnStFN87nsWB4T0Nfc6z3f6Fnae2Ct3SetTJP3o0bzQAn8igz2ksAXk6 5HpEGBgvulAqUQKOQ/QknVtc8rZGC42GgQaXSDa0rwPVhKIuIu3NH21oeHhQ4DZD rsoDDavjZTTtvlyhTnzbu3DDJNWXSQkKt9hvbU79SgnRGs9KzRxKMyG+QFhI7rnQ 19goxYEIv3JmcSTZFOWP4zcbr6EQnHTDScR6duvc5D/1LtcDpLYgLRnOW1uM81wB ss7HSYtigRA9kslqYO6PQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeeludejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhff fugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufht vghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuie dujedvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh dpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhi thesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 31 Mar 2025 02:17:06 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 85cf043b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 31 Mar 2025 06:17:05 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 31 Mar 2025 08:16:46 +0200 Subject: [PATCH 3/5] t/perf: fix benchmarks with out-of-tree builds Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250331-pks-meson-benchmarks-v1-3-b2ace85616a3@pks.im> References: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im> In-Reply-To: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 The "perf-lib.sh" script is sourced by all of our benchmarking suites to make available common infrastructure. The script assumes that build and source directory are the same, which works for our Makefile. But the assumption breaks with both CMake and Meson, where the build directory can be located in an arbitrary place. Adapt the script so that it works with out-of-tree builds. This prepares us for wiring up benchmarks in Meson. Signed-off-by: Patrick Steinhardt --- t/perf/perf-lib.sh | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 4173eee4def..5406557b7ca 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -25,7 +25,29 @@ TEST_OUTPUT_DIRECTORY=$(pwd) TEST_NO_CREATE_REPO=t TEST_NO_MALLOC_CHECK=t -. ../test-lib.sh +# While test-lib.sh computes the build directory for us, we also have to do the +# same thing in order to locate the script via GIT-BUILD-OPTIONS in the first +# place. +GIT_BUILD_DIR="${GIT_BUILD_DIR:-$TEST_DIRECTORY/..}" +if test -f "$GIT_BUILD_DIR/GIT-BUILD-DIR" +then + GIT_BUILD_DIR="$(cat "$GIT_BUILD_DIR/GIT-BUILD-DIR")" || exit 1 + # On Windows, we must convert Windows paths lest they contain a colon + case "$(uname -s)" in + *MINGW*) + GIT_BUILD_DIR="$(cygpath -au "$GIT_BUILD_DIR")" + ;; + esac +fi + +if test ! -f "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS +then + echo >&2 'error: GIT-BUILD-OPTIONS missing (has Git been built?).' + exit 1 +fi + +. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS +. "$GIT_SOURCE_DIR"/t/test-lib.sh unset GIT_CONFIG_NOSYSTEM GIT_CONFIG_SYSTEM="$TEST_DIRECTORY/perf/config" @@ -324,7 +346,7 @@ test_at_end_hook_ () { if test -z "$GIT_PERF_AGGREGATING_LATER"; then ( cd "$TEST_DIRECTORY"/perf && - "$PERL_PATH" ./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $(basename "$0") + "$PERL_PATH" "$GIT_SOURCE_DIR"/t/perf/aggregate.perl --results-dir="$TEST_RESULTS_DIR" $(basename "$0") ) fi } From patchwork Mon Mar 31 06:16:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14033172 Received: from fout-a5-smtp.messagingengine.com (fout-a5-smtp.messagingengine.com [103.168.172.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4006117B418 for ; Mon, 31 Mar 2025 06:17:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.148 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743401831; cv=none; b=ElGHcBTQV3PJ3cLLA63bdg3G/fv4AilqHpIvrbd2HyTx++whw+cd333edl7W7KixYhY1Nlh6V9lVL7JVSXQ3A1dnq6n+3fn3uYOZ9lzYDr0FryJPDz2G/pQsAix5rMoknq+wPtjcWeJS6O5d6yX6qXcSLBCVlSu99sKrkeXQl8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743401831; c=relaxed/simple; bh=+POAV3FlKDXv0LB/OvNo3S27cHvvXouQCsHF8zMI5AQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M4DaUohr+8IWeMw1WVQeV8dIaitteMecRXmpa5CLURdcenRL3ipzhrJS9y6vmZuL5/8b8vy38Jf6o17MobHTemtdaiCNml4E8xswX9JpdjXlISxXAqvCj+7O92K0up7EEqsNQUQYx6vmqVE9I32BPRn+YThYJrnAtpPIXky3E4Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=Ll8w2rva; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=kdMEwDUa; arc=none smtp.client-ip=103.168.172.148 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="Ll8w2rva"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="kdMEwDUa" Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfout.phl.internal (Postfix) with ESMTP id 63C421382D2E for ; Mon, 31 Mar 2025 02:17:08 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-09.internal (MEProxy); Mon, 31 Mar 2025 02:17:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1743401828; x=1743488228; bh=WJ8ztHDcwcpvMy9diYWVBfj0AtdftmxoNpmwkNHIEfw=; b= Ll8w2rvau7sb60U97fzHwYv1gQVE6ppdWzeiF51qr3WRc0irCoADXk/iXfIuJnhB S6f3K4Rgpp3yzpmfx5AfUvAOTP3kWtO+1vWvxRkohB+1M50Td8TIq8obMvmGQb+T Gqb0TZVRyY0aeENcvkdD1/tAEZt0x519Cfn80gQ7sWYQIw+9LJo8XpQIHh28wMj2 C2ciuOBwt5gEUeALQXmAMkwocn66N5kmaPF1wQLNidHvIFIDeqO8fVNY/W3aK3xV ieOnFL8FQIQAFSlZt9AGnrIJSr68uXn0G6eaTpIXwbdRZ1QZW9JkDp/pvpVaSwQd iAphPlUNEa11PeFpN/sXgw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1743401828; x= 1743488228; bh=WJ8ztHDcwcpvMy9diYWVBfj0AtdftmxoNpmwkNHIEfw=; b=k dMEwDUacHnFtMMNI6Maq0IHwCk8kMhqqkt8D+jQIeSRz0vdKkF9ff9WNlSD4WVcm uEustRIAdLnO0hPY4498jRQwo3pSvPa/butg4t5hTDcHtAH75ErXLFdmEP8B27Rr PmogMNIxp+OxYTCI0AlUBD8VxqqOiXbcZ5QhP3vMdPGOuv0Kq9B1fo3pQyVU0VRO Q5adepTwLms5UumUO/MhDWw+a9zVFodb3t7gzDByn7s1hu2v04JGmnZDXZO77KxW sRDE8iG1l2bfnFWxxSBSjGkruqXDcPcchTh1Jsef9ChczseigzWMAzXRNoKEkek3 Fgd65EyPgfOvdGECYcQoA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeeludekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhff fugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufht vghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuie dujedvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh dpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhi thesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 31 Mar 2025 02:17:07 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id d0d51db9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 31 Mar 2025 06:17:07 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 31 Mar 2025 08:16:47 +0200 Subject: [PATCH 4/5] meson: wire up benchmarks Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250331-pks-meson-benchmarks-v1-4-b2ace85616a3@pks.im> References: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im> In-Reply-To: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 Wire up benchmarks in Meson. The setup is mostly the same as how we wire up our tests. The only difference is that benchmarks get wired up via the `benchmark()` option instead of via `test()`, which gives them a bit of special treatment: - Benchmarks never run in parallel. - Benchmarks aren't run by default when tests are executed. - Meson does not inject the `MALLOC_PERTURB` environment variable. Using benchmarks is quite simple: ``` $ meson setup build # Run all benchmarks. $ meson test -C build --benchmark # Run a specific benchmark. $ meson test -C build --benchmark p0000-* ``` Other than that the usual command line arguments accepted when running tests are also accepted when running benchmarks. Note that the benchmarking target is somewhat limited because it will only run benchmarks for the current build. Other usecases, like running benchmarks against multiple different versions of Git, are not currently supported. Users should continue to use "t/perf/run" for those usecases. The script should get extended at one point in time to support Meson, but this is outside of the scope of this series. Signed-off-by: Patrick Steinhardt --- meson.build | 1 + t/meson.build | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/meson.build b/meson.build index efe2871c9db..9af4a10188d 100644 --- a/meson.build +++ b/meson.build @@ -204,6 +204,7 @@ git = find_program('git', dirs: program_path, required: false) sed = find_program('sed', dirs: program_path) shell = find_program('sh', dirs: program_path) tar = find_program('tar', dirs: program_path) +time = find_program('time', dirs: program_path, required: false) # Sanity-check that programs required for the build exist. foreach tool : ['cat', 'cut', 'grep', 'sort', 'tr', 'uname'] diff --git a/t/meson.build b/t/meson.build index a59da26be3f..dba327fd7ec 100644 --- a/t/meson.build +++ b/t/meson.build @@ -1096,11 +1096,71 @@ integration_tests = [ 't9903-bash-prompt.sh', ] +benchmarks = [ + 'perf/p0000-perf-lib-sanity.sh', + 'perf/p0001-rev-list.sh', + 'perf/p0002-read-cache.sh', + 'perf/p0003-delta-base-cache.sh', + 'perf/p0004-lazy-init-name-hash.sh', + 'perf/p0005-status.sh', + 'perf/p0006-read-tree-checkout.sh', + 'perf/p0007-write-cache.sh', + 'perf/p0008-odb-fsync.sh', + 'perf/p0071-sort.sh', + 'perf/p0090-cache-tree.sh', + 'perf/p0100-globbing.sh', + 'perf/p1006-cat-file.sh', + 'perf/p1400-update-ref.sh', + 'perf/p1450-fsck.sh', + 'perf/p1451-fsck-skip-list.sh', + 'perf/p1500-graph-walks.sh', + 'perf/p2000-sparse-operations.sh', + 'perf/p3400-rebase.sh', + 'perf/p3404-rebase-interactive.sh', + 'perf/p4000-diff-algorithms.sh', + 'perf/p4001-diff-no-index.sh', + 'perf/p4002-diff-color-moved.sh', + 'perf/p4205-log-pretty-formats.sh', + 'perf/p4209-pickaxe.sh', + 'perf/p4211-line-log.sh', + 'perf/p4220-log-grep-engines.sh', + 'perf/p4221-log-grep-engines-fixed.sh', + 'perf/p5302-pack-index.sh', + 'perf/p5303-many-packs.sh', + 'perf/p5304-prune.sh', + 'perf/p5310-pack-bitmaps.sh', + 'perf/p5311-pack-bitmaps-fetch.sh', + 'perf/p5312-pack-bitmaps-revs.sh', + 'perf/p5313-pack-objects.sh', + 'perf/p5314-name-hash.sh', + 'perf/p5326-multi-pack-bitmaps.sh', + 'perf/p5332-multi-pack-reuse.sh', + 'perf/p5333-pseudo-merge-bitmaps.sh', + 'perf/p5550-fetch-tags.sh', + 'perf/p5551-fetch-rescan.sh', + 'perf/p5600-partial-clone.sh', + 'perf/p5601-clone-reference.sh', + 'perf/p6100-describe.sh', + 'perf/p6300-for-each-ref.sh', + 'perf/p7000-filter-branch.sh', + 'perf/p7102-reset.sh', + 'perf/p7300-clean.sh', + 'perf/p7519-fsmonitor.sh', + 'perf/p7527-builtin-fsmonitor.sh', + 'perf/p7810-grep.sh', + 'perf/p7820-grep-engines.sh', + 'perf/p7821-grep-engines-fixed.sh', + 'perf/p7822-grep-perl-character.sh', + 'perf/p9210-scalar.sh', + 'perf/p9300-fast-import-export.sh', +] + # Sanity check that we are not missing any tests present in 't/'. This check # only runs once at configure time and is thus best-effort, only. It is # sufficient to catch missing test suites in our CI though. foreach glob, tests : { 't[0-9][0-9][0-9][0-9]-*.sh': integration_tests, + 'perf/p[0-9][0-9][0-9][0-9]-*.sh': benchmarks, 'unit-tests/t-*.c': unit_test_programs, 'unit-tests/u-*.c': clar_test_suites, } @@ -1152,3 +1212,20 @@ foreach integration_test : integration_tests timeout: 0, ) endforeach + +if time.found() + benchmark_environment = test_environment + benchmark_environment.set('GTIME', time.full_path()) + + foreach benchmark : benchmarks + benchmark(fs.stem(benchmark), shell, + args: [ + fs.name(benchmark), + ], + workdir: meson.current_source_dir() / 'perf', + env: benchmark_environment, + depends: test_dependencies + bin_wrappers, + timeout: 0, + ) + endforeach +endif From patchwork Mon Mar 31 06:16:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 14033173 Received: from fout-a5-smtp.messagingengine.com (fout-a5-smtp.messagingengine.com [103.168.172.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 175A119F117 for ; Mon, 31 Mar 2025 06:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.148 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743401833; cv=none; b=Oh5XK14o3dtR6AAFMzxkCpRlfX5r6l77xiN8xEcRgte95XdkPfBLEoGmNeuTXmeS19q6rQeYUPUFi+k/Zy2g3R0GvaGVEOrhtHHDbVyIZ8f5geZHkFamHHRGiPCj4Jm4Nmj747+z2vkJRl8XPEzW2NGFC1zgoe5UURJ9G248+N8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743401833; c=relaxed/simple; bh=BN1VjZfIoAjP6WDL6QWARm3dqY28UQB/xWCI7kjtktE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q3726AOFbfoaOs9UhTLllK9d7ds126ParZWfnhve0rYIE64L/VuU3qxde/B6hs+s54LPgqTVDdlpShArS9tpUYLC3Ivunl7aDuCgmCWorVsmnzF4/IxIc3Hgl31O3vt0qDcigjQvmOHn3CEQ6TExmpxJ6ThAfKJzI+MneCPvLE4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=HbSbFsjH; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=FtRWaVHd; arc=none smtp.client-ip=103.168.172.148 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="HbSbFsjH"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="FtRWaVHd" Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.phl.internal (Postfix) with ESMTP id 38B6A1384360 for ; Mon, 31 Mar 2025 02:17:09 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Mon, 31 Mar 2025 02:17:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1743401829; x=1743488229; bh=JNkTSEFlaG5j6dcwPoWHUuMLx1OkZTOv8UMEisE18GE=; b= HbSbFsjHhnIJE3Dpdu1ZwZdwZgJytORUWCbLwkLunpdwRDdWACmJuSxrKN5unNth xa/Fh9UodTIDP+63MvXpyoNpAu3KTtfMEbe8TQHBsN+gu0MAqDk2B5KFoZboZard 7OGorVEJcwAeFy55f9BydarM5dcCkeul4lv6FSpHCfXAI1m9WzNIiUleTHJYUP2q RNrDPu9jJR0z08AfoC4LTNlGy7lqU+CFMO1/Vt8GqmHxVfAH17N7XdQoe6JZvO0F lb+E8JQZKe1aVxEMTWOI7D9Vxl9UDoS0YF3kNZ4Lx0LjvwfqgL9Vci2gIN6D1sT9 QP5H4trZffrHykTO4qF8qQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1743401829; x= 1743488229; bh=JNkTSEFlaG5j6dcwPoWHUuMLx1OkZTOv8UMEisE18GE=; b=F tRWaVHdwSdoEJoAlxuOD9Wwl+5nMDGaPZWqcn9DzksDmExomfJMtGjONiE7AEHbD +JllZ1OwzQUiHUt/6hcJbqrxI5k3+AcwGxZmV70xYXkkw27l5/OSKPVPQ8k5sWzZ gLn9b1Wu1bpMNqp6Emk5xLmyY+BCRuvJ9WI0KxCZfxn1u6FYRO5zxGTMmR9YR8fQ CDlFmG5Ed8K/axSb2TSlwczVCgq3uu+I/HphRruvZOOSKBSdjmAdeEPcanavgLZA HO6df8/hIOmjkeXyCAr7UPPlNsYFFbrkprky4chilyBL8JDFrt2QokgW5XooHx4M m/2SwFKVpmqf8xRYqjAFA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeeludejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhff fugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufht vghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuie dujedvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh dpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhi thesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 31 Mar 2025 02:17:08 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id dfc6d0d2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 31 Mar 2025 06:17:08 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 31 Mar 2025 08:16:48 +0200 Subject: [PATCH 5/5] meson: wire up benchmarking options Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250331-pks-meson-benchmarks-v1-5-b2ace85616a3@pks.im> References: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im> In-Reply-To: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 Wire up a couple of benchmarking options that we end up writing into our "GIT-BUILD-OPTIONS" file. These options allow users to control how exactly benchmarks are executed. Note that neither `GIT_PERF_MAKE_COMMAND` nor `GIT_PERF_MAKE_OPTS` are exposed as a build option. Those options are used by "t/perf/run", which is not used by Meson. Signed-off-by: Patrick Steinhardt --- meson.build | 6 +++--- meson_options.txt | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 9af4a10188d..ba128ab0759 100644 --- a/meson.build +++ b/meson.build @@ -660,11 +660,11 @@ builtin_sources += custom_target( # build options to our tests. build_options_config = configuration_data() build_options_config.set('GIT_INTEROP_MAKE_OPTS', '') -build_options_config.set('GIT_PERF_LARGE_REPO', '') +build_options_config.set_quoted('GIT_PERF_LARGE_REPO', get_option('benchmark_large_repo')) build_options_config.set('GIT_PERF_MAKE_COMMAND', '') build_options_config.set('GIT_PERF_MAKE_OPTS', '') -build_options_config.set('GIT_PERF_REPEAT_COUNT', '') -build_options_config.set('GIT_PERF_REPO', '') +build_options_config.set_quoted('GIT_PERF_REPEAT_COUNT', get_option('benchmark_repeat_count').to_string()) +build_options_config.set_quoted('GIT_PERF_REPO', get_option('benchmark_repo')) build_options_config.set('GIT_TEST_CMP_USE_COPIED_CONTEXT', '') build_options_config.set('GIT_TEST_INDEX_VERSION', '') build_options_config.set('GIT_TEST_OPTS', '') diff --git a/meson_options.txt b/meson_options.txt index 78d172a7401..ca106c43b2e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -101,6 +101,12 @@ option('docs_backend', type: 'combo', choices: ['asciidoc', 'asciidoctor', 'auto description: 'Which backend to use to generate documentation.') # Testing. +option('benchmark_repo', type: 'string', value: '', + description: 'Repository to copy for the performance tests. Should be at least the size of the Git repository.') +option('benchmark_large_repo', type: 'string', value: '', + description: 'Large repository to copy for the performance tests. Should be at least the size of the Linux repository.') +option('benchmark_repeat_count', type: 'integer', value: 3, + description: 'Number of times a test should be repeated for best-of-N measurements.') option('coccinelle', type: 'feature', value: 'auto', description: 'Provide a coccicheck target that generates a Coccinelle patch.') option('tests', type: 'boolean', value: true,