| Message ID | 5640FB91.9000306@mentor.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 9 Nov 2015, Tom de Vries wrote: > On 09/11/15 16:35, Tom de Vries wrote: > > Hi, > > > > this patch series for stage1 trunk adds support to: > > - parallelize oacc kernels regions using parloops, and > > - map the loops onto the oacc gang dimension. > > > > The patch series contains these patches: > > > > 1 Insert new exit block only when needed in > > transform_to_exit_first_loop_alt > > 2 Make create_parallel_loop return void > > 3 Ignore reduction clause on kernels directive > > 4 Implement -foffload-alias > > 5 Add in_oacc_kernels_region in struct loop > > 6 Add pass_oacc_kernels > > 7 Add pass_dominator_oacc_kernels > > 8 Add pass_ch_oacc_kernels > > 9 Add pass_parallelize_loops_oacc_kernels > > 10 Add pass_oacc_kernels pass group in passes.def > > 11 Update testcases after adding kernels pass group > > 12 Handle acc loop directive > > 13 Add c-c++-common/goacc/kernels-*.c > > 14 Add gfortran.dg/goacc/kernels-*.f95 > > 15 Add libgomp.oacc-c-c++-common/kernels-*.c > > 16 Add libgomp.oacc-fortran/kernels-*.f95 > > > > The first 9 patches are more or less independent, but patches 10-16 are > > intended to be committed at the same time. > > > > Bootstrapped and reg-tested on x86_64. > > > > Build and reg-tested with nvidia accelerator, in combination with a > > patch that enables accelerator testing (which is submitted at > > https://gcc.gnu.org/ml/gcc-patches/2015-10/msg01771.html ). > > > > I'll post the individual patches in reply to this message. > > This patch updates existing testcases with new pass numbers, given the passes > that were added in the pass list in patch 10. I think it would be nice to be able to specify the number in the .def file instead so we can avoid this kind of churn everytime we do this. > Thanks, > - Tom > >
On 11/11/15 12:03, Richard Biener wrote: > On Mon, 9 Nov 2015, Tom de Vries wrote: > >> On 09/11/15 16:35, Tom de Vries wrote: >>> Hi, >>> >>> this patch series for stage1 trunk adds support to: >>> - parallelize oacc kernels regions using parloops, and >>> - map the loops onto the oacc gang dimension. >>> >>> The patch series contains these patches: >>> >>> 1 Insert new exit block only when needed in >>> transform_to_exit_first_loop_alt >>> 2 Make create_parallel_loop return void >>> 3 Ignore reduction clause on kernels directive >>> 4 Implement -foffload-alias >>> 5 Add in_oacc_kernels_region in struct loop >>> 6 Add pass_oacc_kernels >>> 7 Add pass_dominator_oacc_kernels >>> 8 Add pass_ch_oacc_kernels >>> 9 Add pass_parallelize_loops_oacc_kernels >>> 10 Add pass_oacc_kernels pass group in passes.def >>> 11 Update testcases after adding kernels pass group >>> 12 Handle acc loop directive >>> 13 Add c-c++-common/goacc/kernels-*.c >>> 14 Add gfortran.dg/goacc/kernels-*.f95 >>> 15 Add libgomp.oacc-c-c++-common/kernels-*.c >>> 16 Add libgomp.oacc-fortran/kernels-*.f95 >>> >>> The first 9 patches are more or less independent, but patches 10-16 are >>> intended to be committed at the same time. >>> >>> Bootstrapped and reg-tested on x86_64. >>> >>> Build and reg-tested with nvidia accelerator, in combination with a >>> patch that enables accelerator testing (which is submitted at >>> https://gcc.gnu.org/ml/gcc-patches/2015-10/msg01771.html ). >>> >>> I'll post the individual patches in reply to this message. >> >> This patch updates existing testcases with new pass numbers, given the passes >> that were added in the pass list in patch 10. > > I think it would be nice to be able to specify the number in the .def > file instead so we can avoid this kind of churn everytime we do this. How about something along the lines of: ... /* pass_build_ealias is a dummy pass that ensures that we execute TODO_rebuild_alias at this point. */ NEXT_PASS (pass_build_ealias); /* Pass group that runs when there are oacc kernels in the function. */ NEXT_PASS (pass_oacc_kernels); PUSH_INSERT_PASSES_WITHIN (pass_oacc_kernels) PUSH_ID ("oacc_kernels") ... POP_ID () POP_INSERT_PASSES () NEXT_PASS (pass_fre); ... where the PUSH_ID/POP_ID pair has the functionality that all the contained passes: - have the id prefixed to the dump file, so the dump file of pass_ch which normally is "ch" becomes "oacc_kernels_ch", and - the pass name in pass_instances.def becomes pass_oacc_kernels_ch, such that it doesn't count as numbered instance of pass_ch ? Thanks, - Tom
On Thu, Nov 12, 2015 at 3:31 PM, Tom de Vries <Tom_deVries@mentor.com> wrote: > On 11/11/15 12:03, Richard Biener wrote: >> >> On Mon, 9 Nov 2015, Tom de Vries wrote: >> >>> On 09/11/15 16:35, Tom de Vries wrote: >>>> >>>> Hi, >>>> >>>> this patch series for stage1 trunk adds support to: >>>> - parallelize oacc kernels regions using parloops, and >>>> - map the loops onto the oacc gang dimension. >>>> >>>> The patch series contains these patches: >>>> >>>> 1 Insert new exit block only when needed in >>>> transform_to_exit_first_loop_alt >>>> 2 Make create_parallel_loop return void >>>> 3 Ignore reduction clause on kernels directive >>>> 4 Implement -foffload-alias >>>> 5 Add in_oacc_kernels_region in struct loop >>>> 6 Add pass_oacc_kernels >>>> 7 Add pass_dominator_oacc_kernels >>>> 8 Add pass_ch_oacc_kernels >>>> 9 Add pass_parallelize_loops_oacc_kernels >>>> 10 Add pass_oacc_kernels pass group in passes.def >>>> 11 Update testcases after adding kernels pass group >>>> 12 Handle acc loop directive >>>> 13 Add c-c++-common/goacc/kernels-*.c >>>> 14 Add gfortran.dg/goacc/kernels-*.f95 >>>> 15 Add libgomp.oacc-c-c++-common/kernels-*.c >>>> 16 Add libgomp.oacc-fortran/kernels-*.f95 >>>> >>>> The first 9 patches are more or less independent, but patches 10-16 are >>>> intended to be committed at the same time. >>>> >>>> Bootstrapped and reg-tested on x86_64. >>>> >>>> Build and reg-tested with nvidia accelerator, in combination with a >>>> patch that enables accelerator testing (which is submitted at >>>> https://gcc.gnu.org/ml/gcc-patches/2015-10/msg01771.html ). >>>> >>>> I'll post the individual patches in reply to this message. >>> >>> >>> This patch updates existing testcases with new pass numbers, given the >>> passes >>> that were added in the pass list in patch 10. >> >> >> I think it would be nice to be able to specify the number in the .def >> file instead so we can avoid this kind of churn everytime we do this. > > > How about something along the lines of: > ... > /* pass_build_ealias is a dummy pass that ensures that we > execute TODO_rebuild_alias at this point. */ > NEXT_PASS (pass_build_ealias); > /* Pass group that runs when there are oacc kernels in the > function. */ > NEXT_PASS (pass_oacc_kernels); > PUSH_INSERT_PASSES_WITHIN (pass_oacc_kernels) > PUSH_ID ("oacc_kernels") > ... > POP_ID () > POP_INSERT_PASSES () > NEXT_PASS (pass_fre); > ... > > where the PUSH_ID/POP_ID pair has the functionality that all the contained > passes: > - have the id prefixed to the dump file, so the dump file of pass_ch > which normally is "ch" becomes "oacc_kernels_ch", and > - the pass name in pass_instances.def becomes pass_oacc_kernels_ch, such > that it doesn't count as numbered instance of pass_ch > ? Hmm. I'd like to have sth that allows me to add "slp" to both pass_slp_vectorize instances, having them share the suffix (as no two functions are in both dumps). We similarly have "duplicates" across the -Og vs. the -O[0-3] pipeline. Basically make all dump file name suffixes manually specified which means moving them from the class definition to the actual instance. Well, just an idea. In a distant future I like our pass pipeline to become more dynamic, getting away from a static passes.def towards, say, a pass "script" (to be able to say "if inlining did nothing skip this group" or similar). Richard. > Thanks, > - Tom
On Thu, 2015-11-12 at 15:43 +0100, Richard Biener wrote: > On Thu, Nov 12, 2015 at 3:31 PM, Tom de Vries <Tom_deVries@mentor.com> wrote: > > On 11/11/15 12:03, Richard Biener wrote: > >> > >> On Mon, 9 Nov 2015, Tom de Vries wrote: > >> > >>> On 09/11/15 16:35, Tom de Vries wrote: > >>>> > >>>> Hi, > >>>> > >>>> this patch series for stage1 trunk adds support to: > >>>> - parallelize oacc kernels regions using parloops, and > >>>> - map the loops onto the oacc gang dimension. > >>>> > >>>> The patch series contains these patches: > >>>> > >>>> 1 Insert new exit block only when needed in > >>>> transform_to_exit_first_loop_alt > >>>> 2 Make create_parallel_loop return void > >>>> 3 Ignore reduction clause on kernels directive > >>>> 4 Implement -foffload-alias > >>>> 5 Add in_oacc_kernels_region in struct loop > >>>> 6 Add pass_oacc_kernels > >>>> 7 Add pass_dominator_oacc_kernels > >>>> 8 Add pass_ch_oacc_kernels > >>>> 9 Add pass_parallelize_loops_oacc_kernels > >>>> 10 Add pass_oacc_kernels pass group in passes.def > >>>> 11 Update testcases after adding kernels pass group > >>>> 12 Handle acc loop directive > >>>> 13 Add c-c++-common/goacc/kernels-*.c > >>>> 14 Add gfortran.dg/goacc/kernels-*.f95 > >>>> 15 Add libgomp.oacc-c-c++-common/kernels-*.c > >>>> 16 Add libgomp.oacc-fortran/kernels-*.f95 > >>>> > >>>> The first 9 patches are more or less independent, but patches 10-16 are > >>>> intended to be committed at the same time. > >>>> > >>>> Bootstrapped and reg-tested on x86_64. > >>>> > >>>> Build and reg-tested with nvidia accelerator, in combination with a > >>>> patch that enables accelerator testing (which is submitted at > >>>> https://gcc.gnu.org/ml/gcc-patches/2015-10/msg01771.html ). > >>>> > >>>> I'll post the individual patches in reply to this message. > >>> > >>> > >>> This patch updates existing testcases with new pass numbers, given the > >>> passes > >>> that were added in the pass list in patch 10. > >> > >> > >> I think it would be nice to be able to specify the number in the .def > >> file instead so we can avoid this kind of churn everytime we do this. > > > > > > How about something along the lines of: > > ... > > /* pass_build_ealias is a dummy pass that ensures that we > > execute TODO_rebuild_alias at this point. */ > > NEXT_PASS (pass_build_ealias); > > /* Pass group that runs when there are oacc kernels in the > > function. */ > > NEXT_PASS (pass_oacc_kernels); > > PUSH_INSERT_PASSES_WITHIN (pass_oacc_kernels) > > PUSH_ID ("oacc_kernels") > > ... > > POP_ID () > > POP_INSERT_PASSES () > > NEXT_PASS (pass_fre); > > ... > > > > where the PUSH_ID/POP_ID pair has the functionality that all the contained > > passes: > > - have the id prefixed to the dump file, so the dump file of pass_ch > > which normally is "ch" becomes "oacc_kernels_ch", and > > - the pass name in pass_instances.def becomes pass_oacc_kernels_ch, such > > that it doesn't count as numbered instance of pass_ch > > ? > > Hmm. I'd like to have sth that allows me to add "slp" to both > pass_slp_vectorize > instances, having them share the suffix (as no two functions are in both dumps). > > We similarly have "duplicates" across the -Og vs. the -O[0-3] pipeline. > > Basically make all dump file name suffixes manually specified which means moving > them from the class definition to the actual instance. > > Well, just an idea. In a distant future I like our pass pipeline to become more > dynamic, getting away from a static passes.def towards, say, a pass "script" > (to be able to say "if inlining did nothing skip this group" or similar). Can't that be done by having a parent pass to hold them, with a gate function? Or are you thinking of having another domain-specific language? Thinking aloud, I've sometimes wondered if it would be helpful to be able to subclass pass_manager, so that multiple passes.def files could generate alternative pass_manager subclasses, with the precise choice of pass_manager subclass being determined by options+target. I don't know if that latter idea is useful though. Dave
On Thu, 12 Nov 2015, David Malcolm wrote: > On Thu, 2015-11-12 at 15:43 +0100, Richard Biener wrote: > > On Thu, Nov 12, 2015 at 3:31 PM, Tom de Vries <Tom_deVries@mentor.com> wrote: > > > On 11/11/15 12:03, Richard Biener wrote: > > >> > > >> On Mon, 9 Nov 2015, Tom de Vries wrote: > > >> > > >>> On 09/11/15 16:35, Tom de Vries wrote: > > >>>> > > >>>> Hi, > > >>>> > > >>>> this patch series for stage1 trunk adds support to: > > >>>> - parallelize oacc kernels regions using parloops, and > > >>>> - map the loops onto the oacc gang dimension. > > >>>> > > >>>> The patch series contains these patches: > > >>>> > > >>>> 1 Insert new exit block only when needed in > > >>>> transform_to_exit_first_loop_alt > > >>>> 2 Make create_parallel_loop return void > > >>>> 3 Ignore reduction clause on kernels directive > > >>>> 4 Implement -foffload-alias > > >>>> 5 Add in_oacc_kernels_region in struct loop > > >>>> 6 Add pass_oacc_kernels > > >>>> 7 Add pass_dominator_oacc_kernels > > >>>> 8 Add pass_ch_oacc_kernels > > >>>> 9 Add pass_parallelize_loops_oacc_kernels > > >>>> 10 Add pass_oacc_kernels pass group in passes.def > > >>>> 11 Update testcases after adding kernels pass group > > >>>> 12 Handle acc loop directive > > >>>> 13 Add c-c++-common/goacc/kernels-*.c > > >>>> 14 Add gfortran.dg/goacc/kernels-*.f95 > > >>>> 15 Add libgomp.oacc-c-c++-common/kernels-*.c > > >>>> 16 Add libgomp.oacc-fortran/kernels-*.f95 > > >>>> > > >>>> The first 9 patches are more or less independent, but patches 10-16 are > > >>>> intended to be committed at the same time. > > >>>> > > >>>> Bootstrapped and reg-tested on x86_64. > > >>>> > > >>>> Build and reg-tested with nvidia accelerator, in combination with a > > >>>> patch that enables accelerator testing (which is submitted at > > >>>> https://gcc.gnu.org/ml/gcc-patches/2015-10/msg01771.html ). > > >>>> > > >>>> I'll post the individual patches in reply to this message. > > >>> > > >>> > > >>> This patch updates existing testcases with new pass numbers, given the > > >>> passes > > >>> that were added in the pass list in patch 10. > > >> > > >> > > >> I think it would be nice to be able to specify the number in the .def > > >> file instead so we can avoid this kind of churn everytime we do this. > > > > > > > > > How about something along the lines of: > > > ... > > > /* pass_build_ealias is a dummy pass that ensures that we > > > execute TODO_rebuild_alias at this point. */ > > > NEXT_PASS (pass_build_ealias); > > > /* Pass group that runs when there are oacc kernels in the > > > function. */ > > > NEXT_PASS (pass_oacc_kernels); > > > PUSH_INSERT_PASSES_WITHIN (pass_oacc_kernels) > > > PUSH_ID ("oacc_kernels") > > > ... > > > POP_ID () > > > POP_INSERT_PASSES () > > > NEXT_PASS (pass_fre); > > > ... > > > > > > where the PUSH_ID/POP_ID pair has the functionality that all the contained > > > passes: > > > - have the id prefixed to the dump file, so the dump file of pass_ch > > > which normally is "ch" becomes "oacc_kernels_ch", and > > > - the pass name in pass_instances.def becomes pass_oacc_kernels_ch, such > > > that it doesn't count as numbered instance of pass_ch > > > ? > > > > Hmm. I'd like to have sth that allows me to add "slp" to both > > pass_slp_vectorize > > instances, having them share the suffix (as no two functions are in both dumps). > > > > We similarly have "duplicates" across the -Og vs. the -O[0-3] pipeline. > > > > Basically make all dump file name suffixes manually specified which means moving > > them from the class definition to the actual instance. > > > > Well, just an idea. In a distant future I like our pass pipeline to become more > > dynamic, getting away from a static passes.def towards, say, a pass "script" > > (to be able to say "if inlining did nothing skip this group" or similar). > > Can't that be done by having a parent pass to hold them, with a gate > function? Sure, that's how we do it for the loop sub-pipeline for example. > Or are you thinking of having another domain-specific language? Kind of. I'm thinking of the pass pipeline being dynamic in the sense of a program controlling execution of passes. Basically "scripting" the pass manager itself (yes, also with the idea to give users and us more control). Of course specific features can be implemented in the pass manager itself (it's a "script" with static configuration). > Thinking aloud, I've sometimes wondered if it would be helpful to be > able to subclass pass_manager, so that multiple passes.def files could > generate alternative pass_manager subclasses, with the precise choice of > pass_manager subclass being determined by options+target. I don't know > if that latter idea is useful though. I think the "use" of passes.def is simply too static. We shouldn't bother to create all the instances and dump file metadata until we need it. The first thing to do is of course making the pass manager really control the flow of compilation rather than various bits of cgraph infrastructure executing specific (sub-)pass queues. Richard.
Update testcases after adding kernels pass group 2015-11-09 Tom de Vries <tom@codesourcery.com> * c-c++-common/restrict-2.c: Update after adding pass_oacc_kernels pass group. * c-c++-common/restrict-4.c: Same. * g++.dg/tree-ssa/copyprop-1.C: Same. * g++.dg/tree-ssa/pr33615.C: Same. * g++.dg/tree-ssa/restrict1.C: Same. * gcc.dg/gomp/notify-new-function-3.c: Same. * gcc.dg/pr23911.c: Same. * gcc.dg/pr41488.c: Same. * gcc.dg/tm/pub-safety-1.c: Same. * gcc.dg/tm/reg-promotion.c: Same. * gcc.dg/tree-ssa/20030709-2.c: Same. * gcc.dg/tree-ssa/20030731-2.c: Same. * gcc.dg/tree-ssa/20040729-1.c: Same. * gcc.dg/tree-ssa/20050314-1.c: Same. * gcc.dg/tree-ssa/cfgcleanup-1.c: Same. * gcc.dg/tree-ssa/loop-17.c: Same. * gcc.dg/tree-ssa/loop-32.c: Same. * gcc.dg/tree-ssa/loop-33.c: Same. * gcc.dg/tree-ssa/loop-34.c: Same. * gcc.dg/tree-ssa/loop-35.c: Same. * gcc.dg/tree-ssa/loop-36.c: Same. * gcc.dg/tree-ssa/loop-39.c: Same. * gcc.dg/tree-ssa/loop-7.c: Same. * gcc.dg/tree-ssa/pr21086.c: Same. * gcc.dg/tree-ssa/pr23109.c: Same. * gcc.dg/tree-ssa/restrict-3.c: Same. * gcc.dg/tree-ssa/restrict-5.c: Same. * gcc.dg/tree-ssa/scev-7.c: Same. * gcc.dg/tree-ssa/ssa-dce-1.c: Same. * gcc.dg/tree-ssa/ssa-dce-2.c: Same. * gcc.dg/tree-ssa/ssa-lim-1.c: Same. * gcc.dg/tree-ssa/ssa-lim-10.c: Same. * gcc.dg/tree-ssa/ssa-lim-11.c: Same. * gcc.dg/tree-ssa/ssa-lim-12.c: Same. * gcc.dg/tree-ssa/ssa-lim-2.c: Same. * gcc.dg/tree-ssa/ssa-lim-3.c: Same. * gcc.dg/tree-ssa/ssa-lim-6.c: Same. * gcc.dg/tree-ssa/ssa-lim-7.c: Same. * gcc.dg/tree-ssa/ssa-lim-8.c: Same. * gcc.dg/tree-ssa/ssa-lim-9.c: Same. * gcc.dg/tree-ssa/structopt-1.c: Same. * gcc.dg/vect/pr26359.c: Same. * gfortran.dg/pr32921.f: Same. --- gcc/testsuite/c-c++-common/restrict-2.c | 4 ++-- gcc/testsuite/c-c++-common/restrict-4.c | 4 ++-- gcc/testsuite/g++.dg/tree-ssa/copyprop-1.C | 4 ++-- gcc/testsuite/g++.dg/tree-ssa/pr33615.C | 4 ++-- gcc/testsuite/g++.dg/tree-ssa/restrict1.C | 4 ++-- gcc/testsuite/gcc.dg/gomp/notify-new-function-3.c | 2 +- gcc/testsuite/gcc.dg/pr23911.c | 6 +++--- gcc/testsuite/gcc.dg/pr41488.c | 4 ++-- gcc/testsuite/gcc.dg/tm/pub-safety-1.c | 4 ++-- gcc/testsuite/gcc.dg/tm/reg-promotion.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20030709-2.c | 8 ++++---- gcc/testsuite/gcc.dg/tree-ssa/20030731-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/cfgcleanup-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-17.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-32.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-33.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-34.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-35.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/loop-36.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-39.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/loop-7.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/pr21086.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/pr23109.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/scev-7.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c | 4 ++-- gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c | 4 ++-- gcc/testsuite/gcc.dg/vect/pr26359.c | 4 ++-- gcc/testsuite/gfortran.dg/pr32921.f | 4 ++-- 43 files changed, 91 insertions(+), 91 deletions(-) diff --git a/gcc/testsuite/c-c++-common/restrict-2.c b/gcc/testsuite/c-c++-common/restrict-2.c index 5e8bca7..183a0de 100644 --- a/gcc/testsuite/c-c++-common/restrict-2.c +++ b/gcc/testsuite/c-c++-common/restrict-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim1-details" } */ +/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim3-details" } */ void foo (float * __restrict__ a, float * __restrict__ b, int n, int j) { @@ -10,4 +10,4 @@ void foo (float * __restrict__ a, float * __restrict__ b, int n, int j) /* We should move the RHS of the store out of the loop. */ -/* { dg-final { scan-tree-dump-times "Moving statement" 11 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Moving statement" 11 "lim3" } } */ diff --git a/gcc/testsuite/c-c++-common/restrict-4.c b/gcc/testsuite/c-c++-common/restrict-4.c index cea6cd8..8dd597c 100644 --- a/gcc/testsuite/c-c++-common/restrict-4.c +++ b/gcc/testsuite/c-c++-common/restrict-4.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim1-details" } */ +/* { dg-options "-O2 -fdump-tree-lim3-details" } */ struct Foo { @@ -15,4 +15,4 @@ void bar(struct Foo f, int * __restrict__ q) } } -/* { dg-final { scan-tree-dump "Executing store motion" "lim1" } } */ +/* { dg-final { scan-tree-dump "Executing store motion" "lim3" } } */ diff --git a/gcc/testsuite/g++.dg/tree-ssa/copyprop-1.C b/gcc/testsuite/g++.dg/tree-ssa/copyprop-1.C index 5ff289c..34a9f7b 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/copyprop-1.C +++ b/gcc/testsuite/g++.dg/tree-ssa/copyprop-1.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-dce2" } */ +/* { dg-options "-O -fdump-tree-dce3" } */ /* Verify that we can eliminate the useless conversions to/from const qualified pointer types @@ -27,4 +27,4 @@ int foo(Object&o) /* Remaining should be two loads. */ -/* { dg-final { scan-tree-dump-times " = \[^\n\]*;" 2 "dce2" } } */ +/* { dg-final { scan-tree-dump-times " = \[^\n\]*;" 2 "dce3" } } */ diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr33615.C b/gcc/testsuite/g++.dg/tree-ssa/pr33615.C index f1b7a64..dd2bbb2 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/pr33615.C +++ b/gcc/testsuite/g++.dg/tree-ssa/pr33615.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fnon-call-exceptions -fdump-tree-lim1-details -w" } */ +/* { dg-options "-O -fnon-call-exceptions -fdump-tree-lim3-details -w" } */ extern volatile int y; @@ -16,4 +16,4 @@ foo (double a, int x) // The expression 1.0 / 0.0 should not be treated as a loop invariant // if it may throw an exception. -// { dg-final { scan-tree-dump-times "invariant up to" 0 "lim1" } } +// { dg-final { scan-tree-dump-times "invariant up to" 0 "lim3" } } diff --git a/gcc/testsuite/g++.dg/tree-ssa/restrict1.C b/gcc/testsuite/g++.dg/tree-ssa/restrict1.C index 5952fca..718d1ec 100644 --- a/gcc/testsuite/g++.dg/tree-ssa/restrict1.C +++ b/gcc/testsuite/g++.dg/tree-ssa/restrict1.C @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim1-details" } */ +/* { dg-options "-O2 -fdump-tree-lim3-details" } */ struct Foo { @@ -16,4 +16,4 @@ void bar(Foo f, int * __restrict__ q) } } -/* { dg-final { scan-tree-dump "Executing store motion" "lim1" } } */ +/* { dg-final { scan-tree-dump "Executing store motion" "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/gomp/notify-new-function-3.c b/gcc/testsuite/gcc.dg/gomp/notify-new-function-3.c index a8f24b1..033a407 100644 --- a/gcc/testsuite/gcc.dg/gomp/notify-new-function-3.c +++ b/gcc/testsuite/gcc.dg/gomp/notify-new-function-3.c @@ -11,4 +11,4 @@ foo (int *__restrict a, int *__restrict b, int *__restrict c) /* Check for new function notification in ompexpssa dump. */ -/* { dg-final { scan-tree-dump-times "Added new ssa gimple function foo\\.\[\\\$_\]loopfn\\.0 to callgraph" 1 "ompexpssa" } } */ +/* { dg-final { scan-tree-dump-times "Added new ssa gimple function foo\\.\[\\\$_\]loopfn\\.0 to callgraph" 1 "ompexpssa2" } } */ diff --git a/gcc/testsuite/gcc.dg/pr23911.c b/gcc/testsuite/gcc.dg/pr23911.c index 2c27397..3fa0412 100644 --- a/gcc/testsuite/gcc.dg/pr23911.c +++ b/gcc/testsuite/gcc.dg/pr23911.c @@ -1,7 +1,7 @@ /* This was a missed optimization in tree constant propagation that CSE would catch later on. */ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-dce2" } */ +/* { dg-options "-O -fdump-tree-dce3" } */ double _Complex *a; static const double _Complex b[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; @@ -16,5 +16,5 @@ test (void) /* After DCE2 which runs after FRE, the expressions should be fully constant folded. There should be no loads from b left. */ -/* { dg-final { scan-tree-dump-times "__complex__ \\\(1.0e\\\+0, 0.0\\\)" 2 "dce2" } } */ -/* { dg-final { scan-tree-dump-times "= b" 0 "dce2" } } */ +/* { dg-final { scan-tree-dump-times "__complex__ \\\(1.0e\\\+0, 0.0\\\)" 2 "dce3" } } */ +/* { dg-final { scan-tree-dump-times "= b" 0 "dce3" } } */ diff --git a/gcc/testsuite/gcc.dg/pr41488.c b/gcc/testsuite/gcc.dg/pr41488.c index b9bc718..6c7686b 100644 --- a/gcc/testsuite/gcc.dg/pr41488.c +++ b/gcc/testsuite/gcc.dg/pr41488.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-sccp-scev" } */ +/* { dg-options "-O2 -fdump-tree-sccp2-scev" } */ struct struct_t { @@ -14,4 +14,4 @@ void foo (struct struct_t* sp, int start, int end) sp->data[i+start] = 0; } -/* { dg-final { scan-tree-dump-times "Simplify PEELED_CHREC into POLYNOMIAL_CHREC" 1 "sccp" } } */ +/* { dg-final { scan-tree-dump-times "Simplify PEELED_CHREC into POLYNOMIAL_CHREC" 1 "sccp2" } } */ diff --git a/gcc/testsuite/gcc.dg/tm/pub-safety-1.c b/gcc/testsuite/gcc.dg/tm/pub-safety-1.c index c95111c..3841c08 100644 --- a/gcc/testsuite/gcc.dg/tm/pub-safety-1.c +++ b/gcc/testsuite/gcc.dg/tm/pub-safety-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fgnu-tm -O1 -fdump-tree-lim1" } */ +/* { dg-options "-fgnu-tm -O1 -fdump-tree-lim3" } */ /* Test that thread visible loads do not get hoisted out of loops if the load would not have occurred on each path out of the loop. */ @@ -20,4 +20,4 @@ void reader() } } -/* { dg-final { scan-tree-dump-times "Cannot hoist.*DATA_DATA because it is in a transaction" 1 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Cannot hoist.*DATA_DATA because it is in a transaction" 1 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tm/reg-promotion.c b/gcc/testsuite/gcc.dg/tm/reg-promotion.c index 0200600..e0e5f62 100644 --- a/gcc/testsuite/gcc.dg/tm/reg-promotion.c +++ b/gcc/testsuite/gcc.dg/tm/reg-promotion.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fgnu-tm -O2 -fdump-tree-lim1" } */ +/* { dg-options "-fgnu-tm -O2 -fdump-tree-lim3" } */ /* Test that `count' is not written to unless p->data>0. */ @@ -20,4 +20,4 @@ void func() } } -/* { dg-final { scan-tree-dump-times "Cannot hoist conditional load of count because it is in a transaction" 1 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Cannot hoist conditional load of count because it is in a transaction" 1 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030709-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030709-2.c index d4f42f9..5009cd6 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030709-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030709-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-dce2" } */ +/* { dg-options "-O -fdump-tree-dce3" } */ struct rtx_def; typedef struct rtx_def *rtx; @@ -42,13 +42,13 @@ get_alias_set (t) /* There should be precisely one load of ->decl.rtl. If there is more than, then the dominator optimizations failed. */ -/* { dg-final { scan-tree-dump-times "->decl\\.rtl" 1 "dce2"} } */ +/* { dg-final { scan-tree-dump-times "->decl\\.rtl" 1 "dce3"} } */ /* There should be no loads of .rtmem since the complex return statement is just "return 0". */ -/* { dg-final { scan-tree-dump-times ".rtmem" 0 "dce2"} } */ +/* { dg-final { scan-tree-dump-times ".rtmem" 0 "dce3"} } */ /* There should be one IF statement (the complex return statement should collapse down to a simple return 0 without any conditionals). */ -/* { dg-final { scan-tree-dump-times "if " 1 "dce2"} } */ +/* { dg-final { scan-tree-dump-times "if " 1 "dce3"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030731-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030731-2.c index bdb22ff..069f953 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20030731-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20030731-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dce1" } */ +/* { dg-options "-O2 -fdump-tree-dce2" } */ void foo (void); @@ -15,4 +15,4 @@ bar (int i, int partial, int args_addr) /* There should be only one IF conditional since the first does nothing useful. */ -/* { dg-final { scan-tree-dump-times "if " 1 "dce1"} } */ +/* { dg-final { scan-tree-dump-times "if " 1 "dce2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c index 6e7ffbb..812887a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dce2" } */ +/* { dg-options "-O1 -fdump-tree-dce3" } */ int foo () @@ -16,4 +16,4 @@ foo () compiler was mistakenly thinking that the statement had volatile operands. But 'p' itself is not volatile and taking the address of a volatile does not constitute a volatile operand. */ -/* { dg-final { scan-tree-dump-times "&x" 0 "dce2"} } */ +/* { dg-final { scan-tree-dump-times "&x" 0 "dce3"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c index fe220cd..1ad61f1 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-lim1-details --param allow-store-data-races=1" } */ +/* { dg-options "-O1 -fdump-tree-lim3-details --param allow-store-data-races=1" } */ float a[100]; @@ -17,4 +17,4 @@ void xxx (void) /* Store motion may be applied to the assignment to a[k], since sinf cannot read nor write the memory. */ -/* { dg-final { scan-tree-dump-times "Moving statement" 1 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Moving statement" 1 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cfgcleanup-1.c b/gcc/testsuite/gcc.dg/tree-ssa/cfgcleanup-1.c index 4d22a42..53ce973 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/cfgcleanup-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/cfgcleanup-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dce1" } */ +/* { dg-options "-O2 -fdump-tree-dce2" } */ void cleanup (int a, int b) { @@ -15,4 +15,4 @@ cleanup (int a, int b) return; } /* Dce should get rid of the initializers and cfgcleanup should elliminate ifs */ -/* { dg-final { scan-tree-dump-times "if " 0 "dce1"} } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dce2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c index 588cf4c..4cb1438 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-sccp-details" } */ +/* { dg-options "-O -fdump-tree-sccp2-details" } */ /* To determine the number of iterations in this loop we need to fold p_4 + 4B > p_4 + 8B to false. This transformation has caused @@ -15,4 +15,4 @@ int foo (int *p) return i; } -/* { dg-final { scan-tree-dump "# of iterations 1, bounded by 1" "sccp" } } */ +/* { dg-final { scan-tree-dump "# of iterations 1, bounded by 1" "sccp2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c index 9953bb5..9b69c73 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim1-details" } */ +/* { dg-options "-O2 -fdump-tree-lim3-details" } */ int x; int a[100]; @@ -42,4 +42,4 @@ void test3(struct a *A) } } -/* { dg-final { scan-tree-dump-times "Executing store motion of" 3 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of" 3 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c index 2cf4c5a..98a16fb 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim1-details" } */ +/* { dg-options "-O2 -fdump-tree-lim3-details" } */ int x; int a[100]; @@ -36,4 +36,4 @@ void test5(struct a *A, unsigned b) } } -/* { dg-final { scan-tree-dump-times "Executing store motion of" 4 "lim1" { xfail { lp64 || llp64 } } } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of" 4 "lim3" { xfail { lp64 || llp64 } } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c index 67493a5..26fb281 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim1-details" } */ +/* { dg-options "-O2 -fdump-tree-lim3-details" } */ int r[6]; @@ -17,4 +17,4 @@ void f (int n) } -/* { dg-final { scan-tree-dump-times "Executing store motion of r" 6 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of r" 6 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c index 70557c5..87d105a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim1-details" } */ +/* { dg-options "-O2 -fdump-tree-lim3-details" } */ int x; int a[100]; @@ -67,5 +67,5 @@ void test4(struct a *A, unsigned LONG b) } } /* long index not hoisted for avr target PR 36561 */ -/* { dg-final { scan-tree-dump-times "Executing store motion of" 8 "lim1" { xfail { "avr-*-*" } } } } */ -/* { dg-final { scan-tree-dump-times "Executing store motion of" 6 "lim1" { target { "avr-*-*" } } } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of" 8 "lim3" { xfail { "avr-*-*" } } } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of" 6 "lim3" { target { "avr-*-*" } } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-36.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-36.c index d922991..516cad9 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-36.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-36.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dce2" } */ +/* { dg-options "-O2 -fdump-tree-dce3" } */ struct X { float array[2]; }; @@ -18,4 +18,4 @@ float foobar () { /* The temporary structure should have been promoted to registers by FRE after the loops have been unrolled by the early unrolling pass. */ -/* { dg-final { scan-tree-dump-not "c\.array" "dce2" } } */ +/* { dg-final { scan-tree-dump-not "c\.array" "dce3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c index 53680dd..d1edbd5 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-sccp-details" } */ +/* { dg-options "-O2 -fdump-tree-sccp2-details" } */ int foo (unsigned int n) @@ -22,4 +22,4 @@ foo (unsigned int n) return r + n; } -/* { dg-final { scan-tree-dump "# of iterations \[^\n\r]*, bounded by 8" "sccp" } } */ +/* { dg-final { scan-tree-dump "# of iterations \[^\n\r]*, bounded by 8" "sccp2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c index 26fb4ec..e28e4c9 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c @@ -1,6 +1,6 @@ /* PR tree-optimization/19828 */ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-lim1-details" } */ +/* { dg-options "-O1 -fdump-tree-lim3-details" } */ int cst_fun1 (int) __attribute__((__const__)); int cst_fun2 (int) __attribute__((__const__)); @@ -31,4 +31,4 @@ int xxx (void) Calls to cst_fun2 and pure_fun2 should not be, since calling with k = 0 may be invalid. */ -/* { dg-final { scan-tree-dump-times "Moving statement" 2 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Moving statement" 2 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c index 26ea817..e8b62c2 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-vrp1 -fdump-tree-dce1 -fdelete-null-pointer-checks" } */ +/* { dg-options "-O2 -fdump-tree-vrp1 -fdump-tree-dce2 -fdelete-null-pointer-checks" } */ int foo (int *p) @@ -18,5 +18,5 @@ foo (int *p) /* Target disabling -fdelete-null-pointer-checks should not fold checks */ /* { dg-final { scan-tree-dump "Folding predicate " "vrp1" { target { ! keeps_null_pointer_checks } } } } */ /* { dg-final { scan-tree-dump-times "Folding predicate " 0 "vrp1" { target { keeps_null_pointer_checks } } } } */ -/* { dg-final { scan-tree-dump-not "b_. =" "dce1" { target { ! avr-*-* } } } } */ -/* { dg-final { scan-tree-dump "b_. =" "dce1" { target { avr-*-* } } } } */ +/* { dg-final { scan-tree-dump-not "b_. =" "dce2" { target { ! avr-*-* } } } } */ +/* { dg-final { scan-tree-dump "b_. =" "dce2" { target { avr-*-* } } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c index 8281a98..040f3ae 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -funsafe-math-optimizations -ftrapping-math -fdump-tree-recip -fdump-tree-lim1" } */ +/* { dg-options "-O2 -funsafe-math-optimizations -ftrapping-math -fdump-tree-recip -fdump-tree-lim3" } */ /* { dg-warning "-fassociative-math disabled" "" { target *-*-* } 1 } */ double F[2] = { 0., 0. }, e = 0.; @@ -29,6 +29,6 @@ int main() /* LIM only performs the transformation in the no-trapping-math case. In the future we will do it for trapping-math as well in recip, check that this is not wrongly optimized. */ -/* { dg-final { scan-tree-dump-not "reciptmp" "lim1" } } */ +/* { dg-final { scan-tree-dump-not "reciptmp" "lim3" } } */ /* { dg-final { scan-tree-dump-not "reciptmp" "recip" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c index e9e1438..a352129 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim1-details" } */ +/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim3-details" } */ void f(int * __restrict__ r, int a[__restrict__ 16][16], @@ -14,4 +14,4 @@ void f(int * __restrict__ r, /* We should apply store motion to the store to *r. */ -/* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim1" } } */ +/* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c index 6dd4c99..2e0edab 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim1-details" } */ +/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim3-details" } */ static inline __attribute__((always_inline)) void f(int * __restrict__ r, @@ -20,4 +20,4 @@ void g(int *r, int a[16][16], int b[16][16], int i, int j) /* We should apply store motion to the store to *r. */ -/* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim1" } } */ +/* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c b/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c index 5dfc7b1..ead68d0 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-sccp-scev" } */ +/* { dg-options "-O2 -fdump-tree-sccp2-scev" } */ struct struct_t { @@ -14,4 +14,4 @@ void foo (struct struct_t* sp, int start, int end) sp->data[i+start] = 0; } -/* { dg-final { scan-tree-dump-times "Simplify PEELED_CHREC into POLYNOMIAL_CHREC" 1 "sccp" } } */ +/* { dg-final { scan-tree-dump-times "Simplify PEELED_CHREC into POLYNOMIAL_CHREC" 1 "sccp2" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-1.c index 4a8c6b6..0c478d1 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-dce2" } */ +/* { dg-options "-O1 -fdump-tree-dce3" } */ int t() __attribute__ ((const)); void @@ -10,4 +10,4 @@ q() i = t(); } /* There should be no IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 0 "dce2"} } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dce3"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c index 6281a1e..b3f5073 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-dce2" } */ +/* { dg-options "-O2 -fdump-tree-dce3" } */ /* We should notice constantness of this function. */ static int __attribute__((noinline)) t(int a) @@ -13,4 +13,4 @@ void q(void) i = t(1); } /* There should be no IF conditionals. */ -/* { dg-final { scan-tree-dump-times "if " 0 "dce2"} } */ +/* { dg-final { scan-tree-dump-times "if " 0 "dce3"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c index 1b387cd..6a4b819 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim1" } */ +/* { dg-options "-O -fdump-tree-lim3" } */ /* This is a variant that does cause fold to place a cast to int before testing bit 1. */ @@ -18,4 +18,4 @@ quantum_toffoli (int control1, int control2, int target, } } -/* { dg-final { scan-tree-dump-times "1 <<" 3 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "1 <<" 3 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c index 79ea042..afa547c 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim1-details" } */ +/* { dg-options "-O2 -fdump-tree-lim3-details" } */ int *l, *r; int test_func(void) @@ -27,4 +27,4 @@ int test_func(void) return i; } -/* { dg-final { scan-tree-dump "Executing store motion of pos" "lim1" } } */ +/* { dg-final { scan-tree-dump "Executing store motion of pos" "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c index eadf71c..d55f644 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fprofile-arcs -fdump-tree-lim1-details" } */ +/* { dg-options "-O -fprofile-arcs -fdump-tree-lim3-details" } */ /* { dg-require-profiling "-fprofile-generate" } */ struct thread_param @@ -22,4 +22,4 @@ void access_buf(struct thread_param* p) } } -/* { dg-final { scan-tree-dump-times "Executing store motion of __gcov0.access_buf\\\[\[01\]\\\] from loop 1" 2 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of __gcov0.access_buf\\\[\[01\]\\\] from loop 1" 2 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c index 35f17d5..18b055f 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim1" } */ +/* { dg-options "-O -fdump-tree-lim3" } */ int a[1024]; @@ -23,4 +23,4 @@ void bar (int x, int z) } } -/* { dg-final { scan-tree-dump-times "!= 0 ? " 2 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "!= 0 ? " 2 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c index 8e72f78..9ef7bae 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim1" } */ +/* { dg-options "-O -fdump-tree-lim3" } */ /* This is a variant that doesn't cause fold to place a cast to int before testing bit 1. */ @@ -18,4 +18,4 @@ int size) } } -/* { dg-final { scan-tree-dump-times "1 <<" 3 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "1 <<" 3 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c index 2035215..dc7f41a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim1-details" } */ +/* { dg-options "-O -fdump-tree-lim3-details" } */ struct { int x; int y; } global; void foo(int n) @@ -9,5 +9,5 @@ void foo(int n) global.y += global.x*global.x; } -/* { dg-final { scan-tree-dump "Executing store motion of global.y" "lim1" } } */ -/* { dg-final { scan-tree-dump "Moving statement.*global.x.*out of loop 1" "lim1" } } */ +/* { dg-final { scan-tree-dump "Executing store motion of global.y" "lim3" } } */ +/* { dg-final { scan-tree-dump "Moving statement.*global.x.*out of loop 1" "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c index 283d206..535d627 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim1-details" } */ +/* { dg-options "-O2 -fdump-tree-lim3-details" } */ double a[16][64], y[64], x[16]; void foo(void) @@ -10,4 +10,4 @@ void foo(void) y[j] = y[j] + a[i][j] * x[i]; } -/* { dg-final { scan-tree-dump "Executing store motion of y" "lim1" } } */ +/* { dg-final { scan-tree-dump "Executing store motion of y" "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c index f9d685e..bf4e8ec 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim1-details" } */ +/* { dg-options "-O -fdump-tree-lim3-details" } */ extern const int srcshift; @@ -11,4 +11,4 @@ void foo (int *srcdata, int *dstdata) dstdata[i] = srcdata[i] << srcshift; } -/* { dg-final { scan-tree-dump "Moving statement" "lim1" } } */ +/* { dg-final { scan-tree-dump "Moving statement" "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c index aaad0f0..fb69af3 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim1-details" } */ +/* { dg-options "-O -fdump-tree-lim3-details" } */ void bar (int); void foo (int n, int m) @@ -16,4 +16,4 @@ void foo (int n, int m) } } -/* { dg-final { scan-tree-dump-times "Moving PHI node" 1 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Moving PHI node" 1 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c index 8abc2c7..9d2e817 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-lim1-details" } */ +/* { dg-options "-O -fdump-tree-lim3-details" } */ void bar (int); void foo (int n, int m) @@ -16,4 +16,4 @@ void foo (int n, int m) } } -/* { dg-final { scan-tree-dump-times "Moving PHI node" 1 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Moving PHI node" 1 "lim3" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c b/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c index 0582e26..6abcb6c 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-lim1-details" } */ +/* { dg-options "-O2 -fdump-tree-lim3-details" } */ int x; int y; struct { int x; int y; } global; int foo() { @@ -10,5 +10,5 @@ int foo() { global.y += global.x*global.x; } -/* { dg-final { scan-tree-dump-times "Executing store motion of global.y" 1 "lim1" } } */ +/* { dg-final { scan-tree-dump-times "Executing store motion of global.y" 1 "lim3" } } */ /* XXX: We should also check for the load motion of global.x, but there is no easy way to do this. */ diff --git a/gcc/testsuite/gcc.dg/vect/pr26359.c b/gcc/testsuite/gcc.dg/vect/pr26359.c index 597ee7e..5b445a9 100644 --- a/gcc/testsuite/gcc.dg/vect/pr26359.c +++ b/gcc/testsuite/gcc.dg/vect/pr26359.c @@ -1,6 +1,6 @@ /* { dg-do compile } */ /* { dg-require-effective-target vect_int } */ -/* { dg-additional-options "-fdump-tree-dce5-details" } */ +/* { dg-additional-options "-fdump-tree-dce6-details" } */ int a[256], b[256], c[256]; @@ -13,4 +13,4 @@ foo () { } } -/* { dg-final { scan-tree-dump-times "Deleting : vect_" 0 "dce5" } } */ +/* { dg-final { scan-tree-dump-times "Deleting : vect_" 0 "dce6" } } */ diff --git a/gcc/testsuite/gfortran.dg/pr32921.f b/gcc/testsuite/gfortran.dg/pr32921.f index 1c45d1e..e7264b7 100644 --- a/gcc/testsuite/gfortran.dg/pr32921.f +++ b/gcc/testsuite/gfortran.dg/pr32921.f @@ -1,5 +1,5 @@ ! { dg-do compile } -! { dg-options "-O2 -fdump-tree-lim1" } +! { dg-options "-O2 -fdump-tree-lim3" } ! gfortran -c -m32 -O2 -S junk.f ! MODULE LES3D_DATA @@ -45,4 +45,4 @@ RETURN END -! { dg-final { scan-tree-dump-times "stride" 4 "lim1" } } +! { dg-final { scan-tree-dump-times "stride" 4 "lim3" } } -- 1.9.1