Skip to content

Commit 50ca334

Browse files
[BOLT] Excluding GNU build-id and cleanup. (#465)
Pass '--build-id' to the linker to disable emission of a unique build ID into a note section. This breaks nfc-mode tests. Additional cleanup: - Out-of-tree tests are now labeled as 'BOLT large tests' - Dropped step 'nfc-stat-check' as it was disabled - Removed unused flags for Non-NFC tests
1 parent 7fb9450 commit 50ca334

File tree

3 files changed

+16
-25
lines changed

3 files changed

+16
-25
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2997,6 +2997,7 @@
29972997
depends_on_projects=['bolt', 'llvm'],
29982998
extra_configure_args=[
29992999
"-DLLVM_APPEND_VC_REV=OFF",
3000+
"-DCMAKE_EXE_LINKER_FLAGS='-Wl,--build-id=none'"
30003001
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
30013002
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
30023003
"-DLLVM_ENABLE_PROJECTS=clang;lld;bolt",

zorg/buildbot/builders/BOLTBuilder.py

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ def getBOLTCmakeBuildFactory(
4444
]
4545
# Clean checkout of bolt-tests if cleanBuildRequested
4646
f.addSteps([
47-
steps.RemoveDirectory(name="BOLT tests: clean",
47+
steps.RemoveDirectory(name="BOLT large tests: clean",
4848
dir=bolttests_dir,
4949
haltOnFailure=True,
5050
warnOnFailure=True,
5151
doStepIf=cleanBuildRequestedByProperty),
5252

53-
steps.Git(name="BOLT tests: checkout",
53+
steps.Git(name="BOLT large tests: checkout",
5454
description="fetching",
5555
descriptionDone="fetch",
56-
descriptionSuffix="BOLT Tests",
56+
descriptionSuffix="BOLT Large Tests",
5757
repourl='https://github.com/rafaelauler/bolt-tests.git',
5858
workdir=bolttests_dir,
5959
alwaysUseLatest=True),
@@ -147,17 +147,6 @@ def getBOLTCmakeBuildFactory(
147147
flunkOnFailure=False,
148148
doStepIf=FileExists('build/.llvm-bolt.diff'),
149149
env=env),
150-
LitTestCommand(
151-
name='nfc-stat-check',
152-
command=(f"../{f.monorepo_dir}/bolt/utils/nfc-stat-parser.py "
153-
"`find -name timing.log`"),
154-
description="Check BOLT processing time and max RSS swings",
155-
warnOnFailure=True,
156-
haltOnFailure=False,
157-
flunkOnFailure=False,
158-
#doStepIf=FileExists('build/.llvm-bolt.diff'),
159-
doStepIf=False,
160-
env=env),
161150
])
162151

163152
return f

zorg/buildbot/builders/UnifiedTreeBuilder.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -233,17 +233,18 @@ def trunc50(name):
233233
else:
234234
check_env = env or {}
235235

236-
for check in checks:
237-
f.addStep(LitTestCommand(name=trunc50("test-%s-%s" % (step_name, check)),
238-
command=['ninja', check],
239-
description=[
240-
"Test", "just", "built", "components", "for",
241-
check,
242-
],
243-
env=check_env,
244-
workdir=obj_dir,
245-
**kwargs # Pass through all the extra arguments.
246-
))
236+
if checks:
237+
for check in checks:
238+
f.addStep(LitTestCommand(name=trunc50("test-%s-%s" % (step_name, check)),
239+
command=['ninja', check],
240+
description=[
241+
"Test", "just", "built", "components", "for",
242+
check,
243+
],
244+
env=check_env,
245+
workdir=obj_dir,
246+
**kwargs # Pass through all the extra arguments.
247+
))
247248

248249
# Install just built components
249250
if install_dir:

0 commit comments

Comments
 (0)