[gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/

[Sam James]

commit:     7ab9960e9837bdaadb5da7344994f612f5f8672e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 17 00:11:07 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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}"