From 4192d75b251845c010da43f83c5ff6c815159dd4 Mon Sep 17 00:00:00 2001 From: Victor Kaplansky Date: Mon, 7 Aug 2006 11:28:31 +0000 Subject: re PR tree-optimization/26969 (ICE with -O1 -funswitch-loops -ftree-vectorize) ChangeLog PR tree-optimization/26969 * tree-vect-analyze.c (vect_analyze_loop_form): Add check of latch witch an empty list of PHIs. testsuite/Changelog: PR tree-optimizations/26969 * gcc.dg/vect/vect.exp: Compile tests prefixed with "unswitch-loops" with -funswitch-loops. * gcc.dg/vect/unswitch-loops-pr26969.c: New test. From-SVN: r115995 --- gcc/ChangeLog | 6 ++++-- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c | 15 +++++++++++++++ gcc/testsuite/gcc.dg/vect/vect.exp | 6 ++++++ gcc/tree-vect-analyze.c | 3 ++- 5 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c (limited to 'gcc') diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cf04b94..c147849f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,8 @@ -2006-08-06 Andreas Schwab +2006-08-07 Victor Kaplansky - * config/m68k/m68k.md (truncxfsf2): Readd. + PR tree-optimization/26969 + * tree-vect-analyze.c (vect_analyze_loop_form): Add check of latch + with an empty list of PHIs. 2006-08-06 Paolo Bonzini diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d563b73..8fdda6b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2006-08-07 Victor Kaplansky + + PR tree-optimizations/26969 + * gcc.dg/vect/vect.exp: Compile tests prefixed with + "unswitch-loops" with -funswitch-loops. + * gcc.dg/vect/unswitch-loops-pr26969.c: New test. + 2006-08-07 Eric Botcazou * gcc.dg/sparc-getcontext-1.c: Fix typo. diff --git a/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c b/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c new file mode 100644 index 0000000..b92a7fb --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c @@ -0,0 +1,15 @@ +/* { dg-do compile } */ +/* { dg-require-effective-target vect_int } */ + +void +ruby_re_compile_fastmap (char *fastmap, int options) +{ + int j; + for (j = 0; j < (1 << 8); j++) + { + if (j != '\n' || (options & 4)) + fastmap[j] = 1; + } +} + +/* { dg-final { cleanup-tree-dump "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect.exp b/gcc/testsuite/gcc.dg/vect/vect.exp index 007aa20..001c97a 100644 --- a/gcc/testsuite/gcc.dg/vect/vect.exp +++ b/gcc/testsuite/gcc.dg/vect/vect.exp @@ -133,6 +133,12 @@ lappend DEFAULT_VECTCFLAGS "-fno-section-anchors" dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/no-section-anchors-*.\[cS\]]] \ "" $DEFAULT_VECTCFLAGS +# -funswitch-loops tests +set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS +lappend DEFAULT_VECTCFLAGS "-funswitch-loops" +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/unswitch-loops-*.\[cS\]]] \ + "" $DEFAULT_VECTCFLAGS + # With -Os lappend DEFAULT_VECTCFLAGS "-Os" dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/Os-vect-*.\[cS\]]] \ diff --git a/gcc/tree-vect-analyze.c b/gcc/tree-vect-analyze.c index 9df8ba2..f247cd9 100644 --- a/gcc/tree-vect-analyze.c +++ b/gcc/tree-vect-analyze.c @@ -1889,7 +1889,8 @@ vect_analyze_loop_form (struct loop *loop) that the loop is represented as a do-while (with a proper if-guard before the loop if needed), where the loop header contains all the executable statements, and the latch is empty. */ - if (!empty_block_p (loop->latch)) + if (!empty_block_p (loop->latch) + || phi_nodes (loop->latch)) { if (vect_print_dump_info (REPORT_BAD_FORM_LOOPS)) fprintf (vect_dump, "not vectorized: unexpected loop form."); -- cgit v1.1