* [PATCH] Makefile.in: clean up match.pd-related dependencies @ 2023-05-05 17:02 Alexander Monakov 2023-05-05 17:13 ` Richard Biener 0 siblings, 1 reply; 8+ messages in thread From: Alexander Monakov @ 2023-05-05 17:02 UTC (permalink / raw) To: gcc-patches; +Cc: Tamar Christina, Alexander Monakov Clean up confusing changes from the recent refactoring for parallel match.pd build. gimple-match-head.o is not built. Remove related flags adjustment. Autogenerated gimple-match-N.o files do not depend on gimple-match-exports.cc. {gimple,generic)-match-auto.h only depend on the prerequisites of the corresponding s-{gimple,generic}-match stamp file, not any .cc file. gcc/ChangeLog: * Makefile.in: (gimple-match-head.o-warn): Remove. (GIMPLE_MATCH_PD_SEQ_SRC): Do not depend on gimple-match-exports.cc. (gimple-match-auto.h): Only depend on s-gimple-match. (generic-match-auto.h): Likewise. --- Tamar, do I understand correctly that you do not have more plans for match.pd and I won't collide with you if I attempt more cleanups in this area? Thanks! gcc/Makefile.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 7e7ac078c5..0cc13c37d0 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -230,7 +230,6 @@ gengtype-lex.o-warn = -Wno-error libgcov-util.o-warn = -Wno-error libgcov-driver-tool.o-warn = -Wno-error libgcov-merge-tool.o-warn = -Wno-error -gimple-match-head.o-warn = -Wno-unused gimple-match-exports.o-warn = -Wno-unused dfp.o-warn = -Wno-strict-aliasing @@ -2674,12 +2673,10 @@ s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in false; \ fi -$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc \ - gimple-match-exports.cc; @true -gimple-match-auto.h: s-gimple-match gimple-match-head.cc \ - gimple-match-exports.cc; @true +$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc; @true +gimple-match-auto.h: s-gimple-match; @true $(GENERIC_MATCH_PD_SEQ_SRC): s-generic-match generic-match-head.cc; @true -generic-match-auto.h: s-generic-match generic-match-head.cc; @true +generic-match-auto.h: s-generic-match; @true s-gimple-match: build/genmatch$(build_exeext) \ $(srcdir)/match.pd cfn-operators.pd -- 2.39.2 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Makefile.in: clean up match.pd-related dependencies 2023-05-05 17:02 [PATCH] Makefile.in: clean up match.pd-related dependencies Alexander Monakov @ 2023-05-05 17:13 ` Richard Biener 2023-05-05 17:39 ` Tamar Christina 0 siblings, 1 reply; 8+ messages in thread From: Richard Biener @ 2023-05-05 17:13 UTC (permalink / raw) To: Alexander Monakov; +Cc: gcc-patches, Tamar Christina > Am 05.05.2023 um 19:03 schrieb Alexander Monakov via Gcc-patches <gcc-patches@gcc.gnu.org>: > > Clean up confusing changes from the recent refactoring for > parallel match.pd build. > > gimple-match-head.o is not built. Remove related flags adjustment. > > Autogenerated gimple-match-N.o files do not depend on > gimple-match-exports.cc. > > {gimple,generic)-match-auto.h only depend on the prerequisites of the > corresponding s-{gimple,generic}-match stamp file, not any .cc file. LGTM > gcc/ChangeLog: > > * Makefile.in: (gimple-match-head.o-warn): Remove. > (GIMPLE_MATCH_PD_SEQ_SRC): Do not depend on > gimple-match-exports.cc. > (gimple-match-auto.h): Only depend on s-gimple-match. > (generic-match-auto.h): Likewise. > --- > > Tamar, do I understand correctly that you do not have more plans for match.pd > and I won't collide with you if I attempt more cleanups in this area? Thanks! > > gcc/Makefile.in | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/gcc/Makefile.in b/gcc/Makefile.in > index 7e7ac078c5..0cc13c37d0 100644 > --- a/gcc/Makefile.in > +++ b/gcc/Makefile.in > @@ -230,7 +230,6 @@ gengtype-lex.o-warn = -Wno-error > libgcov-util.o-warn = -Wno-error > libgcov-driver-tool.o-warn = -Wno-error > libgcov-merge-tool.o-warn = -Wno-error > -gimple-match-head.o-warn = -Wno-unused > gimple-match-exports.o-warn = -Wno-unused > dfp.o-warn = -Wno-strict-aliasing > > @@ -2674,12 +2673,10 @@ s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in > false; \ > fi > > -$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc \ > - gimple-match-exports.cc; @true > -gimple-match-auto.h: s-gimple-match gimple-match-head.cc \ > - gimple-match-exports.cc; @true > +$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc; @true > +gimple-match-auto.h: s-gimple-match; @true > $(GENERIC_MATCH_PD_SEQ_SRC): s-generic-match generic-match-head.cc; @true > -generic-match-auto.h: s-generic-match generic-match-head.cc; @true > +generic-match-auto.h: s-generic-match; @true > > s-gimple-match: build/genmatch$(build_exeext) \ > $(srcdir)/match.pd cfn-operators.pd > -- > 2.39.2 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH] Makefile.in: clean up match.pd-related dependencies 2023-05-05 17:13 ` Richard Biener @ 2023-05-05 17:39 ` Tamar Christina 2023-05-05 17:59 ` Alexander Monakov 0 siblings, 1 reply; 8+ messages in thread From: Tamar Christina @ 2023-05-05 17:39 UTC (permalink / raw) To: Richard Biener, Alexander Monakov; +Cc: gcc-patches > > Am 05.05.2023 um 19:03 schrieb Alexander Monakov via Gcc-patches <gcc- > patches@gcc.gnu.org>: > > > > Clean up confusing changes from the recent refactoring for parallel > > match.pd build. > > > > gimple-match-head.o is not built. Remove related flags adjustment. > > > > Autogenerated gimple-match-N.o files do not depend on > > gimple-match-exports.cc. > > > > {gimple,generic)-match-auto.h only depend on the prerequisites of the > > corresponding s-{gimple,generic}-match stamp file, not any .cc file. > > LGTM > > > gcc/ChangeLog: > > > > * Makefile.in: (gimple-match-head.o-warn): Remove. > > (GIMPLE_MATCH_PD_SEQ_SRC): Do not depend on > > gimple-match-exports.cc. > > (gimple-match-auto.h): Only depend on s-gimple-match. > > (generic-match-auto.h): Likewise. > > --- > > > > Tamar, do I understand correctly that you do not have more plans for > > match.pd and I won't collide with you if I attempt more cleanups in this > area? Thanks! No, but I'm also not sure why this change. The idea here was that if gimple-head-export.cc changes you must have changed genmatch.cc and so you need to regenerate the gimple-match-* which could change the header. So not sure I agree with this. Thanks, Tamar > > > > gcc/Makefile.in | 9 +++------ > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > diff --git a/gcc/Makefile.in b/gcc/Makefile.in index > > 7e7ac078c5..0cc13c37d0 100644 > > --- a/gcc/Makefile.in > > +++ b/gcc/Makefile.in > > @@ -230,7 +230,6 @@ gengtype-lex.o-warn = -Wno-error > > libgcov-util.o-warn = -Wno-error libgcov-driver-tool.o-warn = > > -Wno-error libgcov-merge-tool.o-warn = -Wno-error > > -gimple-match-head.o-warn = -Wno-unused gimple-match-exports.o-warn > = > > -Wno-unused dfp.o-warn = -Wno-strict-aliasing > > > > @@ -2674,12 +2673,10 @@ s-tm-texi: build/genhooks$(build_exeext) > $(srcdir)/doc/tm.texi.in > > false; \ > > fi > > > > -$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc \ > > - gimple-match-exports.cc; @true > > -gimple-match-auto.h: s-gimple-match gimple-match-head.cc \ > > - gimple-match-exports.cc; @true > > +$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc; > > +@true > > +gimple-match-auto.h: s-gimple-match; @true > > $(GENERIC_MATCH_PD_SEQ_SRC): s-generic-match generic-match-head.cc; > > @true > > -generic-match-auto.h: s-generic-match generic-match-head.cc; @true > > +generic-match-auto.h: s-generic-match; @true > > > > s-gimple-match: build/genmatch$(build_exeext) \ > > $(srcdir)/match.pd cfn-operators.pd > > -- > > 2.39.2 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH] Makefile.in: clean up match.pd-related dependencies 2023-05-05 17:39 ` Tamar Christina @ 2023-05-05 17:59 ` Alexander Monakov 2023-05-05 18:12 ` Tamar Christina 0 siblings, 1 reply; 8+ messages in thread From: Alexander Monakov @ 2023-05-05 17:59 UTC (permalink / raw) To: Tamar Christina; +Cc: Richard Biener, gcc-patches [-- Attachment #1: Type: text/plain, Size: 3548 bytes --] On Fri, 5 May 2023, Tamar Christina wrote: > > > Am 05.05.2023 um 19:03 schrieb Alexander Monakov via Gcc-patches <gcc- > > patches@gcc.gnu.org>: > > > > > > Clean up confusing changes from the recent refactoring for parallel > > > match.pd build. > > > > > > gimple-match-head.o is not built. Remove related flags adjustment. > > > > > > Autogenerated gimple-match-N.o files do not depend on > > > gimple-match-exports.cc. > > > > > > {gimple,generic)-match-auto.h only depend on the prerequisites of the > > > corresponding s-{gimple,generic}-match stamp file, not any .cc file. > > > > LGTM > > > > > gcc/ChangeLog: > > > > > > * Makefile.in: (gimple-match-head.o-warn): Remove. > > > (GIMPLE_MATCH_PD_SEQ_SRC): Do not depend on > > > gimple-match-exports.cc. > > > (gimple-match-auto.h): Only depend on s-gimple-match. > > > (generic-match-auto.h): Likewise. > > > --- > > > > > > Tamar, do I understand correctly that you do not have more plans for > > > match.pd and I won't collide with you if I attempt more cleanups in this > > area? Thanks! > > No, but I'm also not sure why this change. > The idea here was that if gimple-head-export.cc changes you must have changed > genmatch.cc and so you need to regenerate the gimple-match-* which could change the header. gimple-head-export.cc does not exist. gimple-match-exports.cc is not a generated file. It's under source control and edited independently from genmatch.cc. It is compiled separately, producing gimple-match-exports.o. gimple-match-head.cc is also not a generated file, also under source control. It is transitively included into gimple-match-N.o files. If it changes, they will be rebuilt. This is not changed by my patch. gimple-match-auto.h is a generated file. It depends on s-gimple-match stamp file, which in turn depends on genmatch and match.pd. If either changes, the rule for the stamp file triggers. gimple-match-N.o files also depend on the stamp file, so they will be rebuilt as well. Is there some problem I'm not seeing? Thanks. Alexander > So not sure I agree with this. > > Thanks, > Tamar > > > > > > > gcc/Makefile.in | 9 +++------ > > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > > > diff --git a/gcc/Makefile.in b/gcc/Makefile.in index > > > 7e7ac078c5..0cc13c37d0 100644 > > > --- a/gcc/Makefile.in > > > +++ b/gcc/Makefile.in > > > @@ -230,7 +230,6 @@ gengtype-lex.o-warn = -Wno-error > > > libgcov-util.o-warn = -Wno-error libgcov-driver-tool.o-warn = > > > -Wno-error libgcov-merge-tool.o-warn = -Wno-error > > > -gimple-match-head.o-warn = -Wno-unused gimple-match-exports.o-warn > > = > > > -Wno-unused dfp.o-warn = -Wno-strict-aliasing > > > > > > @@ -2674,12 +2673,10 @@ s-tm-texi: build/genhooks$(build_exeext) > > $(srcdir)/doc/tm.texi.in > > > false; \ > > > fi > > > > > > -$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc \ > > > - gimple-match-exports.cc; @true > > > -gimple-match-auto.h: s-gimple-match gimple-match-head.cc \ > > > - gimple-match-exports.cc; @true > > > +$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc; > > > +@true > > > +gimple-match-auto.h: s-gimple-match; @true > > > $(GENERIC_MATCH_PD_SEQ_SRC): s-generic-match generic-match-head.cc; > > > @true > > > -generic-match-auto.h: s-generic-match generic-match-head.cc; @true > > > +generic-match-auto.h: s-generic-match; @true > > > > > > s-gimple-match: build/genmatch$(build_exeext) \ > > > $(srcdir)/match.pd cfn-operators.pd > > > -- > > > 2.39.2 > > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH] Makefile.in: clean up match.pd-related dependencies 2023-05-05 17:59 ` Alexander Monakov @ 2023-05-05 18:12 ` Tamar Christina 2023-05-05 18:21 ` Alexander Monakov 0 siblings, 1 reply; 8+ messages in thread From: Tamar Christina @ 2023-05-05 18:12 UTC (permalink / raw) To: Alexander Monakov; +Cc: Richard Biener, gcc-patches > -----Original Message----- > From: Alexander Monakov <amonakov@ispras.ru> > Sent: Friday, May 5, 2023 6:59 PM > To: Tamar Christina <Tamar.Christina@arm.com> > Cc: Richard Biener <richard.guenther@gmail.com>; gcc-patches@gcc.gnu.org > Subject: RE: [PATCH] Makefile.in: clean up match.pd-related dependencies > > > On Fri, 5 May 2023, Tamar Christina wrote: > > > > > Am 05.05.2023 um 19:03 schrieb Alexander Monakov via Gcc-patches > > > > <gcc- > > > patches@gcc.gnu.org>: > > > > > > > > Clean up confusing changes from the recent refactoring for > > > > parallel match.pd build. > > > > > > > > gimple-match-head.o is not built. Remove related flags adjustment. > > > > > > > > Autogenerated gimple-match-N.o files do not depend on > > > > gimple-match-exports.cc. > > > > > > > > {gimple,generic)-match-auto.h only depend on the prerequisites of > > > > the corresponding s-{gimple,generic}-match stamp file, not any .cc file. > > > > > > LGTM > > > > > > > gcc/ChangeLog: > > > > > > > > * Makefile.in: (gimple-match-head.o-warn): Remove. > > > > (GIMPLE_MATCH_PD_SEQ_SRC): Do not depend on > > > > gimple-match-exports.cc. > > > > (gimple-match-auto.h): Only depend on s-gimple-match. > > > > (generic-match-auto.h): Likewise. > > > > --- > > > > > > > > Tamar, do I understand correctly that you do not have more plans > > > > for match.pd and I won't collide with you if I attempt more > > > > cleanups in this > > > area? Thanks! > > > > No, but I'm also not sure why this change. > > The idea here was that if gimple-head-export.cc changes you must have > > changed genmatch.cc and so you need to regenerate the gimple-match-* > which could change the header. > > gimple-head-export.cc does not exist. > > gimple-match-exports.cc is not a generated file. It's under source control and > edited independently from genmatch.cc. It is compiled separately, producing > gimple-match-exports.o. > > gimple-match-head.cc is also not a generated file, also under source control. > It is transitively included into gimple-match-N.o files. If it changes, they will be > rebuilt. This is not changed by my patch. > > gimple-match-auto.h is a generated file. It depends on s-gimple-match stamp > file, which in turn depends on genmatch and match.pd. If either changes, the > rule for the stamp file triggers. gimple-match-N.o files also depend on the > stamp file, so they will be rebuilt as well. s-gimple-match does not depend on gimple-match-head.cc. if it changes the stamp is not invalidated. This happens to work because gimple-match-N.cc does depend on gimple-match-head.cc, but if the gimple-match-N.cc already exists then nothing changes. So I don't think this changes anything. If anything I would say the stamp file needs to depend on gimple-match-head.cc. Thanks, Tamar > > Is there some problem I'm not seeing? > > Thanks. > Alexander > > > So not sure I agree with this. > > > > Thanks, > > Tamar > > > > > > > > > > gcc/Makefile.in | 9 +++------ > > > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > > > > > diff --git a/gcc/Makefile.in b/gcc/Makefile.in index > > > > 7e7ac078c5..0cc13c37d0 100644 > > > > --- a/gcc/Makefile.in > > > > +++ b/gcc/Makefile.in > > > > @@ -230,7 +230,6 @@ gengtype-lex.o-warn = -Wno-error > > > > libgcov-util.o-warn = -Wno-error libgcov-driver-tool.o-warn = > > > > -Wno-error libgcov-merge-tool.o-warn = -Wno-error > > > > -gimple-match-head.o-warn = -Wno-unused > > > > gimple-match-exports.o-warn > > > = > > > > -Wno-unused dfp.o-warn = -Wno-strict-aliasing > > > > > > > > @@ -2674,12 +2673,10 @@ s-tm-texi: build/genhooks$(build_exeext) > > > $(srcdir)/doc/tm.texi.in > > > > false; \ > > > > fi > > > > > > > > -$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match- > head.cc \ > > > > - gimple-match-exports.cc; @true > > > > -gimple-match-auto.h: s-gimple-match gimple-match-head.cc \ > > > > - gimple-match-exports.cc; @true > > > > +$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match- > head.cc; > > > > +@true > > > > +gimple-match-auto.h: s-gimple-match; @true > > > > $(GENERIC_MATCH_PD_SEQ_SRC): s-generic-match > > > > generic-match-head.cc; @true > > > > -generic-match-auto.h: s-generic-match generic-match-head.cc; > > > > @true > > > > +generic-match-auto.h: s-generic-match; @true > > > > > > > > s-gimple-match: build/genmatch$(build_exeext) \ > > > > $(srcdir)/match.pd cfn-operators.pd > > > > -- > > > > 2.39.2 > > > > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH] Makefile.in: clean up match.pd-related dependencies 2023-05-05 18:12 ` Tamar Christina @ 2023-05-05 18:21 ` Alexander Monakov 2023-05-05 18:28 ` Tamar Christina 2023-05-08 6:18 ` Alexander Monakov 0 siblings, 2 replies; 8+ messages in thread From: Alexander Monakov @ 2023-05-05 18:21 UTC (permalink / raw) To: Tamar Christina; +Cc: Richard Biener, gcc-patches [-- Attachment #1: Type: text/plain, Size: 5268 bytes --] On Fri, 5 May 2023, Tamar Christina wrote: > > -----Original Message----- > > From: Alexander Monakov <amonakov@ispras.ru> > > Sent: Friday, May 5, 2023 6:59 PM > > To: Tamar Christina <Tamar.Christina@arm.com> > > Cc: Richard Biener <richard.guenther@gmail.com>; gcc-patches@gcc.gnu.org > > Subject: RE: [PATCH] Makefile.in: clean up match.pd-related dependencies > > > > > > On Fri, 5 May 2023, Tamar Christina wrote: > > > > > > > Am 05.05.2023 um 19:03 schrieb Alexander Monakov via Gcc-patches > > > > > <gcc- > > > > patches@gcc.gnu.org>: > > > > > > > > > > Clean up confusing changes from the recent refactoring for > > > > > parallel match.pd build. > > > > > > > > > > gimple-match-head.o is not built. Remove related flags adjustment. > > > > > > > > > > Autogenerated gimple-match-N.o files do not depend on > > > > > gimple-match-exports.cc. > > > > > > > > > > {gimple,generic)-match-auto.h only depend on the prerequisites of > > > > > the corresponding s-{gimple,generic}-match stamp file, not any .cc file. > > > > > > > > LGTM > > > > > > > > > gcc/ChangeLog: > > > > > > > > > > * Makefile.in: (gimple-match-head.o-warn): Remove. > > > > > (GIMPLE_MATCH_PD_SEQ_SRC): Do not depend on > > > > > gimple-match-exports.cc. > > > > > (gimple-match-auto.h): Only depend on s-gimple-match. > > > > > (generic-match-auto.h): Likewise. > > > > > --- > > > > > > > > > > Tamar, do I understand correctly that you do not have more plans > > > > > for match.pd and I won't collide with you if I attempt more > > > > > cleanups in this > > > > area? Thanks! > > > > > > No, but I'm also not sure why this change. > > > The idea here was that if gimple-head-export.cc changes you must have > > > changed genmatch.cc and so you need to regenerate the gimple-match-* > > which could change the header. > > > > gimple-head-export.cc does not exist. > > > > gimple-match-exports.cc is not a generated file. It's under source control and > > edited independently from genmatch.cc. It is compiled separately, producing > > gimple-match-exports.o. > > > > gimple-match-head.cc is also not a generated file, also under source control. > > It is transitively included into gimple-match-N.o files. If it changes, they will be > > rebuilt. This is not changed by my patch. > > > > gimple-match-auto.h is a generated file. It depends on s-gimple-match stamp > > file, which in turn depends on genmatch and match.pd. If either changes, the > > rule for the stamp file triggers. gimple-match-N.o files also depend on the > > stamp file, so they will be rebuilt as well. > > s-gimple-match does not depend on gimple-match-head.cc. if it changes the stamp > is not invalidated. Right, this is correct: there's no need to rerun the recipe for the stamp, because contents of gimple-match-head.cc do not affect it. > This happens to work because gimple-match-N.cc does depend on gimple-match-head.cc, > but if the gimple-match-N.cc already exists then nothing changes. No, if gimple-match-N.cc already exist, make notices they are out-of-date via $(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc; @true and this triggers rebuilding gimple-match-N.o. I tested this. After 'touch gimple-match-head.cc' all ten gimple-match-N.o files are rebuilt. > So I don't think this changes anything. If anything I would say the stamp file needs to > depend on gimple-match-head.cc. Is my explanation above satisfactory? Thanks. Alexander > > Thanks, > Tamar > > > > > Is there some problem I'm not seeing? > > > > Thanks. > > Alexander > > > > > So not sure I agree with this. > > > > > > Thanks, > > > Tamar > > > > > > > > > > > > > gcc/Makefile.in | 9 +++------ > > > > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > > > > > > > diff --git a/gcc/Makefile.in b/gcc/Makefile.in index > > > > > 7e7ac078c5..0cc13c37d0 100644 > > > > > --- a/gcc/Makefile.in > > > > > +++ b/gcc/Makefile.in > > > > > @@ -230,7 +230,6 @@ gengtype-lex.o-warn = -Wno-error > > > > > libgcov-util.o-warn = -Wno-error libgcov-driver-tool.o-warn = > > > > > -Wno-error libgcov-merge-tool.o-warn = -Wno-error > > > > > -gimple-match-head.o-warn = -Wno-unused > > > > > gimple-match-exports.o-warn > > > > = > > > > > -Wno-unused dfp.o-warn = -Wno-strict-aliasing > > > > > > > > > > @@ -2674,12 +2673,10 @@ s-tm-texi: build/genhooks$(build_exeext) > > > > $(srcdir)/doc/tm.texi.in > > > > > false; \ > > > > > fi > > > > > > > > > > -$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match- > > head.cc \ > > > > > - gimple-match-exports.cc; @true > > > > > -gimple-match-auto.h: s-gimple-match gimple-match-head.cc \ > > > > > - gimple-match-exports.cc; @true > > > > > +$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match- > > head.cc; > > > > > +@true > > > > > +gimple-match-auto.h: s-gimple-match; @true > > > > > $(GENERIC_MATCH_PD_SEQ_SRC): s-generic-match > > > > > generic-match-head.cc; @true > > > > > -generic-match-auto.h: s-generic-match generic-match-head.cc; > > > > > @true > > > > > +generic-match-auto.h: s-generic-match; @true > > > > > > > > > > s-gimple-match: build/genmatch$(build_exeext) \ > > > > > $(srcdir)/match.pd cfn-operators.pd > > > > > -- > > > > > 2.39.2 > > > > > > > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH] Makefile.in: clean up match.pd-related dependencies 2023-05-05 18:21 ` Alexander Monakov @ 2023-05-05 18:28 ` Tamar Christina 2023-05-08 6:18 ` Alexander Monakov 1 sibling, 0 replies; 8+ messages in thread From: Tamar Christina @ 2023-05-05 18:28 UTC (permalink / raw) To: Alexander Monakov; +Cc: Richard Biener, gcc-patches > -----Original Message----- > From: Alexander Monakov <amonakov@ispras.ru> > Sent: Friday, May 5, 2023 7:22 PM > To: Tamar Christina <Tamar.Christina@arm.com> > Cc: Richard Biener <richard.guenther@gmail.com>; gcc-patches@gcc.gnu.org > Subject: RE: [PATCH] Makefile.in: clean up match.pd-related dependencies > > > On Fri, 5 May 2023, Tamar Christina wrote: > > > > -----Original Message----- > > > From: Alexander Monakov <amonakov@ispras.ru> > > > Sent: Friday, May 5, 2023 6:59 PM > > > To: Tamar Christina <Tamar.Christina@arm.com> > > > Cc: Richard Biener <richard.guenther@gmail.com>; > > > gcc-patches@gcc.gnu.org > > > Subject: RE: [PATCH] Makefile.in: clean up match.pd-related > > > dependencies > > > > > > > > > On Fri, 5 May 2023, Tamar Christina wrote: > > > > > > > > > Am 05.05.2023 um 19:03 schrieb Alexander Monakov via > > > > > > Gcc-patches > > > > > > <gcc- > > > > > patches@gcc.gnu.org>: > > > > > > > > > > > > Clean up confusing changes from the recent refactoring for > > > > > > parallel match.pd build. > > > > > > > > > > > > gimple-match-head.o is not built. Remove related flags adjustment. > > > > > > > > > > > > Autogenerated gimple-match-N.o files do not depend on > > > > > > gimple-match-exports.cc. > > > > > > > > > > > > {gimple,generic)-match-auto.h only depend on the prerequisites > > > > > > of the corresponding s-{gimple,generic}-match stamp file, not any .cc > file. > > > > > > > > > > LGTM > > > > > > > > > > > gcc/ChangeLog: > > > > > > > > > > > > * Makefile.in: (gimple-match-head.o-warn): Remove. > > > > > > (GIMPLE_MATCH_PD_SEQ_SRC): Do not depend on > > > > > > gimple-match-exports.cc. > > > > > > (gimple-match-auto.h): Only depend on s-gimple-match. > > > > > > (generic-match-auto.h): Likewise. > > > > > > --- > > > > > > > > > > > > Tamar, do I understand correctly that you do not have more > > > > > > plans for match.pd and I won't collide with you if I attempt > > > > > > more cleanups in this > > > > > area? Thanks! > > > > > > > > No, but I'm also not sure why this change. > > > > The idea here was that if gimple-head-export.cc changes you must > > > > have changed genmatch.cc and so you need to regenerate the > > > > gimple-match-* > > > which could change the header. > > > > > > gimple-head-export.cc does not exist. > > > > > > gimple-match-exports.cc is not a generated file. It's under source > > > control and edited independently from genmatch.cc. It is compiled > > > separately, producing gimple-match-exports.o. > > > > > > gimple-match-head.cc is also not a generated file, also under source > control. > > > It is transitively included into gimple-match-N.o files. If it > > > changes, they will be rebuilt. This is not changed by my patch. > > > > > > gimple-match-auto.h is a generated file. It depends on > > > s-gimple-match stamp file, which in turn depends on genmatch and > > > match.pd. If either changes, the rule for the stamp file triggers. > > > gimple-match-N.o files also depend on the stamp file, so they will be > rebuilt as well. > > > > s-gimple-match does not depend on gimple-match-head.cc. if it changes > > the stamp is not invalidated. > > Right, this is correct: there's no need to rerun the recipe for the stamp, > because contents of gimple-match-head.cc do not affect it. > > > This happens to work because gimple-match-N.cc does depend on > > gimple-match-head.cc, but if the gimple-match-N.cc already exists then > nothing changes. > > No, if gimple-match-N.cc already exist, make notices they are out-of-date via > > $(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc; > @true > > and this triggers rebuilding gimple-match-N.o. > > I tested this. After 'touch gimple-match-head.cc' all ten gimple-match-N.o files > are rebuilt. > > > So I don't think this changes anything. If anything I would say the > > stamp file needs to depend on gimple-match-head.cc. > > Is my explanation above satisfactory? Sure, Thanks, Tamar > > Thanks. > Alexander > > > > > Thanks, > > Tamar > > > > > > > > Is there some problem I'm not seeing? > > > > > > Thanks. > > > Alexander > > > > > > > So not sure I agree with this. > > > > > > > > Thanks, > > > > Tamar > > > > > > > > > > > > > > > > gcc/Makefile.in | 9 +++------ > > > > > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > > > > > > > > > diff --git a/gcc/Makefile.in b/gcc/Makefile.in index > > > > > > 7e7ac078c5..0cc13c37d0 100644 > > > > > > --- a/gcc/Makefile.in > > > > > > +++ b/gcc/Makefile.in > > > > > > @@ -230,7 +230,6 @@ gengtype-lex.o-warn = -Wno-error > > > > > > libgcov-util.o-warn = -Wno-error libgcov-driver-tool.o-warn = > > > > > > -Wno-error libgcov-merge-tool.o-warn = -Wno-error > > > > > > -gimple-match-head.o-warn = -Wno-unused > > > > > > gimple-match-exports.o-warn > > > > > = > > > > > > -Wno-unused dfp.o-warn = -Wno-strict-aliasing > > > > > > > > > > > > @@ -2674,12 +2673,10 @@ s-tm-texi: > > > > > > build/genhooks$(build_exeext) > > > > > $(srcdir)/doc/tm.texi.in > > > > > > false; \ > > > > > > fi > > > > > > > > > > > > -$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match- > > > head.cc \ > > > > > > - gimple-match-exports.cc; @true > > > > > > -gimple-match-auto.h: s-gimple-match gimple-match-head.cc \ > > > > > > - gimple-match-exports.cc; @true > > > > > > +$(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match- > > > head.cc; > > > > > > +@true > > > > > > +gimple-match-auto.h: s-gimple-match; @true > > > > > > $(GENERIC_MATCH_PD_SEQ_SRC): s-generic-match > > > > > > generic-match-head.cc; @true > > > > > > -generic-match-auto.h: s-generic-match generic-match-head.cc; > > > > > > @true > > > > > > +generic-match-auto.h: s-generic-match; @true > > > > > > > > > > > > s-gimple-match: build/genmatch$(build_exeext) \ > > > > > > $(srcdir)/match.pd cfn-operators.pd > > > > > > -- > > > > > > 2.39.2 > > > > > > > > > > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH] Makefile.in: clean up match.pd-related dependencies 2023-05-05 18:21 ` Alexander Monakov 2023-05-05 18:28 ` Tamar Christina @ 2023-05-08 6:18 ` Alexander Monakov 1 sibling, 0 replies; 8+ messages in thread From: Alexander Monakov @ 2023-05-08 6:18 UTC (permalink / raw) To: Tamar Christina; +Cc: Richard Biener, gcc-patches On Fri, 5 May 2023, Alexander Monakov wrote: > > > gimple-head-export.cc does not exist. > > > > > > gimple-match-exports.cc is not a generated file. It's under source control and > > > edited independently from genmatch.cc. It is compiled separately, producing > > > gimple-match-exports.o. > > > > > > gimple-match-head.cc is also not a generated file, also under source control. > > > It is transitively included into gimple-match-N.o files. If it changes, they will be > > > rebuilt. This is not changed by my patch. > > > > > > gimple-match-auto.h is a generated file. It depends on s-gimple-match stamp > > > file, which in turn depends on genmatch and match.pd. If either changes, the > > > rule for the stamp file triggers. gimple-match-N.o files also depend on the > > > stamp file, so they will be rebuilt as well. > > > > s-gimple-match does not depend on gimple-match-head.cc. if it changes the stamp > > is not invalidated. > > Right, this is correct: there's no need to rerun the recipe for the stamp, > because contents of gimple-match-head.cc do not affect it. > > > This happens to work because gimple-match-N.cc does depend on gimple-match-head.cc, > > but if the gimple-match-N.cc already exists then nothing changes. > > No, if gimple-match-N.cc already exist, make notices they are out-of-date via > > $(GIMPLE_MATCH_PD_SEQ_SRC): s-gimple-match gimple-match-head.cc; @true > > and this triggers rebuilding gimple-match-N.o. > > I tested this. After 'touch gimple-match-head.cc' all ten gimple-match-N.o files > are rebuilt. My explanation was incomplete here. The gcc/Makefile.in rule quoted above applies to .cc files and does not trigger rebuilds of .o files on its own. The reason .o files get rebuilt is implicit dependency tracking: initial build records header dependencies in gcc/.deps/*.Po files, and incremental rebuild sees that gimple-match-1.o depends on gimple-match-head.cc. Alexander ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-05-08 6:18 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-05-05 17:02 [PATCH] Makefile.in: clean up match.pd-related dependencies Alexander Monakov 2023-05-05 17:13 ` Richard Biener 2023-05-05 17:39 ` Tamar Christina 2023-05-05 17:59 ` Alexander Monakov 2023-05-05 18:12 ` Tamar Christina 2023-05-05 18:21 ` Alexander Monakov 2023-05-05 18:28 ` Tamar Christina 2023-05-08 6:18 ` Alexander Monakov
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).