* [PATCH v6] genemit.c (main): split insn-emit.c for compiling parallelly
@ 2020-09-11 7:26 Jojo R
2020-09-11 15:29 ` Segher Boessenkool
0 siblings, 1 reply; 3+ messages in thread
From: Jojo R @ 2020-09-11 7:26 UTC (permalink / raw)
To: jiejie_rong, segher, richard.sandiford, ro, richard.guenther,
joseph, gcc-patches, yunhai.syh
gcc/ChangeLog:
* genemit.c (main): Print 'split line'.
* Makefile.in (insn-emit.c): Define split count and file
---
gcc/Makefile.in | 19 +++++++
gcc/genemit.c | 128 ++++++++++++++++++++++++++----------------------
2 files changed, 89 insertions(+), 58 deletions(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 79e854aa938..a7fcc7d5949 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1258,6 +1258,21 @@ ANALYZER_OBJS = \
# We put the *-match.o and insn-*.o files first so that a parallel make
# will build them sooner, because they are large and otherwise tend to be
# the last objects to finish building.
+
+# target overrides
+-include $(tmake_file)
+
+INSN-GENERATED-SPLIT-NUM ?= 0
+
+insn-generated-split-num = $(shell i=1; j=`expr $(INSN-GENERATED-SPLIT-NUM) + 1`; \
+ while test $$i -le $$j; do \
+ echo $$i; i=`expr $$i + 1`; \
+ done)
+
+insn-emit-split-c := $(foreach o, $(shell for i in $(insn-generated-split-num); do echo $$i; done), insn-emit$(o).c)
+insn-emit-split-obj = $(patsubst %.c,%.o, $(insn-emit-split-c))
+$(insn-emit-split-c): insn-emit.c
+
OBJS = \
gimple-match.o \
generic-match.o \
@@ -1265,6 +1280,7 @@ OBJS = \
insn-automata.o \
insn-dfatab.o \
insn-emit.o \
+ $(insn-emit-split-obj) \
insn-extract.o \
insn-latencytab.o \
insn-modes.o \
@@ -2365,6 +2381,9 @@ $(simple_generated_c:insn-%.c=s-%): s-%: build/gen%$(build_exeext)
$(RUN_GEN) build/gen$*$(build_exeext) $(md_file) \
$(filter insn-conditions.md,$^) > tmp-$*.c
$(SHELL) $(srcdir)/../move-if-change tmp-$*.c insn-$*.c
+ $*v=$$(echo $$(csplit insn-$*.c /parallel\ compilation/ -k -s {$(INSN-GENERATED-SPLIT-NUM)} -f insn-$* -b "%d.c" 2>&1));\
+ [ ! "$$$*v" ] || grep "match not found" <<< $$$*v
+ [ -s insn-$*0.c ] || (for i in $(insn-generated-split-num); do touch insn-$*$$i.c; done && echo "" > insn-$*.c)
$(STAMP) s-$*
# gencheck doesn't read the machine description, and the file produced
diff --git a/gcc/genemit.c b/gcc/genemit.c
index 84d07d388ee..4fc8e61c5c8 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -847,6 +847,46 @@ handle_overloaded_gen (overloaded_name *oname)
}
}
+#define printf_include() do { \
+ printf ("/* Generated automatically by the program `genemit'\n\
+from the machine description file `md'. */\n\n"); \
+ printf ("#define IN_TARGET_CODE 1\n"); \
+ printf ("#include \"config.h\"\n"); \
+ printf ("#include \"system.h\"\n"); \
+ printf ("#include \"coretypes.h\"\n"); \
+ printf ("#include \"backend.h\"\n"); \
+ printf ("#include \"predict.h\"\n"); \
+ printf ("#include \"tree.h\"\n"); \
+ printf ("#include \"rtl.h\"\n"); \
+ printf ("#include \"alias.h\"\n"); \
+ printf ("#include \"varasm.h\"\n"); \
+ printf ("#include \"stor-layout.h\"\n"); \
+ printf ("#include \"calls.h\"\n"); \
+ printf ("#include \"memmodel.h\"\n"); \
+ printf ("#include \"tm_p.h\"\n"); \
+ printf ("#include \"flags.h\"\n"); \
+ printf ("#include \"insn-config.h\"\n"); \
+ printf ("#include \"expmed.h\"\n"); \
+ printf ("#include \"dojump.h\"\n"); \
+ printf ("#include \"explow.h\"\n"); \
+ printf ("#include \"emit-rtl.h\"\n"); \
+ printf ("#include \"stmt.h\"\n"); \
+ printf ("#include \"expr.h\"\n"); \
+ printf ("#include \"insn-codes.h\"\n"); \
+ printf ("#include \"optabs.h\"\n"); \
+ printf ("#include \"dfp.h\"\n"); \
+ printf ("#include \"output.h\"\n"); \
+ printf ("#include \"recog.h\"\n"); \
+ printf ("#include \"df.h\"\n"); \
+ printf ("#include \"resource.h\"\n"); \
+ printf ("#include \"reload.h\"\n"); \
+ printf ("#include \"diagnostic-core.h\"\n"); \
+ printf ("#include \"regs.h\"\n"); \
+ printf ("#include \"tm-constrs.h\"\n"); \
+ printf ("#include \"ggc.h\"\n"); \
+ printf ("#include \"target.h\"\n\n"); \
+} while (0)
+
int
main (int argc, const char **argv)
{
@@ -862,73 +902,45 @@ main (int argc, const char **argv)
/* Assign sequential codes to all entries in the machine description
in parallel with the tables in insn-output.c. */
- printf ("/* Generated automatically by the program `genemit'\n\
-from the machine description file `md'. */\n\n");
-
- printf ("#define IN_TARGET_CODE 1\n");
- printf ("#include \"config.h\"\n");
- printf ("#include \"system.h\"\n");
- printf ("#include \"coretypes.h\"\n");
- printf ("#include \"backend.h\"\n");
- printf ("#include \"predict.h\"\n");
- printf ("#include \"tree.h\"\n");
- printf ("#include \"rtl.h\"\n");
- printf ("#include \"alias.h\"\n");
- printf ("#include \"varasm.h\"\n");
- printf ("#include \"stor-layout.h\"\n");
- printf ("#include \"calls.h\"\n");
- printf ("#include \"memmodel.h\"\n");
- printf ("#include \"tm_p.h\"\n");
- printf ("#include \"flags.h\"\n");
- printf ("#include \"insn-config.h\"\n");
- printf ("#include \"expmed.h\"\n");
- printf ("#include \"dojump.h\"\n");
- printf ("#include \"explow.h\"\n");
- printf ("#include \"emit-rtl.h\"\n");
- printf ("#include \"stmt.h\"\n");
- printf ("#include \"expr.h\"\n");
- printf ("#include \"insn-codes.h\"\n");
- printf ("#include \"optabs.h\"\n");
- printf ("#include \"dfp.h\"\n");
- printf ("#include \"output.h\"\n");
- printf ("#include \"recog.h\"\n");
- printf ("#include \"df.h\"\n");
- printf ("#include \"resource.h\"\n");
- printf ("#include \"reload.h\"\n");
- printf ("#include \"diagnostic-core.h\"\n");
- printf ("#include \"regs.h\"\n");
- printf ("#include \"tm-constrs.h\"\n");
- printf ("#include \"ggc.h\"\n");
- printf ("#include \"target.h\"\n\n");
+ int read_count = 0;
/* Read the machine description. */
md_rtx_info info;
while (read_md_rtx (&info))
- switch (GET_CODE (info.def))
- {
- case DEFINE_INSN:
- gen_insn (&info);
- break;
+ {
+ if ((read_count++ % 10000) == 0)
+ {
+ printf ("/* Split file into separate compilation units "
+ "for parallel compilation %d */\n\n", read_count);
+ printf_include();
+ }
- case DEFINE_EXPAND:
- printf ("/* %s:%d */\n", info.loc.filename, info.loc.lineno);
- gen_expand (&info);
- break;
+ switch (GET_CODE (info.def))
+ {
+ case DEFINE_INSN:
+ gen_insn (&info);
+ break;
- case DEFINE_SPLIT:
- printf ("/* %s:%d */\n", info.loc.filename, info.loc.lineno);
- gen_split (&info);
- break;
+ case DEFINE_EXPAND:
+ printf ("/* %s:%d */\n", info.loc.filename, info.loc.lineno);
+ gen_expand (&info);
+ break;
- case DEFINE_PEEPHOLE2:
- printf ("/* %s:%d */\n", info.loc.filename, info.loc.lineno);
- gen_split (&info);
- break;
+ case DEFINE_SPLIT:
+ printf ("/* %s:%d */\n", info.loc.filename, info.loc.lineno);
+ gen_split (&info);
+ break;
- default:
- break;
- }
+ case DEFINE_PEEPHOLE2:
+ printf ("/* %s:%d */\n", info.loc.filename, info.loc.lineno);
+ gen_split (&info);
+ break;
+
+ default:
+ break;
+ }
+ }
/* Write out the routines to add CLOBBERs to a pattern and say whether they
clobber a hard reg. */
--
2.24.3 (Apple Git-128)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v6] genemit.c (main): split insn-emit.c for compiling parallelly
2020-09-11 7:26 [PATCH v6] genemit.c (main): split insn-emit.c for compiling parallelly Jojo R
@ 2020-09-11 15:29 ` Segher Boessenkool
2020-09-15 9:17 ` Jojo R
0 siblings, 1 reply; 3+ messages in thread
From: Segher Boessenkool @ 2020-09-11 15:29 UTC (permalink / raw)
To: Jojo R
Cc: richard.sandiford, ro, richard.guenther, joseph, gcc-patches, yunhai.syh
Hi!
On Fri, Sep 11, 2020 at 03:26:17PM +0800, Jojo R wrote:
> +#define printf_include() do { \
Don't use macros please, use a function?
And maybe do this in a separate patch, for ease of review. That should
be ack'ed pretty much immediately, after which it is out of the way, and
we do not have to see it again.
> while (read_md_rtx (&info))
> - switch (GET_CODE (info.def))
Factor this body to a separate function, too? Again, as earlier patch.
As it is, it is impossible to see if you changed anything here.
I suspect all this patch really does is pretty trivial, but it is hard
to tell.
Segher
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v6] genemit.c (main): split insn-emit.c for compiling parallelly
2020-09-11 15:29 ` Segher Boessenkool
@ 2020-09-15 9:17 ` Jojo R
0 siblings, 0 replies; 3+ messages in thread
From: Jojo R @ 2020-09-15 9:17 UTC (permalink / raw)
To: Segher Boessenkool
Cc: richard.sandiford, ro, richard.guenther, joseph, gcc-patches, yunhai.syh
Hi,
Ok & Thanks, I will do my best for it :)
It’s fixed in patch v7.
Jojo
在 2020年9月11日 +0800 PM11:29，Segher Boessenkool <segher@kernel.crashing.org>，写道：
> Hi!
>
> On Fri, Sep 11, 2020 at 03:26:17PM +0800, Jojo R wrote:
> > +#define printf_include() do { \
>
> Don't use macros please, use a function?
>
> And maybe do this in a separate patch, for ease of review. That should
> be ack'ed pretty much immediately, after which it is out of the way, and
> we do not have to see it again.
>
> > while (read_md_rtx (&info))
> > - switch (GET_CODE (info.def))
>
> Factor this body to a separate function, too? Again, as earlier patch.
> As it is, it is impossible to see if you changed anything here.
>
> I suspect all this patch really does is pretty trivial, but it is hard
> to tell.
>
>
> Segher
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-15 9:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-11 7:26 [PATCH v6] genemit.c (main): split insn-emit.c for compiling parallelly Jojo R
2020-09-11 15:29 ` Segher Boessenkool
2020-09-15 9:17 ` Jojo R
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).