diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2014-04-14 10:42:12 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2014-04-14 10:42:12 +0000 |
| commit | b15b59794635b6d6b3ebdda6bbc7f32d801118f6 (patch) | |
| tree | 4825c20c81ab8820a8e1f8fb33d540d4815b5a85 /gcc/tree-if-conv.c | |
| parent | e5b1a4bc244fd096151c1299fa5241ce0c3a222a (diff) | |
| download | gcc-b15b59794635b6d6b3ebdda6bbc7f32d801118f6.zip gcc-b15b59794635b6d6b3ebdda6bbc7f32d801118f6.tar.gz gcc-b15b59794635b6d6b3ebdda6bbc7f32d801118f6.tar.bz2 | |
cfgloop.h (struct loop): Rename force_vect into force_vectorize.
* cfgloop.h (struct loop): Rename force_vect into force_vectorize.
* function.h (struct function): Rename has_force_vect_loops into
has_force_vectorize_loops.
* lto-streamer-in.c (input_cfg): Adjust for renaming.
(input_struct_function_base): Likewise.
* lto-streamer-out.c (output_cfg): Likewise.
(output_struct_function_base): Likewise.
* omp-low.c (expand_omp_simd): Likewise.
* tree-cfg.c (move_sese_region_to_fn): Likewise.
* tree-if-conv.c (ifcvt_can_use_mask_load_store): Likewise.
(version_loop_for_if_conversion): Likewise.
(tree_if_conversion): Likewise.
(main_tree_if_conversion): Likewise.
(gate_tree_if_conversion): Likewise.
* tree-inline.c (copy_loops): Likewise.
* tree-ssa-loop-ivcanon.c (tree_unroll_loops_completely_1): Likewise.
* tree-ssa-loop.c (tree_loop_vectorize): Likewise.
* tree-ssa-phiopt.c (tree_ssa_phiopt_worker): Likewise.
* tree-vect-loop.c (vect_estimate_min_profitable_iters): Likewise.
* tree-vectorizer.c (vectorize_loops): Likewise.
* tree-vectorizer.h (unlimited_cost_model): Likewise.
From-SVN: r209362
Diffstat (limited to 'gcc/tree-if-conv.c')
| -rw-r--r-- | gcc/tree-if-conv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c index 0dc340f..7ff2132 100644 --- a/gcc/tree-if-conv.c +++ b/gcc/tree-if-conv.c @@ -728,7 +728,7 @@ ifcvt_can_use_mask_load_store (gimple stmt) basic_block bb = gimple_bb (stmt); bool is_load; - if (!(flag_tree_loop_vectorize || bb->loop_father->force_vect) + if (!(flag_tree_loop_vectorize || bb->loop_father->force_vectorize) || bb->loop_father->dont_vectorize || !gimple_assign_single_p (stmt) || gimple_has_volatile_ops (stmt)) @@ -1926,7 +1926,7 @@ version_loop_for_if_conversion (struct loop *loop) if (new_loop == NULL) return false; new_loop->dont_vectorize = true; - new_loop->force_vect = false; + new_loop->force_vectorize = false; gsi = gsi_last_bb (cond_bb); gimple_call_set_arg (g, 1, build_int_cst (integer_type_node, new_loop->num)); gsi_insert_before (&gsi, g, GSI_SAME_STMT); @@ -1950,7 +1950,7 @@ tree_if_conversion (struct loop *loop) goto cleanup; if (any_mask_load_store - && ((!flag_tree_loop_vectorize && !loop->force_vect) + && ((!flag_tree_loop_vectorize && !loop->force_vectorize) || loop->dont_vectorize)) goto cleanup; @@ -1998,7 +1998,7 @@ main_tree_if_conversion (void) FOR_EACH_LOOP (loop, 0) if (flag_tree_loop_if_convert == 1 || flag_tree_loop_if_convert_stores == 1 - || ((flag_tree_loop_vectorize || loop->force_vect) + || ((flag_tree_loop_vectorize || loop->force_vectorize) && !loop->dont_vectorize)) todo |= tree_if_conversion (loop); @@ -2018,7 +2018,7 @@ main_tree_if_conversion (void) static bool gate_tree_if_conversion (void) { - return (((flag_tree_loop_vectorize || cfun->has_force_vect_loops) + return (((flag_tree_loop_vectorize || cfun->has_force_vectorize_loops) && flag_tree_loop_if_convert != 0) || flag_tree_loop_if_convert == 1 || flag_tree_loop_if_convert_stores == 1); |