From 791929c91a53a168bb46e3cd08612eb69d5a6785 Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Mon, 30 Oct 2017 16:07:20 +0100 Subject: [PATCH] [hsa] Add missing guard in OMP gridification 2017-10-30 Martin Jambor * omp-grid.c (grid_attempt_target_gridification): Also insert a condition whether loop should be executed at all. From-SVN: r254225 --- gcc/ChangeLog | 5 +++++ gcc/omp-grid.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c690e338484..8710e29f51a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-10-30 Martin Jambor + + * omp-grid.c (grid_attempt_target_gridification): Also insert a + condition whether loop should be executed at all. + 2017-10-30 Will Schmidt * config/rs6000/rs6000.c (rs6000_gimple_fold_builtin): Add support for diff --git a/gcc/omp-grid.c b/gcc/omp-grid.c index a7b6f60aeaf..121c96ebe39 100644 --- a/gcc/omp-grid.c +++ b/gcc/omp-grid.c @@ -1315,6 +1315,7 @@ grid_attempt_target_gridification (gomp_target *target, n1 = fold_convert (itype, n1); n2 = fold_convert (itype, n2); + tree cond = fold_build2 (cond_code, boolean_type_node, n1, n2); tree step = omp_get_for_step_from_incr (loc, gimple_omp_for_incr (inner_loop, i)); @@ -1328,6 +1329,7 @@ grid_attempt_target_gridification (gomp_target *target, fold_build1 (NEGATE_EXPR, itype, step)); else t = fold_build2 (TRUNC_DIV_EXPR, itype, t, step); + t = fold_build3 (COND_EXPR, itype, cond, t, build_zero_cst (itype)); if (grid.tiling) { if (cond_code == GT_EXPR) -- 2.30.2