mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-03-29 15:31:20 +08:00
2008-07-05 Daniel Berlin <dberlin@dberlin.org> Fix PR tree-optimization/23455 Fix PR tree-optimization/35286 Fix PR tree-optimization/35287 * Makefile.in (OBJS-common): Remove tree-vn.o. tree-vn.o: Remove. * dbgcnt.def: Add treepre_insert debug counter. * gcc/tree-flow.h (add_to_value): Updated for other changes. (debug_value_expressions): Ditto. (print_value_expressions): Ditto. * tree-pretty-print.c (dump_generic_node): Updated for VALUE_HANDLE removal. * tree-ssa-dom.c (record_equality): Ditto. (cprop_operand): Ditto. (lookup_avail_expr): Ditto. * tree-ssa-threadedge.c (record_temporary_equivalences_from_stmts_at_dest): Ditto. (simplify_control_stmt_condition): Ditto. * tree.c (tree_code_size): Ditto. (tree_node_structure): Ditto. (iterative_hash_expr): Ditto. * tree.def: Ditto. * tree.h (VALUE_HANDLE_ID): Ditto. (VALUE_HANDLE_EXPR_SET): Ditto. (struct tree_value_handle): Ditto. (union tree_node): Ditto. * treestruct.def: Ditto. * tree-vn.c: Removed. * tree-ssa-pre.c: Rewritten entirely. * tree-ssa-sccvn.c (constant_to_value_id): New hashtable. (constant_value_ids): Ditto. (vn_nary_op_t): Moved to header. (vn_phi_t): Ditto. (vn_reference_op_t): Ditto (vn_reference_t): Ditto. (next_value_id): New variable. (VN_INFO): Add an assert. (vn_constant_eq): New function. (vn_constant_hash): Ditto. (get_or_alloc_constant_value_id): Ditto. (value_id_constant_p): Ditto. (vn_reference_compute_hash): De-staticify. (copy_reference_ops_from_ref): Don't use get_callee_fndecl. Disable some code with a FIXME. Remove VALUE_HANDLE use. (valueize_refs): Update opcode if it changes from ssa name to constant. (vn_reference_lookup_1): Add new argument. (vn_reference_lookup): Ditto. (vn_reference_lookup_pieces): New function. (vn_reference_insert): Add return type. Modify to deal with value ids. (vn_reference_insert_pieces): New function. (vn_nary_op_compute_hash): De-staticify. (vn_nary_op_eq): Ditto. (vn_nary_op_lookup_pieces): New function. (vn_nary_op_lookup): Add new argument. (vn_nary_op_insert_pieces): New function. (vn_nary_op_insert): Add return type. Modify to deal with value ids. (vn_phi_insert): Ditto. (visit_unary_op): Update for callee changes. (visit_binary_op): Ditto. (visit_reference_op_load): Ditto. (visit_reference_op_store): Ditto. (init_scc_vn): Init next_value_id, constant_to_value_id and constant_value_ids. (free_scc_vn): Free them. (set_hashtable_value_ids): New function. (run_scc_vn): Use it. (get_max_value_id): New function. (get_next_value_id): Ditto. (expressions_equal_p): Moved from tree-vn.c (sort_vuses): Ditto. (sort_vuses_heap): Ditto. * tree-ssa-sccvn.h: Structures moved from tree-ssa-sccvn.c (noted above). * tree.c (iterative_hash_hashval_t): Made non-static * tree.h (iterative_hash_hashval_t): Declare it. From-SVN: r137631
172 lines
5.9 KiB
C
172 lines
5.9 KiB
C
/* Tree SCC value numbering
|
|
Copyright (C) 2007 Free Software Foundation, Inc.
|
|
Contributed by Daniel Berlin <dberlin@dberlin.org>
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
GCC is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GCC; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef TREE_SSA_SCCVN_H
|
|
#define TREE_SSA_SCCVN_H
|
|
|
|
/* TOP of the VN lattice. */
|
|
extern tree VN_TOP;
|
|
|
|
/* N-ary operations in the hashtable consist of length operands, an
|
|
opcode, and a type. Result is the value number of the operation,
|
|
and hashcode is stored to avoid having to calculate it
|
|
repeatedly. */
|
|
|
|
typedef struct vn_nary_op_s
|
|
{
|
|
/* Unique identify that all expressions with the same value have. */
|
|
unsigned int value_id;
|
|
ENUM_BITFIELD(tree_code) opcode : 16;
|
|
unsigned length : 16;
|
|
hashval_t hashcode;
|
|
tree result;
|
|
tree type;
|
|
tree op[4];
|
|
} *vn_nary_op_t;
|
|
typedef const struct vn_nary_op_s *const_vn_nary_op_t;
|
|
|
|
/* Phi nodes in the hashtable consist of their non-VN_TOP phi
|
|
arguments, and the basic block the phi is in. Result is the value
|
|
number of the operation, and hashcode is stored to avoid having to
|
|
calculate it repeatedly. Phi nodes not in the same block are never
|
|
considered equivalent. */
|
|
|
|
typedef struct vn_phi_s
|
|
{
|
|
/* Unique identifier that all expressions with the same value have. */
|
|
unsigned int value_id;
|
|
hashval_t hashcode;
|
|
VEC (tree, heap) *phiargs;
|
|
basic_block block;
|
|
tree result;
|
|
} *vn_phi_t;
|
|
typedef const struct vn_phi_s *const_vn_phi_t;
|
|
|
|
/* Reference operands only exist in reference operations structures.
|
|
They consist of an opcode, type, and some number of operands. For
|
|
a given opcode, some, all, or none of the operands may be used.
|
|
The operands are there to store the information that makes up the
|
|
portion of the addressing calculation that opcode performs. */
|
|
|
|
typedef struct vn_reference_op_struct
|
|
{
|
|
enum tree_code opcode;
|
|
tree type;
|
|
tree op0;
|
|
tree op1;
|
|
tree op2;
|
|
} vn_reference_op_s;
|
|
typedef vn_reference_op_s *vn_reference_op_t;
|
|
typedef const vn_reference_op_s *const_vn_reference_op_t;
|
|
|
|
DEF_VEC_O(vn_reference_op_s);
|
|
DEF_VEC_ALLOC_O(vn_reference_op_s, heap);
|
|
|
|
/* A reference operation in the hashtable is representation as a
|
|
collection of vuses, representing the memory state at the time of
|
|
the operation, and a collection of operands that make up the
|
|
addressing calculation. If two vn_reference_t's have the same set
|
|
of operands, they access the same memory location. We also store
|
|
the resulting value number, and the hashcode. The vuses are
|
|
always stored in order sorted by ssa name version. */
|
|
|
|
typedef struct vn_reference_s
|
|
{
|
|
/* Unique identifier that all expressions with the same value have. */
|
|
unsigned int value_id;
|
|
hashval_t hashcode;
|
|
VEC (tree, gc) *vuses;
|
|
VEC (vn_reference_op_s, heap) *operands;
|
|
tree result;
|
|
} *vn_reference_t;
|
|
typedef const struct vn_reference_s *const_vn_reference_t;
|
|
|
|
typedef struct vn_constant_s
|
|
{
|
|
unsigned int value_id;
|
|
hashval_t hashcode;
|
|
tree constant;
|
|
} *vn_constant_t;
|
|
|
|
typedef struct vn_ssa_aux
|
|
{
|
|
/* Value number. This may be an SSA name or a constant. */
|
|
tree valnum;
|
|
/* Representative expression, if not a direct constant. */
|
|
tree expr;
|
|
|
|
/* Unique identifier that all expressions with the same value have. */
|
|
unsigned int value_id;
|
|
|
|
/* SCC information. */
|
|
unsigned int dfsnum;
|
|
unsigned int low;
|
|
unsigned visited : 1;
|
|
unsigned on_sccstack : 1;
|
|
|
|
/* Whether the representative expression contains constants. */
|
|
unsigned has_constants : 1;
|
|
/* Whether the SSA_NAME has been value numbered already. This is
|
|
only saying whether visit_use has been called on it at least
|
|
once. It cannot be used to avoid visitation for SSA_NAME's
|
|
involved in non-singleton SCC's. */
|
|
unsigned use_processed : 1;
|
|
|
|
/* Whether the SSA_NAME has no defining statement and thus an
|
|
insertion of such with EXPR as definition is required before
|
|
a use can be created of it. */
|
|
unsigned needs_insertion : 1;
|
|
} *vn_ssa_aux_t;
|
|
|
|
/* Return the value numbering info for an SSA_NAME. */
|
|
extern vn_ssa_aux_t VN_INFO (tree);
|
|
extern vn_ssa_aux_t VN_INFO_GET (tree);
|
|
bool run_scc_vn (bool);
|
|
void free_scc_vn (void);
|
|
void switch_to_PRE_table (void);
|
|
tree vn_nary_op_lookup (tree, vn_nary_op_t *);
|
|
tree vn_nary_op_lookup_pieces (unsigned int, enum tree_code,
|
|
tree, tree, tree, tree, tree,
|
|
vn_nary_op_t *);
|
|
vn_nary_op_t vn_nary_op_insert (tree, tree);
|
|
vn_nary_op_t vn_nary_op_insert_pieces (unsigned int, enum tree_code,
|
|
tree, tree, tree, tree,
|
|
tree, tree, unsigned int);
|
|
tree vn_reference_lookup_pieces (VEC (tree, gc) *,
|
|
VEC (vn_reference_op_s, heap) *,
|
|
vn_reference_t *);
|
|
tree vn_reference_lookup (tree, VEC (tree, gc) *, bool, vn_reference_t *);
|
|
vn_reference_t vn_reference_insert (tree, tree, VEC (tree, gc) *);
|
|
vn_reference_t vn_reference_insert_pieces (VEC (tree, gc) *,
|
|
VEC (vn_reference_op_s, heap) *,
|
|
tree, unsigned int);
|
|
|
|
hashval_t vn_nary_op_compute_hash (const vn_nary_op_t);
|
|
int vn_nary_op_eq (const void *, const void *);
|
|
hashval_t vn_reference_compute_hash (const vn_reference_t);
|
|
int vn_reference_eq (const void *, const void *);
|
|
unsigned int get_max_value_id (void);
|
|
unsigned int get_next_value_id (void);
|
|
unsigned int get_or_alloc_constant_value_id (tree);
|
|
bool value_id_constant_p (unsigned int);
|
|
VEC (tree, gc) *shared_vuses_from_stmt (tree);
|
|
VEC (tree, gc) *copy_vuses_from_stmt (tree);
|
|
#endif /* TREE_SSA_SCCVN_H */
|