Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add WoA testsuite buildbot #253

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions buildbot/osuosl/master/config/builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"])},

Expand Down Expand Up @@ -591,22 +591,42 @@
"-DMLIR_RUN_ARM_SVE_TESTS=True",
"-DLLVM_LIT_ARGS='-v'"])},

{'name' : "clang-arm64-windows-msvc-testsuite",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is very late to say this, but it is confusing that we have "msvc" in the bot names. Could we change that for this new one? clang-arm64-windows-testsuite would be fine.

A couple of times I've had to explain that the "msvc" bot actually uses clang-cl.

I would have proposed changing all the names but that's a fiddly multi week process so I never had the energy to do it.

'tags' : ["clang"],
'workernames' : ["linaro-armv8-windows-msvc-03"],
'builddir': "clang-arm64-windows-msvc-testsuite",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
vs="manual",
checks=[],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are you disabling the check stage 1 and 2 here? Also this doesn't seem to be a 2 stage, there's no useTwoStage.

clean=False,
checkout_flang=True,
checkout_lld=True,
runTestSuite=True,
testWithLNT=False,
testsuite_flags=["-DTEST_SUITE_SUBDIRS='Fortran'"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does enabling flang not just automatically do this?

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-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"])},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Windows on Arm, we are only building compiler-rt for the compiler runtime part, correct? I see that all these are disabling the sanitizers.


{'name' : 'clang-x64-windows-msvc',
'tags' : ["clang"],
Expand Down
1 change: 0 additions & 1 deletion buildbot/osuosl/master/config/workers.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ 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),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Be careful with the timing of when this change lands vs. when you remove the agent from the actual machine. I managed to get our server IP banned because I left some workers running that kept trying to connect to the build master.

If the machine is offline before this lands there should be no problem.

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),
Expand Down