[CMake] Re-enable libomptarget and restrict tests to Clang 6.0.0

[Hahnfeld]

Summary

We have just fixed the codegen of omp_is_initial_device() to reliably work
when offloading to the same device, see commit rL316001. This fixes the
failing tests that were the reason why we disabled the library for 5.0.

[hans]

When we ran into the test failures last time, in PR33859, it turned out there were no upstream buildbots running the tests, so we didn't find out they were failing until we started the release process. Are the tests run by any buildbots now?

[Hahnfeld]

In D39052#900899, @hans wrote:

When we ran into the test failures last time, in PR33859, it turned out there were no upstream buildbots running the tests, so we didn't find out they were failing until we started the release process. Are the tests run by any buildbots now?

Good point, let me find that out and come back to you.

[Hahnfeld]

In D39052#900920, @Hahnfeld wrote:

In D39052#900899, @hans wrote:

When we ran into the test failures last time, in PR33859, it turned out there were no upstream buildbots running the tests, so we didn't find out they were failing until we started the release process. Are the tests run by any buildbots now?

Good point, let me find that out and come back to you.

Turned out they were not (yet). See linked revision that adapts the buildbot configuration to change that.

[Hahnfeld]

In D39052#903481, @Hahnfeld wrote:

In D39052#900920, @Hahnfeld wrote:

In D39052#900899, @hans wrote:

When we ran into the test failures last time, in PR33859, it turned out there were no upstream buildbots running the tests, so we didn't find out they were failing until we started the release process. Are the tests run by any buildbots now?

Good point, let me find that out and come back to you.

Turned out they were not (yet). See linked revision that adapts the buildbot configuration to change that.

Hi Hans,

the following bots are now configured to test libomptarget:
http://lab.llvm.org:8011/builders/openmp-clang-x86_64-linux-debian
http://lab.llvm.org:8011/builders/openmp-clang-ppc64le-linux-debian
And this one will just build libomptarget with GCC:
http://lab.llvm.org:8011/builders/openmp-gcc-x86_64-linux-debian

Unfortunately, there is still an error with the arguments passed to lit that I just fixed but the master needs to be restarted...

Jonas

[hans]

In D39052#910610, @Hahnfeld wrote:

In D39052#903481, @Hahnfeld wrote:

In D39052#900920, @Hahnfeld wrote:

In D39052#900899, @hans wrote:

When we ran into the test failures last time, in PR33859, it turned out there were no upstream buildbots running the tests, so we didn't find out they were failing until we started the release process. Are the tests run by any buildbots now?

Good point, let me find that out and come back to you.

Turned out they were not (yet). See linked revision that adapts the buildbot configuration to change that.

Hi Hans,

the following bots are now configured to test libomptarget:
http://lab.llvm.org:8011/builders/openmp-clang-x86_64-linux-debian
http://lab.llvm.org:8011/builders/openmp-clang-ppc64le-linux-debian
And this one will just build libomptarget with GCC:
http://lab.llvm.org:8011/builders/openmp-gcc-x86_64-linux-debian

Unfortunately, there is still an error with the arguments passed to lit that I just fixed but the master needs to be restarted...

OK, let me know when that's fixed so we can get this landed.

[Hahnfeld]

In D39052#912897, @hans wrote:

In D39052#910610, @Hahnfeld wrote:

Hi Hans,

the following bots are now configured to test libomptarget:
http://lab.llvm.org:8011/builders/openmp-clang-x86_64-linux-debian
http://lab.llvm.org:8011/builders/openmp-clang-ppc64le-linux-debian
And this one will just build libomptarget with GCC:
http://lab.llvm.org:8011/builders/openmp-gcc-x86_64-linux-debian

Unfortunately, there is still an error with the arguments passed to lit that I just fixed but the master needs to be restarted...

OK, let me know when that's fixed so we can get this landed.

http://lab.llvm.org:8011/builders/openmp-clang-ppc64le-linux-debian/builds/23 is now green since the last restart. The x86 bots are currently offline but they use the same configuration so I expect them to work...

