omp-low.c (MASK_GANG, [...]): Delete.

	* omp-low.c (MASK_GANG, MASK_WORKER, MASK_VECTOR): Delete.
	(extract_omp_for_data): Remove OpenACC special handling of
	chunking.

From-SVN: r229499

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 707ae2dc73fdf07c2645dd8e4cdc33ae1670e26d..bc863ce1025134d0ed7c4893807558dc56c9917e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2015-10-28  Nathan Sidwell  <nathan@codesourcery.com>
 
+       * omp-low.c (MASK_GANG, MASK_WORKER, MASK_VECTOR): Delete.
+       (extract_omp_for_data): Remove OpenACC special handling of
+       chunking.
+
        * config/nvptx/nvptx.c (nvptx_print_operand): Remove 'd' case.
        (struct parallel): Update comment.
        (nvptx_reorg): Likewise.

diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index c4411669c4686f998ac2ef9d56d56e7a2a8c2e29..6fe71c7453c3a41e08ccc051af0605ef4344ae6e 100644 (file)
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -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, struct omp_for_data *fd,
     }
   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);
-    }
 }