[Openmp-commits] [PATCH] D138411: Enable OMPD tests

[Vignesh Balasubramanian via Phabricator via Openmp-commits]

Vigneshbalu created this revision.
Vigneshbalu added reviewers: jdoerfert, dreachem, ronlieb, RaviNarayanaswamy, ye-luo.
Herald added subscribers: kosarev, tpr.
Herald added a project: All.
Vigneshbalu requested review of this revision.
Herald added subscribers: openmp-commits, sstefan1.
Herald added a project: OpenMP.

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 failing 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"
I removed the code that looks for llvm-lit and filecheck as it is taken care by "OpenMPTesting.cmake"


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D138411

Files:
  openmp/CMakeLists.txt
  openmp/libompd/test/CMakeLists.txt


Index: openmp/libompd/test/CMakeLists.txt
===================================================================
--- openmp/libompd/test/CMakeLists.txt
+++ openmp/libompd/test/CMakeLists.txt
@@ -6,31 +6,6 @@
   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
Index: openmp/CMakeLists.txt
===================================================================
--- openmp/CMakeLists.txt
+++ openmp/CMakeLists.txt
@@ -87,9 +87,6 @@
 # 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)
@@ -115,6 +112,9 @@
 
 option(OPENMP_MSVC_NAME_SCHEME "Build dll with MSVC naming scheme." OFF)
 
+# Build libompd.so
+add_subdirectory(libompd)
+
 # Build documentation
 add_subdirectory(docs)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D138411.476836.patch
Type: text/x-patch
Size: 1720 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20221121/9b9c332c/attachment.bin>