diff options
| author | Martin Jambor <mjambor@suse.cz> | 2019-02-21 12:00:47 +0100 |
|---|---|---|
| committer | Martin Jambor <jamborm@gcc.gnu.org> | 2019-02-21 12:00:47 +0100 |
| commit | 031c5c8b6034cc0aced853adf7a66f1eed019549 (patch) | |
| tree | 6cbac7f13f7b1c073387e8bc78b3d7ffa656567f /gcc/omp-general.c | |
| parent | 0864e3fcb6ffbb47de637600fa5f632aa1700ed3 (diff) | |
| download | gcc-031c5c8b6034cc0aced853adf7a66f1eed019549.zip gcc-031c5c8b6034cc0aced853adf7a66f1eed019549.tar.gz gcc-031c5c8b6034cc0aced853adf7a66f1eed019549.tar.bz2 | |
[omp] Move NE_EXPR handling to omp_adjust_for_condition
2019-02-21 Martin Jambor <mjambor@suse.cz>
PR hsa/89302
* omp-general.c (omp_extract_for_data): Removed a duplicate call
to omp_adjust_for_condition, moved NE_EXPR code_cond processing...
(omp_adjust_for_condition): ...here. Added necessary parameters.
* omp-general.h (omp_adjust_for_condition): Updated declaration.
* omp-grid.c (grid_attempt_target_gridification): Adjust to pass
proper values to new parameters of omp_adjust_for_condition.
From-SVN: r269066
Diffstat (limited to 'gcc/omp-general.c')
| -rw-r--r-- | gcc/omp-general.c | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/gcc/omp-general.c b/gcc/omp-general.c index 12210c5..0f66ba0 100644 --- a/gcc/omp-general.c +++ b/gcc/omp-general.c @@ -56,18 +56,47 @@ omp_is_reference (tree decl) return lang_hooks.decls.omp_privatize_by_reference (decl); } -/* Adjust *COND_CODE and *N2 so that the former is either LT_EXPR or - GT_EXPR. */ +/* Adjust *COND_CODE and *N2 so that the former is either LT_EXPR or GT_EXPR, + given that V is the loop index variable and STEP is loop step. */ void -omp_adjust_for_condition (location_t loc, enum tree_code *cond_code, tree *n2) +omp_adjust_for_condition (location_t loc, enum tree_code *cond_code, tree *n2, + tree v, tree step) { switch (*cond_code) { case LT_EXPR: case GT_EXPR: + break; + case NE_EXPR: + gcc_assert (TREE_CODE (step) == INTEGER_CST); + if (TREE_CODE (TREE_TYPE (v)) == INTEGER_TYPE) + { + if (integer_onep (step)) + *cond_code = LT_EXPR; + else + { + gcc_assert (integer_minus_onep (step)); + *cond_code = GT_EXPR; + } + } + else + { + tree unit = TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (v))); + gcc_assert (TREE_CODE (unit) == INTEGER_CST); + if (tree_int_cst_equal (unit, step)) + *cond_code = LT_EXPR; + else + { + gcc_assert (wi::neg (wi::to_widest (unit)) + == wi::to_widest (step)); + *cond_code = GT_EXPR; + } + } + break; + case LE_EXPR: if (POINTER_TYPE_P (TREE_TYPE (*n2))) *n2 = fold_build_pointer_plus_hwi_loc (loc, *n2, 1); @@ -258,41 +287,13 @@ omp_extract_for_data (gomp_for *for_stmt, struct omp_for_data *fd, gcc_assert (loop->cond_code != NE_EXPR || (gimple_omp_for_kind (for_stmt) != GF_OMP_FOR_KIND_OACC_LOOP)); - omp_adjust_for_condition (loc, &loop->cond_code, &loop->n2); t = gimple_omp_for_incr (for_stmt, i); gcc_assert (TREE_OPERAND (t, 0) == var); loop->step = omp_get_for_step_from_incr (loc, t); - if (loop->cond_code == NE_EXPR) - { - gcc_assert (TREE_CODE (loop->step) == INTEGER_CST); - if (TREE_CODE (TREE_TYPE (loop->v)) == INTEGER_TYPE) - { - if (integer_onep (loop->step)) - loop->cond_code = LT_EXPR; - else - { - gcc_assert (integer_minus_onep (loop->step)); - loop->cond_code = GT_EXPR; - } - } - else - { - tree unit = TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (loop->v))); - gcc_assert (TREE_CODE (unit) == INTEGER_CST); - if (tree_int_cst_equal (unit, loop->step)) - loop->cond_code = LT_EXPR; - else - { - gcc_assert (wi::neg (wi::to_widest (unit)) - == wi::to_widest (loop->step)); - loop->cond_code = GT_EXPR; - } - } - } - - omp_adjust_for_condition (loc, &loop->cond_code, &loop->n2); + omp_adjust_for_condition (loc, &loop->cond_code, &loop->n2, loop->v, + loop->step); if (simd || (fd->sched_kind == OMP_CLAUSE_SCHEDULE_STATIC |