Skip to content

Commit f0ee436

Browse files
authored
Fix quotes in Fortran flags on SVE/SVE2 builders (#339)
Lnt was passing the flags with double quotes to cmake, which were forwarded in this way to flang, making it parse them as a single argument.
1 parent 93e7611 commit f0ee436

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@
486486
},
487487
testsuite_flags=[
488488
'--cppflags', '-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
489-
'--cmake-define=CMAKE_Fortran_FLAGS="-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3"',
489+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
490490
'--threads=32', '--build-threads=32'],
491491
extra_cmake_args=[
492492
"-DCMAKE_C_FLAGS='-mcpu=neoverse-512tvb'",
@@ -511,7 +511,7 @@
511511
},
512512
testsuite_flags=[
513513
'--cppflags', '-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
514-
'--cmake-define=CMAKE_Fortran_FLAGS="-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3"',
514+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
515515
'--threads=32', '--build-threads=32'],
516516
extra_cmake_args=[
517517
"-DCMAKE_C_FLAGS='-mcpu=neoverse-512tvb -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false'",
@@ -534,7 +534,7 @@
534534
},
535535
testsuite_flags=[
536536
'--cppflags', '-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
537-
'--cmake-define=CMAKE_Fortran_FLAGS="-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false -O3"',
537+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
538538
'--threads=32', '--build-threads=32'],
539539
extra_cmake_args=[
540540
"-DCMAKE_C_FLAGS='-mcpu=neoverse-512tvb'",
@@ -559,7 +559,7 @@
559559
},
560560
testsuite_flags=[
561561
'--cppflags', '-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
562-
'--cmake-define=CMAKE_Fortran_FLAGS="-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false -O3"',
562+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
563563
'--threads=32', '--build-threads=32'],
564564
extra_cmake_args=[
565565
"-DCMAKE_C_FLAGS='-mcpu=neoverse-512tvb -msve-vector-bits=256 -mllvm -treat-scalable-fixed-error-as-warning=false'",
@@ -585,7 +585,7 @@
585585
},
586586
testsuite_flags=[
587587
'--cppflags', '-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
588-
'--cmake-define=CMAKE_Fortran_FLAGS="-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3"',
588+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
589589
'--threads=48', '--build-threads=48'],
590590
extra_cmake_args=[
591591
"-DCMAKE_C_FLAGS='-mcpu=neoverse-v2'",
@@ -611,7 +611,7 @@
611611
},
612612
testsuite_flags=[
613613
'--cppflags', '-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
614-
'--cmake-define=CMAKE_Fortran_FLAGS="-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3"',
614+
'--cmake-define', 'CMAKE_Fortran_FLAGS=-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false -O3',
615615
'--threads=48', '--build-threads=48'],
616616
extra_cmake_args=[
617617
"-DCMAKE_C_FLAGS='-mcpu=neoverse-v2 -mllvm -scalable-vectorization=preferred -mllvm -treat-scalable-fixed-error-as-warning=false'",

0 commit comments

Comments
 (0)