This is an archive of the discontinued LLVM Phabricator instance.

Differential D117267

[lldb] Add support for choosing which checks to run on lldb builders
AbandonedPublic

Authored by stella.stamenova on Jan 13 2022, 5:49 PM.

Details

Reviewers
JDevlieghere
gkistanova
Summary

This change adds the option to select checks for the lldb builders and then uses the new option for the windows lldb builder.

The implementation is based on how the UnifiedTreeBuilder handles the checks.

Diff Detail

Event Timeline

stella.stamenova requested review of this revision.Jan 13 2022, 5:49 PM
stella.stamenova created this revision.
stella.stamenova added inline comments.
zorg/buildbot/builders/LLDBBuilder.py
112

@gkistanova : What version of python runs on buildbot? This should work fine for Python 3, but not for Python 2 if I remember correctly.

stella.stamenova retitled this revision from [lldb] Add support for choosing which checks to run to lldb builders to [lldb] Add support for choosing which checks to run on lldb builders.Jan 13 2022, 8:38 PM
JDevlieghere accepted this revision.Jan 13 2022, 9:26 PM

LGTM

zorg/buildbot/builders/LLDBBuilder.py
112

According to https://lab.llvm.org/buildbot/#/about, it's running Python 3.6.

This revision is now accepted and ready to land.Jan 13 2022, 9:26 PM
gkistanova accepted this revision.Jan 26 2022, 9:59 PM

The patch looks good. Thanks, Stella!

Jonas is right, we are running Python 3 on buildbot, so that's fine.

zorg/buildbot/builders/LLDBBuilder.py
111

Are you sure you don't want to use LitTestCommand for the check steps? That would parse the test failures and warnings and would provide a bit better UI for that. The check-lldb* tests are LIT tests, right?

stella.stamenova marked an inline comment as done.Jan 27 2022, 12:36 PM
stella.stamenova added a subscriber: omjavaid.

@gkistanova: Thanks for the review! Since @omjavaid asked if we could keep the API tests running, I am going to see if there are other things we can do before disabling them entirely, so I've put this change on hold for the moment. If we end up not needing it, I'll abandon it. I sent out https://reviews.llvm.org/D118403 earlier which will disable just all of the watchpoint tests and that should help with stability.

zorg/buildbot/builders/LLDBBuilder.py
111

They are lit tests, thanks for pointing this out. If we decide to make this change in addition to the new one I sent out, I'll make the change.

stella.stamenova abandoned this revision.Jan 31 2022, 4:26 PM

Disabling the watchpoint tests was sufficient to get the buildbot happy, so we no longer have need of this.

Revision Contents

PathSize
buildbot/
osuosl/
master/
config/
4 lines
zorg/
buildbot/
builders/
23 lines

Diff 399858

buildbot/osuosl/master/config/builders.py

