From 7bcbf2d83269394899f27695e19715dca8f098bf Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Tue, 31 Jul 2018 14:23:44 +0000 Subject: [PATCH] [23/46] Make LOOP_VINFO_MAY_MISALIGN_STMTS use stmt_vec_info This patch changes LOOP_VINFO_MAY_MISALIGN_STMTS from an auto_vec to an auto_vec. 2018-07-31 Richard Sandiford gcc/ * tree-vectorizer.h (_loop_vec_info::may_misalign_stmts): Change from an auto_vec to an auto_vec. * tree-vect-data-refs.c (vect_enhance_data_refs_alignment): Update accordingly. * tree-vect-loop-manip.c (vect_create_cond_for_align_checks): Likewise. From-SVN: r263138 --- gcc/ChangeLog | 8 ++++++++ gcc/tree-vect-data-refs.c | 7 +++---- gcc/tree-vect-loop-manip.c | 13 ++++++------- gcc/tree-vectorizer.h | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 340a738a8bb..dde2596749d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2018-07-31 Richard Sandiford + + * tree-vectorizer.h (_loop_vec_info::may_misalign_stmts): Change + from an auto_vec to an auto_vec. + * tree-vect-data-refs.c (vect_enhance_data_refs_alignment): Update + accordingly. + * tree-vect-loop-manip.c (vect_create_cond_for_align_checks): Likewise. + 2018-07-31 Richard Sandiford * tree-vectorizer.h (_stmt_vec_info::same_dr_stmt): Change from diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c index 14a1a8fea25..e1d644c67f0 100644 --- a/gcc/tree-vect-data-refs.c +++ b/gcc/tree-vect-data-refs.c @@ -2231,16 +2231,15 @@ vect_enhance_data_refs_alignment (loop_vec_info loop_vinfo) if (do_versioning) { - vec may_misalign_stmts + vec may_misalign_stmts = LOOP_VINFO_MAY_MISALIGN_STMTS (loop_vinfo); - gimple *stmt; + stmt_vec_info stmt_info; /* It can now be assumed that the data references in the statements in LOOP_VINFO_MAY_MISALIGN_STMTS will be aligned in the version of the loop being vectorized. */ - FOR_EACH_VEC_ELT (may_misalign_stmts, i, stmt) + FOR_EACH_VEC_ELT (may_misalign_stmts, i, stmt_info) { - stmt_vec_info stmt_info = vinfo_for_stmt (stmt); dr = STMT_VINFO_DATA_REF (stmt_info); SET_DR_MISALIGNMENT (dr, 0); if (dump_enabled_p ()) diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c index 4ff6d2dafa4..83ddff2d12d 100644 --- a/gcc/tree-vect-loop-manip.c +++ b/gcc/tree-vect-loop-manip.c @@ -2772,9 +2772,9 @@ vect_create_cond_for_align_checks (loop_vec_info loop_vinfo, tree *cond_expr, gimple_seq *cond_expr_stmt_list) { - vec may_misalign_stmts + vec may_misalign_stmts = LOOP_VINFO_MAY_MISALIGN_STMTS (loop_vinfo); - gimple *ref_stmt; + stmt_vec_info stmt_info; int mask = LOOP_VINFO_PTR_MASK (loop_vinfo); tree mask_cst; unsigned int i; @@ -2795,23 +2795,22 @@ vect_create_cond_for_align_checks (loop_vec_info loop_vinfo, /* Create expression (mask & (dr_1 || ... || dr_n)) where dr_i is the address of the first vector of the i'th data reference. */ - FOR_EACH_VEC_ELT (may_misalign_stmts, i, ref_stmt) + FOR_EACH_VEC_ELT (may_misalign_stmts, i, stmt_info) { gimple_seq new_stmt_list = NULL; tree addr_base; tree addr_tmp_name; tree new_or_tmp_name; gimple *addr_stmt, *or_stmt; - stmt_vec_info stmt_vinfo = vinfo_for_stmt (ref_stmt); - tree vectype = STMT_VINFO_VECTYPE (stmt_vinfo); + tree vectype = STMT_VINFO_VECTYPE (stmt_info); bool negative = tree_int_cst_compare - (DR_STEP (STMT_VINFO_DATA_REF (stmt_vinfo)), size_zero_node) < 0; + (DR_STEP (STMT_VINFO_DATA_REF (stmt_info)), size_zero_node) < 0; tree offset = negative ? size_int (-TYPE_VECTOR_SUBPARTS (vectype) + 1) : size_zero_node; /* create: addr_tmp = (int)(address_of_first_vector) */ addr_base = - vect_create_addr_base_for_vector_ref (ref_stmt, &new_stmt_list, + vect_create_addr_base_for_vector_ref (stmt_info, &new_stmt_list, offset); if (new_stmt_list != NULL) gimple_seq_add_seq (cond_expr_stmt_list, new_stmt_list); diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h index daa63fd515c..ff3b4c641b9 100644 --- a/gcc/tree-vectorizer.h +++ b/gcc/tree-vectorizer.h @@ -472,7 +472,7 @@ typedef struct _loop_vec_info : public vec_info { /* Statements in the loop that have data references that are candidates for a runtime (loop versioning) misalignment check. */ - auto_vec may_misalign_stmts; + auto_vec may_misalign_stmts; /* Reduction cycles detected in the loop. Used in loop-aware SLP. */ auto_vec reductions; -- 2.30.2