diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-07-17 09:13:52 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-07-17 09:13:52 +0200 |
| commit | dfa6e5b43b9a801973f5c8be21e158586beb8056 (patch) | |
| tree | 4d2e3b172e075283f702e5c5aa65409c28b3101c /gcc/omp-grid.c | |
| parent | 7eb5baff994b249c0fb5d913e6f7afa7b9fbbc63 (diff) | |
| download | gcc-dfa6e5b43b9a801973f5c8be21e158586beb8056.zip gcc-dfa6e5b43b9a801973f5c8be21e158586beb8056.tar.gz gcc-dfa6e5b43b9a801973f5c8be21e158586beb8056.tar.bz2 | |
gimple.h (enum gf_mask): Remove GF_OMP_FOR_SIMD...
* gimple.h (enum gf_mask): Remove GF_OMP_FOR_SIMD, change
GF_OMP_FOR_KIND_SIMD to a value serially after other kinds,
divide GF_OMP_FOR_KIND_MASK, GF_OMP_FOR_COMBINED,
GF_OMP_FOR_COMBINED_INTO, GF_OMP_FOR_GRID_PHONY,
GF_OMP_FOR_GRID_INTRA_GROUP and GF_OMP_FOR_GRID_GROUP_ITER by two.
* omp-grid.c (grid_process_grid_body,
grid_eliminate_combined_simd_part): Use GF_OMP_FOR_KIND_SIMD instead
of GF_OMP_FOR_SIMD, don't test & GF_OMP_FOR_SIMD but
== GF_OMP_FOR_KIND_SIMD.
* omp-low.c (build_outer_var_ref, scan_sharing_clauses,
check_omp_nesting_restrictions, scan_omp_1_stmt,
lower_rec_input_clauses, lower_lastprivate_conditional_clauses,
lower_lastprivate_clauses, lower_reduction_clauses, lower_omp_scan,
omp_find_scan): Likewise.
* omp-expand.c (expand_omp_for): Likewise.
* omp-general.c (omp_extract_for_data): Likewise.
From-SVN: r273544
Diffstat (limited to 'gcc/omp-grid.c')
| -rw-r--r-- | gcc/omp-grid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/omp-grid.c b/gcc/omp-grid.c index 898d73f..e7e18aa 100644 --- a/gcc/omp-grid.c +++ b/gcc/omp-grid.c @@ -1002,7 +1002,7 @@ grid_process_grid_body (gimple_stmt_iterator *gsi, bool *handled_ops_p, *handled_ops_p = false; gimple *stmt = gsi_stmt (*gsi); if (gimple_code (stmt) == GIMPLE_OMP_FOR - && (gimple_omp_for_kind (stmt) & GF_OMP_FOR_SIMD)) + && gimple_omp_for_kind (stmt) == GF_OMP_FOR_KIND_SIMD) { gomp_for *loop = as_a <gomp_for *> (stmt); tree clauses = gimple_omp_for_clauses (loop); @@ -1030,14 +1030,14 @@ grid_eliminate_combined_simd_part (gomp_for *parloop) memset (&wi, 0, sizeof (wi)); wi.val_only = true; - enum gf_mask msk = GF_OMP_FOR_SIMD; + enum gf_mask msk = GF_OMP_FOR_KIND_SIMD; wi.info = (void *) &msk; walk_gimple_seq (gimple_omp_body (parloop), omp_find_combined_for, NULL, &wi); gimple *stmt = (gimple *) wi.info; /* We expect that the SIMD id the only statement in the parallel loop. */ gcc_assert (stmt && gimple_code (stmt) == GIMPLE_OMP_FOR - && (gimple_omp_for_kind (stmt) == GF_OMP_FOR_SIMD) + && (gimple_omp_for_kind (stmt) == GF_OMP_FOR_KIND_SIMD) && gimple_omp_for_combined_into_p (stmt) && !gimple_omp_for_combined_p (stmt)); gomp_for *simd = as_a <gomp_for *> (stmt); |