Enable OMPD tests

[Vigneshbalu]

Summary

Enabling ompd tests that are disabled by this commit: https://github.com/llvm/llvm-project/commit/b5bf908fd7f87d2f0d74f62362a7e08366e926ff

This patch https://github.com/llvm/llvm-project/commit/1099498e3f35b2ad4b021ba3888b590259124e74 were failing differently in two different llvm-bots. Issues were failure at "cmake configuration" stage and test case failure at "openmp-offload-amdgpu-runtime"

Configuration issue: https://lab.llvm.org/buildbot/#/builders/84/builds/31109
Test case issues: https://lab.llvm.org/buildbot/#/builders/193/builds/21594 (couldn't reproduce locally)

This patch will make libompd build after libomptarget .
Configuration issue in debian machines seems to come from "find_package" of "libompd/test/CMakeLists.txt" which disables building DeviceRTL by messing up with "LLVM_DIR"
Also, I removed the code that looks for llvm-lit and filecheck as it is taken care by "OpenMPTesting.cmake"

[Vigneshbalu]

Gentle Reminder!

[ye-luo]

Seems fine in my builds of OpenMP as a project and a runtime.

[Vigneshbalu]

Checking the availability of GDB as well as it is required to run the tests.

[Vigneshbalu]

Reopening as I am adding GDB changes.

[Vigneshbalu]

@ye-luo would you please review it again ?
It fails when the machine doesn't have GDB, added the check for the same.

[Vigneshbalu]

Gentle Reminder !

[Meinersbur]

The test ompd-test::test_ompd_get_icv_from_scope.c is (still?) failing on the openmp-offload-cuda-runtime buildbot:

******************** TEST 'ompd-test :: api_tests/test_ompd_get_icv_from_scope.c' FAILED ********************
Script:
--
: 'RUN: at line 1';   /home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.build/./bin/clang -fopenmp -g -gdwarf-4 /home/buildbot-worker/src/llvm-project/openmp/libompd/test/api_tests/test_ompd_get_icv_from_scope.c -o /home/buildbot-worker/minipc-1050ti-linux/openmp-offload-cuda-runtime/llvm.build/runtimes/runtimes-bins/openmp/libompd/test/api_tests/Output/test_ompd_get_icv_from_scope.c.tmp  -I /home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.src/openmp/libompd/test -I /home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.build/runtimes/runtimes-bins/openmp/runtime/src  -L /home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.build/runtimes/runtimes-bins/openmp/runtime/src 2>&1 | tee /home/buildbot-worker/minipc-1050ti-linux/openmp-offload-cuda-runtime/llvm.build/runtimes/runtimes-bins/openmp/libompd/test/api_tests/Output/test_ompd_get_icv_from_scope.c.tmp.compile
: 'RUN: at line 2';   env OMP_DEBUG=enabled gdb -x /home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.build/runtimes/runtimes-bins/openmp/libompd/test/../gdb-plugin/python-module/ompd/__init__.py  -x /home/buildbot-worker/src/llvm-project/openmp/libompd/test/api_tests/test_ompd_get_icv_from_scope.c.cmd /home/buildbot-worker/minipc-1050ti-linux/openmp-offload-cuda-runtime/llvm.build/runtimes/runtimes-bins/openmp/libompd/test/api_tests/Output/test_ompd_get_icv_from_scope.c.tmp 2>&1 | tee /home/buildbot-worker/minipc-1050ti-linux/openmp-offload-cuda-runtime/llvm.build/runtimes/runtimes-bins/openmp/libompd/test/api_tests/Output/test_ompd_get_icv_from_scope.c.tmp.out | /home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.build/./bin/FileCheck /home/buildbot-worker/src/llvm-project/openmp/libompd/test/api_tests/test_ompd_get_icv_from_scope.c
--
Exit Code: 1
Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "/home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.build/./bin/clang" "-fopenmp" "-g" "-gdwarf-4" "/home/buildbot-worker/src/llvm-project/openmp/libompd/test/api_tests/test_ompd_get_icv_from_scope.c" "-o" "/home/buildbot-worker/minipc-1050ti-linux/openmp-offload-cuda-runtime/llvm.build/runtimes/runtimes-bins/openmp/libompd/test/api_tests/Output/test_ompd_get_icv_from_scope.c.tmp" "-I" "/home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.src/openmp/libompd/test" "-I" "/home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.build/runtimes/runtimes-bins/openmp/runtime/src" "-L" "/home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.build/runtimes/runtimes-bins/openmp/runtime/src"
$ "tee" "/home/buildbot-worker/minipc-1050ti-linux/openmp-offload-cuda-runtime/llvm.build/runtimes/runtimes-bins/openmp/libompd/test/api_tests/Output/test_ompd_get_icv_from_scope.c.tmp.compile"
$ ":" "RUN: at line 2"
$ "env" "OMP_DEBUG=enabled" "gdb" "-x" "/home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.build/runtimes/runtimes-bins/openmp/libompd/test/../gdb-plugin/python-module/ompd/__init__.py" "-x" "/home/buildbot-worker/src/llvm-project/openmp/libompd/test/api_tests/test_ompd_get_icv_from_scope.c.cmd" "/home/buildbot-worker/minipc-1050ti-linux/openmp-offload-cuda-runtime/llvm.build/runtimes/runtimes-bins/openmp/libompd/test/api_tests/Output/test_ompd_get_icv_from_scope.c.tmp"
$ "tee" "/home/buildbot-worker/minipc-1050ti-linux/openmp-offload-cuda-runtime/llvm.build/runtimes/runtimes-bins/openmp/libompd/test/api_tests/Output/test_ompd_get_icv_from_scope.c.tmp.out"
$ "/home/buildbot-worker/minipc-1050ti-linux/rundir/llvm.build/./bin/FileCheck" "/home/buildbot-worker/src/llvm-project/openmp/libompd/test/api_tests/test_ompd_get_icv_from_scope.c"
# command stderr:
/home/buildbot-worker/src/llvm-project/openmp/libompd/test/api_tests/test_ompd_get_icv_from_scope.c:29:15: error: CHECK-NOT: excluded string found in input
// CHECK-NOT: Failed
              ^
