Skip to content

Commit d71e417

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

File tree

3 files changed

+96
-43
lines changed

3 files changed

+96
-43
lines changed

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

Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -188,40 +188,63 @@
188188
'tags' : ["clang", "llvm", "compiler-rt", "cross", "armv7"],
189189
'workernames' : ["as-builder-1"],
190190
'builddir': "x-armv7l",
191-
'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
191+
'factory' : UnifiedTreeBuilder.getCmakeExBuildFactory(
192+
depends_on_projects = [
193+
'llvm',
194+
'compiler-rt',
195+
'clang',
196+
'clang-tools-extra',
197+
'libunwind',
198+
'libcxx',
199+
'libcxxabi',
200+
'lld',
201+
],
192202
vs="autodetect",
193203
clean=True,
194204
checks=[
195-
"check-llvm",
196-
"check-clang",
197-
"check-lld",
198-
"check-compiler-rt-armv7-unknown-linux-gnueabihf"
205+
"check-llvm",
206+
"check-clang",
207+
"check-lld",
208+
"check-compiler-rt-armv7-unknown-linux-gnueabihf",
199209
],
200210
checks_on_target = [
201211
("libunwind",
202212
["python", "bin/llvm-lit.py",
203-
"-v", "-vv", "--threads=32",
204-
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libunwind/test"]),
213+
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libunwind/test",
214+
]),
205215
("libc++abi",
206216
["python", "bin/llvm-lit.py",
207-
"-v", "-vv", "--threads=32",
208-
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxxabi/test"]),
217+
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxxabi/test",
218+
]),
209219
("libc++",
210220
['python', 'bin/llvm-lit.py',
211-
'-v', '-vv', '--threads=32',
212221
'runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxx/test',
213222
])
214223
],
215-
extra_configure_args=[
216-
"-DLLVM_TARGETS_TO_BUILD=ARM",
217-
"-DTOOLCHAIN_TARGET_TRIPLE=armv7-unknown-linux-gnueabihf",
218-
util.Interpolate("-DTOOLCHAIN_TARGET_SYSROOTFS=%(prop:sysroot_path_armv7)s"),
219-
util.Interpolate("-DZLIB_ROOT=%(prop:zlib_root_path)s"),
220-
"-DLLVM_LIT_ARGS=-v -vv --threads=32",
221-
util.Interpolate("%(prop:remote_test_host:+-DREMOTE_TEST_HOST=)s%(prop:remote_test_host:-)s"),
222-
util.Interpolate("%(prop:remote_test_user:+-DREMOTE_TEST_USER=)s%(prop:remote_test_user:-)s"),
224+
cmake_definitions = {
225+
"LLVM_TARGETS_TO_BUILD" : "ARM",
226+
"LLVM_INCLUDE_BENCHMARKS" : "OFF",
227+
"LLVM_CCACHE_BUILD" : "ON",
228+
"LLVM_LIT_ARGS" : "-v -vv --threads=32 --time-tests",
229+
"TOOLCHAIN_TARGET_TRIPLE" : "armv7-unknown-linux-gnueabihf",
230+
"TOOLCHAIN_TARGET_SYSROOTFS" : util.Interpolate("%(prop:sysroot_path_tk1)s"),
231+
"ZLIB_ROOT" : util.Interpolate("%(prop:zlib_root_path)s"),
232+
"REMOTE_TEST_HOST" : util.Interpolate("%(prop:remote_host_tk1)s"),
233+
"REMOTE_TEST_USER" : util.Interpolate("%(prop:remote_user_tk1)s"),
234+
"CMAKE_CXX_FLAGS" : "-D__OPTIMIZE__",
235+
},
236+
cmake_options = [
237+
"-C", util.Interpolate("%(prop:srcdir_relative)s/clang/cmake/caches/CrossWinToARMLinux.cmake"),
223238
],
224-
cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
239+
install_dir = "install",
240+
env = {
241+
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
242+
# TMP/TEMP within the build dir (to utilize a ramdisk).
243+
'TMP' : util.Interpolate("%(prop:builddir)s/build"),
244+
'TEMP' : util.Interpolate("%(prop:builddir)s/build"),
245+
},
246+
)
247+
},
225248

