Skip to content

Commit aa6017d

Browse files
vvereschakavvereschaka
authored
Update Aarch64 Windows cross toolchain builders. (llvm#241)
* moved to UnifiedTreeBuilder.getCmakeExBuildFactory * moved Aarch64 release builder to as-builder-2 worker (same as post-commit builder)
1 parent d71e417 commit aa6017d

File tree

3 files changed

+98
-39
lines changed

3 files changed

+98
-39
lines changed

‎buildbot/osuosl/master/config/builders.py‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,20 @@
250250
'tags' : ["clang", "llvm", "compiler-rt", "cross", "aarch64"],
251251
'workernames' : ["as-builder-2"],
252252
'builddir': "x-aarch64",
253-
'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
254-
vs="autodetect",
255-
clean=True,
256-
checks=[
253+
'factory' : UnifiedTreeBuilder.getCmakeExBuildFactory(
254+
depends_on_projects = [
255+
'llvm',
256+
'compiler-rt',
257+
'clang',
258+
'clang-tools-extra',
259+
'libunwind',
260+
'libcxx',
261+
'libcxxabi',
262+
'lld',
263+
],
264+
vs = "autodetect",
265+
clean = True,
266+
checks = [
257267
"check-llvm",
258268
"check-clang",
259269
"check-lld",
@@ -263,32 +273,41 @@
263273
("libunwind",
264274
["python", "bin/llvm-lit.py",
265275
"-v", "-vv", "--threads=32",
266-
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libunwind/test"]),
276+
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libunwind/test",
277+
]),
267278
("libc++abi",
268279
["python", "bin/llvm-lit.py",
269280
"-v", "-vv", "--threads=32",
270-
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxxabi/test"]),
281+
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxxabi/test",
282+
]),
271283
("libc++",
272284
['python', 'bin/llvm-lit.py',
273285
'-v', '-vv', '--threads=32',
274286
'runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxx/test',
275287
])
276288
],
277-
extra_configure_args=[
278-
"-DLLVM_TARGETS_TO_BUILD=AArch64",
279-
"-DTOOLCHAIN_TARGET_TRIPLE=aarch64-unknown-linux-gnu",
280-
util.Interpolate("-DTOOLCHAIN_TARGET_SYSROOTFS=%(prop:sysroot_path_aarch64)s"),
281-
util.Interpolate("-DZLIB_ROOT=%(prop:zlib_root_path)s"),
282-
"-DLLVM_LIT_ARGS=-v -vv --threads=32",
283-
util.Interpolate("%(prop:remote_test_host:+-DREMOTE_TEST_HOST=)s%(prop:remote_test_host:-)s"),
284-
util.Interpolate("%(prop:remote_test_user:+-DREMOTE_TEST_USER=)s%(prop:remote_test_user:-)s"),
285-
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
286-
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
289+
cmake_definitions = {
290+
"LLVM_TARGETS_TO_BUILD" : "AArch64",
291+
"LLVM_INCLUDE_BENCHMARKS" : "OFF",
292+
"LLVM_LIT_ARGS" : "-v -vv --threads=32 --time-tests",
293+
"TOOLCHAIN_TARGET_TRIPLE" : "aarch64-unknown-linux-gnu",
294+
"TOOLCHAIN_TARGET_SYSROOTFS" : util.Interpolate("%(prop:sysroot_path_agx)s"),
295+
"REMOTE_TEST_HOST" : util.Interpolate("%(prop:remote_host_agx)s"),
296+
"REMOTE_TEST_USER" : util.Interpolate("%(prop:remote_user_agx)s"),
297+
"ZLIB_ROOT" : util.Interpolate("%(prop:zlib_root_path)s"),
298+
"CMAKE_CXX_FLAGS" : "-D__OPTIMIZE__",
299+
"CMAKE_C_COMPILER_LAUNCHER" : "ccache",
300+
"CMAKE_CXX_COMPILER_LAUNCHER" : "ccache",
301+
},
302+
cmake_options = [
303+
"-C", util.Interpolate("%(prop:srcdir_relative)s/clang/cmake/caches/CrossWinToARMLinux.cmake"),
287304
],
288-
cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake",
289-
env={
305+
install_dir = "install",
306+
env = {
290307
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
291-
})},
308+
},
309+
)
310+
},
292311

293312
# Clang builders.
294313

‎buildbot/osuosl/master/config/release_builders.py‎

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,22 @@
164164

