re PR tree-optimization/42916 ("-fcompare-debug failure" with "-O1…

re PR tree-optimization/42916 ("-fcompare-debug failure" with "-O1 -funroll-loops -ftree-vectorize")

2010-02-19  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/42916
	* tree-vect-slp.c (vect_slp_analyze_bb): Count only real
	instructions.

	* gcc.dg/pr42916.c: New testcase.

From-SVN: r156898

gcc/ChangeLog

+2010-02-19  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/42916
+	* tree-vect-slp.c (vect_slp_analyze_bb): Count only real
+	instructions.
+
 2010-02-19  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* configure.ac: Replace all uses of changequote in macro arguments

gcc/testsuite/ChangeLog

+2010-02-19  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/42916
+	* gcc.dg/pr42916.c: New testcase.
+
 2010-02-18  Jason Merrill  <jason@redhat.com>
 
 	PR c++/42837

gcc/testsuite/gcc.dg/pr42916.c

+/* { dg-do compile } */
+/* { dg-options "-O1 -funroll-loops -ftree-vectorize -fcompare-debug" } */
+
+int seed;
+
+static inline int hash(const char *str)
+{
+  int h = seed++;
+  int i = 12;
+  while (i--)
+    h += (h << 3) ^ *str++;
+  return h;
+}
+
+void f(const char *str, int *h)
+{
+  int i = 6;
+  while (i--)
+    *h++ = hash(str);
+}

gcc/tree-vect-slp.c

@@ -1273,7 +1273,13 @@ vect_slp_analyze_bb (basic_block bb)
     fprintf (vect_dump, "===vect_slp_analyze_bb===\n");
 
   for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
+    {
+      gimple stmt = gsi_stmt (gsi);
+      if (!is_gimple_debug (stmt)
+	  && !gimple_nop_p (stmt)
+	  && !gimple_code (stmt) == GIMPLE_LABEL)
 	insns++;
+    }
 
   if (insns > PARAM_VALUE (PARAM_SLP_MAX_INSNS_IN_BB))
     {