Skip to content

Commit 31146d5

Browse files
Remove explicit LLVM_LIT_ARGS='-v' from Linaro builders (llvm#322)
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)
1 parent 063ec2d commit 31146d5

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,7 @@
398398
extra_cmake_args=[
399399
"-DCMAKE_C_FLAGS='-mcpu=cortex-a57'",
400400
"-DCMAKE_CXX_FLAGS='-mcpu=cortex-a57'",
401-
"-DLLVM_ENABLE_LLD=True",
402-
"-DLLVM_LIT_ARGS='-v'"])},
401+
"-DLLVM_ENABLE_LLD=True"])},
403402

404403
## AArch64 run test-suite at -O0 (GlobalISel is now default).
405404
{'name' : "clang-aarch64-global-isel",
@@ -493,8 +492,7 @@
493492
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-512tvb'",
494493
"-DLLVM_ENABLE_LLD=True",
495494
"-DMLIR_INCLUDE_INTEGRATION_TESTS=True",
496-
"-DMLIR_RUN_ARM_SVE_TESTS=True",
497-
"-DLLVM_LIT_ARGS='-v'"])},
495+
"-DMLIR_RUN_ARM_SVE_TESTS=True"])},
498496

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

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

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

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

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

0 commit comments

Comments
 (0)