diff options
author | Vignesh Balasubramanian <Vignesh.Balasubrmanian@amd.com> | 2022-11-30 16:37:01 +0530 |
---|---|---|
committer | Vignesh Balasubramanian <Vignesh.Balasubrmanian@amd.com> | 2022-11-30 16:37:01 +0530 |
commit | a06084ebd2cd1b9e14df304c78d6f5f2ee5670f1 (patch) | |
tree | aad2e0d2bbafc60a4c75ee7a8be082cf085eb5b3 /openmp | |
parent | 3a1b40925486c1eea80e2a0e636b208435487daf (diff) | |
download | llvm-a06084ebd2cd1b9e14df304c78d6f5f2ee5670f1.zip llvm-a06084ebd2cd1b9e14df304c78d6f5f2ee5670f1.tar.gz llvm-a06084ebd2cd1b9e14df304c78d6f5f2ee5670f1.tar.bz2 |
Revert "[OpenMP] [OMPD] Enable OMPD Tests"
This reverts commit 451c017a32695ee62c0ae6de6401d89cd9bd9555.
Diffstat (limited to 'openmp')
-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, 32 insertions, 4 deletions
diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt index e715aea..7f6ea8e 100644 --- a/openmp/CMakeLists.txt +++ b/openmp/CMakeLists.txt @@ -87,6 +87,9 @@ 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) @@ -112,9 +115,6 @@ 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 54fa67d..a62980a 100644 --- a/openmp/libompd/CMakeLists.txt +++ b/openmp/libompd/CMakeLists.txt @@ -16,6 +16,9 @@ if(LIBOMP_OMPD_SUPPORT) add_subdirectory(src) if(LIBOMP_OMPD_GDB_SUPPORT) add_subdirectory(gdb-plugin) - add_subdirectory(test) + # 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) endif() endif() diff --git a/openmp/libompd/test/CMakeLists.txt b/openmp/libompd/test/CMakeLists.txt index 35b96b1..cb9adc4 100644 --- a/openmp/libompd/test/CMakeLists.txt +++ b/openmp/libompd/test/CMakeLists.txt @@ -6,6 +6,31 @@ 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 |