Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libc: make new bootstrap builder a dup of runtimes #332

Merged
merged 3 commits into from
Dec 9, 2024
Merged

libc: make new bootstrap builder a dup of runtimes #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15251a4
libc: make new bootstrap builder a dup of runtimes
nickdesaulniers Dec 4, 2024
029e402
rename libc-x86_64-debian-dbg-bootstrap-build to libc-x86_64-debian-d…
nickdesaulniers Dec 4, 2024
983da19
sort libc buildbot list
nickdesaulniers Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildbot/osuosl/master/config/builders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2237,10 +2237,10 @@
depends_on_projects=['llvm', 'libc', 'clang', 'clang-tools-extra'],
extra_args=['--debug', '--asan'])},

{'name' : "libc-x86_64-debian-dbg-runtimes-build",
{'name' : "libc-x86_64-debian-dbg-bootstrap-build",
'tags' : ["libc"],
'workernames' : ["libc-x86_64-debian"],
'builddir': "libc-x86_64-debian-dbg-runtimes-build",
'builddir': "libc-x86_64-debian-dbg-bootstrap-build",
'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
script="libc-linux.py",
depends_on_projects=['llvm', 'libc', 'clang', 'clang-tools-extra'],
Expand Down
21 changes: 11 additions & 10 deletions buildbot/osuosl/master/config/status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,20 +285,21 @@ def getReporters():
generators = [
utils.LLVMDefaultBuildStatusGenerator(
builders = [
"libc-x86_64-debian",
"libc-x86_64_debian-dbg",
"libc-x86_64-debian-dbg-runtimes-build",
"libc-x86_64-debian-dbg-asan",
"libc-aarch64-ubuntu-dbg",
"libc-x86_64-windows-dbg",
"libc-arm32-debian-dbg",
"libc-aarch64-ubuntu-fullbuild-dbg",
"libc-x86_64-debian-fullbuild-dbg",
"libc-x86_64-debian-gcc-fullbuild-dbg",
"libc-x86_64-debian-fullbuild-dbg-asan",
"libc-arm32-debian-dbg",
"libc-riscv64-debian-dbg",
"libc-riscv64-debian-fullbuild-dbg",
"libc-x86_64-debian-dbg-lint"])
"libc-x86_64-debian",
"libc-x86_64-debian-dbg-asan",
"libc-x86_64-debian-dbg-bootstrap-build",
"libc-x86_64-debian-dbg-lint",
"libc-x86_64-debian-fullbuild-dbg",
"libc-x86_64-debian-fullbuild-dbg-asan",
"libc-x86_64-debian-gcc-fullbuild-dbg",
"libc-x86_64-windows-dbg",
"libc-x86_64_debian-dbg",
])
]),
reporters.MailNotifier(
dumpMailsToLog = True, # TODO: For debug purposes only. Remove this later.
Expand Down
14 changes: 9 additions & 5 deletions zorg/buildbot/builders/annotated/libc-linux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ def is_fullbuild_builder(builder_name):
def is_runtimes_builder(builder_name):
return ('runtimes' in builder_name.split('-'))

def is_bootstrap_builder(builder_name):
return 'bootstrap' in builder_name

def is_gcc_builder(builder_name):
return ('gcc' in builder_name.split('-'))

Expand Down Expand Up @@ -42,6 +45,7 @@ def main(argv):
builder_name = os.environ.get('BUILDBOT_BUILDERNAME')
fullbuild = is_fullbuild_builder(builder_name)
runtimes_build = is_runtimes_builder(builder_name)
bootstrap_build = is_bootstrap_builder(builder_name)
gcc_build = is_gcc_builder(builder_name)
lint_build = is_lint_builder(builder_name)
riscv_build = is_riscv_builder(builder_name)
Expand Down Expand Up @@ -72,11 +76,11 @@ def main(argv):
if lint_build:
cmake_args.append('-DLLVM_LIBC_CLANG_TIDY=%s' % clang_tidy)

if runtimes_build:
projects = ['llvm', 'clang']
if runtimes_build or bootstrap_build:
projects = ['clang']
cmake_args.append('-DLLVM_ENABLE_RUNTIMES=libc')
else:
projects = ['llvm', 'libc']
projects = ['libc']

if args.debug:
cmake_args.append('-DCMAKE_BUILD_TYPE=Debug')
Expand Down Expand Up @@ -127,7 +131,7 @@ def main(argv):
with step('build libc-startup'):
run_command(['ninja', 'libc-startup'])

if runtimes_build:
if runtimes_build or bootstrap_build:
with step('check-libc'):
run_command(['ninja', 'check-libc'])
else:
Expand All @@ -146,7 +150,7 @@ def main(argv):
with step('Benchmark Utils Tests'):
run_command(['ninja', 'libc-benchmark-util-tests'])

if not (fullbuild or runtimes_build) and x86_64_build:
if not (fullbuild or runtimes_build or bootstrap_build) and x86_64_build:
with step('libc-fuzzer'):
run_command(['ninja', 'libc-fuzzer'])

Expand Down