From 80bc284c8c19630d4f1d45d6515f802b13496b66 Mon Sep 17 00:00:00 2001 From: Muhammad Omair Javaid Date: Tue, 20 Aug 2024 21:37:41 +0000 Subject: [PATCH 1/2] Update LLVM WoA buildbots for better converage 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 --- buildbot/osuosl/master/config/builders.py | 14 +++++++------- buildbot/osuosl/master/config/workers.py | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py index 12e95ac55..ff5b81bba 100644 --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -320,10 +320,10 @@ clean=False, checkout_flang=True, checkout_lld=True, - checkout_compiler_rt=False, extra_cmake_args=[ + "-DCLANG_DEFAULT_LINKER=lld", "-DCMAKE_TRY_COMPILE_CONFIGURATION=Release", - "-DLLVM_TARGETS_TO_BUILD='AArch64'", + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF", "-DCMAKE_C_COMPILER_LAUNCHER=ccache", "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"])}, @@ -593,20 +593,20 @@ {'name' : "clang-arm64-windows-msvc-2stage", 'tags' : ["clang"], - 'workernames' : ["linaro-armv8-windows-msvc-01", "linaro-armv8-windows-msvc-02", "linaro-armv8-windows-msvc-03"], + 'workernames' : ["linaro-armv8-windows-msvc-02"], 'builddir': "clang-arm64-windows-msvc-2stage", 'factory' : ClangBuilder.getClangCMakeBuildFactory( vs="manual", + clean=False, useTwoStage=True, checkout_flang=True, + testStage1=False, extra_cmake_args=[ + "-DCLANG_DEFAULT_LINKER=lld", "-DCMAKE_TRY_COMPILE_CONFIGURATION=Release", "-DCMAKE_C_COMPILER_LAUNCHER=ccache", "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache", - # FIXME: compiler-rt\lib\sanitizer_common\sanitizer_unwind_win.cpp assumes WIN64 is x86_64, - # so, before that's fixed, disable everything that triggers its build. - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF", - "-DCOMPILER_RT_BUILD_PROFILE=OFF"])}, + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"])}, {'name' : 'clang-x64-windows-msvc', 'tags' : ["clang"], diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py index b44690eaa..0eaf8e1b7 100644 --- a/buildbot/osuosl/master/config/workers.py +++ b/buildbot/osuosl/master/config/workers.py @@ -41,9 +41,7 @@ def get_all(): create_worker("linaro-g3-04", max_builds=1), # AArch64 Windows Microsoft Surface X Pro - create_worker("linaro-armv8-windows-msvc-01", max_builds=1), create_worker("linaro-armv8-windows-msvc-02", max_builds=1), - create_worker("linaro-armv8-windows-msvc-03", max_builds=1), create_worker("linaro-armv8-windows-msvc-04", max_builds=1), create_worker("linaro-armv8-windows-msvc-05", max_builds=1), From b544b7717b98e58462d27970c48d8695e6e3f900 Mon Sep 17 00:00:00 2001 From: Muhammad Omair Javaid Date: Wed, 24 Jul 2024 08:53:39 +0000 Subject: [PATCH 2/2] Add WoA LLVM Testsuite bot --- buildbot/osuosl/master/config/builders.py | 20 ++++++++++++++++++++ buildbot/osuosl/master/config/workers.py | 1 + 2 files changed, 21 insertions(+) diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py index ff5b81bba..685e394d1 100644 --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -591,6 +591,26 @@ "-DMLIR_RUN_ARM_SVE_TESTS=True", "-DLLVM_LIT_ARGS='-v'"])}, + {'name' : "clang-arm64-windows-msvc-testsuite", + 'tags' : ["clang"], + 'workernames' : ["linaro-armv8-windows-msvc-03"], + 'builddir': "clang-arm64-windows-msvc-testsuite", + 'factory' : ClangBuilder.getClangCMakeBuildFactory( + vs="manual", + checks=[], + clean=False, + checkout_flang=True, + checkout_lld=True, + runTestSuite=True, + testWithLNT=False, + testsuite_flags=["-DTEST_SUITE_SUBDIRS='Fortran'"], + extra_cmake_args=[ + "-DCMAKE_TRY_COMPILE_CONFIGURATION=Release", + "-DCMAKE_C_COMPILER_LAUNCHER=ccache", + "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache", + "-DCLANG_DEFAULT_LINKER=lld", + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"])}, + {'name' : "clang-arm64-windows-msvc-2stage", 'tags' : ["clang"], 'workernames' : ["linaro-armv8-windows-msvc-02"], diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py index 0eaf8e1b7..52a36e7e6 100644 --- a/buildbot/osuosl/master/config/workers.py +++ b/buildbot/osuosl/master/config/workers.py @@ -42,6 +42,7 @@ def get_all(): # AArch64 Windows Microsoft Surface X Pro create_worker("linaro-armv8-windows-msvc-02", max_builds=1), + create_worker("linaro-armv8-windows-msvc-03", max_builds=1), create_worker("linaro-armv8-windows-msvc-04", max_builds=1), create_worker("linaro-armv8-windows-msvc-05", max_builds=1),