This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch] Merge loop-invariant changes from killloop branch
- From: Zdenek Dvorak <rakdver at atrey dot karlin dot mff dot cuni dot cz>
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 24 Nov 2005 14:51:42 +0100
- Subject: [patch] Merge loop-invariant changes from killloop branch
Hello,
this patch merges changes to invariant motion from killloop branch.
This includes:
-- several bugfixes to df.c
-- a (temporary, until dataflow branch is merged) fix for PR 24762
-- merging of invariants with the same value, see
http://gcc.gnu.org/ml/gcc-patches/2005-08/msg01734.html
-- clean up of the flags used to enable the new rtl loop optimizer
(basically redundant -floop-optimize2 is removed).
This patch also enables the new invariant motion by default (and
disables the old loop optimizer. I think this is reasonable, as
it now only implements a few not very important optimizations not done
elsewhere, and the replacements for them should be merged from the
branch soon).
Bootstrapped & regtested on ia64, i686 and x86_64.
Zdenek
* doc/invoke.texi (-floop-optimize2): Removed.
* opts.c (decode_options): Do not initialize flag_loop_optimize.
* toplev.c (process_options): Do not handle -floop-optimize2.
* loop-init.c (gate_handle_loop2): Do not check -floop-optimize2.
Only consider flag_branch_on_count_reg if HAVE_doloop_end.
* df.c (df_bitmaps_free): Only work for bbs for that structures are
allocated.
(df_bb_modify): Realloc tables to the new index.
(df_find_use): New function.
* df.h (df_find_use): Declare.
* except.c (dw2_build_landing_pads): Always emit clobbers for registers
modified by eh handling.
* loop-invariant.c: Include hashtab.h.
(struct invariant): Remove processed field, add eqto and reg fields.
(struct invariant_expr_entry): New.
(invariant_for_use, hash_invariant_expr_1, invariant_expr_equal_p,
hash_invariant_expr, eq_invariant_expr, find_or_insert_inv,
find_identical_invariants, merge_identical_invariants): New functions.
(df): New global variable.
(find_defs, check_dependencies, find_invariant_insn, record_uses,
find_invariants_bb, find_invariants_body, find_invariants,
find_invariants_to_move, move_invariants, free_inv_motion_data,
move_single_loop_invariants, move_loop_invariants): Do not pass df in
arguments.
(create_new_invariant): Return the new invariant. Initialize new
fields.
(find_invariants): Call merge_identical_invariants.
(get_inv_cost, best_gain_for_invariant, set_move_mark,
move_invariant_reg): Handle equivalent invariants.
* common.opt (-floop-optimize2): Removed.
(-fmove-loop-invariants): Enabled by default.
* Makefile.in (loop-invariant.o): Add HASHTAB_H dependency.
* testsuite/gcc.dg/20050105-1.c: Do not use -floop-optimize2.
Index: doc/invoke.texi
===================================================================
*** doc/invoke.texi (revision 107424)
--- doc/invoke.texi (working copy)
*************** Objective-C and Objective-C++ Dialects}.
*** 310,316 ****
-finline-limit=@var{n} -fkeep-inline-functions @gol
-fkeep-static-consts -fmerge-constants -fmerge-all-constants @gol
-fmodulo-sched -fno-branch-count-reg @gol
! -fno-default-inline -fno-defer-pop -floop-optimize2 -fmove-loop-invariants @gol
-fno-function-cse -fno-guess-branch-probability @gol
-fno-inline -fno-math-errno -fno-peephole -fno-peephole2 @gol
-funsafe-math-optimizations -funsafe-loop-optimizations -ffinite-math-only @gol
--- 310,316 ----
-finline-limit=@var{n} -fkeep-inline-functions @gol
-fkeep-static-consts -fmerge-constants -fmerge-all-constants @gol
-fmodulo-sched -fno-branch-count-reg @gol
! -fno-default-inline -fno-defer-pop -fmove-loop-invariants @gol
-fno-function-cse -fno-guess-branch-probability @gol
-fno-inline -fno-math-errno -fno-peephole -fno-peephole2 @gol
-funsafe-math-optimizations -funsafe-loop-optimizations -ffinite-math-only @gol
*************** Perform loop optimizations: move constan
*** 4777,4788 ****
exit test conditions and optionally do strength-reduction as well.
Enabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}.
-
- @item -floop-optimize2
- @opindex floop-optimize2
- Perform loop optimizations using the new loop optimizer. The optimizations
- (loop unrolling, peeling and unswitching, loop invariant motion) are enabled
- by separate flags.
@item -funsafe-loop-optimizations
@opindex funsafe-loop-optimizations
--- 4777,4782 ----
Index: toplev.c
===================================================================
*** toplev.c (revision 107424)
--- toplev.c (working copy)
*************** process_options (void)
*** 1559,1577 ****
if (flag_rename_registers == AUTODETECT_VALUE)
flag_rename_registers = flag_unroll_loops || flag_peel_loops;
- /* If explicitly asked to run new loop optimizer, switch off the old
- one. */
- if (flag_loop_optimize2)
- flag_loop_optimize = 0;
-
- /* Enable new loop optimizer pass if any of its optimizations is called. */
- if (flag_move_loop_invariants
- || flag_unswitch_loops
- || flag_peel_loops
- || flag_unroll_loops
- || flag_branch_on_count_reg)
- flag_loop_optimize2 = 1;
-
if (flag_non_call_exceptions)
flag_asynchronous_unwind_tables = 1;
if (flag_asynchronous_unwind_tables)
--- 1559,1564 ----
Index: testsuite/gcc.dg/20050105-1.c
===================================================================
*** testsuite/gcc.dg/20050105-1.c (revision 107424)
--- testsuite/gcc.dg/20050105-1.c (working copy)
***************
*** 1,6 ****
/* PR rtl-optimization/18861 */
/* { dg-do compile } */
! /* { dg-options "-O2 -floop-optimize2" } */
extern void abort (void);
--- 1,6 ----
/* PR rtl-optimization/18861 */
/* { dg-do compile } */
! /* { dg-options "-O2" } */
extern void abort (void);
Index: loop-init.c
===================================================================
*** loop-init.c (revision 107424)
--- loop-init.c (working copy)
*************** loop_optimizer_finalize (struct loops *l
*** 129,140 ****
static bool
gate_handle_loop2 (void)
{
! return (optimize > 0 && flag_loop_optimize2
&& (flag_move_loop_invariants
|| flag_unswitch_loops
|| flag_peel_loops
|| flag_unroll_loops
! || flag_branch_on_count_reg));
}
struct tree_opt_pass pass_loop2 =
--- 129,143 ----
static bool
gate_handle_loop2 (void)
{
! return (optimize > 0
&& (flag_move_loop_invariants
|| flag_unswitch_loops
|| flag_peel_loops
|| flag_unroll_loops
! #ifdef HAVE_doloop_end
! || (flag_branch_on_count_reg && HAVE_doloop_end)
! #endif
! ));
}
struct tree_opt_pass pass_loop2 =
Index: opts.c
===================================================================
*** opts.c (revision 107424)
--- opts.c (working copy)
*************** decode_options (unsigned int argc, const
*** 520,526 ****
#endif
flag_guess_branch_prob = 1;
flag_cprop_registers = 1;
- flag_loop_optimize = 1;
flag_if_conversion = 1;
flag_if_conversion2 = 1;
flag_ipa_pure_const = 1;
--- 520,525 ----
Index: df.c
===================================================================
*** df.c (revision 107424)
--- df.c (working copy)
*************** df_bitmaps_alloc (struct df *df, bitmap
*** 451,464 ****
static void
df_bitmaps_free (struct df *df, int flags)
{
! basic_block bb;
!
! FOR_EACH_BB (bb)
{
! struct bb_info *bb_info = DF_BB_INFO (df, bb);
!
! if (!bb_info)
! continue;
if ((flags & DF_RD) && bb_info->rd_in)
{
--- 451,461 ----
static void
df_bitmaps_free (struct df *df, int flags)
{
! unsigned i;
!
! for (i = 0; i < df->n_bbs; i++)
{
! struct bb_info *bb_info = &df->bbs[i];
if ((flags & DF_RD) && bb_info->rd_in)
{
*************** static void
*** 2649,2655 ****
df_bb_modify (struct df *df, basic_block bb)
{
if ((unsigned) bb->index >= df->n_bbs)
! df_bb_table_realloc (df, df->n_bbs);
bitmap_set_bit (df->bbs_modified, bb->index);
}
--- 2646,2652 ----
df_bb_modify (struct df *df, basic_block bb)
{
if ((unsigned) bb->index >= df->n_bbs)
! df_bb_table_realloc (df, bb->index);
bitmap_set_bit (df->bbs_modified, bb->index);
}
*************** df_find_def (struct df *df, rtx insn, rt
*** 3048,3053 ****
--- 3045,3071 ----
for (defs = DF_INSN_DEFS (df, insn); defs; defs = defs->next)
if (rtx_equal_p (DF_REF_REG (defs->ref), reg))
return defs->ref;
+
+ return NULL;
+ }
+
+ /* Finds the reference corresponding to the use of REG in INSN.
+ DF is the dataflow object. */
+
+ struct ref *
+ df_find_use (struct df *df, rtx insn, rtx reg)
+ {
+ struct df_link *uses;
+
+ for (uses = DF_INSN_USES (df, insn); uses; uses = uses->next)
+ {
+ rtx areg = DF_REF_REG (uses->ref);
+ if (GET_CODE (areg) == SUBREG)
+ areg = SUBREG_REG (areg);
+
+ if (rtx_equal_p (areg, reg))
+ return uses->ref;
+ }
return NULL;
}
Index: df.h
===================================================================
*** df.h (revision 107424)
--- df.h (working copy)
*************** extern struct ref *df_bb_regno_last_def_
*** 293,298 ****
--- 293,300 ----
extern struct ref *df_find_def (struct df *, rtx, rtx);
+ extern struct ref *df_find_use (struct df *, rtx, rtx);
+
extern int df_reg_used (struct df *, rtx, rtx);
/* Functions for debugging from GDB. */
Index: except.c
===================================================================
*** except.c (revision 107424)
--- except.c (working copy)
*************** dw2_build_landing_pads (void)
*** 1527,1543 ****
/* If the eh_return data registers are call-saved, then we
won't have considered them clobbered from the call that
! threw. Kill them now. */
for (j = 0; ; ++j)
{
unsigned r = EH_RETURN_DATA_REGNO (j);
if (r == INVALID_REGNUM)
break;
! if (! call_used_regs[r])
! {
! emit_insn (gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, r)));
! clobbers_hard_regs = true;
! }
}
if (clobbers_hard_regs)
--- 1527,1544 ----
/* If the eh_return data registers are call-saved, then we
won't have considered them clobbered from the call that
! threw. But we need to clobber all hard registers, since
! df.c assumes that call clobbers are not definitions
! (normally it is invalid to use call-clobbered register
! after the call). */
for (j = 0; ; ++j)
{
unsigned r = EH_RETURN_DATA_REGNO (j);
if (r == INVALID_REGNUM)
break;
!
! emit_insn (gen_rtx_CLOBBER (VOIDmode, gen_rtx_REG (Pmode, r)));
! clobbers_hard_regs = true;
}
if (clobbers_hard_regs)
Index: loop-invariant.c
===================================================================
*** loop-invariant.c (revision 107424)
--- loop-invariant.c (working copy)
***************
*** 1,28 ****
! /* Rtl-level loop invariant motion.
Copyright (C) 2004, 2005 Free Software Foundation, Inc.
!
This file is part of GCC.
!
GCC is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, 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 COPYING. If not, write to the Free
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
/* This implements the loop invariant motion pass. It is very simple
! (no calls, libcalls, etc.). This should be sufficient to cleanup things like
! address arithmetics -- other more complicated invariants should be
eliminated on tree level either in tree-ssa-loop-im.c or in tree-ssa-pre.c.
!
We proceed loop by loop -- it is simpler than trying to handle things
globally and should not lose much. First we inspect all sets inside loop
and create a dependency graph on insns (saying "to move this insn, you must
--- 1,28 ----
! /* RTL-level loop invariant motion.
Copyright (C) 2004, 2005 Free Software Foundation, Inc.
!
This file is part of GCC.
!
GCC is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, 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 COPYING. If not, write to the Free
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
/* This implements the loop invariant motion pass. It is very simple
! (no calls, libcalls, etc.). This should be sufficient to cleanup things
! like address arithmetics -- other more complicated invariants should be
eliminated on tree level either in tree-ssa-loop-im.c or in tree-ssa-pre.c.
!
We proceed loop by loop -- it is simpler than trying to handle things
globally and should not lose much. First we inspect all sets inside loop
and create a dependency graph on insns (saying "to move this insn, you must
*************** Software Foundation, 51 Franklin Street,
*** 31,37 ****
We then need to determine what to move. We estimate the number of registers
used and move as many invariants as possible while we still have enough free
registers. We prefer the expensive invariants.
!
Then we move the selected invariants out of the loop, creating a new
temporaries for them if necessary. */
--- 31,37 ----
We then need to determine what to move. We estimate the number of registers
used and move as many invariants as possible while we still have enough free
registers. We prefer the expensive invariants.
!
Then we move the selected invariants out of the loop, creating a new
temporaries for them if necessary. */
*************** Software Foundation, 51 Franklin Street,
*** 50,55 ****
--- 50,56 ----
#include "function.h"
#include "flags.h"
#include "df.h"
+ #include "hashtab.h"
/* The data stored for the loop. */
*************** struct invariant
*** 88,95 ****
/* The number of the invariant. */
unsigned invno;
! /* Whether we already processed the invariant. */
! bool processed;
/* The definition of the invariant. */
struct def *def;
--- 89,100 ----
/* The number of the invariant. */
unsigned invno;
! /* The number of the invariant with the same value. */
! unsigned eqto;
!
! /* If we moved the invariant out of the loop, the register that contains its
! value. */
! rtx reg;
/* The definition of the invariant. */
struct def *def;
*************** struct invariant
*** 103,109 ****
/* Whether to move the invariant. */
bool move;
! /* Cost if the invariant. */
unsigned cost;
/* The invariants it depends on. */
--- 108,114 ----
/* Whether to move the invariant. */
bool move;
! /* Cost of the invariant. */
unsigned cost;
/* The invariants it depends on. */
*************** struct invariant
*** 114,119 ****
--- 119,141 ----
unsigned stamp;
};
+ /* Entry for hash table of invariant expressions. */
+
+ struct invariant_expr_entry
+ {
+ /* The invariant. */
+ struct invariant *inv;
+
+ /* Its value. */
+ rtx expr;
+
+ /* Its mode. */
+ enum machine_mode mode;
+
+ /* Its hash. */
+ hashval_t hash;
+ };
+
/* The actual stamp for marking already visited invariants during determining
costs of movements. */
*************** DEF_VEC_ALLOC_P(invariant_p, heap);
*** 128,133 ****
--- 150,159 ----
static VEC(invariant_p,heap) *invariants;
+ /* The dataflow object. */
+
+ static struct df *df;
+
/* Test for possibility of invariantness of X. */
static bool
*************** check_maybe_invariant (rtx x)
*** 195,200 ****
--- 221,505 ----
return true;
}
+ /* Returns the invariant definition for USE, or NULL if USE is not
+ invariant. */
+
+ static struct invariant *
+ invariant_for_use (struct ref *use)
+ {
+ struct df_link *defs;
+ struct ref *def;
+ basic_block bb = BLOCK_FOR_INSN (use->insn), def_bb;
+
+ if (use->flags & DF_REF_READ_WRITE)
+ return NULL;
+
+ defs = DF_REF_CHAIN (use);
+ if (!defs || defs->next)
+ return NULL;
+ def = defs->ref;
+ if (!DF_REF_DATA (def))
+ return NULL;
+
+ def_bb = DF_REF_BB (def);
+ if (!dominated_by_p (CDI_DOMINATORS, bb, def_bb))
+ return NULL;
+ return DF_REF_DATA (def);
+ }
+
+ /* Computes hash value for invariant expression X in INSN. */
+
+ static hashval_t
+ hash_invariant_expr_1 (rtx insn, rtx x)
+ {
+ enum rtx_code code = GET_CODE (x);
+ int i, j;
+ const char *fmt;
+ hashval_t val = code;
+ int do_not_record_p;
+ struct ref *use;
+ struct invariant *inv;
+
+ switch (code)
+ {
+ case CONST_INT:
+ case CONST_DOUBLE:
+ case SYMBOL_REF:
+ case CONST:
+ case LABEL_REF:
+ return hash_rtx (x, GET_MODE (x), &do_not_record_p, NULL, false);
+
+ case REG:
+ use = df_find_use (df, insn, x);
+ if (!use)
+ return hash_rtx (x, GET_MODE (x), &do_not_record_p, NULL, false);
+ inv = invariant_for_use (use);
+ if (!inv)
+ return hash_rtx (x, GET_MODE (x), &do_not_record_p, NULL, false);
+
+ gcc_assert (inv->eqto != ~0u);
+ return inv->eqto;
+
+ default:
+ break;
+ }
+
+ fmt = GET_RTX_FORMAT (code);
+ for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
+ {
+ if (fmt[i] == 'e')
+ val ^= hash_invariant_expr_1 (insn, XEXP (x, i));
+ else if (fmt[i] == 'E')
+ {
+ for (j = 0; j < XVECLEN (x, i); j++)
+ val ^= hash_invariant_expr_1 (insn, XVECEXP (x, i, j));
+ }
+ }
+
+ return val;
+ }
+
+ /* Compares invariant expressions E1 and E2 in modes MODE1 and MODE2 used in
+ insns INSN1 and INSN2. */
+
+ static bool
+ invariant_expr_equal_p (rtx insn1, rtx e1, enum machine_mode mode1,
+ rtx insn2, rtx e2, enum machine_mode mode2)
+ {
+ enum rtx_code code = GET_CODE (e1);
+ int i, j;
+ const char *fmt;
+ struct ref *use1, *use2;
+ struct invariant *inv1 = NULL, *inv2 = NULL;
+ rtx sub1, sub2;
+ enum machine_mode submode1, submode2;
+
+ gcc_assert (GET_MODE (e1) == VOIDmode || GET_MODE (e1) == mode1);
+ gcc_assert (GET_MODE (e2) == VOIDmode || GET_MODE (e2) == mode2);
+
+ if (code != GET_CODE (e2) || mode1 != mode2)
+ return false;
+
+ switch (code)
+ {
+ case CONST_INT:
+ case CONST_DOUBLE:
+ case SYMBOL_REF:
+ case CONST:
+ case LABEL_REF:
+ return rtx_equal_p (e1, e2);
+
+ case REG:
+ use1 = df_find_use (df, insn1, e1);
+ use2 = df_find_use (df, insn2, e2);
+ if (use1)
+ inv1 = invariant_for_use (use1);
+ if (use2)
+ inv2 = invariant_for_use (use2);
+
+ if (!inv1 && !inv2)
+ return rtx_equal_p (e1, e2);
+
+ if (!inv1 || !inv2)
+ return false;
+
+ gcc_assert (inv1->eqto != ~0u);
+ gcc_assert (inv2->eqto != ~0u);
+ return inv1->eqto == inv2->eqto;
+
+ default:
+ break;
+ }
+
+ fmt = GET_RTX_FORMAT (code);
+ for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
+ {
+ if (fmt[i] == 'e')
+ {
+ sub1 = XEXP (e1, i);
+ sub2 = XEXP (e2, i);
+ submode1 = GET_MODE (sub1);
+ if (submode1 == VOIDmode)
+ submode1 = mode1;
+ submode2 = GET_MODE (sub2);
+ if (submode2 == VOIDmode)
+ submode2 = mode2;
+
+ if (!invariant_expr_equal_p (insn1, sub1, submode1,
+ insn2, sub2, submode2))
+ return false;
+ }
+
+ else if (fmt[i] == 'E')
+ {
+ if (XVECLEN (e1, i) != XVECLEN (e2, i))
+ return false;
+
+ for (j = 0; j < XVECLEN (e1, i); j++)
+ {
+ sub1 = XVECEXP (e1, i, j);
+ sub2 = XVECEXP (e2, i, j);
+ submode1 = GET_MODE (sub1);
+ if (submode1 == VOIDmode)
+ submode1 = mode1;
+ submode2 = GET_MODE (sub2);
+ if (submode2 == VOIDmode)
+ submode2 = mode2;
+
+ if (!invariant_expr_equal_p (insn1, sub1, submode1,
+ insn2, sub2, submode2))
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /* Returns hash value for invariant expression entry E. */
+
+ static hashval_t
+ hash_invariant_expr (const void *e)
+ {
+ const struct invariant_expr_entry *entry = e;
+
+ return entry->hash;
+ }
+
+ /* Compares invariant expression entries E1 and E2. */
+
+ static int
+ eq_invariant_expr (const void *e1, const void *e2)
+ {
+ const struct invariant_expr_entry *entry1 = e1;
+ const struct invariant_expr_entry *entry2 = e2;
+
+ return invariant_expr_equal_p (entry1->inv->insn, entry1->expr, entry1->mode,
+ entry2->inv->insn, entry2->expr, entry2->mode);
+ }
+
+ /* Checks whether invariant with value EXPR in machine mode MODE is
+ recorded in EQ. If this is the case, return the invariant. Otherwise
+ insert INV to the table for this expression and return INV. */
+
+ static struct invariant *
+ find_or_insert_inv (htab_t eq, rtx expr, enum machine_mode mode,
+ struct invariant *inv)
+ {
+ hashval_t hash = hash_invariant_expr_1 (inv->insn, expr);
+ struct invariant_expr_entry *entry;
+ struct invariant_expr_entry pentry;
+ PTR *slot;
+
+ pentry.expr = expr;
+ pentry.inv = inv;
+ pentry.mode = mode;
+ slot = htab_find_slot_with_hash (eq, &pentry, hash, INSERT);
+ entry = *slot;
+
+ if (entry)
+ return entry->inv;
+
+ entry = xmalloc (sizeof (struct invariant_expr_entry));
+ entry->inv = inv;
+ entry->expr = expr;
+ entry->mode = mode;
+ entry->hash = hash;
+ *slot = entry;
+
+ return inv;
+ }
+
+ /* Finds invariants identical to INV and records the equivalence. EQ is the
+ hash table of the invariants. */
+
+ static void
+ find_identical_invariants (htab_t eq, struct invariant *inv)
+ {
+ unsigned depno;
+ bitmap_iterator bi;
+ struct invariant *dep;
+ rtx expr, set;
+ enum machine_mode mode;
+
+ if (inv->eqto != ~0u)
+ return;
+
+ EXECUTE_IF_SET_IN_BITMAP (inv->depends_on, 0, depno, bi)
+ {
+ dep = VEC_index (invariant_p, invariants, depno);
+ find_identical_invariants (eq, dep);
+ }
+
+ set = single_set (inv->insn);
+ expr = SET_SRC (set);
+ mode = GET_MODE (expr);
+ if (mode == VOIDmode)
+ mode = GET_MODE (SET_DEST (set));
+ inv->eqto = find_or_insert_inv (eq, expr, mode, inv)->invno;
+
+ if (dump_file && inv->eqto != inv->invno)
+ fprintf (dump_file,
+ "Invariant %d is equivalent to invariant %d.\n ",
+ inv->invno, inv->eqto);
+ }
+
+ /* Find invariants with the same value and record the equivalences. */
+
+ static void
+ merge_identical_invariants (void)
+ {
+ unsigned i;
+ struct invariant *inv;
+ htab_t eq = htab_create (VEC_length (invariant_p, invariants),
+ hash_invariant_expr, eq_invariant_expr, free);
+
+ for (i = 0; VEC_iterate (invariant_p, invariants, i, inv); i++)
+ find_identical_invariants (eq, inv);
+
+ htab_delete (eq);
+ }
+
/* Determines the basic blocks inside LOOP that are always executed and
stores their bitmap to ALWAYS_REACHED. MAY_EXIT is a bitmap of
basic blocks that may either exit the loop, or contain the call that
*************** find_exits (struct loop *loop, basic_blo
*** 259,265 ****
}
continue;
}
!
/* Use the data stored for the subloop to decide whether we may exit
through it. It is sufficient to do this for header of the loop,
as other basic blocks inside it must be dominated by it. */
--- 564,570 ----
}
continue;
}
!
/* Use the data stored for the subloop to decide whether we may exit
through it. It is sufficient to do this for header of the loop,
as other basic blocks inside it must be dominated by it. */
*************** may_assign_reg_p (rtx x)
*** 298,308 ****
|| REGNO_REG_CLASS (REGNO (x)) != NO_REGS));
}
! /* Finds definitions that may correspond to invariants in LOOP with body BODY.
! DF is the dataflow object. */
static void
! find_defs (struct loop *loop, basic_block *body, struct df *df)
{
unsigned i;
bitmap blocks = BITMAP_ALLOC (NULL);
--- 603,613 ----
|| REGNO_REG_CLASS (REGNO (x)) != NO_REGS));
}
! /* Finds definitions that may correspond to invariants in LOOP with body
! BODY. */
static void
! find_defs (struct loop *loop, basic_block *body)
{
unsigned i;
bitmap blocks = BITMAP_ALLOC (NULL);
*************** find_defs (struct loop *loop, basic_bloc
*** 316,324 ****
/* Creates a new invariant for definition DEF in INSN, depending on invariants
in DEPENDS_ON. ALWAYS_EXECUTED is true if the insn is always executed,
! unless the program ends due to a function call. */
! static void
create_new_invariant (struct def *def, rtx insn, bitmap depends_on,
bool always_executed)
{
--- 621,630 ----
/* Creates a new invariant for definition DEF in INSN, depending on invariants
in DEPENDS_ON. ALWAYS_EXECUTED is true if the insn is always executed,
! unless the program ends due to a function call. The newly created invariant
! is returned. */
! static struct invariant *
create_new_invariant (struct def *def, rtx insn, bitmap depends_on,
bool always_executed)
{
*************** create_new_invariant (struct def *def, r
*** 337,347 ****
inv->cost = rtx_cost (SET_SRC (set), SET);
inv->move = false;
! inv->processed = false;
inv->stamp = 0;
inv->insn = insn;
inv->invno = VEC_length (invariant_p, invariants);
if (def)
def->invno = inv->invno;
VEC_safe_push (invariant_p, heap, invariants, inv);
--- 643,654 ----
inv->cost = rtx_cost (SET_SRC (set), SET);
inv->move = false;
! inv->reg = NULL_RTX;
inv->stamp = 0;
inv->insn = insn;
inv->invno = VEC_length (invariant_p, invariants);
+ inv->eqto = ~0u;
if (def)
def->invno = inv->invno;
VEC_safe_push (invariant_p, heap, invariants, inv);
*************** create_new_invariant (struct def *def, r
*** 353,358 ****
--- 660,667 ----
INSN_UID (insn), inv->invno, inv->cost);
dump_bitmap (dump_file, inv->depends_on);
}
+
+ return inv;
}
/* Record USE at DEF. */
*************** record_use (struct def *def, rtx *use, r
*** 374,389 ****
}
/* Finds the invariants INSN depends on and store them to the DEPENDS_ON
! bitmap. DF is the dataflow object. */
static bool
! check_dependencies (rtx insn, struct df *df, bitmap depends_on)
{
struct df_link *uses, *defs;
struct ref *use, *def;
basic_block bb = BLOCK_FOR_INSN (insn), def_bb;
struct def *def_data;
!
for (uses = DF_INSN_USES (df, insn); uses; uses = uses->next)
{
use = uses->ref;
--- 683,699 ----
}
/* Finds the invariants INSN depends on and store them to the DEPENDS_ON
! bitmap. */
static bool
! check_dependencies (rtx insn, bitmap depends_on)
{
struct df_link *uses, *defs;
struct ref *use, *def;
basic_block bb = BLOCK_FOR_INSN (insn), def_bb;
struct def *def_data;
! struct invariant *inv;
!
for (uses = DF_INSN_USES (df, insn); uses; uses = uses->next)
{
use = uses->ref;
*************** check_dependencies (rtx insn, struct df
*** 396,406 ****
return false;
def = defs->ref;
! def_data = DF_REF_DATA (def);
! if (!def_data)
return false;
def_bb = DF_REF_BB (def);
if (!dominated_by_p (CDI_DOMINATORS, bb, def_bb))
return false;
--- 706,722 ----
return false;
def = defs->ref;
! inv = DF_REF_DATA (def);
! if (!inv)
return false;
+ def_data = inv->def;
+ gcc_assert (def_data != NULL);
+
def_bb = DF_REF_BB (def);
+ /* Note that in case bb == def_bb, we know that the definition dominates
+ insn, because def has DF_REF_DATA defined and we process the insns
+ in the basic block bb sequentially. */
if (!dominated_by_p (CDI_DOMINATORS, bb, def_bb))
return false;
*************** check_dependencies (rtx insn, struct df
*** 412,436 ****
/* Finds invariant in INSN. ALWAYS_REACHED is true if the insn is always
executed. ALWAYS_EXECUTED is true if the insn is always executed,
! unless the program ends due to a function call. DF is the dataflow
! object. */
static void
! find_invariant_insn (rtx insn, bool always_reached, bool always_executed,
! struct df *df)
{
struct ref *ref;
struct def *def;
bitmap depends_on;
rtx set, dest;
bool simple = true;
/* Until we get rid of LIBCALLS. */
if (find_reg_note (insn, REG_RETVAL, NULL_RTX)
|| find_reg_note (insn, REG_LIBCALL, NULL_RTX)
|| find_reg_note (insn, REG_NO_CONFLICT, NULL_RTX))
return;
!
set = single_set (insn);
if (!set)
return;
--- 728,751 ----
/* Finds invariant in INSN. ALWAYS_REACHED is true if the insn is always
executed. ALWAYS_EXECUTED is true if the insn is always executed,
! unless the program ends due to a function call. */
static void
! find_invariant_insn (rtx insn, bool always_reached, bool always_executed)
{
struct ref *ref;
struct def *def;
bitmap depends_on;
rtx set, dest;
bool simple = true;
+ struct invariant *inv;
/* Until we get rid of LIBCALLS. */
if (find_reg_note (insn, REG_RETVAL, NULL_RTX)
|| find_reg_note (insn, REG_LIBCALL, NULL_RTX)
|| find_reg_note (insn, REG_NO_CONFLICT, NULL_RTX))
return;
!
set = single_set (insn);
if (!set)
return;
*************** find_invariant_insn (rtx insn, bool alwa
*** 456,529 ****
}
depends_on = BITMAP_ALLOC (NULL);
! if (!check_dependencies (insn, df, depends_on))
{
BITMAP_FREE (depends_on);
return;
}
if (simple)
! {
! ref = df_find_def (df, insn, dest);
! def = xcalloc (1, sizeof (struct def));
! DF_REF_DATA (ref) = def;
! }
else
def = NULL;
! create_new_invariant (def, insn, depends_on, always_executed);
}
! /* Record registers used in INSN that have a unique invariant definition.
! DF is the dataflow object. */
static void
! record_uses (rtx insn, struct df *df)
{
! struct df_link *uses, *defs;
! struct ref *use, *def;
! basic_block bb = BLOCK_FOR_INSN (insn), def_bb;
!
for (uses = DF_INSN_USES (df, insn); uses; uses = uses->next)
{
use = uses->ref;
!
! defs = DF_REF_CHAIN (use);
! if (!defs || defs->next)
! continue;
! def = defs->ref;
! if (!DF_REF_DATA (def))
! continue;
!
! def_bb = DF_REF_BB (def);
! if (!dominated_by_p (CDI_DOMINATORS, bb, def_bb))
! continue;
!
! record_use (DF_REF_DATA (def), DF_REF_LOC (use), DF_REF_INSN (use));
}
}
/* Finds invariants in INSN. ALWAYS_REACHED is true if the insn is always
executed. ALWAYS_EXECUTED is true if the insn is always executed,
! unless the program ends due to a function call. DF is the dataflow
! object. */
static void
! find_invariants_insn (rtx insn, bool always_reached, bool always_executed,
! struct df *df)
{
! find_invariant_insn (insn, always_reached, always_executed, df);
! record_uses (insn, df);
}
/* Finds invariants in basic block BB. ALWAYS_REACHED is true if the
basic block is always executed. ALWAYS_EXECUTED is true if the basic
block is always executed, unless the program ends due to a function
! call. DF is the dataflow object. */
static void
! find_invariants_bb (basic_block bb, bool always_reached, bool always_executed,
! struct df *df)
{
rtx insn;
--- 771,832 ----
}
depends_on = BITMAP_ALLOC (NULL);
! if (!check_dependencies (insn, depends_on))
{
BITMAP_FREE (depends_on);
return;
}
if (simple)
! def = xcalloc (1, sizeof (struct def));
else
def = NULL;
! inv = create_new_invariant (def, insn, depends_on, always_executed);
!
! if (simple)
! {
! ref = df_find_def (df, insn, dest);
! DF_REF_DATA (ref) = inv;
! }
}
! /* Record registers used in INSN that have a unique invariant definition. */
static void
! record_uses (rtx insn)
{
! struct df_link *uses;
! struct ref *use;
! struct invariant *inv;
!
for (uses = DF_INSN_USES (df, insn); uses; uses = uses->next)
{
use = uses->ref;
! inv = invariant_for_use (use);
! if (inv)
! record_use (inv->def, DF_REF_LOC (use), DF_REF_INSN (use));
}
}
/* Finds invariants in INSN. ALWAYS_REACHED is true if the insn is always
executed. ALWAYS_EXECUTED is true if the insn is always executed,
! unless the program ends due to a function call. */
static void
! find_invariants_insn (rtx insn, bool always_reached, bool always_executed)
{
! find_invariant_insn (insn, always_reached, always_executed);
! record_uses (insn);
}
/* Finds invariants in basic block BB. ALWAYS_REACHED is true if the
basic block is always executed. ALWAYS_EXECUTED is true if the basic
block is always executed, unless the program ends due to a function
! call. */
static void
! find_invariants_bb (basic_block bb, bool always_reached, bool always_executed)
{
rtx insn;
*************** find_invariants_bb (basic_block bb, bool
*** 532,538 ****
if (!INSN_P (insn))
continue;
! find_invariants_insn (insn, always_reached, always_executed, df);
if (always_reached
&& CALL_P (insn)
--- 835,841 ----
if (!INSN_P (insn))
continue;
! find_invariants_insn (insn, always_reached, always_executed);
if (always_reached
&& CALL_P (insn)
*************** find_invariants_bb (basic_block bb, bool
*** 544,569 ****
/* Finds invariants in LOOP with body BODY. ALWAYS_REACHED is the bitmap of
basic blocks in BODY that are always executed. ALWAYS_EXECUTED is the
bitmap of basic blocks in BODY that are always executed unless the program
! ends due to a function call. DF is the dataflow object. */
static void
find_invariants_body (struct loop *loop, basic_block *body,
! bitmap always_reached, bitmap always_executed,
! struct df *df)
{
unsigned i;
for (i = 0; i < loop->num_nodes; i++)
find_invariants_bb (body[i],
bitmap_bit_p (always_reached, i),
! bitmap_bit_p (always_executed, i),
! df);
}
! /* Finds invariants in LOOP. DF is the dataflow object. */
static void
! find_invariants (struct loop *loop, struct df *df)
{
bitmap may_exit = BITMAP_ALLOC (NULL);
bitmap always_reached = BITMAP_ALLOC (NULL);
--- 847,870 ----
/* Finds invariants in LOOP with body BODY. ALWAYS_REACHED is the bitmap of
basic blocks in BODY that are always executed. ALWAYS_EXECUTED is the
bitmap of basic blocks in BODY that are always executed unless the program
! ends due to a function call. */
static void
find_invariants_body (struct loop *loop, basic_block *body,
! bitmap always_reached, bitmap always_executed)
{
unsigned i;
for (i = 0; i < loop->num_nodes; i++)
find_invariants_bb (body[i],
bitmap_bit_p (always_reached, i),
! bitmap_bit_p (always_executed, i));
}
! /* Finds invariants in LOOP. */
static void
! find_invariants (struct loop *loop)
{
bitmap may_exit = BITMAP_ALLOC (NULL);
bitmap always_reached = BITMAP_ALLOC (NULL);
*************** find_invariants (struct loop *loop, stru
*** 575,582 ****
compute_always_reached (loop, body, may_exit, always_reached);
compute_always_reached (loop, body, has_exit, always_executed);
! find_defs (loop, body, df);
! find_invariants_body (loop, body, always_reached, always_executed, df);
BITMAP_FREE (always_reached);
BITMAP_FREE (always_executed);
--- 876,884 ----
compute_always_reached (loop, body, may_exit, always_reached);
compute_always_reached (loop, body, has_exit, always_executed);
! find_defs (loop, body);
! find_invariants_body (loop, body, always_reached, always_executed);
! merge_identical_invariants ();
BITMAP_FREE (always_reached);
BITMAP_FREE (always_executed);
*************** get_inv_cost (struct invariant *inv, int
*** 611,616 ****
--- 913,921 ----
struct invariant *dep;
bitmap_iterator bi;
+ /* Find the representative of the class of the equivalent invariants. */
+ inv = VEC_index (invariant_p, invariants, inv->eqto);
+
*comp_cost = 0;
*regs_needed = 0;
if (inv->move
*************** best_gain_for_invariant (struct invarian
*** 687,692 ****
--- 992,1001 ----
if (inv->move)
continue;
+ /* Only consider the "representatives" of equivalent invariants. */
+ if (inv->eqto != inv->invno)
+ continue;
+
again = gain_for_invariant (inv, &aregs_needed,
new_regs, regs_used, n_inv_uses);
if (again > gain)
*************** set_move_mark (unsigned invno)
*** 708,713 ****
--- 1017,1025 ----
struct invariant *inv = VEC_index (invariant_p, invariants, invno);
bitmap_iterator bi;
+ /* Find the representative of the class of the equivalent invariants. */
+ inv = VEC_index (invariant_p, invariants, inv->eqto);
+
if (inv->move)
return;
inv->move = true;
*************** set_move_mark (unsigned invno)
*** 721,730 ****
}
}
! /* Determines which invariants to move. DF is the dataflow object. */
static void
! find_invariants_to_move (struct df *df)
{
unsigned i, regs_used, n_inv_uses, regs_needed = 0, new_regs;
struct invariant *inv = NULL;
--- 1033,1042 ----
}
}
! /* Determines which invariants to move. */
static void
! find_invariants_to_move (void)
{
unsigned i, regs_used, n_inv_uses, regs_needed = 0, new_regs;
struct invariant *inv = NULL;
*************** find_invariants_to_move (struct df *df)
*** 764,819 ****
}
}
! /* Move invariant INVNO out of the LOOP. DF is the dataflow object. */
static void
! move_invariant_reg (struct loop *loop, unsigned invno, struct df *df)
{
struct invariant *inv = VEC_index (invariant_p, invariants, invno);
unsigned i;
basic_block preheader = loop_preheader_edge (loop)->src;
rtx reg, set;
struct use *use;
bitmap_iterator bi;
! if (inv->processed)
return;
- inv->processed = true;
! if (inv->depends_on)
{
! EXECUTE_IF_SET_IN_BITMAP (inv->depends_on, 0, i, bi)
{
! move_invariant_reg (loop, i, df);
}
- }
! /* Move the set out of the loop. If the set is always executed (we could
! omit this condition if we know that the register is unused outside of the
! loop, but it does not seem worth finding out) and it has no uses that
! would not be dominated by it, we may just move it (TODO). Otherwise we
! need to create a temporary register. */
! set = single_set (inv->insn);
! reg = gen_reg_rtx (GET_MODE (SET_DEST (set)));
! df_pattern_emit_after (df, gen_move_insn (SET_DEST (set), reg),
! BLOCK_FOR_INSN (inv->insn), inv->insn);
!
! /* If the SET_DEST of the invariant insn is a reg, we can just move
! the insn out of the loop. Otherwise, we have to use gen_move_insn
! to let emit_move_insn produce a valid instruction stream. */
! if (REG_P (SET_DEST (set)))
! {
! SET_DEST (set) = reg;
! reorder_insns (inv->insn, inv->insn, BB_END (preheader));
! df_insn_modify (df, preheader, inv->insn);
}
else
{
! df_pattern_emit_after (df, gen_move_insn (reg, SET_SRC (set)),
! preheader, BB_END (preheader));
df_insn_delete (df, BLOCK_FOR_INSN (inv->insn), inv->insn);
}
/* Replace the uses we know to be dominated. It saves work for copy
propagation, and also it is necessary so that dependent invariants
are computed right. */
--- 1076,1149 ----
}
}
! /* Move invariant INVNO out of the LOOP. */
static void
! move_invariant_reg (struct loop *loop, unsigned invno)
{
struct invariant *inv = VEC_index (invariant_p, invariants, invno);
+ struct invariant *repr = VEC_index (invariant_p, invariants, inv->eqto);
unsigned i;
basic_block preheader = loop_preheader_edge (loop)->src;
rtx reg, set;
struct use *use;
bitmap_iterator bi;
! if (inv->reg
! || !repr->move)
return;
! /* If this is a representative of the class of equivalent invariants,
! really move the invariant. Otherwise just replace its use with
! the register used for the representative. */
! if (inv == repr)
{
! if (inv->depends_on)
{
! EXECUTE_IF_SET_IN_BITMAP (inv->depends_on, 0, i, bi)
! {
! move_invariant_reg (loop, i);
! }
}
! /* Move the set out of the loop. If the set is always executed (we could
! omit this condition if we know that the register is unused outside of the
! loop, but it does not seem worth finding out) and it has no uses that
! would not be dominated by it, we may just move it (TODO). Otherwise we
! need to create a temporary register. */
! set = single_set (inv->insn);
! reg = gen_reg_rtx (GET_MODE (SET_DEST (set)));
! df_pattern_emit_after (df, gen_move_insn (SET_DEST (set), reg),
! BLOCK_FOR_INSN (inv->insn), inv->insn);
!
! /* If the SET_DEST of the invariant insn is a reg, we can just move
! the insn out of the loop. Otherwise, we have to use gen_move_insn
! to let emit_move_insn produce a valid instruction stream. */
! if (REG_P (SET_DEST (set)))
! {
! SET_DEST (set) = reg;
! reorder_insns (inv->insn, inv->insn, BB_END (preheader));
! df_insn_modify (df, preheader, inv->insn);
! }
! else
! {
! df_pattern_emit_after (df, gen_move_insn (reg, SET_SRC (set)),
! preheader, BB_END (preheader));
! df_insn_delete (df, BLOCK_FOR_INSN (inv->insn), inv->insn);
! }
}
else
{
! move_invariant_reg (loop, repr->invno);
! reg = repr->reg;
! set = single_set (inv->insn);
! df_pattern_emit_after (df, gen_move_insn (SET_DEST (set), reg),
! BLOCK_FOR_INSN (inv->insn), inv->insn);
df_insn_delete (df, BLOCK_FOR_INSN (inv->insn), inv->insn);
}
+ inv->reg = reg;
+
/* Replace the uses we know to be dominated. It saves work for copy
propagation, and also it is necessary so that dependent invariants
are computed right. */
*************** move_invariant_reg (struct loop *loop, u
*** 828,846 ****
}
/* Move selected invariant out of the LOOP. Newly created regs are marked
! in TEMPORARY_REGS. DF is the dataflow object. */
static void
! move_invariants (struct loop *loop, struct df *df)
{
struct invariant *inv;
unsigned i;
for (i = 0; VEC_iterate (invariant_p, invariants, i, inv); i++)
! {
! if (inv->move)
! move_invariant_reg (loop, i, df);
! }
}
/* Initializes invariant motion data. */
--- 1158,1173 ----
}
/* Move selected invariant out of the LOOP. Newly created regs are marked
! in TEMPORARY_REGS. */
static void
! move_invariants (struct loop *loop)
{
struct invariant *inv;
unsigned i;
for (i = 0; VEC_iterate (invariant_p, invariants, i, inv); i++)
! move_invariant_reg (loop, i);
}
/* Initializes invariant motion data. */
*************** init_inv_motion_data (void)
*** 853,863 ****
invariants = VEC_alloc (invariant_p, heap, 100);
}
! /* Frees the data allocated by invariant motion. DF is the dataflow
! object. */
static void
! free_inv_motion_data (struct df *df)
{
unsigned i;
struct def *def;
--- 1180,1189 ----
invariants = VEC_alloc (invariant_p, heap, 100);
}
! /* Frees the data allocated by invariant motion. */
static void
! free_inv_motion_data (void)
{
unsigned i;
struct def *def;
*************** free_inv_motion_data (struct df *df)
*** 868,876 ****
if (!df->defs[i])
continue;
! def = DF_REF_DATA (df->defs[i]);
! if (!def)
continue;
free_use_list (def->uses);
free (def);
--- 1194,1204 ----
if (!df->defs[i])
continue;
! inv = DF_REF_DATA (df->defs[i]);
! if (!inv)
continue;
+ def = inv->def;
+ gcc_assert (def != NULL);
free_use_list (def->uses);
free (def);
*************** free_inv_motion_data (struct df *df)
*** 885,902 ****
VEC_free (invariant_p, heap, invariants);
}
! /* Move the invariants out of the LOOP. DF is the dataflow object. */
static void
! move_single_loop_invariants (struct loop *loop, struct df *df)
{
init_inv_motion_data ();
! find_invariants (loop, df);
! find_invariants_to_move (df);
! move_invariants (loop, df);
! free_inv_motion_data (df);
}
/* Releases the auxiliary data for LOOP. */
--- 1213,1230 ----
VEC_free (invariant_p, heap, invariants);
}
! /* Move the invariants out of the LOOP. */
static void
! move_single_loop_invariants (struct loop *loop)
{
init_inv_motion_data ();
! find_invariants (loop);
! find_invariants_to_move ();
! move_invariants (loop);
! free_inv_motion_data ();
}
/* Releases the auxiliary data for LOOP. */
*************** move_loop_invariants (struct loops *loop
*** 917,923 ****
{
struct loop *loop;
unsigned i;
! struct df *df = df_init ();
/* Process the loops, innermost first. */
loop = loops->tree_root;
--- 1245,1252 ----
{
struct loop *loop;
unsigned i;
!
! df = df_init ();
/* Process the loops, innermost first. */
loop = loops->tree_root;
*************** move_loop_invariants (struct loops *loop
*** 926,932 ****
while (loop != loops->tree_root)
{
! move_single_loop_invariants (loop, df);
if (loop->next)
{
--- 1255,1261 ----
while (loop != loops->tree_root)
{
! move_single_loop_invariants (loop);
if (loop->next)
{
Index: common.opt
===================================================================
*** common.opt (revision 107424)
--- common.opt (working copy)
*************** floop-optimize
*** 543,552 ****
Common Report Var(flag_loop_optimize)
Perform loop optimizations
- floop-optimize2
- Common Report Var(flag_loop_optimize2)
- Perform loop optimizations using the new loop optimizer
-
fmath-errno
Common Report Var(flag_errno_math) Init(1)
Set errno after built-in math functions
--- 543,548 ----
*************** Common Report Var(flag_modulo_sched)
*** 575,581 ****
Perform SMS based modulo scheduling before the first scheduling pass
fmove-loop-invariants
! Common Report Var(flag_move_loop_invariants)
Move loop invariant computations out of loops
fmudflap
--- 571,577 ----
Perform SMS based modulo scheduling before the first scheduling pass
fmove-loop-invariants
! Common Report Var(flag_move_loop_invariants) Init(1)
Move loop invariant computations out of loops
fmudflap
Index: Makefile.in
===================================================================
*** Makefile.in (revision 107424)
--- Makefile.in (working copy)
*************** loop-iv.o : loop-iv.c $(CONFIG_H) $(SYST
*** 2321,2327 ****
output.h intl.h
loop-invariant.o : loop-invariant.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) \
$(BASIC_BLOCK_H) hard-reg-set.h $(CFGLOOP_H) $(EXPR_H) coretypes.h \
! $(TM_H) $(TM_P_H) function.h $(FLAGS_H) $(DF_H) $(OBSTACK_H) output.h
cfgloopmanip.o : cfgloopmanip.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) \
$(BASIC_BLOCK_H) hard-reg-set.h $(CFGLOOP_H) $(CFGLAYOUT_H) output.h \
coretypes.h $(TM_H) cfghooks.h $(OBSTACK_H)
--- 2321,2328 ----
output.h intl.h
loop-invariant.o : loop-invariant.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) \
$(BASIC_BLOCK_H) hard-reg-set.h $(CFGLOOP_H) $(EXPR_H) coretypes.h \
! $(TM_H) $(TM_P_H) function.h $(FLAGS_H) $(DF_H) $(OBSTACK_H) output.h \
! $(HASHTAB_H)
cfgloopmanip.o : cfgloopmanip.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) \
$(BASIC_BLOCK_H) hard-reg-set.h $(CFGLOOP_H) $(CFGLAYOUT_H) output.h \
coretypes.h $(TM_H) cfghooks.h $(OBSTACK_H)