Skip to content

[BOLT] Add nfc-check-validation step #462

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

Merged
merged 5 commits into from
Jun 23, 2025
Merged

[BOLT] Add nfc-check-validation step #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9f62ef
[BOLT] Rename Meta's Aarch64 workers and builders.
paschalis-mpeis May 29, 2025
5b1ba41
Renaming the builddirs too.
paschalis-mpeis Jun 13, 2025
22d4eb1
[BOLT] Add nfc-check-validation step
paschalis-mpeis Jun 6, 2025
697e2c1
Fix case when unique ids are not present
paschalis-mpeis Jun 6, 2025
55a3b78
nits
paschalis-mpeis Jun 12, 2025
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
12 changes: 6 additions & 6 deletions buildbot/osuosl/master/config/builders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3018,10 +3018,10 @@
],
)},

{'name': "bolt-aarch64-ubuntu-clang",
{'name': "bolt-aarch64-ubuntu-clang-meta",
'tags': ["bolt"],
'workernames':["bolt-worker-aarch64"],
'builddir': "bolt-aarch64-ubuntu-clang",
'workernames':["bolt-worker-aarch64-meta"],
'builddir': "bolt-aarch64-ubuntu-clang-meta",
'factory' : BOLTBuilder.getBOLTCmakeBuildFactory(
bolttests=False,
clean=True,
Expand All @@ -3045,10 +3045,10 @@
],
)},

{'name': "bolt-aarch64-ubuntu-clang-shared",
{'name': "bolt-aarch64-ubuntu-clang-shared-meta",
'tags': ["bolt"],
'workernames':["bolt-worker-aarch64"],
'builddir': "bolt-aarch64-ubuntu-clang-shared",
'workernames':["bolt-worker-aarch64-meta"],
'builddir': "bolt-aarch64-ubuntu-clang-shared-meta",
'factory' : BOLTBuilder.getBOLTCmakeBuildFactory(
bolttests=True,
depends_on_projects=['bolt', 'lld', 'llvm'],
Expand Down
2 changes: 1 addition & 1 deletion buildbot/osuosl/master/config/workers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ def get_all():

# BOLT workers
create_worker("bolt-worker", max_builds=1),
create_worker("bolt-worker-aarch64", max_builds=1),
create_worker("bolt-worker-aarch64-meta", max_builds=1),

# Fedora worker
create_worker("standalone-build-x86_64", max_builds=1),
Expand Down
21 changes: 21 additions & 0 deletions zorg/buildbot/builders/BOLTBuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from buildbot.plugins import steps
from buildbot.process.results import SUCCESS, FAILURE, WARNINGS
from buildbot.steps.shell import ShellCommand
from zorg.buildbot.builders.UnifiedTreeBuilder import getLLVMBuildFactoryAndSourcecodeSteps, addCmakeSteps, addNinjaSteps
from zorg.buildbot.commands.LitTestCommand import LitTestCommand
Expand Down Expand Up @@ -92,6 +93,26 @@ def getBOLTCmakeBuildFactory(
haltOnFailure=False,
flunkOnFailure=False,
env=env),
ShellCommand(
name='nfc-check-validation',
command=(
"info=$(bin/llvm-bolt.new --version | grep 'BOLT revision' "
"| grep -q '<unknown>' || echo 'bolt-revision'); "
"info=$info$(readelf --notes bin/llvm-bolt.new "
"| grep -q 'Build ID:' && echo ' GNU-build-id'); "
"info=$(echo \"$info\" | sed 's/^ //'); "
"[ ! -z \"$info\" ] || return 0 && "
"(printf \"NFC-Mode WARNING: unique IDs found in binaries ($info)"
". This means tests will run at all times.\"; return 2)"
),
description=('Check that nfc-mode works as intended when '
'comparing with the previous commit.'),
haltOnFailure=False,
warnOnFailure=True,
warnOnWarnings=True,
decodeRC={0: SUCCESS, 1: FAILURE, 2: WARNINGS},
descriptionDone=["NFC-Mode unique IDs in binaries"],
env=env),
ShellCommand(
name='check-bolt-different',
command=('find -name timing.log -delete; '
Expand Down