Skip to content

Commit 5611bf6

Browse files
committed
Revert "[openmp] [test] XFAIL many-microtask-args.c on ARM"
This reverts commit 03bf001. This commit broke a number of OpenMP buildbots, e.g. https://lab.llvm.org/buildbot#builders/84/builds/31839, where the build ends up with errors like this: [0/1] Running OpenMP tests llvm-lit: /b/1/openmp-clang-x86_64-linux-debian/llvm.src/llvm/utils/lit/lit/TestingConfig.py:140: fatal: unable to parse config file '/b/1/openmp-clang-x86_64-linux-debian/llvm.build/projects/openmp/libomptarget/test/x86_64-pc-linux-gnu/lit.site.cfg', traceback: Traceback (most recent call last): File "/b/1/openmp-clang-x86_64-linux-debian/llvm.src/llvm/utils/lit/lit/TestingConfig.py", line 129, in load_from_path exec(compile(data, path, 'exec'), cfg_globals, None) File "/b/1/openmp-clang-x86_64-linux-debian/llvm.build/projects/openmp/libomptarget/test/x86_64-pc-linux-gnu/lit.site.cfg", line 6 config.test_compiler_features = ^ SyntaxError: invalid syntax
1 parent 322966f commit 5611bf6

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

openmp/cmake/OpenMPTesting.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ function(set_test_compiler_features)
168168
# Just use the lowercase of the compiler ID as fallback.
169169
string(TOLOWER "${OPENMP_TEST_COMPILER_ID}" comp)
170170
endif()
171-
set(OPENMP_TEST_COMPILER_FEATURE_LIST ${comp}, ${comp}-${OPENMP_TEST_COMPILER_VERSION_MAJOR}, ${comp}-${OPENMP_TEST_COMPILER_VERSION_MAJOR_MINOR}, ${comp}-${OPENMP_TEST_COMPILER_VERSION} PARENT_SCOPE)
171+
set(OPENMP_TEST_COMPILER_FEATURES "['${comp}', '${comp}-${OPENMP_TEST_COMPILER_VERSION_MAJOR}', '${comp}-${OPENMP_TEST_COMPILER_VERSION_MAJOR_MINOR}', '${comp}-${OPENMP_TEST_COMPILER_VERSION}']" PARENT_SCOPE)
172172
endfunction()
173173
set_test_compiler_features()
174174

openmp/runtime/test/CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,6 @@ macro(pythonize_bool var)
2424
endif()
2525
endmacro()
2626

27-
list(APPEND OPENMP_TEST_COMPILER_FEATURE_LIST "${LIBOMP_ARCH}")
28-
set(OPENMP_TEST_COMPILER_FEATURES "[")
29-
set(first TRUE)
30-
foreach(feat IN LISTS OPENMP_TEST_COMPILER_FEATURE_LIST)
31-
if (NOT first)
32-
string(APPEND OPENMP_TEST_COMPILER_FEATURES ", ")
33-
endif()
34-
set(first FALSE)
35-
string(APPEND OPENMP_TEST_COMPILER_FEATURES "'${feat}'")
36-
endforeach()
37-
string(APPEND OPENMP_TEST_COMPILER_FEATURES "]")
38-
3927
pythonize_bool(LIBOMP_USE_HWLOC)
4028
pythonize_bool(LIBOMP_OMPT_SUPPORT)
4129
pythonize_bool(LIBOMP_OMPT_OPTIONAL)

openmp/runtime/test/misc_bugs/many-microtask-args.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
// RUN: %libomp-compile-and-run
22
#include <stdio.h>
33

4-
// This test fails with Clang unless __kmp_invoke_microtask supports at least
5-
// 17 arguments. On ARM, the fallback C implementation of __kmp_invoke_microtask
6-
// is used, and that one only currently supports up to 15 arguments.
7-
// XFAIL: arm
8-
94
int main()
105
{
116

0 commit comments

Comments
 (0)