[llvm-branch-commits] [openmp] r338726 - Merging r338720:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug  2 07:59:17 2018
New Revision: 338726

URL: http://llvm.org/viewvc/llvm-project?rev=338726&view=rev
Log:
Merging r338720:
------------------------------------------------------------------------
r338720 | hahnfeld | 2018-08-02 16:34:03 +0200 (Thu, 02 Aug 2018) | 6 lines

[tests] Add annotations for taskloop features

Only supported since GCC 6 and Intel 17.0. However GCC 6.3.0 is
crashing on two of the tests, so disable them as well...

Differential Revision: https://reviews.llvm.org/D50085
------------------------------------------------------------------------

Modified:
    openmp/branches/release_70/   (props changed)
    openmp/branches/release_70/runtime/test/ompt/tasks/taskloop.c
    openmp/branches/release_70/runtime/test/tasking/omp_taskloop_grainsize.c
    openmp/branches/release_70/runtime/test/tasking/omp_taskloop_num_tasks.c

Propchange: openmp/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  2 07:59:17 2018
@@ -1 +1 @@
-/openmp/trunk:338580
+/openmp/trunk:338580,338720

Modified: openmp/branches/release_70/runtime/test/ompt/tasks/taskloop.c
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_70/runtime/test/ompt/tasks/taskloop.c?rev=338726&r1=338725&r2=338726&view=diff
==============================================================================
--- openmp/branches/release_70/runtime/test/ompt/tasks/taskloop.c (original)
+++ openmp/branches/release_70/runtime/test/ompt/tasks/taskloop.c Thu Aug  2 07:59:17 2018
@@ -1,6 +1,12 @@
 // RUN: %libomp-compile-and-run | FileCheck %s
 // RUN: %libomp-compile-and-run | FileCheck --check-prefix=TASKS %s
 // REQUIRES: ompt
+
+// These compilers don't support the taskloop construct
+// UNSUPPORTED: gcc-4, gcc-5, icc-16
+// GCC 6 has support for taskloops, but at least 6.3.0 is crashing on this test
+// UNSUPPORTED: gcc-6
+
 #include "callback.h"
 #include <omp.h>
 

Modified: openmp/branches/release_70/runtime/test/tasking/omp_taskloop_grainsize.c
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_70/runtime/test/tasking/omp_taskloop_grainsize.c?rev=338726&r1=338725&r2=338726&view=diff
==============================================================================
--- openmp/branches/release_70/runtime/test/tasking/omp_taskloop_grainsize.c (original)
+++ openmp/branches/release_70/runtime/test/tasking/omp_taskloop_grainsize.c Thu Aug  2 07:59:17 2018
@@ -1,5 +1,11 @@
 // RUN: %libomp-compile-and-run
 // RUN: %libomp-compile && env KMP_TASKLOOP_MIN_TASKS=1 %libomp-run
+
+// These compilers don't support the taskloop construct
+// UNSUPPORTED: gcc-4, gcc-5, icc-16
+// GCC 6 has support for taskloops, but at least 6.3.0 is crashing on this test
+// UNSUPPORTED: gcc-6
+
 /*
  * Test for taskloop
  * Method: caculate how many times the iteration space is dispatched

Modified: openmp/branches/release_70/runtime/test/tasking/omp_taskloop_num_tasks.c
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_70/runtime/test/tasking/omp_taskloop_num_tasks.c?rev=338726&r1=338725&r2=338726&view=diff
==============================================================================
--- openmp/branches/release_70/runtime/test/tasking/omp_taskloop_num_tasks.c (original)
+++ openmp/branches/release_70/runtime/test/tasking/omp_taskloop_num_tasks.c Thu Aug  2 07:59:17 2018
@@ -1,5 +1,9 @@
 // RUN: %libomp-compile-and-run
 // RUN: %libomp-compile && env KMP_TASKLOOP_MIN_TASKS=1 %libomp-run
+
+// These compilers don't support the taskloop construct
+// UNSUPPORTED: gcc-4, gcc-5, icc-16
+
 /*
  * Test for taskloop
  * Method: caculate how many times the iteration space is dispatched