From: Eric Botcazou Date: Mon, 28 Mar 2011 08:40:49 +0000 (+0000) Subject: tree-vectorizer.h (vect_create_data_ref_ptr): Adjust prototype. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1b29f05e56e3b6711352d5cfd8b30785beb3b663;p=gcc.git tree-vectorizer.h (vect_create_data_ref_ptr): Adjust prototype. * tree-vectorizer.h (vect_create_data_ref_ptr): Adjust prototype. * tree-vect-data-refs.c (vect_create_data_ref_ptr): Add GSI parameter. Insert new statements at it in lieu of STMT. (vect_setup_realignment): Adjust call to vect_create_data_ref_ptr. * tree-vect-stmts.c (vectorizable_store): Likewise. (vectorizable_load): Likewise. From-SVN: r171592 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bfbbf717e9c..0c2b9312a63 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2011-03-28 Eric Botcazou + + * tree-vectorizer.h (vect_create_data_ref_ptr): Adjust prototype. + * tree-vect-data-refs.c (vect_create_data_ref_ptr): Add GSI parameter. + Insert new statements at it in lieu of STMT. + (vect_setup_realignment): Adjust call to vect_create_data_ref_ptr. + * tree-vect-stmts.c (vectorizable_store): Likewise. + (vectorizable_load): Likewise. + 2011-03-28 Uros Bizjak * config/alpha/alpha.md (addtf3): Change mode of operands to TFmode. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fdcc95f91b4..a9f70d0795a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-03-28 Eric Botcazou + + * gcc.dg/slp-1.c: New test. + 2011-03-27 H.J. Lu * gcc.target/i386/avx256-unaligned-load-1.c: New. diff --git a/gcc/testsuite/gcc.dg/slp-1.c b/gcc/testsuite/gcc.dg/slp-1.c new file mode 100644 index 00000000000..bb352020f97 --- /dev/null +++ b/gcc/testsuite/gcc.dg/slp-1.c @@ -0,0 +1,15 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -ftree-vectorize -fno-vect-cost-model" } */ + +struct R { + double d1; + double d2; +}; + +struct R foo (struct R arg) +{ + struct R ret; + ret.d1 = arg.d2 * (0.0 - arg.d1); + ret.d2 = ret.d1; + return ret; +} diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c index d4ba704f459..8f411140880 100644 --- a/gcc/tree-vect-data-refs.c +++ b/gcc/tree-vect-data-refs.c @@ -2922,9 +2922,10 @@ vect_create_addr_base_for_vector_ref (gimple stmt, 2. AT_LOOP: the loop where the vector memref is to be created. 3. OFFSET (optional): an offset to be added to the initial address accessed by the data-ref in STMT. - 4. ONLY_INIT: indicate if vp is to be updated in the loop, or remain + 4. BSI: location where the new stmts are to be placed if there is no loop + 5. ONLY_INIT: indicate if vp is to be updated in the loop, or remain pointing to the initial address. - 5. TYPE: if not NULL indicates the required type of the data-ref. + 6. TYPE: if not NULL indicates the required type of the data-ref. Output: 1. Declare a new ptr to vector_type, and have it point to the base of the @@ -2952,9 +2953,9 @@ vect_create_addr_base_for_vector_ref (gimple stmt, 4. Return the pointer. */ tree -vect_create_data_ref_ptr (gimple stmt, struct loop *at_loop, - tree offset, tree *initial_address, gimple *ptr_incr, - bool only_init, bool *inv_p) +vect_create_data_ref_ptr (gimple stmt, struct loop *at_loop, tree offset, + tree *initial_address, gimple_stmt_iterator *gsi, + gimple *ptr_incr, bool only_init, bool *inv_p) { tree base_name; stmt_vec_info stmt_info = vinfo_for_stmt (stmt); @@ -2980,7 +2981,6 @@ vect_create_data_ref_ptr (gimple stmt, struct loop *at_loop, gimple incr; tree step; bb_vec_info bb_vinfo = STMT_VINFO_BB_VINFO (stmt_info); - gimple_stmt_iterator gsi = gsi_for_stmt (stmt); tree base; if (loop_vinfo) @@ -3125,7 +3125,7 @@ vect_create_data_ref_ptr (gimple stmt, struct loop *at_loop, gcc_assert (!new_bb); } else - gsi_insert_seq_before (&gsi, new_stmt_list, GSI_SAME_STMT); + gsi_insert_seq_before (gsi, new_stmt_list, GSI_SAME_STMT); } *initial_address = new_temp; @@ -3147,7 +3147,7 @@ vect_create_data_ref_ptr (gimple stmt, struct loop *at_loop, gcc_assert (!new_bb); } else - gsi_insert_before (&gsi, vec_stmt, GSI_SAME_STMT); + gsi_insert_before (gsi, vec_stmt, GSI_SAME_STMT); } else vect_ptr_init = new_temp; @@ -3672,7 +3672,7 @@ vect_setup_realignment (gimple stmt, gimple_stmt_iterator *gsi, gcc_assert (!compute_in_loop); vec_dest = vect_create_destination_var (scalar_dest, vectype); ptr = vect_create_data_ref_ptr (stmt, loop_for_initial_load, NULL_TREE, - &init_addr, &inc, true, &inv_p); + &init_addr, NULL, &inc, true, &inv_p); new_stmt = gimple_build_assign_with_ops (BIT_AND_EXPR, NULL_TREE, ptr, build_int_cst (TREE_TYPE (ptr), diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index 069a8eeeabd..16020e5c0ee 100644 --- a/gcc/tree-vect-stmts.c +++ b/gcc/tree-vect-stmts.c @@ -3582,7 +3582,7 @@ vectorizable_store (gimple stmt, gimple_stmt_iterator *gsi, gimple *vec_stmt, gcc_assert (useless_type_conversion_p (vectype, TREE_TYPE (vec_oprnd))); dataref_ptr = vect_create_data_ref_ptr (first_stmt, NULL, NULL_TREE, - &dummy, &ptr_incr, false, + &dummy, gsi, &ptr_incr, false, &inv_p); gcc_assert (bb_vinfo || !inv_p); } @@ -4109,9 +4109,8 @@ vectorizable_load (gimple stmt, gimple_stmt_iterator *gsi, gimple *vec_stmt, { /* 1. Create the vector pointer update chain. */ if (j == 0) - dataref_ptr = vect_create_data_ref_ptr (first_stmt, - at_loop, offset, - &dummy, &ptr_incr, false, + dataref_ptr = vect_create_data_ref_ptr (first_stmt, at_loop, offset, + &dummy, gsi, &ptr_incr, false, &inv_p); else dataref_ptr = diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h index ee8410c1811..4efa5be20d8 100644 --- a/gcc/tree-vectorizer.h +++ b/gcc/tree-vectorizer.h @@ -824,7 +824,8 @@ extern bool vect_analyze_data_ref_accesses (loop_vec_info, bb_vec_info); extern bool vect_prune_runtime_alias_test_list (loop_vec_info); extern bool vect_analyze_data_refs (loop_vec_info, bb_vec_info, int *); extern tree vect_create_data_ref_ptr (gimple, struct loop *, tree, tree *, - gimple *, bool, bool *); + gimple_stmt_iterator *, gimple *, + bool, bool *); extern tree bump_vector_ptr (tree, gimple, gimple_stmt_iterator *, gimple, tree); extern tree vect_create_destination_var (tree, tree); extern bool vect_strided_store_supported (tree);