I've committed this as obvious. There were a couple of bits of now-redundant
code I'd missed in my recent merge to trunk.
nathan
2015-10-28 Nathan Sidwell <nat...@codesourcery.com>
* omp-low.c (MASK_GANG, MASK_WORKER, MASK_VECTOR): Delete.
(extract_omp_for_data): Remove OpenACC special handling of
chunking.
Index: gcc/omp-low.c
===================================================================
--- gcc/omp-low.c (revision 229488)
+++ gcc/omp-low.c (working copy)
@@ -137,12 +137,6 @@ struct omp_region
gomp_ordered *ord_stmt;
};
-/* Levels of parallelism as defined by OpenACC. Increasing numbers
- correspond to deeper loop nesting levels. */
-#define MASK_GANG 1
-#define MASK_WORKER 2
-#define MASK_VECTOR 4
-
/* Context structure. Used to store information about each parallel
directive in the code. */
@@ -840,15 +834,6 @@ extract_omp_for_data (gomp_for *for_stmt
}
else if (loops)
loops[0] = fd->loop;
-
- /* For OpenACC loops, force a chunk size of one, as this avoids the default
- scheduling where several subsequent iterations are being executed by the
- same thread. */
- if (gimple_omp_for_kind (for_stmt) == GF_OMP_FOR_KIND_OACC_LOOP)
- {
- gcc_assert (fd->chunk_size == NULL_TREE);
- fd->chunk_size = build_int_cst (TREE_TYPE (fd->loop.v), 1);
- }
}