<stdin>:62:1: note: found here
Failed. with return code = 0
^~~~~~
Input file: <stdin>
Check file: /home/buildbot-worker/src/llvm-project/openmp/libompd/test/api_tests/test_ompd_get_icv_from_scope.c
-dump-input=help explains the following input dump.
Input was:
<<<<<<
        .
        .
        .
       57: Success. 
       58: Testing "ompd_get_icv_from_scope with thread_handle"... 
       59: Test: With Correct Arguments. 
       60: Success. 
       61: Test: with nthreads_var for ompd_rc_incomplete. 
       62: Failed. with return code = 0 
not:29     !~~~~~                        error: no match expected
       63: Testing "ompd_get_icv_from_scope with parallel_handle"... 
       64: Test: With Correct Arguments. 
       65: Success. 
       66: Testing "ompd_get_icv_from_scope with task_handle"... 
       67: Test: With Correct Arguments. 
        .
        .
        .
>>>>>>
error: command failed with exit status: 1
--
********************

openmp/CMakeLists.txt

else()
   string(REGEX MATCH "[0-9]+" CLANG_VERSION ${PACKAGE_VERSION})
   set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
 endif()
 
 # Build host runtime library, after LIBOMPTARGET variables are set since they are needed
 # to enable time profiling support in the OpenMP runtime.
 add_subdirectory(runtime)
 
