Pushed to trunk.
libgomp/ChangeLog:
* testsuite/libgomp.c++/scan-10.C: Add option -fvect-cost-model=cheap.
* testsuite/libgomp.c++/scan-11.C: Ditto.
* testsuite/libgomp.c++/scan-12.C: Ditto.
* testsuite/libgomp.c++/scan-13.C: Ditto.
* testsuite/libgomp.c++/scan-14.C: Ditto.
* testsuite/libgomp.c++/scan-15.C: Ditto.
* testsuite/libgomp.c++/scan-16.C: Ditto.
* testsuite/libgomp.c++/scan-9.C: Ditto.
* testsuite/libgomp.c-c++-common/lastprivate-conditional-7.c: Ditto.
* testsuite/libgomp.c-c++-common/lastprivate-conditional-8.c: Ditto.
* testsuite/libgomp.c/scan-11.c: Ditto.
* testsuite/libgomp.c/scan-12.c: Ditto.
* testsuite/libgomp.c/scan-13.c: Ditto.
* testsuite/libgomp.c/scan-14.c: Ditto.
* testsuite/libgomp.c/scan-15.c: Ditto.
* testsuite/libgomp.c/scan-16.c: Ditto.
* testsuite/libgomp.c/scan-17.c: Ditto.
* testsuite/libgomp.c/scan-18.c: Ditto.
* testsuite/libgomp.c/scan-19.c: Ditto.
* testsuite/libgomp.c/scan-20.c: Ditto.
* testsuite/libgomp.c/scan-21.c: Ditto.
* testsuite/libgomp.c/scan-22.c: Ditto.
gcc/testsuite/ChangeLog:
* g++.dg/tree-ssa/pr94403.C: Add -fno-tree-vectorize
* gcc.dg/optimize-bswapsi-5.c: Ditto.
* gcc.dg/optimize-bswapsi-6.c: Ditto.
* gcc.dg/Warray-bounds-51.c: Add -mtune=generic
* gcc.dg/Wstringop-overflow-14.c:
---
gcc/testsuite/g++.dg/tree-ssa/pr94403.C | 2 +-
gcc/testsuite/gcc.dg/Warray-bounds-51.c | 3 ++-
gcc/testsuite/gcc.dg/Wstringop-overflow-14.c | 3 ++-
gcc/testsuite/gcc.dg/optimize-bswapsi-5.c | 2 +-
gcc/testsuite/gcc.dg/optimize-bswapsi-6.c | 2 +-
libgomp/testsuite/libgomp.c++/scan-10.C | 2 +-
libgomp/testsuite/libgomp.c++/scan-11.C | 2 +-
libgomp/testsuite/libgomp.c++/scan-12.C | 2 +-
libgomp/testsuite/libgomp.c++/scan-13.C | 2 +-
libgomp/testsuite/libgomp.c++/scan-14.C | 2 +-
libgomp/testsuite/libgomp.c++/scan-15.C | 2 +-
libgomp/testsuite/libgomp.c++/scan-16.C | 2 +-
libgomp/testsuite/libgomp.c++/scan-9.C | 2 +-
.../testsuite/libgomp.c-c++-common/lastprivate-conditional-7.c | 2 +-
.../testsuite/libgomp.c-c++-common/lastprivate-conditional-8.c | 2 +-
libgomp/testsuite/libgomp.c/scan-11.c | 2 +-
libgomp/testsuite/libgomp.c/scan-12.c | 2 +-
libgomp/testsuite/libgomp.c/scan-13.c | 2 +-
libgomp/testsuite/libgomp.c/scan-14.c | 2 +-
libgomp/testsuite/libgomp.c/scan-15.c | 2 +-
libgomp/testsuite/libgomp.c/scan-16.c | 2 +-
libgomp/testsuite/libgomp.c/scan-17.c | 2 +-
libgomp/testsuite/libgomp.c/scan-18.c | 2 +-
libgomp/testsuite/libgomp.c/scan-19.c | 2 +-
libgomp/testsuite/libgomp.c/scan-20.c | 2 +-
libgomp/testsuite/libgomp.c/scan-21.c | 2 +-
libgomp/testsuite/libgomp.c/scan-22.c | 2 +-
27 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr94403.C
b/gcc/testsuite/g++.dg/tree-ssa/pr94403.C
index d47e7fcc5a3..5f8f868e469 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/pr94403.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr94403.C
@@ -3,7 +3,7 @@
// are either big or little endian (not pdp endian).
// { dg-do compile { target { lp64 && { i?86-*-* x86_64-*-* powerpc*-*-*
aarch64*-*-* } } } }
// { dg-require-effective-target store_merge }
-// { dg-options "-O2 -fdump-tree-store-merging -std=c++17" }
+// { dg-options "-O2 -fno-tree-vectorize -fdump-tree-store-merging -std=c++17"
}
namespace std {
template <typename T>
diff --git a/gcc/testsuite/gcc.dg/Warray-bounds-51.c
b/gcc/testsuite/gcc.dg/Warray-bounds-51.c
index b0b8bdb7938..cadb7a3f1b2 100644
--- a/gcc/testsuite/gcc.dg/Warray-bounds-51.c
+++ b/gcc/testsuite/gcc.dg/Warray-bounds-51.c
@@ -1,7 +1,8 @@
/* PR middle-end/92333 - missing variable name referencing VLA in warnings
PR middle-end/82608 - missing -Warray-bounds on an out-of-bounds VLA index
{ dg-do compile }
- { dg-options "-O2 -Wall" } */
+ { dg-options "-O2 -Wall" }
+ { dg-additional-options "-mtune=generic" { target { i?86-*-* x86_64-*-* } }
} */
void sink (void*);
diff --git a/gcc/testsuite/gcc.dg/Wstringop-overflow-14.c
b/gcc/testsuite/gcc.dg/Wstringop-overflow-14.c
index b648f5b41b1..83b069c3de8 100644
--- a/gcc/testsuite/gcc.dg/Wstringop-overflow-14.c
+++ b/gcc/testsuite/gcc.dg/Wstringop-overflow-14.c
@@ -2,7 +2,8 @@
types than char are diagnosed.
{ dg-do compile }
{ dg-require-effective-target int32plus }
- { dg-options "-O2 -Wall -Wno-array-bounds" } */
+ { dg-options "-O2 -Wall -Wno-array-bounds" }
+ { dg-additional-options "-mtune=generic" { target { i?86-*-* x86_64-*-* } }
} */
typedef __INT16_TYPE__ int16_t;
typedef __INT32_TYPE__ int32_t;
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapsi-5.c
b/gcc/testsuite/gcc.dg/optimize-bswapsi-5.c
index 91a5284fa81..5934aacf75a 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswapsi-5.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapsi-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target bswap } */
-/* { dg-options "-O2 -fdump-tree-optimized -fno-inline-functions" } */
+/* { dg-options "-O2 -fno-tree-vectorize -fdump-tree-optimized
-fno-inline-functions" } */
/* { dg-additional-options "-march=z900" { target s390-*-* } } */
struct L { unsigned int l[2]; };
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapsi-6.c
b/gcc/testsuite/gcc.dg/optimize-bswapsi-6.c
index 3c089b36fd8..75f8aecb5d8 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswapsi-6.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapsi-6.c
@@ -1,7 +1,7 @@
/* PR tree-optimization/42587 */
/* { dg-do compile } */
/* { dg-require-effective-target bswap } */
-/* { dg-options "-O2 -fdump-tree-store-merging" } */
+/* { dg-options "-O2 -fno-tree-vectorize -fdump-tree-store-merging" } */
/* { dg-additional-options "-march=z900" { target s390-*-* } } */
typedef unsigned char u8;
diff --git a/libgomp/testsuite/libgomp.c++/scan-10.C
b/libgomp/testsuite/libgomp.c++/scan-10.C
index 04b8796a24e..df5e724dcae 100644
--- a/libgomp/testsuite/libgomp.c++/scan-10.C
+++ b/libgomp/testsuite/libgomp.c++/scan-10.C
@@ -1,5 +1,5 @@
// { dg-require-effective-target size32plus }
-// { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -fvect-cost-model=cheap -fopenmp
-fdump-tree-vect-details" }
// { dg-additional-options "-msse2" { target sse2_runtime } }
// { dg-additional-options "-mavx" { target avx_runtime } }
// { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } }
diff --git a/libgomp/testsuite/libgomp.c++/scan-11.C
b/libgomp/testsuite/libgomp.c++/scan-11.C
index 9e83effd077..f895486f800 100644
--- a/libgomp/testsuite/libgomp.c++/scan-11.C
+++ b/libgomp/testsuite/libgomp.c++/scan-11.C
@@ -1,5 +1,5 @@
// { dg-require-effective-target size32plus }
-// { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -fvect-cost-model=cheap -fopenmp
-fdump-tree-vect-details" }
// { dg-additional-options "-msse2" { target sse2_runtime } }
// { dg-additional-options "-mavx" { target avx_runtime } }
// { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } }
diff --git a/libgomp/testsuite/libgomp.c++/scan-12.C
b/libgomp/testsuite/libgomp.c++/scan-12.C
index ee911578520..39959dc290a 100644
--- a/libgomp/testsuite/libgomp.c++/scan-12.C
+++ b/libgomp/testsuite/libgomp.c++/scan-12.C
@@ -1,5 +1,5 @@
// { dg-require-effective-target size32plus }
-// { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -fvect-cost-model=cheap -fopenmp
-fdump-tree-vect-details" }
// { dg-additional-options "-msse2" { target sse2_runtime } }
// { dg-additional-options "-mavx" { target avx_runtime } }
// { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } }
diff --git a/libgomp/testsuite/libgomp.c++/scan-13.C
b/libgomp/testsuite/libgomp.c++/scan-13.C
index 613045768e7..44db445ff6c 100644
--- a/libgomp/testsuite/libgomp.c++/scan-13.C
+++ b/libgomp/testsuite/libgomp.c++/scan-13.C
@@ -1,5 +1,5 @@
// { dg-require-effective-target size32plus }
-// { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -fvect-cost-model=cheap -fopenmp
-fdump-tree-vect-details" }
// { dg-additional-options "-msse2" { target sse2_runtime } }
// { dg-additional-options "-mavx" { target avx_runtime } }
// { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } }
diff --git a/libgomp/testsuite/libgomp.c++/scan-14.C
b/libgomp/testsuite/libgomp.c++/scan-14.C
index 8ee4354c7fc..e20dd05effd 100644
--- a/libgomp/testsuite/libgomp.c++/scan-14.C
+++ b/libgomp/testsuite/libgomp.c++/scan-14.C
@@ -1,5 +1,5 @@
// { dg-require-effective-target size32plus }
-// { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -fvect-cost-model=cheap -fopenmp
-fdump-tree-vect-details" }
// { dg-additional-options "-msse2" { target sse2_runtime } }
// { dg-additional-options "-mavx" { target avx_runtime } }
// { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } }
diff --git a/libgomp/testsuite/libgomp.c++/scan-15.C
b/libgomp/testsuite/libgomp.c++/scan-15.C
index 69550af9d62..e36bc07b337 100644
--- a/libgomp/testsuite/libgomp.c++/scan-15.C
+++ b/libgomp/testsuite/libgomp.c++/scan-15.C
@@ -1,5 +1,5 @@
// { dg-require-effective-target size32plus }
-// { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" }
// { dg-additional-options "-msse2" { target sse2_runtime } }
// { dg-additional-options "-mavx" { target avx_runtime } }
// { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } }
diff --git a/libgomp/testsuite/libgomp.c++/scan-16.C
b/libgomp/testsuite/libgomp.c++/scan-16.C
index 3fb6135c343..07e0a4a29d0 100644
--- a/libgomp/testsuite/libgomp.c++/scan-16.C
+++ b/libgomp/testsuite/libgomp.c++/scan-16.C
@@ -1,5 +1,5 @@
// { dg-require-effective-target size32plus }
-// { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" }
// { dg-additional-options "-msse2" { target sse2_runtime } }
// { dg-additional-options "-mavx" { target avx_runtime } }
// { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } }
diff --git a/libgomp/testsuite/libgomp.c++/scan-9.C
b/libgomp/testsuite/libgomp.c++/scan-9.C
index cd08f76895b..91fa14b3f43 100644
--- a/libgomp/testsuite/libgomp.c++/scan-9.C
+++ b/libgomp/testsuite/libgomp.c++/scan-9.C
@@ -1,5 +1,5 @@
// { dg-require-effective-target size32plus }
-// { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" }
// { dg-additional-options "-msse2" { target sse2_runtime } }
// { dg-additional-options "-mavx" { target avx_runtime } }
// { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } }
diff --git a/libgomp/testsuite/libgomp.c-c++-common/lastprivate-conditional-7.c
b/libgomp/testsuite/libgomp.c-c++-common/lastprivate-conditional-7.c
index 2d542d6d56c..3b5875550a0 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/lastprivate-conditional-7.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/lastprivate-conditional-7.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-additional-options "-O2 -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 3 "vect" { target
avx_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c-c++-common/lastprivate-conditional-8.c
b/libgomp/testsuite/libgomp.c-c++-common/lastprivate-conditional-8.c
index b935a6c2dbf..0443c9d1ab9 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/lastprivate-conditional-8.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/lastprivate-conditional-8.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-additional-options "-O2 -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 3 "vect" { target
avx_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-11.c
b/libgomp/testsuite/libgomp.c/scan-11.c
index 3bc2d3a1d7c..bc9f9410e66 100644
--- a/libgomp/testsuite/libgomp.c/scan-11.c
+++ b/libgomp/testsuite/libgomp.c/scan-11.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target size32plus } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fvect-cost-model=cheap -fopenmp
-fdump-tree-vect-details" } */
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-12.c
b/libgomp/testsuite/libgomp.c/scan-12.c
index f769d17e8ca..a290dd66688 100644
--- a/libgomp/testsuite/libgomp.c/scan-12.c
+++ b/libgomp/testsuite/libgomp.c/scan-12.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target size32plus } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-13.c
b/libgomp/testsuite/libgomp.c/scan-13.c
index 9cf1623d262..0822ad9bc2b 100644
--- a/libgomp/testsuite/libgomp.c/scan-13.c
+++ b/libgomp/testsuite/libgomp.c/scan-13.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target size32plus } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-14.c
b/libgomp/testsuite/libgomp.c/scan-14.c
index 3a20a75b2e9..206ac78d05b 100644
--- a/libgomp/testsuite/libgomp.c/scan-14.c
+++ b/libgomp/testsuite/libgomp.c/scan-14.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target size32plus } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-15.c
b/libgomp/testsuite/libgomp.c/scan-15.c
index c0c6dfd3b99..dd9abe9702c 100644
--- a/libgomp/testsuite/libgomp.c/scan-15.c
+++ b/libgomp/testsuite/libgomp.c/scan-15.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target size32plus } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-16.c
b/libgomp/testsuite/libgomp.c/scan-16.c
index 8b816781dd8..f85269f9d08 100644
--- a/libgomp/testsuite/libgomp.c/scan-16.c
+++ b/libgomp/testsuite/libgomp.c/scan-16.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target size32plus } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-17.c
b/libgomp/testsuite/libgomp.c/scan-17.c
index 57e4390462a..fb03c8ce040 100644
--- a/libgomp/testsuite/libgomp.c/scan-17.c
+++ b/libgomp/testsuite/libgomp.c/scan-17.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target size32plus } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-18.c
b/libgomp/testsuite/libgomp.c/scan-18.c
index ae467fc7bdb..81679b4d72b 100644
--- a/libgomp/testsuite/libgomp.c/scan-18.c
+++ b/libgomp/testsuite/libgomp.c/scan-18.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target size32plus } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-19.c
b/libgomp/testsuite/libgomp.c/scan-19.c
index b4205012902..098fb437188 100644
--- a/libgomp/testsuite/libgomp.c/scan-19.c
+++ b/libgomp/testsuite/libgomp.c/scan-19.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target size32plus } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-20.c
b/libgomp/testsuite/libgomp.c/scan-20.c
index 3ef88d78d9d..ae834f96a15 100644
--- a/libgomp/testsuite/libgomp.c/scan-20.c
+++ b/libgomp/testsuite/libgomp.c/scan-20.c
@@ -1,5 +1,5 @@
/* { dg-require-effective-target size32plus } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details" } */
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
/* { dg-additional-options "-mavx" { target avx_runtime } } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" {
target sse2_runtime } } } */
diff --git a/libgomp/testsuite/libgomp.c/scan-21.c
b/libgomp/testsuite/libgomp.c/scan-21.c
index c531961ffe4..cd7fe2572f6 100644
--- a/libgomp/testsuite/libgomp.c/scan-21.c
+++ b/libgomp/testsuite/libgomp.c/scan-21.c
@@ -1,6 +1,6 @@
/* { dg-require-effective-target size32plus } */
/* { dg-require-effective-target avx_runtime } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details -msse2
-mno-sse3" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details -msse2 -mno-sse3" } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" } } */
#include "scan-13.c"
diff --git a/libgomp/testsuite/libgomp.c/scan-22.c
b/libgomp/testsuite/libgomp.c/scan-22.c
index 96fead7d54d..e548f97c3a1 100644
--- a/libgomp/testsuite/libgomp.c/scan-22.c
+++ b/libgomp/testsuite/libgomp.c/scan-22.c
@@ -1,6 +1,6 @@
/* { dg-require-effective-target size32plus } */
/* { dg-require-effective-target avx_runtime } */
-/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details -msse2
-mno-sse3" } */
+/* { dg-additional-options "-O2 -fopenmp -fvect-cost-model=cheap
-fdump-tree-vect-details -msse2 -mno-sse3" } */
/* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" } } */
#include "scan-17.c"
--
2.18.1
