[gcc(refs/users/hubicka/heads/honza-gcc-benchmark-branch-v2)] Revert "Very cheap vectorization at -O2 and -O3."

[gcc(refs/users/hubicka/heads/honza-gcc-benchmark-branch-v2)] Revert "Very cheap vectorization at -O2 and -O3."

[Jan Hubicka]

https://gcc.gnu.org/g:e9a185976abe5fb6c94d1489ce2eb25ac9d83baf

commit e9a185976abe5fb6c94d1489ce2eb25ac9d83baf
Author: Jan Hubicka <jh@suse.cz>
Date:   Mon Nov 23 18:59:41 2020 +0100

    Revert "Very cheap vectorization at -O2 and -O3."
    
    This reverts commit 11d39d4b278efb4a0134f495d698c2cd764c06e4.

Diff:
---
 gcc/opts.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gcc/opts.c b/gcc/opts.c
index 8b4ad13addd..57774916a09 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -507,9 +507,7 @@ static const struct default_options default_options_table[] =
     { OPT_LEVELS_2_PLUS, OPT_ftree_switch_conversion, NULL, 1 },
     { OPT_LEVELS_2_PLUS, OPT_ftree_tail_merge, NULL, 1 },
     { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 },
-    { OPT_LEVELS_2_PLUS, OPT_ftree_loop_vectorize, NULL, 1 },
-    { OPT_LEVELS_2_PLUS, OPT_ftree_slp_vectorize, NULL, 1 },
-    { OPT_LEVELS_2_PLUS, OPT_fvect_cost_model_, NULL, VECT_COST_MODEL_VERY_CHEAP },
+    { OPT_LEVELS_2_PLUS, OPT_fvect_cost_model_, NULL, VECT_COST_MODEL_CHEAP },
     { OPT_LEVELS_2_PLUS, OPT_finline_functions, NULL, 1 },
     { OPT_LEVELS_2_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 },
 
@@ -538,8 +536,11 @@ static const struct default_options default_options_table[] =
     { OPT_LEVELS_3_PLUS, OPT_fsplit_loops, NULL, 1 },
     { OPT_LEVELS_3_PLUS, OPT_fsplit_paths, NULL, 1 },
     { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribution, NULL, 1 },
+    { OPT_LEVELS_3_PLUS, OPT_ftree_loop_vectorize, NULL, 1 },
     { OPT_LEVELS_3_PLUS, OPT_ftree_partial_pre, NULL, 1 },
+    { OPT_LEVELS_3_PLUS, OPT_ftree_slp_vectorize, NULL, 1 },
     { OPT_LEVELS_3_PLUS, OPT_funswitch_loops, NULL, 1 },
+    { OPT_LEVELS_3_PLUS, OPT_fvect_cost_model_, NULL, VECT_COST_MODEL_DYNAMIC },
     { OPT_LEVELS_3_PLUS, OPT_fversion_loops_for_strides, NULL, 1 },
 
     /* -O3 parameters.  */