[zorg] r319676 - OpenMPBuilder: Remove obsolete parameters and steps

[Jonas Hahnfeld via llvm-commits]

Author: hahnfeld
Date: Mon Dec  4 11:15:02 2017
New Revision: 319676

URL: http://llvm.org/viewvc/llvm-project?rev=319676&view=rev
Log:
OpenMPBuilder: Remove obsolete parameters and steps

1. libomptarget is now enabled by default on Linux, no need to
   pass in -DOPENMP_ENABLE_LIBOMPTARGET.
2. The build system gained a target check-openmp that will find
   out which tests to run (libomptarget with Clang >= 6.0.0).
3. This refactoring introduced the variable OPENMP_LIT_ARGS. For
   compatibility, this currently looks if LIBOMP_LIT_ARGS is set
   so the bots continue to work for now.

No need to reconfigure the master for now, an update on the next
planned maintenance is fine. I just want to get rid of the
compatibility code in the long term.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=319676&r1=319675&r2=319676&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Dec  4 11:15:02 2017
@@ -1132,7 +1132,6 @@ def _get_openmp_builders():
          'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
                          c_compiler="gcc",
                          cxx_compiler="g++",
-                         libomptarget=True,
                          env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
 
         {'name': "openmp-clang-x86_64-linux-debian",
@@ -1141,8 +1140,6 @@ def _get_openmp_builders():
          'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
                          c_compiler="clang",
                          cxx_compiler="clang++",
-                         libomptarget=True,
-                         test_libomptarget=True,
                          env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
 
         {'name': "openmp-ompt-gcc-x86_64-linux-debian",
@@ -1169,8 +1166,6 @@ def _get_openmp_builders():
          'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
                          c_compiler="clang",
                          cxx_compiler="clang++",
-                         libomptarget=True,
-                         test_libomptarget=True,
                          env={'PATH':'/home/bbot/opt/cmake/bin:/home/bbot/opt/ninja/bin:/usr/local/bin:/usr/bin:/bin'})},
 
         ]

Modified: zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py?rev=319676&r1=319675&r2=319676&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/OpenMPBuilder.py Mon Dec  4 11:15:02 2017
@@ -16,10 +16,8 @@ def getOpenMPCMakeBuildFactory(
         jobs                = '%(jobs)s',   # Number of concurrent jobs.
         clean               = True,         # "clean" step is requested if true
         env                 = None,         # Environmental variables for all steps.
-        libomptarget        = False,        # Build libomptarget.
         ompt                = False,        # Whether to enable the OpenMP Tools Interface.
         test                = True,         # Test the built libraries.
-        test_libomptarget   = False,        # Test the built libraries.
     ):
 
     # Prepare environmental variables. Set here all env we want everywhere.
@@ -116,16 +114,12 @@ def getOpenMPCMakeBuildFactory(
     cmake_args  = ['cmake', '-G', 'Ninja', '../%s' % openmp_srcdir]
     cmake_args += ['-DCMAKE_C_COMPILER=%s' % c_compiler]
     cmake_args += ['-DCMAKE_CXX_COMPILER=%s' % cxx_compiler]
-    if libomptarget:
-        cmake_args += ['-DOPENMP_ENABLE_LIBOMPTARGET=ON']
     if ompt:
         cmake_args += ['-DLIBOMP_OMPT_SUPPORT=ON']
 
     if test:
         lit_args = '-v --show-unsupported --show-xfail -j %s' % jobs
-        cmake_args += [WithProperties('-DLIBOMP_LIT_ARGS=%s' % lit_args)]
-        if test_libomptarget:
-            cmake_args += [WithProperties('-DLIBOMPTARGET_LIT_ARGS=%s' % lit_args)]
+        cmake_args += [WithProperties('-DOPENMP_LIT_ARGS=%s' % lit_args)]
 
     f.addStep(
         Configure(
@@ -148,19 +142,10 @@ def getOpenMPCMakeBuildFactory(
         ninja_test_args = ['ninja', WithProperties('-j %s' % jobs)]
         f.addStep(
             LitTestCommand(
-                name        = 'test-libomp',
-                command     = ninja_test_args + ['check-libomp'],
-                description = 'test libomp',
+                name        = 'test-openmp',
+                command     = ninja_test_args + ['check-openmp'],
+                description = 'test openmp',
                 workdir     = openmp_builddir,
                 env         = merged_env))
 
-        if test_libomptarget:
-            f.addStep(
-                LitTestCommand(
-                    name        = 'test-libomptarget',
-                    command     = ninja_test_args + ['check-libomptarget'],
-                    description = 'test libomptarget',
-                    workdir     = openmp_builddir,
-                    env         = merged_env))
-
     return f