This is an archive of the discontinued LLVM Phabricator instance.

Differential D28661

[zorg] Delete LLVMGCCBuilder and its uses in dead code paths
AbandonedPublic

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

Details

Reviewers
gkistanova

Diff Detail

Event Timeline

Hahnfeld updated this revision to Diff 84251.Jan 13 2017, 1:03 AM
Hahnfeld retitled this revision from to [zorg] Delete LLVMGCCBuilder and its uses in dead code paths.
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/
llvmlab/
master/
config/
42 lines
test/
buildbot/
builders/
4 lines
zorg/
buildbot/
builders/
util/
5 lines

Diff 84251

buildbot/llvmlab/master/config/builderconstruction.py

Show First 20 Lines • Show All 80 Lines • ▼ Show 20 Linesdef construct_compiler_builder_from_name(name, use_lto=False,
# Hack around x86_64 problem for now, to avoid changing builder names yet. # Hack around x86_64 problem for now, to avoid changing builder names yet.
# #
# FIXME: Use a better mangling. # FIXME: Use a better mangling.
params = name.replace("x86_64", "x86$64").split('_') params = name.replace("x86_64", "x86$64").split('_')
if len(params) == 2: if len(params) == 2:
name, branch = params name, branch = params
name = name.replace("x86$64", "x86_64") name = name.replace("x86$64", "x86_64")
params = name.replace('llvm-gcc', 'llvm$gcc').split('-')
params = [p.replace('llvm$gcc', 'llvm-gcc')
for p in params]
if len(params) == 4: if len(params) == 4:
compiler,host_arch,host_os,build_style = params compiler,host_arch,host_os,build_style = params
build_cc = None build_cc = None
elif len(params) == 5: elif len(params) == 5:
compiler,host_arch,host_os,build_cc,build_style = params compiler,host_arch,host_os,build_cc,build_style = params
else: else:
raise ValueError, "invalid builder name: %r" % name raise ValueError, "invalid builder name: %r" % name
Show All 37 Linesdef construct_compiler_builder_from_name(name, use_lto=False,
if compiler == 'clang': if compiler == 'clang':
if host_os == 'darwin11': if host_os == 'darwin11':
config_options.extend(['--enable-libcpp']) config_options.extend(['--enable-libcpp'])
return { 'factory' : ClangBuilder.phasedClang(config_options, return { 'factory' : ClangBuilder.phasedClang(config_options,
is_bootstrap=(build_cc is None), is_bootstrap=(build_cc is None),
use_lto=use_lto, use_lto=use_lto,
incremental=incremental) } incremental=incremental) }
elif compiler == 'llvm-gcc':
# Currently, llvm-gcc builders do their own two-stage build,
# they don't use any prebuilt artifacts.
# Set the gxxincludedir.
if host_os == 'darwin9':
gxxincludedir = "/usr/include/c++/4.0.0"
elif host_os == 'darwin11':
gxxincludedir = "/usr/include/c++/v1"
else:
gxxincludedir = "/usr/include/c++/4.2.1"
# Construct the GCC style build triple:
if host_arch == "i386" and host_os.startswith("darwin"):
triple = 'i686-apple-%s' % host_os
elif host_arch == "x86_64" and host_os.startswith("darwin"):
triple = 'x86_64-apple-%s' % host_os
else:
raise ValueError, "invalid builder name: %r" % name
dst = rsync_user + '@' + master_name + ':~/artifacts/' + name + '/'
return {
'factory' : LLVMGCCBuilder.getLLVMGCCBuildFactory(
jobs = '%(jobs)s', triple = triple,
gxxincludedir = gxxincludedir,
stage1_config = build_config, stage2_config = build_config,
package_dst = dst) }
else: else:
raise NotImplementedError raise NotImplementedError
def construct_lnt_builder_from_name(name): def construct_lnt_builder_from_name(name):
# LNT builds are named following: # LNT builds are named following:
# lnt_<compiler under test>_<arch>_<options>. # lnt_<compiler under test>_<arch>_<options>.
# and all options are prefixed by '-' and no '-' can appear in an option. # and all options are prefixed by '-' and no '-' can appear in an option.
Show All 13 Linesdef construct_lnt_builder_from_name(name):
split_options = lnt_options_string.split('-') split_options = lnt_options_string.split('-')
arch = split_options[0] arch = split_options[0]
lnt_options = ['-'+s lnt_options = ['-'+s
for s in split_options[1:]] for s in split_options[1:]]
# Create the LNT flags. # Create the LNT flags.
lnt_flags = [] lnt_flags = []
# If this is llvm-gcc, don't expect it to honor -arch (that is actually the
# "driver driver"). Hard coded to support only i386 and x86_64 for now.
if name.startswith('llvm-gcc'):
if arch == 'x86_64':
lnt_flags.extend(["--cflag", "-m64"])
elif arch == 'i386':
lnt_flags.extend(["--cflag", "-m32"])
else:
raise ValueError, "invalid builder name: %r" % name
else:
lnt_flags.extend(["--arch", arch]) lnt_flags.extend(["--arch", arch])
for option in lnt_options: for option in lnt_options:
# FIXME: Reorganize this. # FIXME: Reorganize this.
if option in ('-g','-flto'): if option in ('-g','-flto'):
lnt_flags.extend(["--cflag", option]) lnt_flags.extend(["--cflag", option])
else: else:
lnt_flags.extend(["--optimize-option", option]) lnt_flags.extend(["--optimize-option", option])
lnt_flags.append("--small") lnt_flags.append("--small")
▲ Show 20 Lines • Show All 46 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, LLVMGCCBuilder from zorg.buildbot.builders import ClangBuilder, LLVMBuilder
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 LLVMBuilder.getLLVMBuildFactory()
print LLVMGCCBuilder.getLLVMGCCBuildFactory()
print SanitizerBuilder.getSanitizerBuildFactory() print SanitizerBuilder.getSanitizerBuildFactory()

zorg/buildbot/builders/LLVMGCCBuilder.py

  • This file was deleted.
import buildbot
from buildbot.steps.source import SVN
from buildbot.steps.shell import Configure, WarningCountingShellCommand
from buildbot.steps.shell import ShellCommand, SetProperty
from buildbot.process.properties import WithProperties
from zorg.buildbot.commands.LitTestCommand import LitTestCommand
from Util import getConfigArgs
def getLLVMGCCBuildFactory(jobs='%(jobs)s', update=True, clean=True,
gxxincludedir=None,
triple=None, build=None, host=None, target=None,
useTwoStage=True, stage1_config='Release+Asserts',
stage2_config='Release+Asserts', make='make',
extra_configure_args=[], extra_languages=None,
verbose=False, env = {}, defaultBranch='trunk',
timeout=20, package_dst=None):
if build or host or target:
if not build or not host or not target:
raise ValueError,"Must specify all of 'build', 'host', 'target' if used."
if triple:
raise ValueError,"Cannot specify 'triple' and 'build', 'host', 'target' options."
elif triple:
build = host = target = triple
# 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.
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))
# Get the sources.
if update:
f.addStep(SVN(name='svn-llvm',
mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
defaultBranch = defaultBranch,
workdir = "llvm.src"))
f.addStep(SVN(name='svn-llvm-gcc',
mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm-gcc-4.2/',
defaultBranch = defaultBranch,
workdir = "llvm-gcc.src"))
# Clean up llvm (stage 1).
if clean:
f.addStep(ShellCommand(name="rm-llvm.obj.stage1",
command=["rm", "-rf", "llvm.obj"],
haltOnFailure = True,
description = ["rm build dir",
"llvm",
"(stage 1)"],
workdir = ".",
env = merged_env))
# Configure llvm (stage 1).
base_llvm_configure_args = [WithProperties("%(builddir)s/llvm.src/configure")]
if build:
base_llvm_configure_args.append('--build=' + build)
base_llvm_configure_args.append('--host=' + host)
base_llvm_configure_args.append('--target=' + target)
stage_configure_args = getConfigArgs(stage1_config)
f.addStep(Configure(name='configure.llvm.stage1',
command=base_llvm_configure_args +
stage_configure_args +
["--without-llvmgcc",
"--without-llvmgxx"],
description = [ "configure",
"llvm",
"(stage 1)",
stage1_config ],
workdir = "llvm.obj",
env = merged_env))
# Build llvm (stage 1).
base_llvm_make_args = ['nice', '-n', '10',
make, WithProperties("-j%s" % jobs)]
if verbose:
base_llvm_make_args.append('VERBOSE=1')
f.addStep(WarningCountingShellCommand(name = "compile.llvm.stage1",
command = base_llvm_make_args,
haltOnFailure = True,
description = ["compile",
"llvm",
"(stage 1)",
stage1_config],
workdir = "llvm.obj",
env = merged_env,
timeout = timeout * 60))
# Run LLVM tests (stage 1).
f.addStep(LitTestCommand(name = 'test.llvm.stage1',
command = [make, "check-lit", "VERBOSE=1"],
description = ["testing", "llvm"],
descriptionDone = ["test", "llvm"],
workdir = 'llvm.obj',
env = merged_env))
# Clean up llvm-gcc.
if clean:
f.addStep(ShellCommand(name="rm-llvm-gcc.obj.stage1",
command=["rm", "-rf", "llvm-gcc.obj"],
haltOnFailure = True,
description = ["rm build dir",
"llvm-gcc"],
workdir = ".",
env = merged_env))
# Configure llvm-gcc.
base_llvmgcc_configure_args = ["../llvm-gcc.src/configure"]
llvmgcc_languages = "--enable-languages=c,c++"
if extra_languages:
llvmgcc_languages = llvmgcc_languages + "," + extra_languages
base_llvmgcc_configure_args.append(llvmgcc_languages)
if gxxincludedir:
base_llvmgcc_configure_args.append('--with-gxx-include-dir=' + gxxincludedir)
base_llvmgcc_configure_args.extend(extra_configure_args)
if build:
base_llvmgcc_configure_args.append('--build=' + build)
base_llvmgcc_configure_args.append('--host=' + host)
base_llvmgcc_configure_args.append('--target=' + target)
f.addStep(Configure(name='configure.llvm-gcc.stage1',
command=(base_llvmgcc_configure_args +
["--program-prefix=llvm-",
WithProperties("--prefix=%(builddir)s/llvm-gcc.install"),
WithProperties("--enable-llvm=%(builddir)s/llvm.obj")]),
haltOnFailure = True,
description = ["configure",
"llvm-gcc",
"(stage 1)"],
workdir = "llvm-gcc.obj",
env = merged_env))
# Build llvm-gcc.
f.addStep(WarningCountingShellCommand(name="compile.llvm-gcc.stage1",
command=['nice', '-n', '10',
make, WithProperties("-j%s" % jobs)],
haltOnFailure = True,
description = ["compile",
"llvm-gcc"],
workdir = "llvm-gcc.obj",
env = merged_env,
timeout = timeout * 60))
# Clean up llvm-gcc install.
if clean:
f.addStep(ShellCommand(name="rm-llvm-gcc.install.stage1",
command=["rm", "-rf", "llvm-gcc.install"],
haltOnFailure = True,
description = ["rm install dir",
"llvm-gcc"],
workdir = ".",
env = merged_env))
# Install llvm-gcc.
f.addStep(WarningCountingShellCommand(name="install.llvm-gcc.stage1",
command=['nice', '-n', '10',
make, 'install'],
haltOnFailure = True,
description = ["install",
"llvm-gcc"],
workdir = "llvm-gcc.obj",
env = merged_env))
# We are done if not doing a two-stage build.
if not useTwoStage:
return f
# Clean up llvm (stage 2).
if clean:
f.addStep(ShellCommand(name="rm-llvm.obj.stage2",
command=["rm", "-rf", "llvm.obj.2"],
haltOnFailure = True,
description = ["rm build dir",
"llvm",
"(stage 2)"],
workdir = ".",
env = merged_env))
# Configure llvm (stage 2).
stage_configure_args = getConfigArgs(stage2_config)
local_env = dict(merged_env)
local_env['CC'] = WithProperties("%(builddir)s/llvm-gcc.install/bin/llvm-gcc")
local_env['CXX'] = WithProperties("%(builddir)s/llvm-gcc.install/bin/llvm-g++")
f.addStep(Configure(name="configure.llvm.stage2",
command=base_llvm_configure_args +
stage_configure_args +
[WithProperties("--with-llvmgcc=%(builddir)s/llvm-gcc.install/bin/llvm-gcc"),
WithProperties("--with-llvmgxx=%(builddir)s/llvm-gcc.install/bin/llvm-g++")],
haltOnFailure = True,
description = ["configure",
"llvm",
"(stage 2)",
stage2_config],
workdir = "llvm.obj.2",
env = local_env))
# Build LLVM (stage 2).
f.addStep(WarningCountingShellCommand(name = "compile.llvm.stage2",
command = base_llvm_make_args,
haltOnFailure = True,
description = ["compile",
"llvm",
"(stage 2)",
stage2_config],
workdir = "llvm.obj.2",
env = merged_env,
timeout = timeout * 60))
# Run LLVM tests (stage 2).
f.addStep(LitTestCommand(name = 'test.llvm.stage2',
command = [make, "check-lit", "VERBOSE=1"],
description = ["testing", "llvm", "(stage 2)"],
descriptionDone = ["test", "llvm", "(stage 2)"],
workdir = 'llvm.obj.2',
env = merged_env))
# Clean up llvm-gcc (stage 2).
if clean:
f.addStep(ShellCommand(name="rm-llvm-gcc.obj.stage2",
command=["rm", "-rf", "llvm-gcc.obj.2"],
haltOnFailure = True,
description = ["rm build dir",
"llvm-gcc",
"(stage 2)"],
workdir = ".",
env = merged_env))
# Configure llvm-gcc (stage 2).
local_env = dict(merged_env)
local_env['CC'] = WithProperties("%(builddir)s/llvm-gcc.install/bin/llvm-gcc")
local_env['CXX'] = WithProperties("%(builddir)s/llvm-gcc.install/bin/llvm-g++")
f.addStep(Configure(name = 'configure.llvm-gcc.stage2',
command=base_llvmgcc_configure_args + [
"--program-prefix=llvm.2-",
WithProperties("--prefix=%(builddir)s/llvm-gcc.install.2"),
WithProperties("--enable-llvm=%(builddir)s/llvm.obj.2")],
haltOnFailure = True,
description = ["configure",
"llvm-gcc",
"(stage 2)"],
workdir = "llvm-gcc.obj.2",
env = local_env))
# Build llvm-gcc (stage 2).
f.addStep(WarningCountingShellCommand(name="compile.llvm-gcc.stage2",
command=['nice', '-n', '10',
make, WithProperties("-j%s" % jobs)],
haltOnFailure = True,
description = ["compile",
"llvm-gcc",
"(stage 2)"],
workdir = "llvm-gcc.obj.2",
env = merged_env,
timeout = timeout * 60))
# Clean up llvm-gcc install (stage 2).
if clean:
f.addStep(ShellCommand(name="rm-llvm-gcc.install.stage2",
command=["rm", "-rf", "llvm-gcc.install.2"],
haltOnFailure = True,
description = ["rm install dir",
"llvm-gcc",
"(stage 2)"],
workdir = ".",
env = merged_env))
# Install llvm-gcc.
f.addStep(WarningCountingShellCommand(name="install.llvm-gcc.stage2",
command = ['nice', '-n', '10',
make, 'install'],
haltOnFailure = True,
description = ["install",
"llvm-gcc",
"(stage 2)"],
workdir = "llvm-gcc.obj.2",
env = merged_env))
if package_dst:
addPackageStep(f, package_dst, obj_path = 'llvm-gcc.install.2', env = merged_env)
return f
import os
def addPackageStep(f, package_dst,
obj_path,
info_string = '%(phase_id)s',
env = {}):
# Package and upload.
name = WithProperties(
os.path.join("%(builddir)s", obj_path,
"llvm-gcc-%s.tar.gz" % info_string))
f.addStep(ShellCommand(name = 'pkg.tar',
description = "tar root",
command = ["tar", "zcvf", name, "./"],
workdir = obj_path,
env = env,
warnOnFailure = True,
flunkOnFailure = False,
haltOnFailure = False))
f.addStep(ShellCommand(name = 'pkg.upload',
description = "upload root",
command = ["scp", name, package_dst],
workdir = ".",
env = env,
warnOnFailure = True,
flunkOnFailure = False,
haltOnFailure = False))

