Skip to content
Open
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
11 changes: 9 additions & 2 deletions buildbot/osuosl/master/config/builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@
checkout_flang=True,
checkout_lld=True,
extra_cmake_args=[
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
"-DCLANG_DEFAULT_LINKER=lld",
"-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF",
Expand Down Expand Up @@ -572,15 +573,21 @@
'builddir': "clang-arm64-windows-msvc-2stage",
'factory' : ClangBuilder.getClangCMakeBuildFactory(
vs="manual",
clean=False,
clean=True,
useTwoStage=True,
checkout_flang=True,
testStage1=False,
extra_cmake_args=[
"-DLLVM_TARGETS_TO_BUILD=AArch64",
Copy link
Contributor

Choose a reason for hiding this comment

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

It's obvious in hindsight but if we're not testing stage 1, of course it only needs to be able to produce code for the host. Great thinking!

Every saving helps with this particular build.

"-DCLANG_DEFAULT_LINKER=lld",
"-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"],
extra_stage2_cmake_args=[
"-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
"-DLLVM_ENABLE_PROJECTS=flang;mlir",
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this additive or replacing the projects?

I assume we should have clang and maybe lld in this list.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

clang clang-tools-extra and llvm gets automatically added in both configs. Also we have set checkout_lld=True which will include lld automatically.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it will replace -DLLVM_ENABLE_PROJECTS arg to whatever is defined in f.enable_projects (

CmakeCommand.applyRequiredOptions(extra_stage2_cmake_args, [
). But even if it would work as you think it should, then you build projects commits to which do not trigger the build. leading to false blame lists in case of broken flang or mlir.

"-DCLANG_DEFAULT_LINKER=lld",
"-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"])},

{'name' : 'clang-x64-windows-msvc',
Expand Down