[Openmp-commits] [openmp] 5611bf6 - Revert "[openmp] [test] XFAIL many-microtask-args.c on ARM"

[Martin Storsjö via Openmp-commits]

Author: Martin Storsjö
Date: 2022-11-28T23:08:10+02:00
New Revision: 5611bf69fc48c650c903e58b1e96effb7d6186f0

URL: https://github.com/llvm/llvm-project/commit/5611bf69fc48c650c903e58b1e96effb7d6186f0
DIFF: https://github.com/llvm/llvm-project/commit/5611bf69fc48c650c903e58b1e96effb7d6186f0.diff

LOG: Revert "[openmp] [test] XFAIL many-microtask-args.c on ARM"

This reverts commit 03bf001b6d95f7c6a88a2b95f3cad752b9d1ed45.

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

Added: 
    

Modified: 
    openmp/cmake/OpenMPTesting.cmake
    openmp/runtime/test/CMakeLists.txt
    openmp/runtime/test/misc_bugs/many-microtask-args.c

Removed: 
    


################################################################################
diff  --git a/openmp/cmake/OpenMPTesting.cmake b/openmp/cmake/OpenMPTesting.cmake
index a936304a6a328..a93f7199ed7a7 100644
--- a/openmp/cmake/OpenMPTesting.cmake
+++ b/openmp/cmake/OpenMPTesting.cmake
@@ -168,7 +168,7 @@ function(set_test_compiler_features)
     # Just use the lowercase of the compiler ID as fallback.
     string(TOLOWER "${OPENMP_TEST_COMPILER_ID}" comp)
   endif()
-  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)
+  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)
 endfunction()
 set_test_compiler_features()
 

diff  --git a/openmp/runtime/test/CMakeLists.txt b/openmp/runtime/test/CMakeLists.txt
index 45a4891e775b6..71680a31ae256 100644
--- a/openmp/runtime/test/CMakeLists.txt
+++ b/openmp/runtime/test/CMakeLists.txt
@@ -24,18 +24,6 @@ macro(pythonize_bool var)
   endif()
 endmacro()
 
-list(APPEND OPENMP_TEST_COMPILER_FEATURE_LIST "${LIBOMP_ARCH}")
-set(OPENMP_TEST_COMPILER_FEATURES "[")
-set(first TRUE)
-foreach(feat IN LISTS OPENMP_TEST_COMPILER_FEATURE_LIST)
-  if (NOT first)
-    string(APPEND OPENMP_TEST_COMPILER_FEATURES ", ")
-  endif()
-  set(first FALSE)
-  string(APPEND OPENMP_TEST_COMPILER_FEATURES "'${feat}'")
-endforeach()
-string(APPEND OPENMP_TEST_COMPILER_FEATURES "]")
-
 pythonize_bool(LIBOMP_USE_HWLOC)
 pythonize_bool(LIBOMP_OMPT_SUPPORT)
 pythonize_bool(LIBOMP_OMPT_OPTIONAL)

diff  --git a/openmp/runtime/test/misc_bugs/many-microtask-args.c b/openmp/runtime/test/misc_bugs/many-microtask-args.c
index 1ede11038eed3..d644515d9a4f2 100644
--- a/openmp/runtime/test/misc_bugs/many-microtask-args.c
+++ b/openmp/runtime/test/misc_bugs/many-microtask-args.c
@@ -1,11 +1,6 @@
 // RUN: %libomp-compile-and-run
 #include <stdio.h>
 
-// This test fails with Clang unless __kmp_invoke_microtask supports at least
-// 17 arguments. On ARM, the fallback C implementation of __kmp_invoke_microtask
-// is used, and that one only currently supports up to 15 arguments.
-// XFAIL: arm
-
 int main()
 {