226249
{'name' : "llvm-clang-win-x-aarch64",
227250
'tags' : ["clang", "llvm", "compiler-rt", "cross", "aarch64"],

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

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -102,42 +102,65 @@
102102

103103
{'name' : "llvm-clang-win-x-armv7l-release",
104104
'tags' : ["clang", "llvm", "compiler-rt", "cross", "armv7"],
105-
'workernames' : ["as-builder-5"],
105+
'workernames' : ["as-builder-1"],
106106
'builddir': "x-armv7l-rel",
107-
'factory' : XToolchainBuilder.getCmakeWithMSVCBuildFactory(
107+
'factory' : UnifiedTreeBuilder.getCmakeExBuildFactory(
108+
depends_on_projects = [
109+
'llvm',
110+
'compiler-rt',
111+
'clang',
112+
'clang-tools-extra',
113+
'libunwind',
114+
'libcxx',
115+
'libcxxabi',
116+
'lld',
117+
],
108118
vs="autodetect",
109119
clean=True,
110120
checks=[
111-
"check-llvm",
112-
"check-clang",
113-
"check-lld",
114-
"check-compiler-rt-armv7-unknown-linux-gnueabihf"
121+
"check-llvm",
122+
"check-clang",
123+
"check-lld",
124+
"check-compiler-rt-armv7-unknown-linux-gnueabihf",
115125
],
116126
checks_on_target = [
117127
("libunwind",
118128
["python", "bin/llvm-lit.py",
119-
"-v", "-vv", "--threads=32",
120-
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libunwind/test"]),
129+
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libunwind/test",
130+
]),
121131
("libc++abi",
122132
["python", "bin/llvm-lit.py",
123-
"-v", "-vv", "--threads=32",
124-
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxxabi/test"]),
133+
"runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxxabi/test",
134+
]),
125135
("libc++",
126136
['python', 'bin/llvm-lit.py',
127-
'-v', '-vv', '--threads=32',
128137
'runtimes/runtimes-armv7-unknown-linux-gnueabihf-bins/libcxx/test',
129138
])
130139
],
131-
extra_configure_args=[
132-
"-DLLVM_TARGETS_TO_BUILD=ARM",
133-
"-DTOOLCHAIN_TARGET_TRIPLE=armv7-unknown-linux-gnueabihf",
134-
util.Interpolate("-DTOOLCHAIN_TARGET_SYSROOTFS=%(prop:sysroot_path_armv7)s"),
135-
util.Interpolate("-DZLIB_ROOT=%(prop:zlib_root_path)s"),
136-
"-DLLVM_LIT_ARGS=-v -vv --threads=32",
137-
util.Interpolate("%(prop:remote_test_host:+-DREMOTE_TEST_HOST=)s%(prop:remote_test_host:-)s"),
138-
util.Interpolate("%(prop:remote_test_user:+-DREMOTE_TEST_USER=)s%(prop:remote_test_user:-)s"),
140+
cmake_definitions = {
141+
"LLVM_TARGETS_TO_BUILD" : "ARM",
142+
"LLVM_INCLUDE_BENCHMARKS" : "OFF",
143+
"LLVM_CCACHE_BUILD" : "ON",
144+
"LLVM_LIT_ARGS" : "-v -vv --threads=32 --time-tests",
145+
"TOOLCHAIN_TARGET_TRIPLE" : "armv7-unknown-linux-gnueabihf",
146+
"TOOLCHAIN_TARGET_SYSROOTFS" : util.Interpolate("%(prop:sysroot_path_tk1)s"),
147+
"ZLIB_ROOT" : util.Interpolate("%(prop:zlib_root_path)s"),
148+
"REMOTE_TEST_HOST" : util.Interpolate("%(prop:remote_host_tk1_rel)s"),
149+
"REMOTE_TEST_USER" : util.Interpolate("%(prop:remote_user_tk1_rel)s"),
150+
"CMAKE_CXX_FLAGS" : "-D__OPTIMIZE__",
151+
},
152+
cmake_options = [
153+
"-C", util.Interpolate("%(prop:srcdir_relative)s/clang/cmake/caches/CrossWinToARMLinux.cmake"),
139154
],
140-
cmake_cache="../llvm-project/clang/cmake/caches/CrossWinToARMLinux.cmake")},
155+
install_dir = "install",
156+
env = {
157+
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
158+
# TMP/TEMP within the build dir (to utilize a ramdisk).
159+
'TMP' : util.Interpolate("%(prop:builddir)s/build"),
160+
'TEMP' : util.Interpolate("%(prop:builddir)s/build"),
161+
},
162+
)
163+
},
141164

142165
{'name' : "llvm-clang-win-x-aarch64-release",
143166
'tags' : ["clang", "llvm", "compiler-rt", "cross", "aarch64"],

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

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

179179
# Windows Server on Xeon Gold 6130 (2x2.1GHz), 128Gb of RAM
180180
create_worker("as-builder-1", properties={
181-
'remote_test_host' : 'jetson6.lab.llvm.org',
182-
'remote_test_user' : 'ubuntu',
183-
'sysroot_path_aarch64' : 'c:/buildbot/fs/jetson-agx-ubuntu',
184-
'sysroot_path_armv7' : 'c:/buildbot/fs/jetson-tk1-arm-ubuntu',
181+
# Post-commit builder target settings.
182+
'remote_host_tk1' : 'jetson6.lab.llvm.org',
183+
'remote_user_tk1' : 'ubuntu',
184+
# Release builder target settings.
185+
'remote_host_tk1_rel' : 'jetson4.lab.llvm.org',
186+
'remote_user_tk1_rel' : 'ubuntu',
187+
# Available target's sysroots.
188+
'sysroot_path_tk1' : 'c:/buildbot/fs/jetson-tk1-arm-ubuntu',
189+
'sysroot_path_tx2' : 'c:/buildbot/fs/jetson-tx2-ubuntu',
190+
'sysroot_path_agx' : 'c:/buildbot/fs/jetson-agx-ubuntu',
191+
185192
'zlib_root_path' : 'c:/buildbot/fs/zlib-win32',
186193
},
187194
max_builds=1),

0 commit comments

Comments
 (0)