Skip to content

Commit 0972188

Browse files
authored
Drop unnecessary -treat-scalable-fixed-error-as-warning=false options (#584)
This is already the default, and I'm dropping this option in llvm/llvm-project#156336.
1 parent 2b44506 commit 0972188

File tree

1 file changed

+19
-23
lines changed

1 file changed

+19
-23
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -476,11 +476,7 @@
476476
# https://github.com/aws/aws-graviton-getting-started/blob/main/c-c++.md.
477477

478478
# AArch64 Clang+LLVM+RT+LLD check-all + flang + test-suite +
479-
# mlir-integration-tests w/SVE-Vector-Length-Agnostic Note that in this and
480-
# other clang-aarch64-sve-* builders we set -mllvm
481-
# -treat-scalable-fixed-error-as-warning=false to make compiler fail on
482-
# non-critical SVE codegen issues. This helps us notice and fix SVE
483-
# problems sooner rather than later.
479+
# mlir-integration-tests w/SVE-Vector-Length-Agnostic
484480
{'name' : "clang-aarch64-sve-vla",
485481
'tags' : ["clang"],
486482
'workernames' : ["linaro-g3-01", "linaro-g3-02", "linaro-g3-03", "linaro-g3-04"],
@@ -493,8 +489,8 @@
493489
'NO_STOP_MESSAGE':'1', # For Fortran test-suite
494490
},
495491
testsuite_flags=[
496-
'--cppflags', '-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
497-
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
492+
'--cppflags', '-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -O3',
493+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -O3',
498494
'--threads=32', '--build-threads=32'],
499495
extra_cmake_args=[
500496
"-DCMAKE_C_FLAGS='-mcpu=neoverse-512tvb'",
@@ -518,12 +514,12 @@
518514
'NO_STOP_MESSAGE':'1', # For Fortran test-suite
519515
},
520516
testsuite_flags=[
521-
'--cppflags', '-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
522-
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
517+
'--cppflags', '-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -O3',
518+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -O3',
523519
'--threads=32', '--build-threads=32'],
524520
extra_cmake_args=[
525-
"-DCMAKE_C_FLAGS='-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false'",
526-
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false'",
521+
"-DCMAKE_C_FLAGS='-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred'",
522+
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred'",
527523
"-DLLVM_ENABLE_LLD=True",
528524
"-DMLIR_INCLUDE_INTEGRATION_TESTS=True",
529525
"-DMLIR_RUN_ARM_SVE_TESTS=True"])},
@@ -541,8 +537,8 @@
541537
'NO_STOP_MESSAGE':'1', # For Fortran test-suite
542538
},
543539
testsuite_flags=[
544-
'--cppflags', '-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
545-
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
540+
'--cppflags', '-mcpu=neoverse-512tvb -msve-vector-bits=256 -O3',
541+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -msve-vector-bits=256 -O3',
546542
'--threads=32', '--build-threads=32'],
547543
extra_cmake_args=[
548544
"-DCMAKE_C_FLAGS='-mcpu=neoverse-512tvb'",
@@ -566,12 +562,12 @@
566562
'NO_STOP_MESSAGE':'1', # For Fortran test-suite
567563
},
568564
testsuite_flags=[
569-
'--cppflags', '-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
570-
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
565+
'--cppflags', '-mcpu=neoverse-512tvb -msve-vector-bits=256 -O3',
566+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -msve-vector-bits=256 -O3',
571567
'--threads=32', '--build-threads=32'],
572568
extra_cmake_args=[
573-
"-DCMAKE_C_FLAGS='-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false'",
574-
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false'",
569+
"-DCMAKE_C_FLAGS='-mcpu=neoverse-512tvb -msve-vector-bits=256'",
570+
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-512tvb -msve-vector-bits=256'",
575571
"-DLLVM_ENABLE_LLD=True",
576572
"-DMLIR_INCLUDE_INTEGRATION_TESTS=True",
577573
"-DMLIR_RUN_ARM_SVE_TESTS=True"])},
@@ -592,8 +588,8 @@
592588
'NO_STOP_MESSAGE':'1', # For Fortran test-suite
593589
},
594590
testsuite_flags=[
595-
'--cppflags', '-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
596-
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
591+
'--cppflags', '-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -O3',
592+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -O3',
597593
'--threads=48', '--build-threads=48'],
598594
extra_cmake_args=[
599595
"-DCMAKE_C_FLAGS='-mcpu=neoverse-v2'",
@@ -618,12 +614,12 @@
618614
'NO_STOP_MESSAGE':'1', # For Fortran test-suite
619615
},
620616
testsuite_flags=[
621-
'--cppflags', '-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
622-
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
617+
'--cppflags', '-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -O3',
618+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -O3',
623619
'--threads=48', '--build-threads=48'],
624620
extra_cmake_args=[
625-
"-DCMAKE_C_FLAGS='-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false'",
626-
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false'",
621+
"-DCMAKE_C_FLAGS='-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred'",
622+
"-DCMAKE_CXX_FLAGS='-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred'",
627623
"-DLLVM_ENABLE_LLD=True",
628624
"-DMLIR_INCLUDE_INTEGRATION_TESTS=True",
629625
"-DMLIR_RUN_ARM_SVE_TESTS=True"])},

0 commit comments

Comments
 (0)