From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A06AF158287 for ; Sat, 17 May 2025 00:12:44 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8F6403437B4 for ; Sat, 17 May 2025 00:12:44 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 874D111036D; Sat, 17 May 2025 00:12:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7F9A511036D for ; Sat, 17 May 2025 00:12:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0EEA13437AE for ; Sat, 17 May 2025 00:12:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BBF4C3A for ; Sat, 17 May 2025 00:12:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1747440667.7ab9960e9837bdaadb5da7344994f612f5f8672e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/xz-utils/xz-utils-5.8.1.ebuild app-arch/xz-utils/xz-utils-9999.ebuild X-VCS-Directories: app-arch/xz-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7ab9960e9837bdaadb5da7344994f612f5f8672e X-VCS-Branch: master Date: Sat, 17 May 2025 00:12:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d5891ba0-2cc3-4088-92cf-094e937e144d X-Archives-Hash: 5c1271d4f6522ca8b18e2aeb913c3662 commit: 7ab9960e9837bdaadb5da7344994f612f5f8672e Author: Sam James gentoo org> AuthorDate: Sat May 17 00:11:07 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 17 00:11:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab9960e Revert "app-arch/xz-utils: drop -fprofile-partial-training" This reverts commit 84c9c7bdfbca4b296eefc3b107ab03b2c31e15ae. I don't think what we have is enough yet. With `perf top`, I regularly see both lzma_decode.lto_priv.0 (fine) and lzma_mf_bt4_find.cold (not fine) and lzma_lzma_encode.cold (not fine) appear for a while and quite high. Signed-off-by: Sam James gentoo.org> app-arch/xz-utils/xz-utils-5.8.1.ebuild | 9 ++++++--- app-arch/xz-utils/xz-utils-9999.ebuild | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app-arch/xz-utils/xz-utils-5.8.1.ebuild b/app-arch/xz-utils/xz-utils-5.8.1.ebuild index 98d24748b067..dbe8c2b3ca06 100644 --- a/app-arch/xz-utils/xz-utils-5.8.1.ebuild +++ b/app-arch/xz-utils/xz-utils-5.8.1.ebuild @@ -6,7 +6,7 @@ EAPI=8 -inherit dot-a libtool multilib multilib-minimal preserve-libs toolchain-funcs +inherit dot-a flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs if [[ ${PV} == 9999 ]] ; then # Per tukaani.org, git.tukaani.org is a mirror of github and @@ -112,8 +112,11 @@ multilib_src_configure() { } multilib_src_compile() { - local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo") - local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo") + # -fprofile-partial-training because upstream note the test suite isn't super comprehensive + # TODO: revisit that now we have the tar/xz loop below? + # See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo + local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") + local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index dd0bcb3489e8..bce0a88b7ae0 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 -inherit dot-a libtool multilib multilib-minimal preserve-libs toolchain-funcs +inherit dot-a flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs if [[ ${PV} == 9999 ]] ; then # Per tukaani.org, git.tukaani.org is a mirror of github and @@ -112,8 +112,11 @@ multilib_src_configure() { } multilib_src_compile() { - local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo") - local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo") + # -fprofile-partial-training because upstream note the test suite isn't super comprehensive + # TODO: revisit that now we have the tar/xz loop below? + # See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo + local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") + local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"