[OpenMP] Temporarily disable failing runtime tests for OpenMP 5.0

[saiislam]

Summary

Following tests are failing after upgrading to version 5.0 but are passing
for version 4.5:

1. openmp/runtime/test/env/kmp_set_dispatch_buf.c
2. openmp/runtime/test/worksharing/for/kmp_set_dispatch_buf.c

To be enabled as soon as these tests are fixed.

[ABataev]

openmp/runtime/test/env/kmp_set_dispatch_buf.c

0–1

This flag is not supported neither by gcc, nor by ice. Maybe, better to mark these tests as expected failed with clang-11?

[ABataev]

openmp/runtime/test/env/kmp_set_dispatch_buf.c

0–1

Or even better to mark these tests as unsupported by clang-11, because in some configs these tests pass.

[saiislam]

openmp/runtime/test/env/kmp_set_dispatch_buf.c

0–1

Ok. How do I mark it unsupported for clang-11 only? The test gets called with "clang" which is a symlink to clang-11, but lit doesn't recognize the symlink.

[saiislam]

1. Added clang version identification in openmp/runtime/test
2. Marked these three tests as unsupported for clang-11
3. Refactored test lines to pass clang-format

[ABataev]

openmp/runtime/test/lit.cfg

110–119

I thought we already have such processing for clang, no? Many tests are marked as UNSUPPORTED for some particular clang version already.

[Hahnfeld]

openmp/runtime/test/lit.cfg

110–119

openmp/cmake/OpenMPTesting.cmake extracts the compiler version and the features are added via config.test_compiler_features above.

[protze.joachim]

I think D82267 should fix the issue for dependence.c

[saiislam]

Thanks @Hahnfeld. I realized that LLVM_MAJOR_VERSION was neither getting set in OpenMPTesting.cmake nor was it
inheriting it from anywhere else. So, OPENMP_TEST_COMPILER_VERSION_MAJOR was also getting set as empty, which
was getting propagated to lit by config.test_compiler_features. That is why "clang-11" was not getting recognized
as a valid target by lit-unsupported (though clang-11.0.0 would have worked). This change should fix this issue.

Thanks @protze.joachim. I have removed dependences.c from this patch and will wait for D82267 to land.

[protze.joachim]

Does clang-11 now default to 50 behavior?
In this case, we can remove -fopenmp-version=50 from the tests, right?

[Hahnfeld]

In D82963#2128507, @saiislam wrote:

Thanks @Hahnfeld. I realized that LLVM_MAJOR_VERSION was neither getting set in OpenMPTesting.cmake nor was it
inheriting it from anywhere else. So, OPENMP_TEST_COMPILER_VERSION_MAJOR was also getting set as empty, which
was getting propagated to lit by config.test_compiler_features. That is why "clang-11" was not getting recognized
as a valid target by lit-unsupported (though clang-11.0.0 would have worked). This change should fix this issue.

That's because the variable is called LLVM_VERSION_MAJOR (and it's been wrong since I added that code in 2017). I went ahead and fixed that mistake in https://github.com/llvm/llvm-project/commit/0e0483bf5c383d5815b9f945fea7e347d4badc0e. You shouldn't have to deal with broken infrastructure in this patch :)

[saiislam]

In D82963#2128607, @protze.joachim wrote:

Does clang-11 now default to 50 behavior?
In this case, we can remove -fopenmp-version=50 from the tests, right?

Yes, it now defaults to 50 behavior and -fopenmp-version=50 can be removed.
I am working on a follow up patch (D82575) to add tests without version string.

[saiislam]

In D82963#2128679, @Hahnfeld wrote:

In D82963#2128507, @saiislam wrote:

Thanks @Hahnfeld. I realized that LLVM_MAJOR_VERSION was neither getting set in OpenMPTesting.cmake nor was it
inheriting it from anywhere else. So, OPENMP_TEST_COMPILER_VERSION_MAJOR was also getting set as empty, which
was getting propagated to lit by config.test_compiler_features. That is why "clang-11" was not getting recognized
as a valid target by lit-unsupported (though clang-11.0.0 would have worked). This change should fix this issue.

That's because the variable is called LLVM_VERSION_MAJOR (and it's been wrong since I added that code in 2017). I went ahead and fixed that mistake in https://github.com/llvm/llvm-project/commit/0e0483bf5c383d5815b9f945fea7e347d4badc0e. You shouldn't have to deal with broken infrastructure in this patch :)

