From: Bill Schmidt <wschmidt@linux.ibm.com>
To: gcc-patches@gcc.gnu.org
Cc: segher@kernel.crashing.org, dje.gcc@gmail.com, willschm@linux.ibm.com
Subject: [PATCH 01/34] rs6000: Incorporate new builtins code into the build machinery
Date: Thu, 29 Jul 2021 08:30:48 -0500 [thread overview]
Message-ID: <47396f9d5d8e2f9ce7c08f2f412ce638394041a2.1627562851.git.wschmidt@linux.ibm.com> (raw)
In-Reply-To: <cover.1627562851.git.wschmidt@linux.ibm.com>
In-Reply-To: <cover.1627562851.git.wschmidt@linux.ibm.com>
Differences from previous version:
- Removed the change to add rs6000-c.o to extra_objs (unnecessary)
- Avoided race condition and documented how this works
2021-07-27 Bill Schmidt <wschmidt@linux.ibm.com>
gcc/
* config.gcc (powerpc*-*-*): Add rs6000-builtins.o to extra_objs.
* config/rs6000/rs6000-gen-builtins.c (main): Close init_file
last.
* config/rs6000/t-rs6000 (rs6000-gen-builtins.o): New target.
(rbtree.o): Likewise.
(rs6000-gen-builtins): Likewise.
(rs6000-builtins.c): Likewise.
(rs6000-builtins.h): Likewise.
(rs6000.o): Add dependency.
(EXTRA_HEADERS): Add rs6000-vecdefines.h.
(rs6000-vecdefines.h): New target.
(rs6000-builtins.o): Likewise.
(rs6000-call.o): Add rs6000-builtins.h as a dependency.
(rs6000-c.o): Likewise.
---
gcc/config.gcc | 1 +
gcc/config/rs6000/rs6000-gen-builtins.c | 4 ++-
gcc/config/rs6000/t-rs6000 | 46 ++++++++++++++++++++++---
3 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 93e2b3219b9..fe2205b4bc2 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -476,6 +476,7 @@ powerpc*-*-*)
cpu_type=rs6000
extra_objs="rs6000-string.o rs6000-p8swap.o rs6000-logue.o"
extra_objs="${extra_objs} rs6000-call.o rs6000-pcrel-opt.o"
+ extra_objs="${extra_objs} rs6000-builtins.o"
extra_headers="ppc-asm.h altivec.h htmintrin.h htmxlintrin.h"
extra_headers="${extra_headers} bmi2intrin.h bmiintrin.h"
extra_headers="${extra_headers} xmmintrin.h mm_malloc.h emmintrin.h"
diff --git a/gcc/config/rs6000/rs6000-gen-builtins.c b/gcc/config/rs6000/rs6000-gen-builtins.c
index e5d3b71b622..c401a44e104 100644
--- a/gcc/config/rs6000/rs6000-gen-builtins.c
+++ b/gcc/config/rs6000/rs6000-gen-builtins.c
@@ -2979,9 +2979,11 @@ main (int argc, const char **argv)
exit (1);
}
+ /* Always close init_file last. This avoids race conditions in the
+ build machinery. See comments in t-rs6000. */
fclose (header_file);
- fclose (init_file);
fclose (defines_file);
+ fclose (init_file);
return 0;
}
diff --git a/gcc/config/rs6000/t-rs6000 b/gcc/config/rs6000/t-rs6000
index 44f7ffb35fe..e0e8ab8d828 100644
--- a/gcc/config/rs6000/t-rs6000
+++ b/gcc/config/rs6000/t-rs6000
@@ -27,10 +27,6 @@ rs6000-pcrel-opt.o: $(srcdir)/config/rs6000/rs6000-pcrel-opt.c
$(COMPILE) $<
$(POSTCOMPILE)
-rs6000-c.o: $(srcdir)/config/rs6000/rs6000-c.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-
rs6000-string.o: $(srcdir)/config/rs6000/rs6000-string.c
$(COMPILE) $<
$(POSTCOMPILE)
@@ -47,7 +43,47 @@ rs6000-logue.o: $(srcdir)/config/rs6000/rs6000-logue.c
$(COMPILE) $<
$(POSTCOMPILE)
-rs6000-call.o: $(srcdir)/config/rs6000/rs6000-call.c
+rs6000-gen-builtins.o: $(srcdir)/config/rs6000/rs6000-gen-builtins.c
+ $(COMPILE) $<
+ $(POSTCOMPILE)
+
+rbtree.o: $(srcdir)/config/rs6000/rbtree.c
+ $(COMPILE) $<
+ $(POSTCOMPILE)
+
+rs6000-gen-builtins: rs6000-gen-builtins.o rbtree.o
+ $(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ \
+ $(filter-out $(BUILD_LIBDEPS), $^) $(BUILD_LIBS)
+
+# TODO: Whenever GNU make 4.3 is the minimum required, we should use
+# grouped targets on this:
+# rs6000-builtins.c rs6000-builtins.h rs6000-vecdefines.h &: <deps>
+# <recipe>
+# For now, the header files depend on rs6000-builtins.c, which avoids
+# races because the .c file is closed last in rs6000-gen-builtins.c.
+rs6000-builtins.c: rs6000-gen-builtins \
+ $(srcdir)/config/rs6000/rs6000-builtin-new.def \
+ $(srcdir)/config/rs6000/rs6000-overload.def
+ ./rs6000-gen-builtins $(srcdir)/config/rs6000/rs6000-builtin-new.def \
+ $(srcdir)/config/rs6000/rs6000-overload.def rs6000-builtins.h \
+ rs6000-builtins.c rs6000-vecdefines.h
+
+rs6000-builtins.h: rs6000-builtins.c
+
+rs6000.o: rs6000-builtins.h
+
+EXTRA_HEADERS += rs6000-vecdefines.h
+rs6000-vecdefines.h: rs6000-builtins.c
+
+rs6000-builtins.o: rs6000-builtins.c
+ $(COMPILE) $<
+ $(POSTCOMPILE)
+
+rs6000-call.o: $(srcdir)/config/rs6000/rs6000-call.c rs6000-builtins.h
+ $(COMPILE) $<
+ $(POSTCOMPILE)
+
+rs6000-c.o: $(srcdir)/config/rs6000/rs6000-c.c rs6000-builtins.h
$(COMPILE) $<
$(POSTCOMPILE)
--
2.27.0
next prev parent reply other threads:[~2021-07-29 13:31 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-29 13:30 [PATCHv4 00/34] Replace the Power target-specific builtin machinery Bill Schmidt
2021-07-29 13:30 ` Bill Schmidt [this message]
2021-08-04 22:29 ` [PATCH 01/34] rs6000: Incorporate new builtins code into the build machinery Segher Boessenkool
2021-08-05 13:47 ` Bill Schmidt
2021-08-05 16:04 ` Segher Boessenkool
2021-07-29 13:30 ` [PATCH 02/34] rs6000: Add gengtype handling to " Bill Schmidt
2021-08-04 22:52 ` Segher Boessenkool
2021-07-29 13:30 ` [PATCH 03/34] rs6000: Add the rest of the [altivec] stanza to the builtins file Bill Schmidt
2021-08-07 0:01 ` Segher Boessenkool
2021-08-08 16:53 ` Bill Schmidt
2021-08-08 20:27 ` Segher Boessenkool
2021-08-08 20:53 ` Bill Schmidt
2021-08-09 18:05 ` Segher Boessenkool
2021-08-09 19:18 ` Bill Schmidt
2021-08-09 23:44 ` Segher Boessenkool
2021-08-10 12:17 ` Bill Schmidt
2021-08-10 12:48 ` Segher Boessenkool
2021-08-10 13:02 ` Bill Schmidt
2021-08-10 13:40 ` Segher Boessenkool
2021-08-10 13:49 ` Bill Schmidt
2021-07-29 13:30 ` [PATCH 04/34] rs6000: Add VSX builtins Bill Schmidt
2021-08-10 16:14 ` will schmidt
2021-08-10 17:52 ` Segher Boessenkool
2021-07-29 13:30 ` [PATCH 05/34] rs6000: Add available-everywhere and ancient builtins Bill Schmidt
2021-08-10 16:17 ` will schmidt
2021-08-10 17:34 ` Segher Boessenkool
2021-08-10 21:29 ` Bill Schmidt
2021-08-11 10:29 ` Segher Boessenkool
2021-08-10 18:38 ` Segher Boessenkool
2021-08-10 18:56 ` Bill Schmidt
2021-08-10 20:33 ` Segher Boessenkool
2021-07-29 13:30 ` [PATCH 06/34] rs6000: Add power7 and power7-64 builtins Bill Schmidt
2021-08-10 16:16 ` will schmidt
2021-08-10 17:48 ` Segher Boessenkool
2021-07-29 13:30 ` [PATCH 07/34] rs6000: Add power8-vector builtins Bill Schmidt
2021-08-23 21:28 ` Segher Boessenkool
2021-07-29 13:30 ` [PATCH 08/34] rs6000: Add Power9 builtins Bill Schmidt
2021-08-23 21:40 ` Segher Boessenkool
2021-08-24 14:20 ` Bill Schmidt
2021-08-24 15:38 ` Segher Boessenkool
2021-08-24 16:27 ` Bill Schmidt
2021-07-29 13:30 ` [PATCH 09/34] rs6000: Add more type nodes to support builtin processing Bill Schmidt
2021-08-23 22:15 ` Segher Boessenkool
2021-08-24 14:38 ` Bill Schmidt
2021-07-29 13:30 ` [PATCH 10/34] rs6000: Add Power10 builtins Bill Schmidt
2021-08-23 23:48 ` Segher Boessenkool
2021-07-29 13:30 ` [PATCH 11/34] rs6000: Add MMA builtins Bill Schmidt
2021-08-25 22:56 ` Segher Boessenkool
2021-07-29 13:30 ` [PATCH 12/34] rs6000: Add miscellaneous builtins Bill Schmidt
2021-08-25 22:58 ` Segher Boessenkool
2021-07-29 13:31 ` [PATCH 13/34] rs6000: Add Cell builtins Bill Schmidt
2021-08-25 22:59 ` Segher Boessenkool
2021-07-29 13:31 ` [PATCH 14/34] rs6000: Add remaining overloads Bill Schmidt
2021-08-25 23:27 ` Segher Boessenkool
2021-08-26 12:59 ` Bill Schmidt
2021-08-26 13:58 ` Segher Boessenkool
2021-07-29 13:31 ` [PATCH 15/34] rs6000: Execute the automatic built-in initialization code Bill Schmidt
2021-08-26 23:15 ` Segher Boessenkool
2021-08-27 12:35 ` Bill Schmidt
2021-08-27 12:49 ` Segher Boessenkool
2021-07-29 13:31 ` [PATCH 16/34] rs6000: Darwin builtin support Bill Schmidt
2021-08-27 18:01 ` Segher Boessenkool
2021-07-29 13:31 ` [PATCH 17/34] rs6000: Add sanity to V2DI_type_node definitions Bill Schmidt
2021-08-27 19:27 ` Segher Boessenkool
2021-07-29 13:31 ` [PATCH 18/34] rs6000: Always initialize vector_pair and vector_quad nodes Bill Schmidt
2021-08-27 19:34 ` Segher Boessenkool
2021-07-29 13:31 ` [PATCH 19/34] rs6000: Handle overloads during program parsing Bill Schmidt
2021-08-27 23:07 ` Segher Boessenkool
2021-08-31 3:34 ` Bill Schmidt
2021-07-29 13:31 ` [PATCH 20/34] rs6000: Handle gimple folding of target built-ins Bill Schmidt
2021-07-29 13:31 ` [PATCH 21/34] rs6000: Handle some recent MMA builtin changes Bill Schmidt
2021-07-29 13:31 ` [PATCH 22/34] rs6000: Support for vectorizing built-in functions Bill Schmidt
2021-07-29 13:31 ` [PATCH 23/34] rs6000: Builtin expansion, part 1 Bill Schmidt
2021-07-29 13:31 ` [PATCH 24/34] rs6000: Builtin expansion, part 2 Bill Schmidt
2021-07-29 13:31 ` [PATCH 25/34] rs6000: Builtin expansion, part 3 Bill Schmidt
2021-07-29 13:31 ` [PATCH 26/34] rs6000: Builtin expansion, part 4 Bill Schmidt
2021-07-29 13:31 ` [PATCH 27/34] rs6000: Builtin expansion, part 5 Bill Schmidt
2021-07-29 13:31 ` [PATCH 28/34] rs6000: Builtin expansion, part 6 Bill Schmidt
2021-07-29 13:31 ` [PATCH 29/34] rs6000: Update rs6000_builtin_decl Bill Schmidt
2021-07-29 13:31 ` [PATCH 30/34] rs6000: Miscellaneous uses of rs6000_builtins_decl_x Bill Schmidt
2021-07-29 13:31 ` [PATCH 31/34] rs6000: Debug support Bill Schmidt
2021-07-29 13:31 ` [PATCH 32/34] rs6000: Update altivec.h for automated interfaces Bill Schmidt
2021-07-29 13:31 ` [PATCH 33/34] rs6000: Test case adjustments Bill Schmidt
2021-07-29 13:31 ` [PATCH 34/34] rs6000: Enable the new builtin support Bill Schmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=47396f9d5d8e2f9ce7c08f2f412ce638394041a2.1627562851.git.wschmidt@linux.ibm.com \
--to=wschmidt@linux.ibm.com \
--cc=dje.gcc@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=segher@kernel.crashing.org \
--cc=willschm@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).