diff options
26 files changed, 32 insertions, 7 deletions
diff --git a/openmp/cmake/OpenMPTesting.cmake b/openmp/cmake/OpenMPTesting.cmake index 9092ffbb6cf..1cff9ec8a9d 100644 --- a/openmp/cmake/OpenMPTesting.cmake +++ b/openmp/cmake/OpenMPTesting.cmake @@ -124,6 +124,8 @@ endif() function(set_test_compiler_features) if ("${OPENMP_TEST_COMPILER_ID}" STREQUAL "GNU") set(comp "gcc") + elseif ("${OPENMP_TEST_COMPILER_ID}" STREQUAL "Intel") + set(comp "icc") else() # Just use the lowercase of the compiler ID as fallback. string(TOLOWER "${OPENMP_TEST_COMPILER_ID}" comp) diff --git a/openmp/runtime/test/ompt/cancel/cancel_taskgroup.c b/openmp/runtime/test/ompt/cancel/cancel_taskgroup.c index 28558f85fb3..803fa9739bd 100644 --- a/openmp/runtime/test/ompt/cancel/cancel_taskgroup.c +++ b/openmp/runtime/test/ompt/cancel/cancel_taskgroup.c @@ -1,7 +1,8 @@ // RUN: %libomp-compile && env OMP_CANCELLATION=true %libomp-run | %sort-threads | FileCheck %s // REQUIRES: ompt -// Current GOMP interface implementation does not support cancellation -// XFAIL: gcc +// UNSUPPORTED: clang-3, clang-4.0.0 +// Current GOMP interface implementation does not support cancellation; icc 16 has a bug +// XFAIL: gcc, icc-16 #include "callback.h" #include <unistd.h> diff --git a/openmp/runtime/test/ompt/cancel/cancel_worksharing.c b/openmp/runtime/test/ompt/cancel/cancel_worksharing.c index 41073362a3a..db3b16864a1 100644 --- a/openmp/runtime/test/ompt/cancel/cancel_worksharing.c +++ b/openmp/runtime/test/ompt/cancel/cancel_worksharing.c @@ -1,8 +1,7 @@ // RUN: %libomp-compile && env OMP_CANCELLATION=true %libomp-run | %sort-threads | FileCheck %s // REQUIRES: ompt -// Current GOMP interface implementation does not support cancellation -// XFAIL: gcc - +// Current GOMP interface implementation does not support cancellation; icc 16 does not distinguish between sections and loops +// XFAIL: gcc, icc-16 #include "callback.h" #include <unistd.h> diff --git a/openmp/runtime/test/ompt/misc/control_tool.c b/openmp/runtime/test/ompt/misc/control_tool.c index 7fc4f023a36..f16da193e43 100644 --- a/openmp/runtime/test/ompt/misc/control_tool.c +++ b/openmp/runtime/test/ompt/misc/control_tool.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/parallel/max_active_levels_serialized.c b/openmp/runtime/test/ompt/parallel/max_active_levels_serialized.c index 6b45354acd8..bbe73efa76f 100644 --- a/openmp/runtime/test/ompt/parallel/max_active_levels_serialized.c +++ b/openmp/runtime/test/ompt/parallel/max_active_levels_serialized.c @@ -1,6 +1,7 @@ // RUN: %libomp-compile-and-run | FileCheck %s // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=THREADS %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/parallel/nested.c b/openmp/runtime/test/ompt/parallel/nested.c index d128e8021c6..badfafeb33f 100644 --- a/openmp/runtime/test/ompt/parallel/nested.c +++ b/openmp/runtime/test/ompt/parallel/nested.c @@ -1,6 +1,7 @@ // RUN: %libomp-compile-and-run | FileCheck %s // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=THREADS %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> #include <unistd.h> diff --git a/openmp/runtime/test/ompt/parallel/nested_lwt.c b/openmp/runtime/test/ompt/parallel/nested_lwt.c index b3327c2de66..41ed30df2ae 100644 --- a/openmp/runtime/test/ompt/parallel/nested_lwt.c +++ b/openmp/runtime/test/ompt/parallel/nested_lwt.c @@ -1,6 +1,7 @@ // RUN: %libomp-compile-and-run | FileCheck %s // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=THREADS %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> #include <unistd.h> diff --git a/openmp/runtime/test/ompt/parallel/nested_serialized.c b/openmp/runtime/test/ompt/parallel/nested_serialized.c index e55eb2e8b33..f87b8f48aa5 100644 --- a/openmp/runtime/test/ompt/parallel/nested_serialized.c +++ b/openmp/runtime/test/ompt/parallel/nested_serialized.c @@ -1,6 +1,7 @@ // RUN: %libomp-compile-and-run | FileCheck %s // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=THREADS %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/parallel/parallel_if0.c b/openmp/runtime/test/ompt/parallel/parallel_if0.c index 8827448b3fb..f5c44542efc 100644 --- a/openmp/runtime/test/ompt/parallel/parallel_if0.c +++ b/openmp/runtime/test/ompt/parallel/parallel_if0.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" int main() diff --git a/openmp/runtime/test/ompt/parallel/serialized.c b/openmp/runtime/test/ompt/parallel/serialized.c index 55bf98fee7c..e7a9207170b 100644 --- a/openmp/runtime/test/ompt/parallel/serialized.c +++ b/openmp/runtime/test/ompt/parallel/serialized.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" int main() diff --git a/openmp/runtime/test/ompt/synchronization/barrier/explicit.c b/openmp/runtime/test/ompt/synchronization/barrier/explicit.c index 4def7f83931..d60acd62311 100644 --- a/openmp/runtime/test/ompt/synchronization/barrier/explicit.c +++ b/openmp/runtime/test/ompt/synchronization/barrier/explicit.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/synchronization/barrier/for_loop.c b/openmp/runtime/test/ompt/synchronization/barrier/for_loop.c index 0e3abc59086..52594478e1f 100644 --- a/openmp/runtime/test/ompt/synchronization/barrier/for_loop.c +++ b/openmp/runtime/test/ompt/synchronization/barrier/for_loop.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/synchronization/barrier/for_simd.c b/openmp/runtime/test/ompt/synchronization/barrier/for_simd.c index 376a435c04e..351b2c23b8c 100644 --- a/openmp/runtime/test/ompt/synchronization/barrier/for_simd.c +++ b/openmp/runtime/test/ompt/synchronization/barrier/for_simd.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | FileCheck %s // REQUIRES: ompt +// XFAIL: gcc-4 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/synchronization/barrier/single.c b/openmp/runtime/test/ompt/synchronization/barrier/single.c index 4b928ff16ef..8ba8b5211b1 100644 --- a/openmp/runtime/test/ompt/synchronization/barrier/single.c +++ b/openmp/runtime/test/ompt/synchronization/barrier/single.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/synchronization/critical.c b/openmp/runtime/test/ompt/synchronization/critical.c index 7787ede9ac6..ed982b77138 100644 --- a/openmp/runtime/test/ompt/synchronization/critical.c +++ b/openmp/runtime/test/ompt/synchronization/critical.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/synchronization/ordered.c b/openmp/runtime/test/ompt/synchronization/ordered.c index 1d498b9e122..14284a48c25 100644 --- a/openmp/runtime/test/ompt/synchronization/ordered.c +++ b/openmp/runtime/test/ompt/synchronization/ordered.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/synchronization/taskgroup.c b/openmp/runtime/test/ompt/synchronization/taskgroup.c index a85bf205991..7309c0ad5b2 100644 --- a/openmp/runtime/test/ompt/synchronization/taskgroup.c +++ b/openmp/runtime/test/ompt/synchronization/taskgroup.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <unistd.h> diff --git a/openmp/runtime/test/ompt/synchronization/taskwait.c b/openmp/runtime/test/ompt/synchronization/taskwait.c index 3e319ff8229..c4310246b7e 100644 --- a/openmp/runtime/test/ompt/synchronization/taskwait.c +++ b/openmp/runtime/test/ompt/synchronization/taskwait.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/synchronization/test_nest_lock_parallel.c b/openmp/runtime/test/ompt/synchronization/test_nest_lock_parallel.c index 0e1dcece8c1..a34aba5b962 100644 --- a/openmp/runtime/test/ompt/synchronization/test_nest_lock_parallel.c +++ b/openmp/runtime/test/ompt/synchronization/test_nest_lock_parallel.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/tasks/dependences.c b/openmp/runtime/test/ompt/tasks/dependences.c index 32817c4e2dd..69429ccaa54 100644 --- a/openmp/runtime/test/ompt/tasks/dependences.c +++ b/openmp/runtime/test/ompt/tasks/dependences.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/tasks/explicit_task.c b/openmp/runtime/test/ompt/tasks/explicit_task.c index 491192426ec..6ffad3ef45f 100644 --- a/openmp/runtime/test/ompt/tasks/explicit_task.c +++ b/openmp/runtime/test/ompt/tasks/explicit_task.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> diff --git a/openmp/runtime/test/ompt/tasks/serialized.c b/openmp/runtime/test/ompt/tasks/serialized.c index 1fb6f066481..d464c5da58b 100644 --- a/openmp/runtime/test/ompt/tasks/serialized.c +++ b/openmp/runtime/test/ompt/tasks/serialized.c @@ -1,5 +1,6 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #include "callback.h" #include <omp.h> #include <math.h> diff --git a/openmp/runtime/test/ompt/worksharing/for/dynamic_split.c b/openmp/runtime/test/ompt/worksharing/for/dynamic_split.c index 3886f71319e..cf149711296 100644 --- a/openmp/runtime/test/ompt/worksharing/for/dynamic_split.c +++ b/openmp/runtime/test/ompt/worksharing/for/dynamic_split.c @@ -1,6 +1,7 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %S/base_split.h // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=CHECK-LOOP %S/base_split.h // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #define SCHEDULE dynamic #include "base_split.h" diff --git a/openmp/runtime/test/ompt/worksharing/for/guided_split.c b/openmp/runtime/test/ompt/worksharing/for/guided_split.c index aaefbb31d86..7d560c2b3bd 100644 --- a/openmp/runtime/test/ompt/worksharing/for/guided_split.c +++ b/openmp/runtime/test/ompt/worksharing/for/guided_split.c @@ -1,6 +1,7 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %S/base_split.h // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=CHECK-LOOP %S/base_split.h // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #define SCHEDULE guided #include "base_split.h" diff --git a/openmp/runtime/test/ompt/worksharing/for/runtime_split.c b/openmp/runtime/test/ompt/worksharing/for/runtime_split.c index 032353e4127..7a677edbfd0 100644 --- a/openmp/runtime/test/ompt/worksharing/for/runtime_split.c +++ b/openmp/runtime/test/ompt/worksharing/for/runtime_split.c @@ -1,6 +1,7 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %S/base_split.h // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=CHECK-LOOP %S/base_split.h // REQUIRES: ompt +// UNSUPPORTED: gcc-4, gcc-5, gcc-6, gcc-7 #define SCHEDULE runtime #include "base_split.h" diff --git a/openmp/runtime/test/ompt/worksharing/sections.c b/openmp/runtime/test/ompt/worksharing/sections.c index 43656de9c85..bafb74312ff 100644 --- a/openmp/runtime/test/ompt/worksharing/sections.c +++ b/openmp/runtime/test/ompt/worksharing/sections.c @@ -1,7 +1,8 @@ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s // REQUIRES: ompt -// GCC generates code that does not distinguish between sections and loops -// XFAIL: gcc +// Some compilers generate code that does not distinguish between sections and loops +// XFAIL: gcc, clang-3, clang-4, clang-5, icc-16, icc-17 +// UNSUPPORTED: icc-18 #include "callback.h" #include <omp.h> |
