Skip to content

Commit 699c3ba

Browse files
authored
Update LLVM WoA buildbots for better coverage (#252)
This updates LLVM WoA bots with following changes: 1) Do not run stage1 testing on 2 stage clang bot. 2) Remove redundant workers. 3) Remove -DCOMPILER_RT_BUILD_PROFILE=OFF 4) Add compiler-rt to single stage bot 5) Set clean=False for the 2stage bots 6) Set "-DCLANG_DEFAULT_LINKER=lld" for all WoA bots
1 parent 4d57130 commit 699c3ba

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,10 @@
295295
clean=False,
296296
checkout_flang=True,
297297
checkout_lld=True,
298-
checkout_compiler_rt=False,
299298
extra_cmake_args=[
299+
"-DCLANG_DEFAULT_LINKER=lld",
300300
"-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
301-
"-DLLVM_TARGETS_TO_BUILD='AArch64'",
301+
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF",
302302
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
303303
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"])},
304304

@@ -568,20 +568,20 @@
568568

569569
{'name' : "clang-arm64-windows-msvc-2stage",
570570
'tags' : ["clang"],
571-
'workernames' : ["linaro-armv8-windows-msvc-01", "linaro-armv8-windows-msvc-02", "linaro-armv8-windows-msvc-03"],
571+
'workernames' : ["linaro-armv8-windows-msvc-02"],
572572
'builddir': "clang-arm64-windows-msvc-2stage",
573573
'factory' : ClangBuilder.getClangCMakeBuildFactory(
574574
vs="manual",
575+
clean=False,
575576
useTwoStage=True,
576577
checkout_flang=True,
578+
testStage1=False,
577579
extra_cmake_args=[
580+
"-DCLANG_DEFAULT_LINKER=lld",
578581
"-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
579582
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
580583
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
581-
# FIXME: compiler-rt\lib\sanitizer_common\sanitizer_unwind_win.cpp assumes WIN64 is x86_64,
582-
# so, before that's fixed, disable everything that triggers its build.
583-
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF",
584-
"-DCOMPILER_RT_BUILD_PROFILE=OFF"])},
584+
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"])},
585585

586586
{'name' : 'clang-x64-windows-msvc',
587587
'tags' : ["clang"],

buildbot/osuosl/master/config/workers.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ def get_all():
4141
create_worker("linaro-g3-04", max_builds=1),
4242

4343
# AArch64 Windows Microsoft Surface X Pro
44-
create_worker("linaro-armv8-windows-msvc-01", max_builds=1),
4544
create_worker("linaro-armv8-windows-msvc-02", max_builds=1),
46-
create_worker("linaro-armv8-windows-msvc-03", max_builds=1),
4745
create_worker("linaro-armv8-windows-msvc-04", max_builds=1),
4846
create_worker("linaro-armv8-windows-msvc-05", max_builds=1),
4947

0 commit comments

Comments
 (0)