[zorg] r267138 - Add libomp builders with OMPT

[Jonas Hahnfeld via llvm-commits]

Author: hahnfeld
Date: Fri Apr 22 06:20:44 2016
New Revision: 267138

URL: http://llvm.org/viewvc/llvm-project?rev=267138&view=rev
Log:
Add libomp builders with OMPT

Differential Revision: http://reviews.llvm.org/D18887

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.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=267138&r1=267137&r2=267138&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Apr 22 06:20:44 2016
@@ -798,8 +798,7 @@ def _get_openmp_builders():
          'factory' : Libiomp5Builder.getLibompCMakeBuildFactory(
                          c_compiler="gcc",
                          cxx_compiler="g++",
-                         env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'}),
-         'category' : 'libomp'},
+                         env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
 
         {'name': "libomp-clang-x86_64-linux-debian",
          'slavenames':["gribozavr4"],
@@ -807,8 +806,25 @@ def _get_openmp_builders():
          'factory' : Libiomp5Builder.getLibompCMakeBuildFactory(
                          c_compiler="clang",
                          cxx_compiler="clang++",
-                         env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'}),
-         'category' : 'libomp'},
+                         env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
+
+        {'name': "libomp-ompt-gcc-x86_64-linux-debian",
+         'slavenames':["gribozavr4"],
+         'builddir':"libomp-ompt-gcc-x86_64-linux-debian",
+         'factory' : Libiomp5Builder.getLibompCMakeBuildFactory(
+                         c_compiler="gcc",
+                         cxx_compiler="g++",
+                         ompt=True,
+                         env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
+
+        {'name': "libomp-ompt-clang-x86_64-linux-debian",
+         'slavenames':["gribozavr4"],
+         'builddir':"libomp-ompt-clang-x86_64-linux-debian",
+         'factory' : Libiomp5Builder.getLibompCMakeBuildFactory(
+                         c_compiler="clang",
+                         cxx_compiler="clang++",
+                         ompt=True
+                         env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'})},
         ]
 
 def _get_libcxx_builders():

Modified: zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py?rev=267138&r1=267137&r2=267138&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/Libiomp5Builder.py Fri Apr 22 06:20:44 2016
@@ -11,7 +11,7 @@ import zorg.buildbot.commands as command
 import zorg.buildbot.commands.LitTestCommand as lit_test_command
 
 
-def getLibompCMakeBuildFactory(clean=True, env=None, test=True, c_compiler="gcc", cxx_compiler="g++"):
+def getLibompCMakeBuildFactory(clean=True, env=None, ompt=False, test=True, c_compiler="gcc", cxx_compiler="g++"):
 
     # Prepare environmental variables. Set here all env we want everywhere.
     merged_env = {
@@ -88,14 +88,25 @@ def getLibompCMakeBuildFactory(clean=Tru
                                               workdir=llvm_builddir,
                                               env=merged_env))
 
+    if ompt:
+        f.addStep(WarningCountingShellCommand(name='make ompt test utils',
+                                              command=['ninja', 'FileCheck'],
+                                              haltOnFailure=True,
+                                              description='make ompt test utils',
+                                              workdir=llvm_builddir,
+                                              env=merged_env))
+
     # Add clang/llvm-lit to PATH
     merged_env.update( { 'PATH' : WithProperties("%(workdir)s/" + llvm_builddir + "/bin:" + "${PATH}")} )
 
     # CMake libomp
+    command=["cmake", "../"+openmp_srcdir,
+             "-DCMAKE_C_COMPILER="+c_compiler,
+             "-DCMAKE_CXX_COMPILER="+cxx_compiler]
+    if ompt:
+        command.append("-DLIBOMP_OMPT_SUPPORT=ON")
     f.addStep(ShellCommand(name='cmake libomp',
-                           command=["cmake", "../"+openmp_srcdir,
-                                    "-DCMAKE_C_COMPILER="+c_compiler,
-                                    "-DCMAKE_CXX_COMPILER="+cxx_compiler],
+                           command=command,
                            haltOnFailure=True,
                            description='cmake libomp',
                            workdir=openmp_builddir,