This is an archive of the discontinued LLVM Phabricator instance.

Differential D137988

[BOLT] Fold bolt-x86_64-ubuntu into bolt-nfc builder
ClosedPublic

Authored by Amir on Nov 14 2022, 2:56 PM.

Details

Reviewers
gkistanova
Group Reviewers
Restricted Project
Commits
rZORGf72bdba3a7fc: [BOLT] Fold bolt-x86_64-ubuntu into bolt-nfc builder
Summary

Remove bolt-x86_64-ubuntu builder as its functionality is covered by bolt-nfc
builder.

Diff Detail

Event Timeline

Amir created this revision.Nov 14 2022, 2:56 PM
Herald added a reviewer: gkistanova. · View Herald TranscriptNov 14 2022, 2:56 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: treapster, pengfei. · View Herald Transcript
Amir requested review of this revision.Nov 14 2022, 2:56 PM
Harbormaster completed remote builds in B197633: Diff 475287.Nov 14 2022, 2:56 PM
gkistanova accepted this revision.Nov 15 2022, 9:49 AM

LGTM.

This revision is now accepted and ready to land.Nov 15 2022, 9:49 AM
Closed by commit rZORGf72bdba3a7fc: [BOLT] Fold bolt-x86_64-ubuntu into bolt-nfc builder (authored by Amir). · Explain WhyNov 15 2022, 10:22 AM
This revision was automatically updated to reflect the committed changes.
Amir added a commit: rZORGf72bdba3a7fc: [BOLT] Fold bolt-x86_64-ubuntu into bolt-nfc builder.

Revision Contents

PathSize
buildbot/
osuosl/
master/
config/
15 lines
zorg/
buildbot/
builders/
annotated/
4 lines

Diff 475514

buildbot/osuosl/master/config/builders.py

Show First 20 Lines • Show All 2,460 Lines • ▼ Show 20 Lines 'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
"-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=0", "-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=0",
"-DLLVM_ENABLE_LIBPFM=OFF", "-DLLVM_ENABLE_LIBPFM=OFF",
"-DLLVM_TARGETS_TO_BUILD=X86", "-DLLVM_TARGETS_TO_BUILD=X86",
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=ARC", "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=ARC",
])}, ])},
# BOLT builders managed by Meta # BOLT builders managed by Meta
{'name': "bolt-x86_64-ubuntu",
'tags': ["bolt"],
'collapseRequests': False,
'workernames':["bolt-worker"],
'builddir': "bolt-x86_64-ubuntu-bolttests",
'factory' : BOLTBuilder.getBOLTCmakeBuildFactory(
bolttests=True,
extra_configure_args=[
"-DLLVM_APPEND_VC_REV=OFF",
"-DLLVM_CCACHE_BUILD=ON",
"-DLLVM_ENABLE_PROJECTS=clang;lld;bolt",
"-DLLVM_TARGETS_TO_BUILD=X86;AArch64",
],
)},
{'name' : 'bolt-x86_64-ubuntu-nfc', {'name' : 'bolt-x86_64-ubuntu-nfc',
'tags' : ["bolt"], 'tags' : ["bolt"],
'collapseRequests': False, 'collapseRequests': False,
'workernames' : ['bolt-worker'], 'workernames' : ['bolt-worker'],
'builddir': "bolt-x86_64-ubuntu-nfc", 'builddir': "bolt-x86_64-ubuntu-nfc",
'factory' : AnnotatedBuilder.getAnnotatedBuildFactory( 'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
script="bolt-nfc.py", script="bolt-nfc.py",
depends_on_projects=['llvm', 'bolt'], depends_on_projects=['llvm', 'bolt'],
▲ Show 20 Lines • Show All 262 Lines • Show Last 20 Lines

zorg/buildbot/builders/annotated/bolt-nfc.py

Show All 22 Linesdef main():
with step('cmake'): with step('cmake'):
cmake_args = ['-GNinja', cmake_args = ['-GNinja',
'-DCMAKE_BUILD_TYPE=Release', '-DCMAKE_BUILD_TYPE=Release',
'-DLLVM_APPEND_VC_REV=OFF', '-DLLVM_APPEND_VC_REV=OFF',
'-DLLVM_CCACHE_BUILD=ON', '-DLLVM_CCACHE_BUILD=ON',
'-DLLVM_ENABLE_ASSERTIONS=ON', '-DLLVM_ENABLE_ASSERTIONS=ON',
'-DLLVM_ENABLE_LLD=ON', '-DLLVM_ENABLE_LLD=ON',
'-DLLVM_ENABLE_PROJECTS=bolt', '-DLLVM_ENABLE_PROJECTS=clang;lld;bolt',
'-DLLVM_TARGETS_TO_BUILD=X86;AArch64', '-DLLVM_TARGETS_TO_BUILD=X86;AArch64',
'-DBOLT_CLANG_EXE=/usr/bin/clang',
'-DBOLT_LLD_EXE=/usr/bin/ld.lld',
'-DLLVM_EXTERNAL_PROJECTS=bolttests', '-DLLVM_EXTERNAL_PROJECTS=bolttests',
'-DLLVM_EXTERNAL_BOLTTESTS_SOURCE_DIR='+tests_dir, '-DLLVM_EXTERNAL_BOLTTESTS_SOURCE_DIR='+tests_dir,
] ]
run_command(['cmake', os.path.join(source_dir, 'llvm')] + cmake_args) run_command(['cmake', os.path.join(source_dir, 'llvm')] + cmake_args)
with step('build bolt'): with step('build bolt'):
run_command(['ninja', 'bolt']) run_command(['ninja', 'bolt'])
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines