Skip to content

Commit

Permalink
Remove explicit LLVM_LIT_ARGS='-v' from Linaro builders (#322)
Browse files Browse the repository at this point in the history
As this is added by the build factories anyway.

Arm lldb has a thread limit so I've kept that in.

(this because the machine it runs on actually has a lot of headroom, but
not all the time, so assuming you can always use every thread makes the
results flaky)
  • Loading branch information
DavidSpickett authored Nov 29, 2024
1 parent 063ec2d commit 31146d5
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions buildbot/osuosl/master/config/builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,7 @@
extra_cmake_args=[
"-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
"-DLLVM_ENABLE_LLD=True",
"-DLLVM_LIT_ARGS='-v'"])},
"-DLLVM_ENABLE_LLD=True"])},

## AArch64 run test-suite at -O0 (GlobalISel is now default).
{'name' : "clang-aarch64-global-isel",
Expand Down Expand Up @@ -493,8 +492,7 @@
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-512tvb'",
"-DLLVM_ENABLE_LLD=True",
"-DMLIR_INCLUDE_INTEGRATION_TESTS=True",
"-DMLIR_RUN_ARM_SVE_TESTS=True",
"-DLLVM_LIT_ARGS='-v'"])},
"-DMLIR_RUN_ARM_SVE_TESTS=True"])},

# AArch64 Clang+LLVM+RT+LLD check-all + flang + test-suite 2-stage w/SVE-Vector-Length-Agnostic
{'name' : "clang-aarch64-sve-vla-2stage",
Expand All @@ -518,8 +516,7 @@
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false'",
"-DLLVM_ENABLE_LLD=True",
"-DMLIR_INCLUDE_INTEGRATION_TESTS=True",
"-DMLIR_RUN_ARM_SVE_TESTS=True",
"-DLLVM_LIT_ARGS='-v'"])},
"-DMLIR_RUN_ARM_SVE_TESTS=True"])},

# AArch64 Clang+LLVM+RT+LLD check-all + flang + test-suite w/SVE-Vector-Length-Specific
{'name' : "clang-aarch64-sve-vls",
Expand All @@ -541,8 +538,7 @@
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-512tvb'",
"-DLLVM_ENABLE_LLD=True",
"-DMLIR_INCLUDE_INTEGRATION_TESTS=True",
"-DMLIR_RUN_ARM_SVE_TESTS=True",
"-DLLVM_LIT_ARGS='-v'"])},
"-DMLIR_RUN_ARM_SVE_TESTS=True"])},

# AArch64 Clang+LLVM+RT+LLD check-all + flang + test-suite 2-stage w/SVE-Vector-Length-Specific
{'name' : "clang-aarch64-sve-vls-2stage",
Expand All @@ -566,8 +562,7 @@
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false'",
"-DLLVM_ENABLE_LLD=True",
"-DMLIR_INCLUDE_INTEGRATION_TESTS=True",
"-DMLIR_RUN_ARM_SVE_TESTS=True",
"-DLLVM_LIT_ARGS='-v'"])},
"-DMLIR_RUN_ARM_SVE_TESTS=True"])},

# All SVE2 builders are using optimisation flags for Graviton 4 "performance" from
# https://github.com/aws/aws-graviton-getting-started/blob/main/c-c++.md
Expand Down Expand Up @@ -1349,7 +1344,6 @@
clean=True,
extra_cmake_args=[
'-DLLVM_ENABLE_ASSERTIONS=True',
'-DLLVM_LIT_ARGS=-v',
'-DLLVM_USE_LINKER=lld',
'-DLLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=ON'])},

Expand Down Expand Up @@ -1377,7 +1371,6 @@
extra_cmake_args=[
"-DCMAKE_C_COMPILER_LAUNCHER=ccache",
"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
'-DLLVM_LIT_ARGS=-v',
# Hardware breakpoints and watchpoints are not yet supported,
# https://github.com/llvm/llvm-project/issues/80665.
'-DLLDB_TEST_USER_ARGS=--skip-category=watchpoint',
Expand Down

0 comments on commit 31146d5

Please sign in to comment.