Index: buildbot/osuosl/master/config/builders.py =================================================================== --- buildbot/osuosl/master/config/builders.py +++ buildbot/osuosl/master/config/builders.py @@ -810,6 +810,26 @@ 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'}, + + {'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'}), + 'category' : 'libomp'}, + + {'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'}), + 'category' : 'libomp'}, ] def _get_libcxx_builders(): Index: zorg/buildbot/builders/Libiomp5Builder.py =================================================================== --- zorg/buildbot/builders/Libiomp5Builder.py +++ zorg/buildbot/builders/Libiomp5Builder.py @@ -11,7 +11,7 @@ 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 @@ 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,