Enable autofdo bootstrap for lto/fortran
Checks
Context |
Check |
Description |
linaro-tcwg-bot/tcwg_gcc_build--master-arm |
fail
|
Build failed
|
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 |
fail
|
Build failed
|
Commit Message
From: Andi Kleen <ak@gcc.gnu.org>
When autofdo bootstrap support was originally implemented there were
issues with the LTO bootstrap, that is why it wasn't enabled
for them. I retested this now and it works on x86_64-linux.
Fortran was also missing, not sure why. Also enabled now.
gcc/fortran/ChangeLog:
* Make-lang.in: Enable autofdo.
gcc/lto/ChangeLog:
* Make-lang.in: Enable autofdo.
---
gcc/fortran/Make-lang.in | 13 +++++++++++--
gcc/lto/Make-lang.in | 14 +++++---------
2 files changed, 16 insertions(+), 11 deletions(-)
Comments
This line in gcc/fortran/Make-lang.in looks wrong (copy/paste?):
+f95.fda: create_fdas_for_lto1
There are no invocations of $(CREATE_GCOV in gcc/fortran/Make-lang.in so this is incomplete.
-----Original Message-----
From: Andi Kleen <ak@linux.intel.com>
Sent: Thursday, October 31, 2024 4:19 PM
To: gcc-patches@gcc.gnu.org
Cc: Eugene Rozenfeld <Eugene.Rozenfeld@microsoft.com>; Andi Kleen <ak@gcc.gnu.org>
Subject: [EXTERNAL] [PATCH] Enable autofdo bootstrap for lto/fortran
From: Andi Kleen <ak@gcc.gnu.org>
When autofdo bootstrap support was originally implemented there were issues with the LTO bootstrap, that is why it wasn't enabled for them. I retested this now and it works on x86_64-linux.
Fortran was also missing, not sure why. Also enabled now.
gcc/fortran/ChangeLog:
* Make-lang.in: Enable autofdo.
gcc/lto/ChangeLog:
* Make-lang.in: Enable autofdo.
---
gcc/fortran/Make-lang.in | 13 +++++++++++--
gcc/lto/Make-lang.in | 14 +++++---------
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index 0be3c6b654b1..7295118185fd 100644
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -69,6 +69,15 @@ F95_OBJS = $(F95_PARSER_OBJS) $(FORTRAN_TARGET_OBJS) \
fortran_OBJS = $(F95_OBJS) fortran/gfortranspec.o
+ifeq ($(if $(wildcard ../stage_current),$(shell cat \
+ ../stage_current)),stageautofeedback)
+$(fortran_OBJS): CFLAGS += -fauto-profile=f95.fda
+$(fortran_OBJS): f95.fda
+endif
+
+f95.fda: create_fdas_for_lto1
+ $(PROFILE_MERGER) $(shell ls -ha f95_*.fda) --output_file f95.fda
+-gcov_version 2
+
#
# Define the names for selecting gfortran in LANGUAGES.
fortran: f951$(exeext)
@@ -272,7 +281,7 @@ fortran.install-info: $(DESTDIR)$(infodir)/gfortran.info
fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext)
$(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext): doc/gfortran.1 \
- installdirs
+ installdirs f95*.fda
-rm -f $@
-$(INSTALL_DATA) $< $@
-chmod a-x $@
@@ -293,7 +302,7 @@ fortran.uninstall:
# We just have to delete files specific to us.
fortran.mostlyclean:
- -rm -f gfortran$(exeext) gfortran-cross$(exeext) f951$(exeext)
+ -rm -f gfortran$(exeext) gfortran-cross$(exeext) f951$(exeext)
+f95*.fda
-rm -f fortran/*.o
fortran.clean:
diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in index b62ddcbe0dc9..4f9f21cdfc9e 100644
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -29,15 +29,11 @@ lto_OBJS = $(LTO_OBJS) LTO_DUMP_OBJS = lto/lto-lang.o lto/lto-object.o attribs.o lto/lto-partition.o lto/lto-symtab.o lto/lto-dump.o lto/lto-common.o lto_dump_OBJS = $(LTO_DUMP_OBJS)
-# this is only useful in a LTO bootstrap, but this does not work right -# now. Should reenable after this is fixed, but only when LTO bootstrap -# is enabled.
-
-#ifeq ($(if $(wildcard ../stage_current),$(shell cat \ -# ../stage_current)),stageautofeedback)
-#$(LTO_OBJS): CFLAGS += -fauto-profile=lto1.fda
-#$(LTO_OBJS): lto1.fda
-#endif
+ifeq ($(if $(wildcard ../stage_current),$(shell cat \
+ ../stage_current)),stageautofeedback)
+$(LTO_OBJS): CFLAGS += -fauto-profile=lto1.fda
+$(LTO_OBJS): lto1.fda
+endif
# Rules
--
2.46.2
@@ -69,6 +69,15 @@ F95_OBJS = $(F95_PARSER_OBJS) $(FORTRAN_TARGET_OBJS) \
fortran_OBJS = $(F95_OBJS) fortran/gfortranspec.o
+ifeq ($(if $(wildcard ../stage_current),$(shell cat \
+ ../stage_current)),stageautofeedback)
+$(fortran_OBJS): CFLAGS += -fauto-profile=f95.fda
+$(fortran_OBJS): f95.fda
+endif
+
+f95.fda: create_fdas_for_lto1
+ $(PROFILE_MERGER) $(shell ls -ha f95_*.fda) --output_file f95.fda -gcov_version 2
+
#
# Define the names for selecting gfortran in LANGUAGES.
fortran: f951$(exeext)
@@ -272,7 +281,7 @@ fortran.install-info: $(DESTDIR)$(infodir)/gfortran.info
fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext)
$(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext): doc/gfortran.1 \
- installdirs
+ installdirs f95*.fda
-rm -f $@
-$(INSTALL_DATA) $< $@
-chmod a-x $@
@@ -293,7 +302,7 @@ fortran.uninstall:
# We just have to delete files specific to us.
fortran.mostlyclean:
- -rm -f gfortran$(exeext) gfortran-cross$(exeext) f951$(exeext)
+ -rm -f gfortran$(exeext) gfortran-cross$(exeext) f951$(exeext) f95*.fda
-rm -f fortran/*.o
fortran.clean:
@@ -29,15 +29,11 @@ lto_OBJS = $(LTO_OBJS)
LTO_DUMP_OBJS = lto/lto-lang.o lto/lto-object.o attribs.o lto/lto-partition.o lto/lto-symtab.o lto/lto-dump.o lto/lto-common.o
lto_dump_OBJS = $(LTO_DUMP_OBJS)
-# this is only useful in a LTO bootstrap, but this does not work right
-# now. Should reenable after this is fixed, but only when LTO bootstrap
-# is enabled.
-
-#ifeq ($(if $(wildcard ../stage_current),$(shell cat \
-# ../stage_current)),stageautofeedback)
-#$(LTO_OBJS): CFLAGS += -fauto-profile=lto1.fda
-#$(LTO_OBJS): lto1.fda
-#endif
+ifeq ($(if $(wildcard ../stage_current),$(shell cat \
+ ../stage_current)),stageautofeedback)
+$(LTO_OBJS): CFLAGS += -fauto-profile=lto1.fda
+$(LTO_OBJS): lto1.fda
+endif
# Rules