]> git.ipfire.org Git - thirdparty/gcc.git/commit
vectorizer: Fix up -fsimd-cost-model= handling
authorJakub Jelinek <jakub@redhat.com>
Tue, 12 Oct 2021 07:28:10 +0000 (09:28 +0200)
committerJakub Jelinek <jakub@redhat.com>
Tue, 12 Oct 2021 07:28:10 +0000 (09:28 +0200)
commitfab2f61dc1b195fec9161be15635b87d312e4626
tree6c12bfb3db92b9265cbb18c8d5d73d0c9c646637
parent73c535a00bc4dfe9a939cd80facbe79a929cab3e
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.
25 files changed:
gcc/testsuite/gcc.dg/gomp/simd-2.c
gcc/testsuite/gcc.dg/gomp/simd-3.c
gcc/tree-vect-data-refs.c
gcc/tree-vect-loop.c
gcc/tree-vectorizer.h
libgomp/testsuite/libgomp.c++/scan-10.C
libgomp/testsuite/libgomp.c++/scan-11.C
libgomp/testsuite/libgomp.c++/scan-12.C
libgomp/testsuite/libgomp.c++/scan-13.C
libgomp/testsuite/libgomp.c++/scan-14.C
libgomp/testsuite/libgomp.c++/scan-15.C
libgomp/testsuite/libgomp.c++/scan-16.C
libgomp/testsuite/libgomp.c++/scan-9.C
libgomp/testsuite/libgomp.c/scan-11.c
libgomp/testsuite/libgomp.c/scan-12.c
libgomp/testsuite/libgomp.c/scan-13.c
libgomp/testsuite/libgomp.c/scan-14.c
libgomp/testsuite/libgomp.c/scan-15.c
libgomp/testsuite/libgomp.c/scan-16.c
libgomp/testsuite/libgomp.c/scan-17.c
libgomp/testsuite/libgomp.c/scan-18.c
libgomp/testsuite/libgomp.c/scan-19.c
libgomp/testsuite/libgomp.c/scan-20.c
libgomp/testsuite/libgomp.c/scan-21.c
libgomp/testsuite/libgomp.c/scan-22.c