Oh wow. So ultimately something good came out of it :-)
Thank you! I will update my patch in a few minutes.

[saiislam]

Removed fix for OpenMPTesting.cmake bug.

[ABataev]

LG

openmp/runtime/test/env/kmp_set_dispatch_buf.c

-// RUN: %libomp-compile && env KMP_DISP_NUM_BUFFERS=0 %libomp-run
-// RUN: env KMP_DISP_NUM_BUFFERS=1 %libomp-run && env KMP_DISP_NUM_BUFFERS=3 %libomp-run
-// RUN: env KMP_DISP_NUM_BUFFERS=4 %libomp-run && env KMP_DISP_NUM_BUFFERS=7 %libomp-run
-// RUN: %libomp-compile -DMY_SCHEDULE=guided && env KMP_DISP_NUM_BUFFERS=1 %libomp-run
-// RUN: env KMP_DISP_NUM_BUFFERS=3 %libomp-run && env KMP_DISP_NUM_BUFFERS=4 %libomp-run
+// RUN: %libomp-compile
+// RUN: env KMP_DISP_NUM_BUFFERS=0 %libomp-run
+// RUN: env KMP_DISP_NUM_BUFFERS=1 %libomp-run
+// RUN: env KMP_DISP_NUM_BUFFERS=3 %libomp-run
+// RUN: env KMP_DISP_NUM_BUFFERS=4 %libomp-run
 // RUN: env KMP_DISP_NUM_BUFFERS=7 %libomp-run
+// RUN: %libomp-compile -DMY_SCHEDULE=guided
+// RUN: env KMP_DISP_NUM_BUFFERS=1 %libomp-run
+// RUN: env KMP_DISP_NUM_BUFFERS=3 %libomp-run
+// RUN: env KMP_DISP_NUM_BUFFERS=4 %libomp-run
+// RUN: env KMP_DISP_NUM_BUFFERS=7 %libomp-run
+// UNSUPPORTED: clang-11
 #include <stdio.h>
 #include <omp.h>
 #include <stdlib.h>
 #include <limits.h>
 #include "omp_testsuite.h"
 
 #define INCR 7
 #define MY_MAX 200

openmp/runtime/test/lit.cfg

 
 import multiprocessing
 try:
     if multiprocessing.cpu_count() > 1:
         config.available_features.add('multicpu')
 except NotImplementedError:
     pass
 
 # to run with icc INTEL_LICENSE_FILE must be set
 if 'INTEL_LICENSE_FILE' in os.environ:
     config.environment['INTEL_LICENSE_FILE'] = os.environ['INTEL_LICENSE_FILE']
 
-
 # substitutions
 config.substitutions.append(("%libomp-compile-and-run", \
     "%libomp-compile && %libomp-run"))
 config.substitutions.append(("%libomp-cxx-compile-and-run", \
     "%libomp-cxx-compile && %libomp-run"))
 config.substitutions.append(("%libomp-cxx-compile", \
     "%clangXX %openmp_flags %flags -std=c++14 %s -o %t" + libs))
 config.substitutions.append(("%libomp-compile", \
     "%clang %openmp_flags %flags %s -o %t" + libs))
 config.substitutions.append(("%libomp-run", "%t"))
 config.substitutions.append(("%clangXX", config.test_cxx_compiler))
 config.substitutions.append(("%clang", config.test_c_compiler))
 config.substitutions.append(("%openmp_flags", config.test_openmp_flags))
 config.substitutions.append(("%flags", config.test_flags))

openmp/runtime/test/worksharing/for/kmp_set_dispatch_buf.c

 // RUN: %libomp-compile && %libomp-run 7
 // RUN: %libomp-run 0 && %libomp-run -1
 // RUN: %libomp-run 1 && %libomp-run 2 && %libomp-run 5
 // RUN: %libomp-compile -DMY_SCHEDULE=guided && %libomp-run 7
 // RUN: %libomp-run 1 && %libomp-run 2 && %libomp-run 5
+// UNSUPPORTED: clang-11
 #include <stdio.h>
 #include <omp.h>
 #include <stdlib.h>
 #include <limits.h>
 #include "omp_testsuite.h"
 
 #define INCR 7
 #define MY_MAX 200