| Message ID | 20201104015315.81416-1-jiejie_rong@c-sky.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v9] genemit.c (main): split insn-emit.c for compiling parallelly | expand |
Jojo R <jiejie_rong@c-sky.com> writes: > gcc/ChangeLog: > > * genemit.c (main): Print 'split line'. > * Makefile.in (insn-emit.c): Define split count and file Looks good, thanks. Will commit once the copyright situation is sorted out. Richard > > --- > gcc/Makefile.in | 35 +++++++++++----- > gcc/genemit.c | 104 +++++++++++++++++++++++++++++------------------- > 2 files changed, 90 insertions(+), 49 deletions(-) > > diff --git a/gcc/Makefile.in b/gcc/Makefile.in > index 978a08f7b04..de846c0fcd4 100644 > --- a/gcc/Makefile.in > +++ b/gcc/Makefile.in > @@ -1154,6 +1154,15 @@ export STRIP_FOR_TARGET > export RANLIB_FOR_TARGET > export libsubdir > > +number_series0:=1 2 3 4 5 6 7 8 9 > +number_series1:=0 $(number_series0) > +number_series2:=$(foreach i,$(number_series0),$(addprefix $(i),$(number_series1))) > +number_series3:=$(addprefix 0,$(number_series1)) $(number_series2) > +number_series4:=$(foreach i,$(number_series0),$(addprefix $(i),$(number_series3))) > +number_series5:=$(addprefix 0,$(number_series3)) $(number_series4) > +number_series6:=$(foreach i,$(number_series0),$(addprefix $(i),$(number_series5))) > +number_series:=$(number_series0) $(number_series2) $(number_series4) $(number_series6) > + > FLAGS_TO_PASS = \ > "ADA_CFLAGS=$(ADA_CFLAGS)" \ > "BISON=$(BISON)" \ > @@ -1259,6 +1268,18 @@ 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 = $(wordlist 1,$(shell expr $(INSN-GENERATED-SPLIT-NUM) + 1),$(number_series)) > + > +insn-emit-split-c := $(foreach o, $(insn-generated-split-num), 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 \ > @@ -1266,6 +1287,7 @@ OBJS = \ > insn-automata.o \ > insn-dfatab.o \ > insn-emit.o \ > + $(insn-emit-split-obj) \ > insn-extract.o \ > insn-latencytab.o \ > insn-modes.o \ > @@ -2376,6 +2398,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 > @@ -4096,18 +4121,10 @@ $(patsubst %,%-subtargets,$(lang_checks)): check-%-subtargets: > check_p_tool=$(firstword $(subst _, ,$*)) > check_p_count=$(check_$(check_p_tool)_parallelize) > check_p_subno=$(word 2,$(subst _, ,$*)) > -check_p_numbers0:=1 2 3 4 5 6 7 8 9 > -check_p_numbers1:=0 $(check_p_numbers0) > -check_p_numbers2:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers1))) > -check_p_numbers3:=$(addprefix 0,$(check_p_numbers1)) $(check_p_numbers2) > -check_p_numbers4:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers3))) > -check_p_numbers5:=$(addprefix 0,$(check_p_numbers3)) $(check_p_numbers4) > -check_p_numbers6:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers5))) > -check_p_numbers:=$(check_p_numbers0) $(check_p_numbers2) $(check_p_numbers4) $(check_p_numbers6) > check_p_subdir=$(subst _,,$*) > check_p_subdirs=$(wordlist 1,$(check_p_count),$(wordlist 1, \ > $(if $(GCC_TEST_PARALLEL_SLOTS),$(GCC_TEST_PARALLEL_SLOTS),128), \ > - $(check_p_numbers))) > + $(number_series))) > > # For parallelized check-% targets, this decides whether parallelization > # is desirable (if -jN is used). If desirable, recursive make is run with > diff --git a/gcc/genemit.c b/gcc/genemit.c > index 84d07d388ee..54a0d909d9d 100644 > --- a/gcc/genemit.c > +++ b/gcc/genemit.c > @@ -847,24 +847,13 @@ handle_overloaded_gen (overloaded_name *oname) > } > } > > -int > -main (int argc, const char **argv) > -{ > - progname = "genemit"; > - > - if (!init_rtx_reader_args (argc, argv)) > - return (FATAL_EXIT_CODE); > - > -#define DEF_INTERNAL_OPTAB_FN(NAME, FLAGS, OPTAB, TYPE) \ > - nofail_optabs[OPTAB##_optab] = true; > -#include "internal-fn.def" > - > - /* 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"); > +/* Print include header. */ > > +static void > +printf_include (void) > +{ > + 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"); > @@ -900,35 +889,70 @@ from the machine description file `md'. */\n\n"); > printf ("#include \"tm-constrs.h\"\n"); > printf ("#include \"ggc.h\"\n"); > printf ("#include \"target.h\"\n\n"); > +} > > - /* Read the machine description. */ > +/* Generate the `gen_...' function from GET_CODE(). */ > > - md_rtx_info info; > - while (read_md_rtx (&info)) > - switch (GET_CODE (info.def)) > - { > - case DEFINE_INSN: > - gen_insn (&info); > - break; > +static void > +gen_md_rtx (md_rtx_info *info) > +{ > + switch (GET_CODE (info->def)) > + { > + case DEFINE_INSN: > + gen_insn (info); > + break; > > - case DEFINE_EXPAND: > - printf ("/* %s:%d */\n", info.loc.filename, info.loc.lineno); > - gen_expand (&info); > - break; > + case DEFINE_EXPAND: > + printf ("/* %s:%d */\n", info->loc.filename, info->loc.lineno); > + gen_expand (info); > + break; > > - case DEFINE_SPLIT: > - 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; > > - case DEFINE_PEEPHOLE2: > - printf ("/* %s:%d */\n", info.loc.filename, info.loc.lineno); > - gen_split (&info); > - break; > + case DEFINE_PEEPHOLE2: > + printf ("/* %s:%d */\n", info->loc.filename, info->loc.lineno); > + gen_split (info); > + break; > > - default: > - break; > - } > + default: > + break; > + } > +} > + > +int > +main (int argc, const char **argv) > +{ > + progname = "genemit"; > + > + if (!init_rtx_reader_args (argc, argv)) > + return (FATAL_EXIT_CODE); > + > +#define DEF_INTERNAL_OPTAB_FN(NAME, FLAGS, OPTAB, TYPE) \ > + nofail_optabs[OPTAB##_optab] = true; > +#include "internal-fn.def" > + > + /* Assign sequential codes to all entries in the machine description > + in parallel with the tables in insn-output.c. */ > + > + int read_count = 0; > + > + /* Read the machine description. */ > + > + md_rtx_info info; > + while (read_md_rtx (&info)) > + { > + if ((read_count++ % 10000) == 0) > + { > + printf ("/* Split file into separate compilation units " > + "for parallel compilation %d */\n\n", read_count); > + printf_include(); > + } > + > + gen_md_rtx (&info); > + } > > /* Write out the routines to add CLOBBERs to a pattern and say whether they > clobber a hard reg. */
Sorry, going it over it again before committing, I spotted a couple of things… Jojo R <jiejie_rong@c-sky.com> writes: > gcc/ChangeLog: > > * genemit.c (main): Print 'split line'. > * Makefile.in (insn-emit.c): Define split count and file > > --- > gcc/Makefile.in | 35 +++++++++++----- > gcc/genemit.c | 104 +++++++++++++++++++++++++++++------------------- > 2 files changed, 90 insertions(+), 49 deletions(-) > > diff --git a/gcc/Makefile.in b/gcc/Makefile.in > index 978a08f7b04..de846c0fcd4 100644 > --- a/gcc/Makefile.in > +++ b/gcc/Makefile.in > @@ -1154,6 +1154,15 @@ export STRIP_FOR_TARGET > export RANLIB_FOR_TARGET > export libsubdir > > +number_series0:=1 2 3 4 5 6 7 8 9 > +number_series1:=0 $(number_series0) > +number_series2:=$(foreach i,$(number_series0),$(addprefix $(i),$(number_series1))) > +number_series3:=$(addprefix 0,$(number_series1)) $(number_series2) > +number_series4:=$(foreach i,$(number_series0),$(addprefix $(i),$(number_series3))) > +number_series5:=$(addprefix 0,$(number_series3)) $(number_series4) > +number_series6:=$(foreach i,$(number_series0),$(addprefix $(i),$(number_series5))) > +number_series:=$(number_series0) $(number_series2) $(number_series4) $(number_series6) > + > FLAGS_TO_PASS = \ > "ADA_CFLAGS=$(ADA_CFLAGS)" \ > "BISON=$(BISON)" \ > @@ -1259,6 +1268,18 @@ 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 = $(wordlist 1,$(shell expr $(INSN-GENERATED-SPLIT-NUM) + 1),$(number_series)) I think it would be better to make SPLIT-NUM 1-based rather than 0-based and not have the shell expr. > + > +insn-emit-split-c := $(foreach o, $(insn-generated-split-num), 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 \ > @@ -1266,6 +1287,7 @@ OBJS = \ > insn-automata.o \ > insn-dfatab.o \ > insn-emit.o \ > + $(insn-emit-split-obj) \ > insn-extract.o \ > insn-latencytab.o \ > insn-modes.o \ > @@ -2376,6 +2398,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) This still uses bashisms. Also, I don't think we can require csplit. genemit itself is quite fast, so it would probably be simpler to run it multiple times, passing a new command-line parameter to say which output file we want. In other words, rather than generate a monolithic insn-emit.c and then split it later, we should just generate the separate insn-emit.cs directly. Thanks, Richard
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 978a08f7b04..de846c0fcd4 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1154,6 +1154,15 @@ export STRIP_FOR_TARGET export RANLIB_FOR_TARGET export libsubdir +number_series0:=1 2 3 4 5 6 7 8 9 +number_series1:=0 $(number_series0) +number_series2:=$(foreach i,$(number_series0),$(addprefix $(i),$(number_series1))) +number_series3:=$(addprefix 0,$(number_series1)) $(number_series2) +number_series4:=$(foreach i,$(number_series0),$(addprefix $(i),$(number_series3))) +number_series5:=$(addprefix 0,$(number_series3)) $(number_series4) +number_series6:=$(foreach i,$(number_series0),$(addprefix $(i),$(number_series5))) +number_series:=$(number_series0) $(number_series2) $(number_series4) $(number_series6) + FLAGS_TO_PASS = \ "ADA_CFLAGS=$(ADA_CFLAGS)" \ "BISON=$(BISON)" \ @@ -1259,6 +1268,18 @@ 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 = $(wordlist 1,$(shell expr $(INSN-GENERATED-SPLIT-NUM) + 1),$(number_series)) + +insn-emit-split-c := $(foreach o, $(insn-generated-split-num), 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 \ @@ -1266,6 +1287,7 @@ OBJS = \ insn-automata.o \ insn-dfatab.o \ insn-emit.o \ + $(insn-emit-split-obj) \ insn-extract.o \ insn-latencytab.o \ insn-modes.o \ @@ -2376,6 +2398,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 @@ -4096,18 +4121,10 @@ $(patsubst %,%-subtargets,$(lang_checks)): check-%-subtargets: check_p_tool=$(firstword $(subst _, ,$*)) check_p_count=$(check_$(check_p_tool)_parallelize) check_p_subno=$(word 2,$(subst _, ,$*)) -check_p_numbers0:=1 2 3 4 5 6 7 8 9 -check_p_numbers1:=0 $(check_p_numbers0) -check_p_numbers2:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers1))) -check_p_numbers3:=$(addprefix 0,$(check_p_numbers1)) $(check_p_numbers2) -check_p_numbers4:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers3))) -check_p_numbers5:=$(addprefix 0,$(check_p_numbers3)) $(check_p_numbers4) -check_p_numbers6:=$(foreach i,$(check_p_numbers0),$(addprefix $(i),$(check_p_numbers5))) -check_p_numbers:=$(check_p_numbers0) $(check_p_numbers2) $(check_p_numbers4) $(check_p_numbers6) check_p_subdir=$(subst _,,$*) check_p_subdirs=$(wordlist 1,$(check_p_count),$(wordlist 1, \ $(if $(GCC_TEST_PARALLEL_SLOTS),$(GCC_TEST_PARALLEL_SLOTS),128), \ - $(check_p_numbers))) + $(number_series))) # For parallelized check-% targets, this decides whether parallelization # is desirable (if -jN is used). If desirable, recursive make is run with diff --git a/gcc/genemit.c b/gcc/genemit.c index 84d07d388ee..54a0d909d9d 100644 --- a/gcc/genemit.c +++ b/gcc/genemit.c @@ -847,24 +847,13 @@ handle_overloaded_gen (overloaded_name *oname) } } -int -main (int argc, const char **argv) -{ - progname = "genemit"; - - if (!init_rtx_reader_args (argc, argv)) - return (FATAL_EXIT_CODE); - -#define DEF_INTERNAL_OPTAB_FN(NAME, FLAGS, OPTAB, TYPE) \ - nofail_optabs[OPTAB##_optab] = true; -#include "internal-fn.def" - - /* 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"); +/* Print include header. */ +static void +printf_include (void) +{ + 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"); @@ -900,35 +889,70 @@ from the machine description file `md'. */\n\n"); printf ("#include \"tm-constrs.h\"\n"); printf ("#include \"ggc.h\"\n"); printf ("#include \"target.h\"\n\n"); +} - /* Read the machine description. */ +/* Generate the `gen_...' function from GET_CODE(). */ - md_rtx_info info; - while (read_md_rtx (&info)) - switch (GET_CODE (info.def)) - { - case DEFINE_INSN: - gen_insn (&info); - break; +static void +gen_md_rtx (md_rtx_info *info) +{ + switch (GET_CODE (info->def)) + { + case DEFINE_INSN: + gen_insn (info); + break; - case DEFINE_EXPAND: - printf ("/* %s:%d */\n", info.loc.filename, info.loc.lineno); - gen_expand (&info); - break; + case DEFINE_EXPAND: + printf ("/* %s:%d */\n", info->loc.filename, info->loc.lineno); + gen_expand (info); + break; - case DEFINE_SPLIT: - 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; - case DEFINE_PEEPHOLE2: - printf ("/* %s:%d */\n", info.loc.filename, info.loc.lineno); - gen_split (&info); - break; + case DEFINE_PEEPHOLE2: + printf ("/* %s:%d */\n", info->loc.filename, info->loc.lineno); + gen_split (info); + break; - default: - break; - } + default: + break; + } +} + +int +main (int argc, const char **argv) +{ + progname = "genemit"; + + if (!init_rtx_reader_args (argc, argv)) + return (FATAL_EXIT_CODE); + +#define DEF_INTERNAL_OPTAB_FN(NAME, FLAGS, OPTAB, TYPE) \ + nofail_optabs[OPTAB##_optab] = true; +#include "internal-fn.def" + + /* Assign sequential codes to all entries in the machine description + in parallel with the tables in insn-output.c. */ + + int read_count = 0; + + /* Read the machine description. */ + + md_rtx_info info; + while (read_md_rtx (&info)) + { + if ((read_count++ % 10000) == 0) + { + printf ("/* Split file into separate compilation units " + "for parallel compilation %d */\n\n", read_count); + printf_include(); + } + + gen_md_rtx (&info); + } /* Write out the routines to add CLOBBERs to a pattern and say whether they clobber a hard reg. */