165165
{'name' : "llvm-clang-win-x-aarch64-release",
166166
'tags' : ["clang", "llvm", "compiler-rt", "cross", "aarch64"],
167-
'workernames' : ["as-builder-6"],
167+
'workernames' : ["as-builder-2"],
168168
'builddir': "x-aarch64-rel",
169-
'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
170-
vs="autodetect",
171-
clean=True,
172-
checks=[
169+
'factory' : UnifiedTreeBuilder.getCmakeExBuildFactory(
170+
depends_on_projects = [
171+
'llvm',
172+
'compiler-rt',
173+
'clang',
174+
'clang-tools-extra',
175+
'libunwind',
176+
'libcxx',
177+
'libcxxabi',
178+
'lld',
179+
],
180+
vs = "autodetect",
181+
clean = True,
182+
checks = [
173183
"check-llvm",
174184
"check-clang",
175185
"check-lld",
@@ -179,27 +189,50 @@
179189
("libunwind",
180190
["python", "bin/llvm-lit.py",
181191
"-v", "-vv", "--threads=32",
182-
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libunwind/test"]),
192+
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libunwind/test",
193+
]),
183194
("libc++abi",
184195
["python", "bin/llvm-lit.py",
185196
"-v", "-vv", "--threads=32",
186-
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxxabi/test"]),
197+
"runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxxabi/test",
198+
]),
187199
("libc++",
188200
['python', 'bin/llvm-lit.py',
189201
'-v', '-vv', '--threads=32',
190202
'runtimes/runtimes-aarch64-unknown-linux-gnu-bins/libcxx/test',
191203
])
192204
],
193-
extra_configure_args=[
194-
"-DLLVM_TARGETS_TO_BUILD=AArch64",
195-
"-DTOOLCHAIN_TARGET_TRIPLE=aarch64-unknown-linux-gnu",
196-
util.Interpolate("-DTOOLCHAIN_TARGET_SYSROOTFS=%(prop:sysroot_path_aarch64)s"),
197-
util.Interpolate("-DZLIB_ROOT=%(prop:zlib_root_path)s"),
198-
"-DLLVM_LIT_ARGS=-v -vv --threads=32",
199-
util.Interpolate("%(prop:remote_test_host:+-DREMOTE_TEST_HOST=)s%(prop:remote_test_host:-)s"),
200-
util.Interpolate("%(prop:remote_test_user:+-DREMOTE_TEST_USER=)s%(prop:remote_test_user:-)s"),
205+
cmake_definitions = {
206+
"LLVM_TARGETS_TO_BUILD" : "AArch64",
207+
"LLVM_INCLUDE_BENCHMARKS" : "OFF",
208+
"LLVM_LIT_ARGS" : "-v -vv --threads=32 --time-tests",
209+
"TOOLCHAIN_TARGET_TRIPLE" : "aarch64-unknown-linux-gnu",
210+
"TOOLCHAIN_TARGET_SYSROOTFS" : util.Interpolate("%(prop:sysroot_path_tx2)s"),
211+
"REMOTE_TEST_HOST" : util.Interpolate("%(prop:remote_host_tx2_rel)s"),
212+
"REMOTE_TEST_USER" : util.Interpolate("%(prop:remote_user_tx2_rel)s"),
213+
"ZLIB_ROOT" : util.Interpolate("%(prop:zlib_root_path)s"),
214+
"CMAKE_CXX_FLAGS" : "-D__OPTIMIZE__",
215+
"CMAKE_C_COMPILER_LAUNCHER" : "ccache",
216+
"CMAKE_CXX_COMPILER_LAUNCHER" : "ccache",
217+
},
218+
cmake_options = [
219+
"-C", util.Interpolate("%(prop:srcdir_relative)s/clang/cmake/caches/CrossWinToARMLinux.cmake"),
220+
],
221+
install_dir = "install",
222+
post_finalize_steps = [
223+
#Note: requires for Jetson TX2/Linux Ubuntu 18.
224+
steps.ShellCommand(name = "restart-target-finalize",
225+
command = [ "ssh", util.Interpolate("%(prop:remote_user_tx2_rel)s@%(prop:remote_host_tx2_rel)s"),
226+
"((sleep 5 && sudo reboot) > /dev/null 2>&1 &); exit 0;"
227+
],
228+
alwaysRun = True,
229+
),
201230
],
202-
cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
231+
env = {
232+
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
233+
},
234+
)
235+
},
203236

204237
# LLD builders.
205238

‎buildbot/osuosl/master/config/workers.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,17 @@ def get_all():
195195

196196
# Windows Server on Xeon Gold 6130 (2x2.1GHz), 128Gb of RAM
197197
create_worker("as-builder-2", properties={
198-
'remote_test_host' : 'jetson-agx-2197.lab.llvm.org',
199-
'remote_test_user' : 'ubuntu',
200-
'sysroot_path_aarch64' : 'c:/buildbot/fs/jetson-agx-ubuntu',
201-
'sysroot_path_armv7' : 'c:/buildbot/fs/jetson-tk1-arm-ubuntu',
198+
# Post-commit builder target settings.
199+
'remote_host_agx' : 'jetson-agx-2197.lab.llvm.org',
200+
'remote_user_agx' : 'ubuntu',
201+
# Release builder target settings.
202+
'remote_host_tx2_rel' : 'jetson8.lab.llvm.org',
203+
'remote_user_tx2_rel' : 'ubuntu',
204+
# Available target's sysroots.
205+
'sysroot_path_tk1' : 'c:/buildbot/fs/jetson-tk1-arm-ubuntu',
206+
'sysroot_path_tx2' : 'c:/buildbot/fs/jetson-tx2-ubuntu',
207+
'sysroot_path_agx' : 'c:/buildbot/fs/jetson-agx-ubuntu',
208+
202209
'zlib_root_path' : 'c:/buildbot/fs/zlib-win32',
203210
},
204211
max_builds=1),

0 commit comments

Comments
 (0)