Skip to content

Commit 9b0c60f

Browse files
authored
Update configuration for llvm-clang-win-x-aarch64 and release builders. (#151)
* changed target devkits for the remote tests. * updated sysroot fs to Aarch64 Ubuntu 22.04.
1 parent 3e000b6 commit 9b0c60f

File tree

3 files changed

+26
-17
lines changed

3 files changed

+26
-17
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@
233233
vs="autodetect",
234234
clean=True,
235235
checks=[
236-
"check-llvm",
237-
"check-clang",
238-
"check-lld",
239-
"check-compiler-rt-aarch64-unknown-linux-gnu"
236+
"check-llvm",
237+
"check-clang",
238+
"check-lld",
239+
"check-compiler-rt-aarch64-unknown-linux-gnu"
240240
],
241241
checks_on_target = [
242242
("libunwind",
@@ -256,13 +256,18 @@
256256
extra_configure_args=[
257257
"-DLLVM_TARGETS_TO_BUILD=AArch64",
258258
"-DTOOLCHAIN_TARGET_TRIPLE=aarch64-unknown-linux-gnu",
259-
"-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu",
260-
"-DZLIB_ROOT=C:/buildbot/.zlib-win32",
259+
WithProperties("-DDEFAULT_SYSROOT=%(sysroot_path_aarch64)s"),
260+
WithProperties("-DZLIB_ROOT=%(zlib_root_path)s"),
261261
"-DLLVM_LIT_ARGS=-v -vv --threads=32",
262262
WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
263263
WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),
264+
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
265+
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
264266
],
265-
cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
267+
cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake",
268+
env={
269+
'CCACHE_DIR' : WithProperties("%(builddir)s/ccache-db"),
270+
})},
266271

267272
# Clang builders.
268273

buildbot/osuosl/master/config/release_builders.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@
147147
vs="autodetect",
148148
clean=True,
149149
checks=[
150-
"check-llvm",
151-
"check-clang",
152-
"check-lld",
153-
"check-compiler-rt-aarch64-unknown-linux-gnu"
150+
"check-llvm",
151+
"check-clang",
152+
"check-lld",
153+
"check-compiler-rt-aarch64-unknown-linux-gnu"
154154
],
155155
checks_on_target = [
156156
("libunwind",
@@ -170,8 +170,8 @@
170170
extra_configure_args=[
171171
"-DLLVM_TARGETS_TO_BUILD=AArch64",
172172
"-DTOOLCHAIN_TARGET_TRIPLE=aarch64-unknown-linux-gnu",
173-
"-DDEFAULT_SYSROOT=C:/buildbot/.aarch64-ubuntu",
174-
"-DZLIB_ROOT=C:/buildbot/.zlib-win32",
173+
WithProperties("-DDEFAULT_SYSROOT=%(sysroot_path_aarch64)s"),
174+
WithProperties("-DZLIB_ROOT=%(zlib_root_path)s"),
175175
"-DLLVM_LIT_ARGS=-v -vv --threads=32",
176176
WithProperties("%(remote_test_host:+-DREMOTE_TEST_HOST=)s%(remote_test_host:-)s"),
177177
WithProperties("%(remote_test_user:+-DREMOTE_TEST_USER=)s%(remote_test_user:-)s"),

buildbot/osuosl/master/config/workers.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,10 @@ def get_all():
185185

186186
# Windows Server on Xeon Gold 6130 (2x2.1GHz), 128Gb of RAM
187187
create_worker("as-builder-2", properties={
188-
'remote_test_host': 'jetson9.lab.llvm.org',
189-
'remote_test_user': 'ubuntu'
188+
'remote_test_host' : 'jetson-agx-2197.lab.llvm.org',
189+
'remote_test_user' : 'ubuntu',
190+
'sysroot_path_aarch64' : 'c:/buildbot/fs/jetson-agx-ubuntu',
191+
'zlib_root_path' : 'c:/buildbot/fs/zlib-win32',
190192
},
191193
max_builds=1),
192194

@@ -204,8 +206,10 @@ def get_all():
204206
},
205207
max_builds=1),
206208
create_worker("as-builder-6", properties={ # aarch64
207-
'remote_test_host': 'jetson8.lab.llvm.org',
208-
'remote_test_user': 'ubuntu'
209+
'remote_test_host' : 'jetson-agx-2198.lab.llvm.org',
210+
'remote_test_user' : 'ubuntu',
211+
'sysroot_path_aarch64' : 'c:/buildbot/fs/jetson-agx-ubuntu',
212+
'zlib_root_path' : 'c:/buildbot/fs/zlib-win32',
209213
},
210214
max_builds=1),
211215

0 commit comments

Comments
 (0)