This is an archive of the discontinued LLVM Phabricator instance.

Differential D28662

[zorg] Delete old autotools getLLVMBuildFactory
AbandonedPublic

Authored by Hahnfeld on Jan 13 2017, 1:03 AM.

Details

Reviewers
gkistanova
Summary

Rename getLLVMCMakeBuildFactory to getLLVMBuildFactory

Diff Detail

Event Timeline

Hahnfeld updated this revision to Diff 84252.Jan 13 2017, 1:03 AM
Hahnfeld retitled this revision from to [zorg] Delete old autotools getLLVMBuildFactory.
Hahnfeld updated this object.
Hahnfeld added a reviewer: gkistanova.
Hahnfeld added a subscriber: llvm-commits.
Hahnfeld abandoned this revision.Feb 16 2017, 5:11 AM

Revision Contents

PathSize
buildbot/
osuosl/
master/
config/
6 lines
test/
buildbot/
builders/
4 lines
zorg/
buildbot/
builders/
125 lines

Diff 84252

buildbot/osuosl/master/config/builders.py

Show All 23 Lines return [
# LLVM_DEFAULT_TARGET_TRIPLE on this system. CMake gets the value # LLVM_DEFAULT_TARGET_TRIPLE on this system. CMake gets the value
# correct for the processor but it's currently not possible to emit O32 # correct for the processor but it's currently not possible to emit O32
# code using a mips64-* triple. This is a bug and should be fixed soon. # code using a mips64-* triple. This is a bug and should be fixed soon.
# We must also force LLVM_TARGET_ARCH so that the ExecutionEngine tests # We must also force LLVM_TARGET_ARCH so that the ExecutionEngine tests
# run. # run.
{'name': "llvm-mips-linux", {'name': "llvm-mips-linux",
'slavenames':["mipsswbrd002"], 'slavenames':["mipsswbrd002"],
'builddir':"llvm-mips-linux", 'builddir':"llvm-mips-linux",
'factory': LLVMBuilder.getLLVMCMakeBuildFactory( 'factory': LLVMBuilder.getLLVMBuildFactory(
timeout=40, config_name='Release', timeout=40, config_name='Release',
enable_shared=True, enable_shared=True,
extra_cmake_args=["-DLLVM_HOST_TRIPLE=mips-linux-gnu", extra_cmake_args=["-DLLVM_HOST_TRIPLE=mips-linux-gnu",
"-DLLVM_DEFAULT_TARGET_TRIPLE=mips-linux-gnu", "-DLLVM_DEFAULT_TARGET_TRIPLE=mips-linux-gnu",
"-DLLVM_TARGET_ARCH=Mips", "-DLLVM_TARGET_ARCH=Mips",
"-DLLVM_ENABLE_ASSERTIONS=ON", "-DLLVM_ENABLE_ASSERTIONS=ON",
"-DLLVM_PARALLEL_LINK_JOBS=1"], "-DLLVM_PARALLEL_LINK_JOBS=1"],
env={'CC': '/mips/proj/build-compiler/clang-be-o32-latest/bin/clang', env={'CC': '/mips/proj/build-compiler/clang-be-o32-latest/bin/clang',
'CXX': '/mips/proj/build-compiler/clang-be-o32-latest/bin/clang++', 'CXX': '/mips/proj/build-compiler/clang-be-o32-latest/bin/clang++',
})}, })},
{'name': "llvm-hexagon-elf", {'name': "llvm-hexagon-elf",
'slavenames':["hexagon-build-02", "hexagon-build-03"], 'slavenames':["hexagon-build-02", "hexagon-build-03"],
'builddir':"llvm-hexagon-elf", 'builddir':"llvm-hexagon-elf",
'factory': LLVMBuilder.getLLVMCMakeBuildFactory( 'factory': LLVMBuilder.getLLVMBuildFactory(
timeout=40, config_name='Release', timeout=40, config_name='Release',
jobs=16, jobs=16,
enable_shared=False, enable_shared=False,
env={'LD_LIBRARY_PATH': '/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/lib'}, env={'LD_LIBRARY_PATH': '/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/lib'},
extra_cmake_args=[ extra_cmake_args=[
"-G", "Unix Makefiles", "-G", "Unix Makefiles",
"-DCMAKE_BUILD_TYPE:STRING=Release", "-DCMAKE_BUILD_TYPE:STRING=Release",
"-DLLVM_TARGETS_TO_BUILD:STRING=Hexagon", "-DLLVM_TARGETS_TO_BUILD:STRING=Hexagon",
Show All 16 Lines return [
"-DLINK_POLLY_INTO_TOOLS:BOOL=OFF", "-DLINK_POLLY_INTO_TOOLS:BOOL=OFF",
"-DPOLLY_BUILD_SHARED_LIB:BOOL=OFF", "-DPOLLY_BUILD_SHARED_LIB:BOOL=OFF",
"-DCMAKE_C_COMPILER:FILEPATH=/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang", "-DCMAKE_C_COMPILER:FILEPATH=/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang",
"-DCMAKE_CXX_COMPILER:FILEPATH=/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang++" "-DCMAKE_CXX_COMPILER:FILEPATH=/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang++"
])}, ])},
{'name': "llvm-avr-linux", {'name': "llvm-avr-linux",
'slavenames':["avr-build-01"], 'slavenames':["avr-build-01"],
'builddir':"llvm-avr-linux", 'builddir':"llvm-avr-linux",
'factory': LLVMBuilder.getLLVMCMakeBuildFactory( 'factory': LLVMBuilder.getLLVMBuildFactory(
timeout=40, config_name='Release', timeout=40, config_name='Release',
enable_shared=True, enable_shared=True,
extra_cmake_args=[ extra_cmake_args=[
"-G", "Unix Makefiles", "-G", "Unix Makefiles",
"-DCMAKE_BUILD_TYPE:STRING=Release", "-DCMAKE_BUILD_TYPE:STRING=Release",
# We need to compile the X86 backend due to a few generic CodeGen tests. # We need to compile the X86 backend due to a few generic CodeGen tests.
"-DLLVM_TARGETS_TO_BUILD:STRING=AVR;X86", "-DLLVM_TARGETS_TO_BUILD:STRING=AVR;X86",
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:STRING=AVR", "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:STRING=AVR",
▲ Show 20 Lines • Show All 1,283 Lines • Show Last 20 Lines

test/buildbot/builders/Import.py

# RUN: python %s # RUN: python %s
import zorg import zorg
from zorg.buildbot.builders import ClangBuilder, LLVMBuilder from zorg.buildbot.builders import ClangBuilder
from zorg.buildbot.builders import SanitizerBuilder from zorg.buildbot.builders import SanitizerBuilder
# Just check that we can instantiate the build factors, what else can we do? # Just check that we can instantiate the build factors, what else can we do?
print ClangBuilder.getClangBuildFactory() print ClangBuilder.getClangBuildFactory()
print LLVMBuilder.getLLVMBuildFactory()
print SanitizerBuilder.getSanitizerBuildFactory() print SanitizerBuilder.getSanitizerBuildFactory()

zorg/buildbot/builders/LLVMBuilder.py

import os import os
import buildbot import buildbot
import buildbot.process.factory import buildbot.process.factory
from buildbot.steps.source import SVN from buildbot.steps.source import SVN
from buildbot.steps.shell import Configure, ShellCommand from buildbot.steps.shell import Configure, ShellCommand
from buildbot.steps.shell import WarningCountingShellCommand from buildbot.steps.shell import WarningCountingShellCommand
from buildbot.process.properties import WithProperties from buildbot.process.properties import WithProperties
from zorg.buildbot.commands.LitTestCommand import LitTestCommand from zorg.buildbot.commands.LitTestCommand import LitTestCommand
from Util import getConfigArgs from Util import getConfigArgs
def getLLVMBuildFactory( def getLLVMBuildFactory(
triple = None, # Triple to build, host, and target.
clean = True, # "clean-llvm" step is requested if true.
test = True, # "test-llvm" step is requested if true.
expensive_checks = False,
examples = False, # "compile.examples" step is requested if true.
valgrind = False, # Valgrind is used on "test-llvm" step if true.
valgrindLeakCheck = False, # Valgrind leak check is requested if true.
valgrindSuppressions = None, # Valgrind suppression file.
jobs = '%(jobs)s', # Number of concurrent jobs.
timeout = 20, # Timeout if no activity seen (minutes).
make = 'make', # Make command.
enable_shared = False, # Enable shared (--enable-shared configure parameters added) if true.
enable_targets = None, # List of enabled targets (--enable-targets configure param).
defaultBranch = 'trunk', # Branch to build.
llvmgccdir = None, # Path to llvm-gcc.
config_name = 'Debug+Asserts', # Configuration name.
env = {}, # Environmental variables for all steps.
extra_configure_args = []): # Extra args for the conigure step.
# Prepare environmental variables. Set here all env we want everywhere.
merged_env = {
'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences.
}
if env is not None:
merged_env.update(env) # Overwrite pre-set items with the given ones, so user can set anything.
llvm_srcdir = "llvm.src"
llvm_objdir = "llvm.obj"
f = buildbot.process.factory.BuildFactory()
# Determine the build directory.
f.addStep(
buildbot.steps.shell.SetProperty(
name = "get_builddir",
command = ["pwd"],
property = "builddir",
description = "set build dir",
workdir = ".",
env = merged_env))
# Checkout sources.
f.addStep(
SVN(
name = 'svn-llvm',
mode = 'update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
defaultBranch = defaultBranch,
workdir = llvm_srcdir))
# Force without llvm-gcc so we don't run afoul of Frontend test failures.
configure_args = [WithProperties("%%(builddir)s/%s/configure" % llvm_srcdir)]
if llvmgccdir:
configure_args += ['--with-llvmgccdir=%s' % llvmgccdir]
else:
configure_args += ["--without-llvmgcc", "--without-llvmgxx"]
configure_args += getConfigArgs(config_name)
if enable_targets is not None:
configure_args.append('--enable-targets=%s' % enable_targets)
if triple:
configure_args += ['--build=%s' % triple,
'--host=%s' % triple,
'--target=%s' % triple]
if enable_shared:
configure_args.append('--enable-shared')
configure_args.extend(extra_configure_args)
f.addStep(
Configure(
command = configure_args,
description = ['configuring', config_name],
descriptionDone = ['configure', config_name],
workdir = llvm_objdir,
env = merged_env))
if clean:
f.addStep(
WarningCountingShellCommand(
name = "clean-llvm",
command = [make, 'clean'],
haltOnFailure = True,
description = "cleaning llvm",
descriptionDone = "clean llvm",
workdir = llvm_objdir,
env = merged_env))
f.addStep(
WarningCountingShellCommand(
name = "compile",
command = ['nice', '-n', '10',
make, WithProperties("-j%s" % jobs)],
haltOnFailure = True,
description = "compiling llvm",
descriptionDone = "compile llvm",
workdir = llvm_objdir,
env = merged_env,
timeout = timeout * 60))
if examples:
f.addStep(
WarningCountingShellCommand(
name = "compile.examples",
command = ['nice', '-n', '10',
make, WithProperties("-j%s" % jobs),
'BUILD_EXAMPLES=1'],
haltOnFailure = True,
description = ["compiling", "llvm", "examples"],
descriptionDone = ["compile", "llvm", "examples"],
workdir = llvm_objdir,
env = merged_env,
timeout = timeout * 60))
if test:
litTestArgs = '-v -j %s' % jobs
if valgrind:
litTestArgs += ' --vg '
if valgrindLeakCheck:
litTestArgs += ' --vg-leak'
if valgrindSuppressions is not None:
litTestArgs += ' --vg-arg --suppressions=%%(builddir)s/llvm/%s' % valgrindSuppressions
f.addStep(
LitTestCommand(
name = 'test-llvm',
command = [make, "check-lit", "VERBOSE=1",
WithProperties("LIT_ARGS=%s" % litTestArgs)],
description = ["testing", "llvm"],
descriptionDone = ["test", "llvm"],
workdir = llvm_objdir,
env = merged_env))
return f
def getLLVMCMakeBuildFactory(
clean = True, # "clean-llvm" step is requested if true. clean = True, # "clean-llvm" step is requested if true.
test = True, # "test-llvm" step is requested if true. test = True, # "test-llvm" step is requested if true.
jobs = '%(jobs)s', # Number of concurrent jobs. jobs = '%(jobs)s', # Number of concurrent jobs.
timeout = 20, # Timeout if no activity seen (minutes). timeout = 20, # Timeout if no activity seen (minutes).
make = 'make', # Make command. make = 'make', # Make command.
enable_shared = False, # Enable shared (-DBUILD_SHARED_LIBS=ON configure parameters added) if true. enable_shared = False, # Enable shared (-DBUILD_SHARED_LIBS=ON configure parameters added) if true.
defaultBranch = 'trunk', # Branch to build. defaultBranch = 'trunk', # Branch to build.
config_name = 'Debug', # Configuration name. config_name = 'Debug', # Configuration name.
▲ Show 20 Lines • Show All 79 Lines • Show Last 20 Lines