diff mbox series

[committed] Fix OpenMP simd expansion ICE (PR middle-end/81768)

Message ID 20170905213646.GI2323@tucnak
State New
Headers show
Series [committed] Fix OpenMP simd expansion ICE (PR middle-end/81768) | expand

Commit Message

Jakub Jelinek Sept. 5, 2017, 9:36 p.m. UTC 
Hi!

On the following testcase when trying to gimplify a COND_EXPR that we expect
to stay a COND_EXPR in GIMPLE, the gimplifier actually produces code with
branches and labels, which is of course invalid inside of a bb.  The reason
for that is that a former global VAR_DECL is being replaced through
DECL_VALUE_EXPR with a target mapping thereof and so is considered as
potentially trapping.  Fixed by pre-gimplifying the operand. 
Bootstrapped/regtested on x86_64-linux and i686-linux, committed so far to
trunk.

2017-09-05  Jakub Jelinek  <jakub@redhat.com>

	PR middle-end/81768
	* omp-expand.c (expand_omp_simd): Force second operands of COND_EXPR
	into gimple val before gimplification fo the COND_EXPR.

	* gcc.dg/gomp/pr81768-1.c: New test.


	Jakub
diff mbox series

Patch

--- gcc/omp-expand.c.jj	2017-09-01 09:26:27.000000000 +0200
+++ gcc/omp-expand.c	2017-09-05 13:13:49.303159003 +0200
@@ -4730,24 +4730,28 @@  expand_omp_simd (struct omp_region *regi
 	      tree itype2 = TREE_TYPE (fd->loops[i - 1].v);
 	      if (POINTER_TYPE_P (itype2))
 		itype2 = signed_type_for (itype2);
+	      t = fold_convert (itype2, fd->loops[i - 1].step);
+	      t = force_gimple_operand_gsi (&gsi, t, true, NULL_TREE, true,
+					    GSI_SAME_STMT);
 	      t = build3 (COND_EXPR, itype2,
 			  build2 (fd->loops[i].cond_code, boolean_type_node,
 				  fd->loops[i].v,
 				  fold_convert (itype, fd->loops[i].n2)),
-			  build_int_cst (itype2, 0),
-			  fold_convert (itype2, fd->loops[i - 1].step));
+			  build_int_cst (itype2, 0), t);
 	      if (POINTER_TYPE_P (TREE_TYPE (fd->loops[i - 1].v)))
 		t = fold_build_pointer_plus (fd->loops[i - 1].v, t);
 	      else
 		t = fold_build2 (PLUS_EXPR, itype2, fd->loops[i - 1].v, t);
 	      expand_omp_build_assign (&gsi, fd->loops[i - 1].v, t);
 
+	      t = fold_convert (itype, fd->loops[i].n1);
+	      t = force_gimple_operand_gsi (&gsi, t, true, NULL_TREE, true,
+					    GSI_SAME_STMT);
 	      t = build3 (COND_EXPR, itype,
 			  build2 (fd->loops[i].cond_code, boolean_type_node,
 				  fd->loops[i].v,
 				  fold_convert (itype, fd->loops[i].n2)),
-			  fd->loops[i].v,
-			  fold_convert (itype, fd->loops[i].n1));
+			  fd->loops[i].v, t);
 	      expand_omp_build_assign (&gsi, fd->loops[i].v, t);
 	    }
 	}
--- gcc/testsuite/gcc.dg/gomp/pr81768-1.c.jj	2017-09-05 13:59:57.821977911 +0200
+++ gcc/testsuite/gcc.dg/gomp/pr81768-1.c	2017-09-05 13:50:24.000000000 +0200
@@ -0,0 +1,15 @@ 
+/* PR middle-end/81768 */
+/* { dg-do compile } */
+
+float b[10][15][10];
+
+void
+foo (void)
+{
+  float *i;
+#pragma omp target parallel for simd schedule(static, 32) collapse(3)
+  for (i = &b[0][0][0]; i < &b[0][0][10]; i++)
+    for (float *j = &b[0][15][0]; j > &b[0][0][0]; j -= 10)
+      for (float *k = &b[0][0][10]; k > &b[0][0][0]; --k)
+	b[i - &b[0][0][0]][(j - &b[0][0][0]) / 10 - 1][(k - &b[0][0][0]) - 1] -= 3.5;
+}