Show First 20 Lines • Show All 1,194 Lines • ▼ Show 20 Lines 'factory' : LLDBBuilder.getLLDBCMakeBuildFactory(
'-DLLVM_USE_LINKER=gold'])}, '-DLLVM_USE_LINKER=gold'])},
{'name' : "lldb-x64-windows-ninja", {'name' : "lldb-x64-windows-ninja",
'tags' : ["lldb"], 'tags' : ["lldb"],
'workernames' : ["win-py3-buildbot"], 'workernames' : ["win-py3-buildbot"],
'builddir': "lldb-x64-windows-ninja", 'builddir': "lldb-x64-windows-ninja",
'factory' : LLDBBuilder.getLLDBCMakeBuildFactory( 'factory' : LLDBBuilder.getLLDBCMakeBuildFactory(
clean=True, clean=True,
python_source_dir=r'"C:\Program Files (x86)\Microsoft Visual Studio\Shared\Python36_64"',
target_arch='x64', target_arch='x64',
vs="autodetect", vs="autodetect",
test=True, test=True,
checks=[
'check-lldb-shell',
'check-lldb-unit'],
extra_cmake_args=[ extra_cmake_args=[
'-DLLVM_ENABLE_ASSERTIONS=OFF', '-DLLVM_ENABLE_ASSERTIONS=OFF',
'-DLLVM_ENABLE_ZLIB=FALSE', '-DLLVM_ENABLE_ZLIB=FALSE',
'-DLLDB_ENABLE_PYTHON=TRUE'])}, '-DLLDB_ENABLE_PYTHON=TRUE'])},
# LLD builders. # LLD builders.
{'name' : "lld-x86_64-win", {'name' : "lld-x86_64-win",
▲ Show 20 Lines • Show All 1,071 Lines • Show Last 20 Lines

zorg/buildbot/builders/LLDBBuilder.py

Show All 18 Linesdef getLLDBCMakeBuildFactory(
# Default values for VS devenv and build configuration # Default values for VS devenv and build configuration
vs=None, vs=None,
config='Release', config='Release',
target_arch='x86', target_arch='x86',
extra_cmake_args=None, extra_cmake_args=None,
test=False, test=False,
testTimeout=2400, testTimeout=2400,
checks=None,
install=False): install=False):
############# PREPARING ############# PREPARING
# Global configurations # Global configurations
build_dir='build' build_dir='build'
f = LLVMBuildFactory( f = LLVMBuildFactory(
depends_on_projects=["llvm", "clang", "lldb", "lld"], depends_on_projects=["llvm", "clang", "lldb", "lld"],
obj_dir=build_dir) obj_dir=build_dir)
env = {} env = {}
# Determine Slave Environment and Set MSVC environment. # Determine Slave Environment and Set MSVC environment.
if vs and vs != 'manual': if vs and vs != 'manual':
f.addStep(SetProperty( f.addStep(SetProperty(
command=getVisualStudioEnvironment(vs, target_arch), command=getVisualStudioEnvironment(vs, target_arch),
extract_fn=extractVSEnvironment)) extract_fn=extractVSEnvironment))
env = Property('vs_env') env = Property('vs_env')
if checks is None:
checks = ['check-lldb']
f.addGetSourcecodeSteps() f.addGetSourcecodeSteps()
build_cmd=['ninja'] build_cmd=['ninja']
install_cmd = ['ninja','install'] install_cmd = ['ninja','install']
test_cmd = ['ninja','check-lldb'] test_cmd = ['ninja']
lit_args = '-v' lit_args = '-v'
if jobs: if jobs:
build_cmd.append(WithProperties("-j%s" % jobs)) build_cmd.append(WithProperties("-j%s" % jobs))
install_cmd.append(WithProperties("-j%s" % jobs)) install_cmd.append(WithProperties("-j%s" % jobs))
test_cmd.append(WithProperties("-j%s" % jobs)) test_cmd.append(WithProperties("-j%s" % jobs))
lit_args += " -j%s" % jobs lit_args += " -j%s" % jobs
Show All 39 Lines f.addStep(ShellCommand(name='install',
command=install_cmd, command=install_cmd,
flunkOnFailure=ignoreInstallFail, flunkOnFailure=ignoreInstallFail,
description='ninja install', description='ninja install',
workdir=build_dir, workdir=build_dir,
doStepIf=bool(install), doStepIf=bool(install),
env=env)) env=env))
ignoreTestFail = bool(test != 'ignoreFail') ignoreTestFail = bool(test != 'ignoreFail')
f.addStep(ShellCommand(name='test', for check in checks:
command=test_cmd, f.addStep(ShellCommand(name='test-%s' % check,
gkistanovaUnsubmitted
Not Done
ReplyInline Actions

Are you sure you don't want to use LitTestCommand for the check steps? That would parse the test failures and warnings and would provide a bit better UI for that. The check-lldb* tests are LIT tests, right?

gkistanova: Are you sure you don't want to use `LitTestCommand` for the check steps? That would parse the…
stella.stamenovaAuthorUnsubmitted
Done
ReplyInline Actions

They are lit tests, thanks for pointing this out. If we decide to make this change in addition to the new one I sent out, I'll make the change.

stella.stamenova: They are lit tests, thanks for pointing this out. If we decide to make this change in addition…
command=[*test_cmd, check],
stella.stamenovaAuthorUnsubmitted
Done
ReplyInline Actions

@gkistanova : What version of python runs on buildbot? This should work fine for Python 3, but not for Python 2 if I remember correctly.

stella.stamenova: @gkistanova : What version of python runs on buildbot? This should work fine for Python 3, but…
JDevlieghereUnsubmitted
Done
ReplyInline Actions

According to https://lab.llvm.org/buildbot/#/about, it's running Python 3.6.

JDevlieghere: According to https://lab.llvm.org/buildbot/#/about, it's running Python 3.6.
flunkOnFailure=ignoreTestFail, flunkOnFailure=ignoreTestFail,
timeout=testTimeout, timeout=testTimeout,
description='ninja test', description='ninja test %s' % check,
workdir=build_dir, workdir=build_dir,
doStepIf=bool(test), doStepIf=bool(test),
env=env)) env=env))
return f return f