vectorizer: Fix up -fsimd-cost-model= handling

>	* testsuite/libgomp.c++/scan-10.C: Add option -fvect-cost-model=cheap.

I don't think this is the right thing to do.
This just means that at some point between 2013 when -fsimd-cost-model has
been introduced and now -fsimd-cost-model= option at least partially stopped
working properly.
As documented, -fsimd-cost-model= overrides the -fvect-cost-model= setting
for OpenMP simd loops (loop->force_vectorize is true) if specified differently
from default.
In tree-vectorizer.h we have:
static inline bool
unlimited_cost_model (loop_p loop)
{
  if (loop != NULL && loop->force_vectorize
      && flag_simd_cost_model != VECT_COST_MODEL_DEFAULT)
    return flag_simd_cost_model == VECT_COST_MODEL_UNLIMITED;
  return (flag_vect_cost_model == VECT_COST_MODEL_UNLIMITED);
}
and use it in various places, but we also just use flag_vect_cost_model
in lots of places (and in one spot use flag_simd_cost_model, not sure if
we are sure it is a force_vectorize loop or what).

So, IMHO we should change the above inline function to
loop_cost_model and let it return the cost model and then just
reimplement unlimited_cost_model as
return loop_cost_model (loop) == VECT_COST_MODEL_UNLIMITED;
and then adjust the direct uses of the flag and revert these changes.

2021-10-12  Jakub Jelinek  <jakub@redhat.com>

gcc/
	* tree-vectorizer.h (loop_cost_model): New function.
	(unlimited_cost_model): Use it.
	* tree-vect-loop.c (vect_analyze_loop_costing): Use loop_cost_model
	call instead of flag_vect_cost_model.
	* tree-vect-data-refs.c (vect_enhance_data_refs_alignment): Likewise.
	(vect_prune_runtime_alias_test_list): Likewise.  Also use it instead
	of flag_simd_cost_model.
gcc/testsuite/
	* gcc.dg/gomp/simd-2.c: Remove option -fvect-cost-model=cheap.
	* gcc.dg/gomp/simd-3.c: Likewise.
libgomp/
	* testsuite/libgomp.c/scan-11.c: Remove option -fvect-cost-model=cheap.
	* testsuite/libgomp.c/scan-12.c: Likewise.
	* testsuite/libgomp.c/scan-13.c: Likewise.
	* testsuite/libgomp.c/scan-14.c: Likewise.
	* testsuite/libgomp.c/scan-15.c: Likewise.
	* testsuite/libgomp.c/scan-16.c: Likewise.
	* testsuite/libgomp.c/scan-17.c: Likewise.
	* testsuite/libgomp.c/scan-18.c: Likewise.
	* testsuite/libgomp.c/scan-19.c: Likewise.
	* testsuite/libgomp.c/scan-20.c: Likewise.
	* testsuite/libgomp.c/scan-21.c: Likewise.
	* testsuite/libgomp.c/scan-22.c: Likewise.
	* testsuite/libgomp.c++/scan-9.C: Likewise.
	* testsuite/libgomp.c++/scan-10.C: Likewise.
	* testsuite/libgomp.c++/scan-11.C: Likewise.
	* testsuite/libgomp.c++/scan-12.C: Likewise.
	* testsuite/libgomp.c++/scan-13.C: Likewise.
	* testsuite/libgomp.c++/scan-14.C: Likewise.
	* testsuite/libgomp.c++/scan-15.C: Likewise.
	* testsuite/libgomp.c++/scan-16.C: Likewise.

20 files changed, 20 insertions, 20 deletions

diff --git a/libgomp/testsuite/libgomp.c++/scan-10.C b/libgomp/testsuite/libgomp.c++/scan-10.C
index df5e724..04b8796 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 -fvect-cost-model=cheap -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -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 f895486..9e83eff 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 -fvect-cost-model=cheap -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -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 39959dc..ee91157 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 -fvect-cost-model=cheap -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -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 44db445..6130457 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 -fvect-cost-model=cheap -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -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 e20dd05..8ee4354 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 -fvect-cost-model=cheap -fopenmp -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -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 e36bc07..69550af 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 -fvect-cost-model=cheap -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -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-16.C b/libgomp/testsuite/libgomp.c++/scan-16.C
index 07e0a4a..3fb6135 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 -fvect-cost-model=cheap -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -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-9.C b/libgomp/testsuite/libgomp.c++/scan-9.C
index 91fa14b..cd08f768 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 -fvect-cost-model=cheap -fdump-tree-vect-details" }
+// { dg-additional-options "-O2 -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 bc9f941..3bc2d3a 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 -fvect-cost-model=cheap -fopenmp -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -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 a290dd6..f769d17 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 -fvect-cost-model=cheap -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -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 0822ad9..9cf1623 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 -fvect-cost-model=cheap -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -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 206ac78..3a20a75 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 -fvect-cost-model=cheap -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -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 dd9abe9..c0c6dfd 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 -fvect-cost-model=cheap -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -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-16.c b/libgomp/testsuite/libgomp.c/scan-16.c
index f85269f..8b81678 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 -fvect-cost-model=cheap -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -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-17.c b/libgomp/testsuite/libgomp.c/scan-17.c
index fb03c8c..57e4390 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 -fvect-cost-model=cheap -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -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-18.c b/libgomp/testsuite/libgomp.c/scan-18.c
index 81679b4..ae467fc 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 -fvect-cost-model=cheap -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -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-19.c b/libgomp/testsuite/libgomp.c/scan-19.c
index 098fb43..b420501 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 -fvect-cost-model=cheap -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -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-20.c b/libgomp/testsuite/libgomp.c/scan-20.c
index ae834f9..3ef88d7 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 -fvect-cost-model=cheap -fdump-tree-vect-details" } */
+/* { dg-additional-options "-O2 -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-21.c b/libgomp/testsuite/libgomp.c/scan-21.c
index cd7fe25..c531961 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 -fvect-cost-model=cheap -fdump-tree-vect-details -msse2 -mno-sse3" } */
+/* { dg-additional-options "-O2 -fopenmp -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 e548f97..96fead7 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 -fvect-cost-model=cheap -fdump-tree-vect-details -msse2 -mno-sse3" } */
+/* { dg-additional-options "-O2 -fopenmp -fdump-tree-vect-details -msse2 -mno-sse3" } */
 /* { dg-final { scan-tree-dump-times "vectorized \[2-6] loops" 2 "vect" } } */
 
 #include "scan-17.c"