From f3dccf50915b31fcc3e03e82fd09ccef243b30e3 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 24 Nov 2014 09:24:26 +0000 Subject: [PATCH] re PR tree-optimization/55334 (mgrid regression (ipa-cp disables vectorization)) 2014-11-24 Richard Biener PR tree-optimization/55334 * function.h (struct function): Add last_clique member. * tree-inline.c (remap_dependence_clique): New function. (remap_gimple_op_r): Remap dependence cliques in MEM_REFs. (copy_tree_body_r): Likewise. (copy_cfg_body): Free dependence map. (copy_gimple_seq_and_replace_locals): Likewise. * tree-pretty-print.c (dump_generic_node): Dump dependence info. * tree-ssa-alias.c (refs_may_alias_p_1): Use dependence info to answer alias query. * tree-ssa-structalias.c: Include tree-phinodes.h, ssa-iterators.h, tree-pretty-print.h and gimple-walk.h. (struct variable_info): Add is_restrict_var flag and ruid member. (new_var_info): Initialize is_restrict_var. (make_constraint_from_restrict): Likewise. (create_variable_info_for): Exclude restricts from global vars from new handling. (intra_create_variable_infos): But not those from parameters. (visit_loadstore): New function. (maybe_set_dependence_info): Likewise. (compute_dependence_clique): Likewise. (compute_may_aliases): Call compute_dependence_clique. * tree-data-ref.c (dr_analyze_indices): Copy dependence info to fake MEM_REF. (dr_may_alias_p): Use recorded dependence info to answer alias query. * tree-core.h (struct tree_base): Add clique, base struct in union. * tree.h (MR_DEPENDENCE_CLIQUE): New macro. (MR_DEPENDENCE_BASE): Likewise. * tree-inline.h (dependence_hasher): New hash-map kind. (struct copy_body_data): Add dependence_map pointer. * gimple-fold.c (maybe_canonicalize_mem_ref_addr): Avoid throwing away dependence info. * tree-streamer-in.c (unpack_value_fields): Stream dependence info. * tree-streamer-out.c (streamer_pack_tree_bitfields): Likewise. * gcc.dg/tree-ssa/restrict-5.c: New testcase. From-SVN: r218004 --- gcc/ChangeLog | 41 ++++++++++++++++++++++ gcc/function.h | 3 ++ gcc/gimple-fold.c | 3 +- gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c | 24 +++++++++++++ gcc/tree-core.h | 10 ++++++ gcc/tree-data-ref.c | 9 +++++ gcc/tree-inline.c | 40 +++++++++++++++++++++ gcc/tree-inline.h | 24 +++++++++++++ gcc/tree-pretty-print.c | 15 ++++++-- gcc/tree-ssa-alias.c | 28 +++++++++++++++ gcc/tree-streamer-in.c | 13 ++++++- gcc/tree-streamer-out.c | 11 +++++- gcc/tree.h | 5 +++ 14 files changed, 226 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index aa38da50fd8..d9507500dd4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,44 @@ +2014-11-24 Richard Biener + + PR tree-optimization/55334 + * function.h (struct function): Add last_clique member. + * tree-inline.c (remap_dependence_clique): New function. + (remap_gimple_op_r): Remap dependence cliques in MEM_REFs. + (copy_tree_body_r): Likewise. + (copy_cfg_body): Free dependence map. + (copy_gimple_seq_and_replace_locals): Likewise. + * tree-pretty-print.c (dump_generic_node): Dump + dependence info. + * tree-ssa-alias.c (refs_may_alias_p_1): Use dependence info + to answer alias query. + * tree-ssa-structalias.c: Include tree-phinodes.h, ssa-iterators.h, + tree-pretty-print.h and gimple-walk.h. + (struct variable_info): Add is_restrict_var flag and ruid + member. + (new_var_info): Initialize is_restrict_var. + (make_constraint_from_restrict): Likewise. + (create_variable_info_for): Exclude restricts from global vars + from new handling. + (intra_create_variable_infos): But not those from parameters. + (visit_loadstore): New function. + (maybe_set_dependence_info): Likewise. + (compute_dependence_clique): Likewise. + (compute_may_aliases): Call compute_dependence_clique. + * tree-data-ref.c (dr_analyze_indices): Copy dependence info + to fake MEM_REF. + (dr_may_alias_p): Use recorded dependence info to answer + alias query. + * tree-core.h (struct tree_base): Add clique, base struct in + union. + * tree.h (MR_DEPENDENCE_CLIQUE): New macro. + (MR_DEPENDENCE_BASE): Likewise. + * tree-inline.h (dependence_hasher): New hash-map kind. + (struct copy_body_data): Add dependence_map pointer. + * gimple-fold.c (maybe_canonicalize_mem_ref_addr): Avoid + throwing away dependence info. + * tree-streamer-in.c (unpack_value_fields): Stream dependence info. + * tree-streamer-out.c (streamer_pack_tree_bitfields): Likewise. + 2014-11-23 Oleg Endo PR target/53976 diff --git a/gcc/function.h b/gcc/function.h index 3a6305ca700..a93090164ee 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -589,6 +589,9 @@ struct GTY(()) function { a string describing the reason for failure. */ const char * GTY((skip)) cannot_be_copied_reason; + /* Last assigned dependence info clique. */ + unsigned short last_clique; + /* Collected bit flags. */ /* Number of units of general registers that need saving in stdarg diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index 8e0c9e055ef..91b9b0c1282 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -3062,7 +3062,8 @@ maybe_canonicalize_mem_ref_addr (tree *t) accessed is a decl that has the same access semantics as the MEM_REF. */ if (TREE_CODE (*t) == MEM_REF && TREE_CODE (TREE_OPERAND (*t, 0)) == ADDR_EXPR - && integer_zerop (TREE_OPERAND (*t, 1))) + && integer_zerop (TREE_OPERAND (*t, 1)) + && MR_DEPENDENCE_CLIQUE (*t) == 0) { tree decl = TREE_OPERAND (TREE_OPERAND (*t, 0), 0); tree alias_type = TREE_TYPE (TREE_OPERAND (*t, 1)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 76d6653ca2a..363e26d42d4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-11-24 Richard Biener + + PR tree-optimization/55334 + * gcc.dg/tree-ssa/restrict-5.c: New testcase. + 2014-11-24 Eric Botcazou * gnat.dg/opt45.adb: New test. diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c new file mode 100644 index 00000000000..d6c240aae03 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c @@ -0,0 +1,24 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fno-strict-aliasing -fdump-tree-lim1-details" } */ + +static inline __attribute__((always_inline)) +void f(int * __restrict__ r, + int a[__restrict__ 16][16], + int b[__restrict__ 16][16], + int i, int j) +{ + int x; + *r = 0; + for (x = 1; x < 16; ++x) + *r = *r + a[i][x] * b[x][j]; +} + +void g(int *r, int a[16][16], int b[16][16], int i, int j) +{ + f (r, a, b, i ,j); +} + +/* We should apply store motion to the store to *r. */ + +/* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim1" } } */ +/* { dg-final { cleanup-tree-dump "lim1" } } */ diff --git a/gcc/tree-core.h b/gcc/tree-core.h index 76d62a37d9c..0d122307456 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -820,6 +820,16 @@ struct GTY(()) tree_base { /* Internal function code. */ enum internal_fn ifn; + + /* The following two fields are used for MEM_REF and TARGET_MEM_REF + expression trees and specify known data non-dependences. For + two memory references in a function they are known to not + alias if dependence_info.clique are equal and dependence_info.base + are distinct. */ + struct { + unsigned short clique; + unsigned short base; + } dependence_info; } GTY((skip(""))) u; }; diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c index cca569ac216..909751c8ff3 100644 --- a/gcc/tree-data-ref.c +++ b/gcc/tree-data-ref.c @@ -991,9 +991,12 @@ dr_analyze_indices (struct data_reference *dr, loop_p nest, loop_p loop) guaranteed. As a band-aid, mark the access so we can special-case it in dr_may_alias_p. */ + tree old = ref; ref = fold_build2_loc (EXPR_LOCATION (ref), MEM_REF, TREE_TYPE (ref), base, memoff); + MR_DEPENDENCE_CLIQUE (ref) = MR_DEPENDENCE_CLIQUE (old); + MR_DEPENDENCE_BASE (ref) = MR_DEPENDENCE_BASE (old); access_fns.safe_push (access_fn); } } @@ -1400,6 +1403,12 @@ dr_may_alias_p (const struct data_reference *a, const struct data_reference *b, return false; } + if ((TREE_CODE (addr_a) == MEM_REF || TREE_CODE (addr_a) == TARGET_MEM_REF) + && (TREE_CODE (addr_b) == MEM_REF || TREE_CODE (addr_b) == TARGET_MEM_REF) + && MR_DEPENDENCE_CLIQUE (addr_a) == MR_DEPENDENCE_CLIQUE (addr_b) + && MR_DEPENDENCE_BASE (addr_a) != MR_DEPENDENCE_BASE (addr_b)) + return false; + /* If we had an evolution in a pointer-based MEM_REF BASE_OBJECT we do not know the size of the base-object. So we cannot do any offset/overlap based analysis but have to rely on points-to diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 835edd12cf3..d4864ae2731 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -849,6 +849,24 @@ is_parm (tree decl) return (TREE_CODE (decl) == PARM_DECL); } +/* Remap the dependence CLIQUE from the source to the destination function + as specified in ID. */ + +static unsigned short +remap_dependence_clique (copy_body_data *id, unsigned short clique) +{ + if (clique == 0) + return 0; + if (!id->dependence_map) + id->dependence_map + = new hash_map; + bool existed; + unsigned short &newc = id->dependence_map->get_or_insert (clique, &existed); + if (!existed) + newc = ++cfun->last_clique; + return newc; +} + /* Remap the GIMPLE operand pointed to by *TP. DATA is really a 'struct walk_stmt_info *'. DATA->INFO is a 'copy_body_data *'. WALK_SUBTREES is used to indicate walk_gimple_op whether to keep @@ -947,6 +965,12 @@ remap_gimple_op_r (tree *tp, int *walk_subtrees, void *data) TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old); TREE_SIDE_EFFECTS (*tp) = TREE_SIDE_EFFECTS (old); TREE_NO_WARNING (*tp) = TREE_NO_WARNING (old); + if (MR_DEPENDENCE_CLIQUE (old) != 0) + { + MR_DEPENDENCE_CLIQUE (*tp) + = remap_dependence_clique (id, MR_DEPENDENCE_CLIQUE (old)); + MR_DEPENDENCE_BASE (*tp) = MR_DEPENDENCE_BASE (old); + } /* We cannot propagate the TREE_THIS_NOTRAP flag if we have remapped a parameter as the property might be valid only for the parameter itself. */ @@ -1198,6 +1222,12 @@ copy_tree_body_r (tree *tp, int *walk_subtrees, void *data) TREE_THIS_VOLATILE (*tp) = TREE_THIS_VOLATILE (old); TREE_SIDE_EFFECTS (*tp) = TREE_SIDE_EFFECTS (old); TREE_NO_WARNING (*tp) = TREE_NO_WARNING (old); + if (MR_DEPENDENCE_CLIQUE (old) != 0) + { + MR_DEPENDENCE_CLIQUE (*tp) + = remap_dependence_clique (id, MR_DEPENDENCE_CLIQUE (old)); + MR_DEPENDENCE_BASE (*tp) = MR_DEPENDENCE_BASE (old); + } /* We cannot propagate the TREE_THIS_NOTRAP flag if we have remapped a parameter as the property might be valid only for the parameter itself. */ @@ -2762,6 +2792,11 @@ copy_cfg_body (copy_body_data * id, gcov_type count, int frequency_scale, delete id->eh_map; id->eh_map = NULL; } + if (id->dependence_map) + { + delete id->dependence_map; + id->dependence_map = NULL; + } return new_fndecl; } @@ -5147,6 +5182,11 @@ copy_gimple_seq_and_replace_locals (gimple_seq seq) delete id.decl_map; if (id.debug_map) delete id.debug_map; + if (id.dependence_map) + { + delete id.dependence_map; + id.dependence_map = NULL; + } return copy; } diff --git a/gcc/tree-inline.h b/gcc/tree-inline.h index 453b9cde0b7..3271ba434e4 100644 --- a/gcc/tree-inline.h +++ b/gcc/tree-inline.h @@ -37,6 +37,26 @@ enum copy_body_cge_which CB_CGE_MOVE_CLONES }; +struct dependence_hasher : default_hashmap_traits +{ + template + static void + mark_deleted (T &e) + { gcc_unreachable (); } + + template + static void + mark_empty (T &e) + { e.m_key = 0; } + + template + static bool + is_deleted (T &) + { return false; } + + template static bool is_empty (T &e) { return e.m_key == 0; } +}; + /* Data required for function body duplication. */ struct copy_body_data @@ -144,6 +164,10 @@ struct copy_body_data /* Cilk keywords currently need to replace some variables that ordinary nested functions do not. */ bool remap_var_for_cilk; + + /* A map from the inlined functions dependence info cliques to + equivalents in the function into which it is being inlined. */ + hash_map *dependence_map; }; /* Weights of constructions for estimate_num_insns. */ diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index 53720ded5cd..df72abb64cd 100644 --- a/gcc/tree-pretty-print.c +++ b/gcc/tree-pretty-print.c @@ -1093,7 +1093,9 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags, /* Same value types ignoring qualifiers. */ && (TYPE_MAIN_VARIANT (TREE_TYPE (node)) == TYPE_MAIN_VARIANT - (TREE_TYPE (TREE_TYPE (TREE_OPERAND (node, 1)))))) + (TREE_TYPE (TREE_TYPE (TREE_OPERAND (node, 1))))) + && (!(flags & TDF_ALIAS) + || MR_DEPENDENCE_CLIQUE (node) == 0)) { if (TREE_CODE (TREE_OPERAND (node, 0)) != ADDR_EXPR) { @@ -1124,6 +1126,14 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags, dump_generic_node (buffer, TREE_OPERAND (node, 1), spc, flags, false); } + if ((flags & TDF_ALIAS) + && MR_DEPENDENCE_CLIQUE (node) != 0) + { + pp_string (buffer, " clique "); + pp_unsigned_wide_integer (buffer, MR_DEPENDENCE_CLIQUE (node)); + pp_string (buffer, " base "); + pp_unsigned_wide_integer (buffer, MR_DEPENDENCE_BASE (node)); + } pp_right_bracket (buffer); } break; @@ -1462,7 +1472,8 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags, /* Same value types ignoring qualifiers. */ && (TYPE_MAIN_VARIANT (TREE_TYPE (op0)) == TYPE_MAIN_VARIANT - (TREE_TYPE (TREE_TYPE (TREE_OPERAND (op0, 1)))))))) + (TREE_TYPE (TREE_TYPE (TREE_OPERAND (op0, 1))))) + && MR_DEPENDENCE_CLIQUE (op0) == 0))) { op0 = TREE_OPERAND (op0, 0); str = "->"; diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c index a122898c2bb..17e84149c7a 100644 --- a/gcc/tree-ssa-alias.c +++ b/gcc/tree-ssa-alias.c @@ -1384,6 +1384,34 @@ refs_may_alias_p_1 (ao_ref *ref1, ao_ref *ref2, bool tbaa_p) return decl_refs_may_alias_p (ref1->ref, base1, offset1, max_size1, ref2->ref, base2, offset2, max_size2); + /* Handle restrict based accesses. + ??? ao_ref_base strips inner MEM_REF [&decl], recover from that + here. */ + tree rbase1 = base1; + tree rbase2 = base2; + if (var1_p) + { + rbase1 = ref1->ref; + if (rbase1) + while (handled_component_p (rbase1)) + rbase1 = TREE_OPERAND (rbase1, 0); + } + if (var2_p) + { + rbase2 = ref2->ref; + if (rbase2) + while (handled_component_p (rbase2)) + rbase2 = TREE_OPERAND (rbase2, 0); + } + if (rbase1 && rbase2 + && (TREE_CODE (base1) == MEM_REF || TREE_CODE (base1) == TARGET_MEM_REF) + && (TREE_CODE (base2) == MEM_REF || TREE_CODE (base2) == TARGET_MEM_REF) + /* If the accesses are in the same restrict clique... */ + && MR_DEPENDENCE_CLIQUE (base1) == MR_DEPENDENCE_CLIQUE (base2) + /* But based on different pointers they do not alias. */ + && MR_DEPENDENCE_BASE (base1) != MR_DEPENDENCE_BASE (base2)) + return false; + ind1_p = (TREE_CODE (base1) == MEM_REF || TREE_CODE (base1) == TARGET_MEM_REF); ind2_p = (TREE_CODE (base2) == MEM_REF diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c index 995b64291eb..99448dd33f3 100644 --- a/gcc/tree-streamer-in.c +++ b/gcc/tree-streamer-in.c @@ -484,7 +484,18 @@ unpack_value_fields (struct data_in *data_in, struct bitpack_d *bp, tree expr) unpack_ts_type_common_value_fields (bp, expr); if (CODE_CONTAINS_STRUCT (code, TS_EXP)) - SET_EXPR_LOCATION (expr, stream_input_location (bp, data_in)); + { + SET_EXPR_LOCATION (expr, stream_input_location (bp, data_in)); + if (code == MEM_REF + || code == TARGET_MEM_REF) + { + MR_DEPENDENCE_CLIQUE (expr) + = (unsigned)bp_unpack_value (bp, sizeof (short) * 8); + if (MR_DEPENDENCE_CLIQUE (expr) != 0) + MR_DEPENDENCE_BASE (expr) + = (unsigned)bp_unpack_value (bp, sizeof (short) * 8); + } + } if (CODE_CONTAINS_STRUCT (code, TS_BLOCK)) unpack_ts_block_value_fields (data_in, bp, expr); diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c index b9594546d91..ad58b849f79 100644 --- a/gcc/tree-streamer-out.c +++ b/gcc/tree-streamer-out.c @@ -446,7 +446,16 @@ streamer_pack_tree_bitfields (struct output_block *ob, pack_ts_type_common_value_fields (bp, expr); if (CODE_CONTAINS_STRUCT (code, TS_EXP)) - stream_output_location (ob, bp, EXPR_LOCATION (expr)); + { + stream_output_location (ob, bp, EXPR_LOCATION (expr)); + if (code == MEM_REF + || code == TARGET_MEM_REF) + { + bp_pack_value (bp, MR_DEPENDENCE_CLIQUE (expr), sizeof (short) * 8); + if (MR_DEPENDENCE_CLIQUE (expr) != 0) + bp_pack_value (bp, MR_DEPENDENCE_BASE (expr), sizeof (short) * 8); + } + } if (CODE_CONTAINS_STRUCT (code, TS_BLOCK)) pack_ts_block_value_fields (ob, bp, expr); diff --git a/gcc/tree.h b/gcc/tree.h index fa6d535982f..45214d690c0 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -1105,6 +1105,11 @@ extern void protected_set_expr_location (tree, location_t); #define TMR_STEP(NODE) (TREE_OPERAND (TARGET_MEM_REF_CHECK (NODE), 3)) #define TMR_INDEX2(NODE) (TREE_OPERAND (TARGET_MEM_REF_CHECK (NODE), 4)) +#define MR_DEPENDENCE_CLIQUE(NODE) \ + (TREE_CHECK2 (NODE, MEM_REF, TARGET_MEM_REF)->base.u.dependence_info.clique) +#define MR_DEPENDENCE_BASE(NODE) \ + (TREE_CHECK2 (NODE, MEM_REF, TARGET_MEM_REF)->base.u.dependence_info.base) + /* The operands of a BIND_EXPR. */ #define BIND_EXPR_VARS(NODE) (TREE_OPERAND (BIND_EXPR_CHECK (NODE), 0)) #define BIND_EXPR_BODY(NODE) (TREE_OPERAND (BIND_EXPR_CHECK (NODE), 1)) -- 2.30.2