Skip to content

Commit d83bc33

Browse files
authored
Update configuration for llvm-clang-x86_64-expensive-checks-ubuntu* builders (#451)
* switch to clang-21/lld-21 instead of gcc/ld.gold to speed up the builds and avoid the ld.gold liner warnings related with unsupported DWARF version. * switch to release build to speed up the builds because of clang/llvm table-gen tool. Also moved to 'UnifiedTreeBuilder.getCmakeExBuildFactory' factory.
1 parent 6e13b9d commit d83bc33

File tree

2 files changed

+52
-32
lines changed

2 files changed

+52
-32
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -152,24 +152,34 @@
152152
'tags' : ["llvm", "expensive-checks"],
153153
'workernames' : ["as-builder-4"],
154154
'builddir': "expensive-checks",
155-
'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
156-
depends_on_projects=["llvm", "lld"],
157-
clean=True,
158-
extra_configure_args=[
159-
"-DLLVM_CCACHE_BUILD=ON",
160-
"-DLLVM_ENABLE_EXPENSIVE_CHECKS=ON",
161-
"-DLLVM_ENABLE_WERROR=OFF",
162-
"-DLLVM_USE_SPLIT_DWARF=ON",
163-
"-DLLVM_USE_LINKER=gold",
164-
"-DCMAKE_BUILD_TYPE=Debug",
165-
"-DCMAKE_CXX_FLAGS=-U_GLIBCXX_DEBUG -Wno-misleading-indentation",
166-
"-DLLVM_LIT_ARGS=-vv --time-tests"],
167-
env={
168-
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
155+
'factory' : UnifiedTreeBuilder.getCmakeExBuildFactory(
156+
depends_on_projects = [
157+
'llvm',
158+
'lld',
159+
],
160+
clean = True,
161+
checks = [
162+
"check-all"
163+
],
164+
cmake_definitions = {
165+
"LLVM_CCACHE_BUILD" : "ON",
166+
"LLVM_ENABLE_EXPENSIVE_CHECKS" : "ON",
167+
"LLVM_ENABLE_WERROR" : "OFF",
168+
"LLVM_USE_LINKER" : "lld-21",
169+
"LLVM_LIT_ARGS" : "-vv --time-tests",
170+
"CMAKE_BUILD_TYPE" : "Release",
171+
"CMAKE_CXX_FLAGS" : "-U_GLIBCXX_DEBUG -Wno-misleading-indentation",
172+
},
173+
env = {
174+
'CC' : "clang-21",
175+
'CXX' : "clang++-21",
176+
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
169177
# TMP/TEMP within the build dir (to utilize a ramdisk).
170-
'TMP' : util.Interpolate("%(prop:builddir)s/build"),
171-
'TEMP' : util.Interpolate("%(prop:builddir)s/build"),
172-
})},
178+
'TMP' : util.Interpolate("%(prop:builddir)s/build"),
179+
'TEMP' : util.Interpolate("%(prop:builddir)s/build"),
180+
},
181+
)
182+
},
173183

174184
{'name' : "llvm-clang-x86_64-expensive-checks-win",
175185
'tags' : ["llvm", "expensive-checks"],

buildbot/osuosl/master/config/release_builders.py

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,31 @@
5050
'tags' : ["llvm", "expensive-checks"],
5151
'workernames' : ["as-builder-4-rel"],
5252
'builddir': "llvm-clang-x86_64-expensive-checks-ubuntu-rel",
53-
'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
54-
depends_on_projects=["llvm", "lld"],
55-
clean=True,
56-
extra_configure_args=[
57-
"-DLLVM_CCACHE_BUILD=ON",
58-
"-DLLVM_ENABLE_EXPENSIVE_CHECKS=ON",
59-
"-DLLVM_ENABLE_WERROR=OFF",
60-
"-DLLVM_USE_SPLIT_DWARF=ON",
61-
"-DLLVM_USE_LINKER=gold",
62-
"-DCMAKE_BUILD_TYPE=Debug",
63-
"-DCMAKE_CXX_FLAGS=-U_GLIBCXX_DEBUG -Wno-misleading-indentation",
64-
"-DLLVM_LIT_ARGS=-vv --time-tests"],
65-
env={
66-
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
67-
})},
53+
'factory' : UnifiedTreeBuilder.getCmakeExBuildFactory(
54+
depends_on_projects = [
55+
'llvm',
56+
'lld',
57+
],
58+
clean = True,
59+
checks = [
60+
"check-all"
61+
],
62+
cmake_definitions = {
63+
"LLVM_CCACHE_BUILD" : "ON",
64+
"LLVM_ENABLE_EXPENSIVE_CHECKS" : "ON",
65+
"LLVM_ENABLE_WERROR" : "OFF",
66+
"LLVM_USE_LINKER" : "lld-21",
67+
"LLVM_LIT_ARGS" : "-vv --time-tests",
68+
"CMAKE_BUILD_TYPE" : "Release",
69+
"CMAKE_CXX_FLAGS" : "-U_GLIBCXX_DEBUG -Wno-misleading-indentation",
70+
},
71+
env = {
72+
'CC' : "clang-21",
73+
'CXX' : "clang++-21",
74+
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
75+
},
76+
)
77+
},
6878

6979
{'name' : "llvm-clang-x86_64-expensive-checks-debian-release",
7080
'tags' : ["llvm", "expensive-checks"],

0 commit comments

Comments
 (0)