Re: [PATCH] AutoFDO: Update profile_merger gcov_version to 3

[Dhruv Chawla]

On 12/02/26 20:44, Jan Hubicka wrote:

External email: Use caution opening links or attachments

From: Dhruv Chawla <dhr...@nvidia.com>

This patch should have been a part of r16-6348-g4dfa48077e3892 but
unfortunately I forgot to bump these versions with it.

Bootstrapped and regtested on aarch64-linux-gnu.

Signed-off-by: Dhruv Chawla <dhr...@nvidia.com>

gcc/ChangeLog:

       * Makefile.in (all.fda): Bump profile_merger gcov_version to 3.

gcc/c/ChangeLog:

       * Make-lang.in (cc1.fda): Likewise.

gcc/cp/ChangeLog:

       * Make-lang.in (cc1plus.fda): Likewise.

gcc/lto/ChangeLog:

       * Make-lang.in (lto1.fda): Likewise.

OK,
thanks!

We should look for way to write makefiles that are future proof. One
option is of course to ship the tools with GCC, other option is to make
GCC to output version it expects and then do something like

profile_merge --gcov_version `gcc --gcov-version`

Hi Honza,

I actually have a patch prepared to switch the build system over to using
a `--print-autofdo-gcov-version` switch, however I wanted to get some things
in the makefiles cleaned up before posting that as that is a slightly more
intensive change.

--
Regards,
Dhruv

Honza

---
  gcc/Makefile.in      | 2 +-
  gcc/c/Make-lang.in   | 2 +-
  gcc/cp/Make-lang.in  | 2 +-
  gcc/lto/Make-lang.in | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3d3b21abe6a..9e8da255186 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -4818,7 +4818,7 @@ paranoia: paranoia.o real.o $(LIBIBERTY)
       g++ -o $@ paranoia.o real.o $(LIBIBERTY)

  all.fda: $(ALL_FDAS)
-     $(PROFILE_MERGER) $(ALL_FDAS) --output_file all.fda -gcov_version 2
+     $(PROFILE_MERGER) $(ALL_FDAS) --output_file all.fda -gcov_version 3

  # These exist for maintenance purposes.

diff --git a/gcc/c/Make-lang.in b/gcc/c/Make-lang.in
index bcb8ffda8ad..fd127caba91 100644
--- a/gcc/c/Make-lang.in
+++ b/gcc/c/Make-lang.in
@@ -93,7 +93,7 @@ components_in_prev = "bfd opcodes binutils fixincludes gas 
gcc gmp mpfr mpc isl
  components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace 
libphobos zlib libgomp libatomic"

  cc1.fda: create_fdas_for_cc1
-     $(PROFILE_MERGER) $(shell ls -ha cc1_*.fda) --output_file cc1.fda 
-gcov_version 2
+     $(PROFILE_MERGER) $(shell ls -ha cc1_*.fda) --output_file cc1.fda 
-gcov_version 3

  create_fdas_for_cc1: ../stage1-gcc/cc1$(exeext) ../prev-gcc/$(PERF_DATA)
       for component_in_prev in "$(components_in_prev)"; do \
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 7f476531d84..55be730f502 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -210,7 +210,7 @@ components_in_prev = "bfd opcodes binutils fixincludes gas 
gcc gmp mpfr mpc isl
  components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace 
libphobos zlib libgomp libatomic"

  cc1plus.fda: create_fdas_for_cc1plus
-     $(PROFILE_MERGER) $(shell ls -ha cc1plus_*.fda) --output_file cc1plus.fda 
-gcov_version 2
+     $(PROFILE_MERGER) $(shell ls -ha cc1plus_*.fda) --output_file cc1plus.fda 
-gcov_version 3

  create_fdas_for_cc1plus: ../stage1-gcc/cc1plus$(exeext) 
../prev-gcc/$(PERF_DATA)
       for component_in_prev in "$(components_in_prev)"; do \
diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
index aacee6c6b25..eacfe53ca14 100644
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -106,7 +106,7 @@ components_in_prev = "bfd opcodes binutils fixincludes gas 
gcc gmp mpfr mpc isl
  components_in_prev_target = "libstdc++-v3 libsanitizer libvtv libgcc libbacktrace 
libphobos zlib libgomp libatomic"

  lto1.fda: create_fdas_for_lto1
-     $(PROFILE_MERGER) $(shell ls -ha lto1_*.fda) --output_file lto1.fda 
-gcov_version 2
+     $(PROFILE_MERGER) $(shell ls -ha lto1_*.fda) --output_file lto1.fda 
-gcov_version 3

  create_fdas_for_lto1: ../stage1-gcc/lto1$(exeext) ../prev-gcc/$(PERF_DATA)
       for component_in_prev in "$(components_in_prev)"; do \
--
2.43.0