-# Build libompd.so
-add_subdirectory(libompd)
-
 if (OPENMP_ENABLE_LIBOMPTARGET)
   # Check that the library can actually be built.
   if (APPLE OR WIN32)
     message(FATAL_ERROR "libomptarget cannot be built on Windows and MacOS X!")
   elseif (NOT OPENMP_HAVE_STD_CPP17_FLAG)
     message(FATAL_ERROR "Host compiler must support C++17 to build libomptarget!")
   endif()
 

 option(OPENMP_ENABLE_OMPT_TOOLS "Enable building ompt based tools for OpenMP."
        ${ENABLE_OMPT_TOOLS})
 if (OPENMP_ENABLE_OMPT_TOOLS)
   add_subdirectory(tools)
 endif()
 
 option(OPENMP_MSVC_NAME_SCHEME "Build dll with MSVC naming scheme." OFF)
 
+# Build libompd.so
+add_subdirectory(libompd)
+
 # Build documentation
 add_subdirectory(docs)
 
 # Now that we have seen all testsuites, create the check-openmp target.
 construct_check_openmp_target()

openmp/libompd/CMakeLists.txt

 #
 #//===----------------------------------------------------------------------===//
 #//
 #// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 #// See https://llvm.org/LICENSE.txt for license information.
 #// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 #//
 #//===----------------------------------------------------------------------===//
 #
 
 find_package (Python3 COMPONENTS Interpreter Development)
 option(LIBOMP_OMPD_GDB_SUPPORT "Build gdb-plugin code that enables OMPD support in GDB." ${Python3_FOUND})
+find_program (GDB_FOUND NAMES "gdb")
+
 
 if(LIBOMP_OMPD_SUPPORT)
     set(OMPD_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/)
     add_subdirectory(src)
     if(LIBOMP_OMPD_GDB_SUPPORT)
         add_subdirectory(gdb-plugin)
-        # temporarily disabled
-        # test/CMakeLists.txt breaks DeviceRTL in LLVM_ENABLE_PROJECTS builds.
-        # find_package(LLVM) is likely the source of the trouble.
-        # add_subdirectory(test)
+    # GDB is required to run the tests
+    if (GDB_FOUND)
+          add_subdirectory(test)
+    endif()
     endif()
 endif()

openmp/libompd/test/CMakeLists.txt

 if(LIBOMP_OMPD_SUPPORT)
 
 if(NOT OPENMP_TEST_COMPILER_ID STREQUAL "Clang")
   message(STATUS "LIBOMPD: Can only test with Clang compiler")
   message(WARNING "LIBOMPD: The check-libompd target will not be available!")
   return()
 endif()
 
-find_package(LLVM REQUIRED CONFIG)
-list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
-include(AddLLVM)
-
-
-#find_program(LLVM_LIT_PATH
-#  NAMES llvm-lit lit
-#  HINTS ${LLVM_TOOLS_BINARY_DIR} 
-#  PATHS ${LLVM_ROOT_DIR}/bin /usr/bin /usr/local/bin /opt/local/bin
-#  DOC "llvm-lit executable. (Workaround for AddLLVM.cmake path not being set)"
-#)
-#if(LLVM_LIT_PATH)
-#  set(LLVM_EXTERNAL_LIT ${LLVM_LIT_PATH})
-#endif()
-
-#find_program(FILECHECK_EXECUTABLE
-#  NAMES Filecheck FileCheck
-#  HINTS ${LLVM_TOOLS_BINARY_DIR} 
-#  PATHS ${LLVM_ROOT_DIR}/bin /usr/bin /usr/local/bin /opt/local/bin
-#  DOC "Filecheck executable. (Workaround for AddLLVM.cmake path not being set)"
-#)
-#if(LLVM_FILECHECK_PATH)
-#  set(LLVM_EXTERNAL_FILECHECK ${LLVM_FILECHECK_PATH})
-#endif()
-
 set(PYTHON_PLUGIN ${ompd_BINARY_DIR}/gdb-plugin/python-module)
 
 # Configure the lit.site.cfg.in file
 set(AUTO_GEN_COMMENT "## Autogenerated by libomp configuration.\n# Do not edit!")
 configure_file(lit.site.cfg.in lit.site.cfg @ONLY)
 add_openmp_testsuite(check-ompd "Running OMPD tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS omp ompd ompd_gdb_plugin)
 
 endif()