[hans]

ok

[Hahnfeld]

libomptarget/test/CMakeLists.txt

30–52 ↗

(On Diff #119475)

btw: This will get much nicer with D40083. But I don't want to hold this one back...

openmp/trunk/CMakeLists.txt

 cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
 set(OPENMP_LLVM_TOOLS_DIR "" CACHE PATH "Path to LLVM tools for testing")
 
 add_subdirectory(runtime)
 
 
-# The tests currently don't pass if the generic ELF plugin is built.
-# TODO: Fix the tests and enable libomptarget by default on supported
-#       architectures and platforms.
-set(ENABLE_LIBOMPTARGET OFF)
+set(ENABLE_LIBOMPTARGET ON)
 # Currently libomptarget cannot be compiled on Windows or MacOS X.
 # Since the device plugins are only supported on Linux anyway,
 # there is no point in trying to compile libomptarget on other OSes.
 if (WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(ENABLE_LIBOMPTARGET OFF)
 endif()
 
 option(OPENMP_ENABLE_LIBOMPTARGET "Enable building libomptarget for offloading."
        ${ENABLE_LIBOMPTARGET})
 if (OPENMP_ENABLE_LIBOMPTARGET)
   add_subdirectory(libomptarget)
 endif()

openmp/trunk/libomptarget/test/CMakeLists.txt

if(CMAKE_VERSION VERSION_LESS 3.1.20141117)
     set(cmake_3_2_USES_TERMINAL)
   else()
     set(cmake_3_2_USES_TERMINAL USES_TERMINAL)
   endif()
   set(LIBOMPTARGET_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING
     "C compiler to use for testing OpenMP offloading library")
   set(LIBOMPTARGET_TEST_CXX_COMPILER ${CMAKE_CXX_COMPILER} CACHE STRING
     "C++ compiler to use for testing OpenMP offloading library")
+
+  if (NOT(${LIBOMPTARGET_TEST_C_COMPILER} MATCHES "clang" AND ${LIBOMPTARGET_TEST_CXX_COMPILER} MATCHES "clang"))
+    libomptarget_say("Can only test with Clang compiler!")
+    libomptarget_warning_say("The check-libomptarget target will not be available!")
+    return()
+  endif()
+
+  execute_process(
+    COMMAND ${LIBOMPTARGET_TEST_C_COMPILER} --version
+    OUTPUT_VARIABLE TEST_COMPILER_VERSION)
+  string(REGEX MATCH "version ([0-9.]+)" TEST_COMPILER_VERSION ${TEST_COMPILER_VERSION})
+  if (NOT(TEST_COMPILER_VERSION))
+    libomptarget_say("Unable to determine Clang compiler version!")
+    libomptarget_warning_say("The check-libomptarget target will not be available!")
+    return()
+  endif()
+  set(TEST_COMPILER_VERSION ${CMAKE_MATCH_1})
+  if (TEST_COMPILER_VERSION VERSION_LESS 6.0.0)
+    libomptarget_say("Clang compiler version does not implement all codegen, please update to 6.0.0!")
+    libomptarget_warning_say("The check-libomptarget target will not be available!")
+    return()
+  endif()
+
   set(LIBOMPTARGET_TEST_OPENMP_FLAG -fopenmp CACHE STRING
     "OpenMP compiler flag to use for testing OpenMP offloading library")
   find_program(LIBOMPTARGET_LLVM_LIT_EXECUTABLE
     NAMES llvm-lit lit.py lit
     PATHS ${OPENMP_LLVM_TOOLS_DIR})
   if(NOT LIBOMPTARGET_LLVM_LIT_EXECUTABLE)
     libomptarget_say("Cannot find llvm-lit.")
     libomptarget_say("Please put llvm-lit in your PATH or set LIBOMPTARGET_LLVM_LIT_EXECUTABLE to its full path or point OPENMP_LLVM_TOOLS_DIR to its directory")