diff options
| author | Vignesh Balasubramanian <Vignesh.Balasubrmanian@amd.com> | 2022-11-30 14:18:29 +0530 |
|---|---|---|
| committer | Vignesh Balasubramanian <Vignesh.Balasubrmanian@amd.com> | 2022-11-30 15:36:19 +0530 |
| commit | 451c017a32695ee62c0ae6de6401d89cd9bd9555 (patch) | |
| tree | 8a092813bc1ad66890011426388ee821bcd166a8 | |
| parent | 5f9b4d8bad22a2cceac5a06e45a0f1d86ce6f0ef (diff) | |
| download | llvm-451c017a32695ee62c0ae6de6401d89cd9bd9555.zip llvm-451c017a32695ee62c0ae6de6401d89cd9bd9555.tar.gz llvm-451c017a32695ee62c0ae6de6401d89cd9bd9555.tar.bz2 | |
[OpenMP] [OMPD] Enable OMPD Tests
It was disabled due to different failures it different llvm bots.
Reviewed By: ye-luo
Differential Revision: https://reviews.llvm.org/D138411
| -rw-r--r-- | openmp/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | openmp/libompd/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | openmp/libompd/test/CMakeLists.txt | 25 |
3 files changed, 4 insertions, 32 deletions
diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt index 7f6ea8e..e715aea 100644 --- a/openmp/CMakeLists.txt +++ b/openmp/CMakeLists.txt @@ -87,9 +87,6 @@ endif() # 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 @@ endif() option(OPENMP_MSVC_NAME_SCHEME "Build dll with MSVC naming scheme." OFF) +# Build libompd.so +add_subdirectory(libompd) + # Build documentation add_subdirectory(docs) diff --git a/openmp/libompd/CMakeLists.txt b/openmp/libompd/CMakeLists.txt index a62980a..54fa67d 100644 --- a/openmp/libompd/CMakeLists.txt +++ b/openmp/libompd/CMakeLists.txt @@ -16,9 +16,6 @@ if(LIBOMP_OMPD_SUPPORT) 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) + add_subdirectory(test) endif() endif() diff --git a/openmp/libompd/test/CMakeLists.txt b/openmp/libompd/test/CMakeLists.txt index cb9adc4..35b96b1 100644 --- a/openmp/libompd/test/CMakeLists.txt +++ b/openmp/libompd/test/CMakeLists.txt @@ -6,31 +6,6 @@ if(NOT OPENMP_TEST_COMPILER_ID STREQUAL "Clang") 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 |