zorg/buildbot/util/phasedbuilderutils.py

Show All 28 Lines def start(self):
for builder in self.triggeredBuilders: for builder in self.triggeredBuilders:
print >>logText, ('<b><a href="../../../../../../%s">%s' print >>logText, ('<b><a href="../../../../../../%s">%s'
'</a></b><br>' % (builder, builder)) '</a></b><br>' % (builder, builder))
self.addHTMLLog('triggered builds', str(logText.getvalue())) self.addHTMLLog('triggered builds', str(logText.getvalue()))
# Dispatch to the super class. # Dispatch to the super class.
Trigger.start(self) Trigger.start(self)
def _project_from_name(buildname): def _project_from_name(buildname):
name = buildname.replace('llvm-gcc', 'llvm$gcc')\ name = buildname.replace('apple-clang', 'apple$clang')
.replace('apple-clang', 'apple$clang')
params = name.split('-') params = name.split('-')
project = params[0].replace('$', '-') project = params[0].replace('$', '-')
return project return project
def _determine_remote_file(props): def _determine_remote_file(props):
return os.path.join(os.getcwd(),props['scheduler'] + '_changes.txt') return os.path.join(os.getcwd(),props['scheduler'] + '_changes.txt')
def _load_changelist(props): def _load_changelist(props):
▲ Show 20 Lines • Show All 234 Lines • ▼ Show 20 Lines f.addStep(MasterShellCommand(
haltOnFailure = True, haltOnFailure = True,
description = ['create', validated_build_dir, 'dir'])) description = ['create', validated_build_dir, 'dir']))
for phase in config.phase_config.phases: for phase in config.phase_config.phases:
for build in phase['builders']: for build in phase['builders']:
buildname = build['name'] buildname = build['name']
project = _project_from_name(buildname) project = _project_from_name(buildname)
if project in ('clang', 'llvm-gcc', 'apple-clang'): if project in ('clang', 'apple-clang'):
file_str = project + '-%(get_phase_id)s.tar.gz' file_str = project + '-%(get_phase_id)s.tar.gz'
link_str = os.path.join(artifacts_dir, buildname, link_str = os.path.join(artifacts_dir, buildname,
file_str) file_str)
build_artifacts_dir = os.path.join(artifacts_dir, validated_build_dir, build_artifacts_dir = os.path.join(artifacts_dir, validated_build_dir,
buildname) buildname)
f.addStep(MasterShellCommand( f.addStep(MasterShellCommand(
name='Publish.Latest.' + buildname, name='Publish.Latest.' + buildname,
Show All 40 Lines
buildbot/llvmlab/master/config/builderconstruction.py