OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR rtl-optimization/27291 (verify_flow_info failed: too many outgoing branch edges from bb 4) 

PR rtl-optimization/27291
	* loop-doloop.c (add_test, doloop_modify): Handle the case condition is
	folded to a constant.

	* g++.dg/tree-ssa/pr27291.C: New test.

From-SVN: r113430
This commit is contained in:
Zdenek Dvorak 2006-05-01 22:46:22 +02:00 committed by Zdenek Dvorak
parent dcccd88d38
commit ed541ddb26
4 changed files with 447 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2006-05-01 Zdenek Dvorak <dvorakz@suse.cz>
PR rtl-optimization/27291
* loop-doloop.c (add_test, doloop_modify): Handle the case condition is
folded to a constant.
2006-05-01 Zdenek Dvorak <dvorakz@suse.cz>
PR tree-optimization/27283

110
gcc/loop-doloop.c
View File

@ -223,15 +223,19 @@ cleanup:
return result;
}
/* Adds test of COND jumping to DEST to the end of BB. */
/* Adds test of COND jumping to DEST on edge *E and set *E to the new fallthru
edge. If the condition is always false, do not do anything. If it is always
true, redirect E to DEST and return false. In all other cases, true is
returned. */
static void
add_test (rtx cond, basic_block bb, basic_block dest)
static bool
add_test (rtx cond, edge *e, basic_block dest)
{
rtx seq, jump, label;
enum machine_mode mode;
rtx op0 = XEXP (cond, 0), op1 = XEXP (cond, 1);
enum rtx_code code = GET_CODE (cond);
basic_block bb;
mode = GET_MODE (XEXP (cond, 0));
if (mode == VOIDmode)
@ -244,22 +248,36 @@ add_test (rtx cond, basic_block bb, basic_block dest)
do_compare_rtx_and_jump (op0, op1, code, 0, mode, NULL_RTX, NULL_RTX, label);
jump = get_last_insn ();
/* It is possible for the jump to be optimized out. */
if (JUMP_P (jump))
if (!JUMP_P (jump))
{
JUMP_LABEL (jump) = label;
/* The jump is supposed to handle an unlikely special case. */
REG_NOTES (jump)
= gen_rtx_EXPR_LIST (REG_BR_PROB,
const0_rtx, REG_NOTES (jump));
LABEL_NUSES (label)++;
/* The condition is always false and the jump was optimized out. */
end_sequence ();
return true;
}
seq = get_insns ();
end_sequence ();
emit_insn_after (seq, BB_END (bb));
bb = loop_split_edge_with (*e, seq);
*e = single_succ_edge (bb);
if (any_uncondjump_p (jump))
{
/* The condition is always true. */
delete_insn (jump);
redirect_edge_and_branch_force (*e, dest);
return false;
}
JUMP_LABEL (jump) = label;
/* The jump is supposed to handle an unlikely special case. */
REG_NOTES (jump)
= gen_rtx_EXPR_LIST (REG_BR_PROB,
const0_rtx, REG_NOTES (jump));
LABEL_NUSES (label)++;
make_edge (bb, dest, (*e)->flags & ~EDGE_FALLTHRU);
return true;
}
/* Modify the loop to use the low-overhead looping insn where LOOP
@ -277,7 +295,7 @@ doloop_modify (struct loop *loop, struct niter_desc *desc,
rtx sequence;
rtx jump_insn;
rtx jump_label;
int nonneg = 0, irr;
int nonneg = 0;
bool increment_count;
basic_block loop_end = desc->out_edge->src;
enum machine_mode mode;
@ -357,39 +375,57 @@ doloop_modify (struct loop *loop, struct niter_desc *desc,
= loop_split_edge_with (loop_preheader_edge (loop), NULL_RTX);
basic_block new_preheader
= loop_split_edge_with (loop_preheader_edge (loop), NULL_RTX);
basic_block bb;
edge te;
gcov_type cnt;
/* Expand the condition testing the assumptions and if it does not pass,
reset the count register to 0. */
add_test (XEXP (ass, 0), preheader, set_zero);
single_succ_edge (preheader)->flags &= ~EDGE_FALLTHRU;
cnt = single_succ_edge (preheader)->count;
single_succ_edge (preheader)->probability = 0;
single_succ_edge (preheader)->count = 0;
irr = single_succ_edge (preheader)->flags & EDGE_IRREDUCIBLE_LOOP;
te = make_edge (preheader, new_preheader, EDGE_FALLTHRU | irr);
te->probability = REG_BR_PROB_BASE;
te->count = cnt;
redirect_edge_and_branch_force (single_succ_edge (preheader), new_preheader);
set_immediate_dominator (CDI_DOMINATORS, new_preheader, preheader);
set_zero->count = 0;
set_zero->frequency = 0;
for (ass = XEXP (ass, 1); ass; ass = XEXP (ass, 1))
te = single_succ_edge (preheader);
for (; ass; ass = XEXP (ass, 1))
if (!add_test (XEXP (ass, 0), &te, set_zero))
break;
if (ass)
{
bb = loop_split_edge_with (te, NULL_RTX);
te = single_succ_edge (bb);
add_test (XEXP (ass, 0), bb, set_zero);
make_edge (bb, set_zero, irr);
/* We reached a condition that is always true. This is very hard to
reproduce (such a loop does not roll, and thus it would most
likely get optimized out by some of the preceding optimizations).
In fact, I do not have any testcase for it. However, it would
also be very hard to show that it is impossible, so we must
handle this case. */
set_zero->count = preheader->count;
set_zero->frequency = preheader->frequency;
}
start_sequence ();
convert_move (counter_reg, noloop, 0);
sequence = get_insns ();
end_sequence ();
emit_insn_after (sequence, BB_END (set_zero));
if (EDGE_COUNT (set_zero->preds) == 0)
{
/* All the conditions were simplified to false, remove the
unreachable set_zero block. */
remove_bb_from_loops (set_zero);
delete_basic_block (set_zero);
}
else
{
/* Reset the counter to zero in the set_zero block. */
start_sequence ();
convert_move (counter_reg, noloop, 0);
sequence = get_insns ();
end_sequence ();
emit_insn_after (sequence, BB_END (set_zero));
set_immediate_dominator (CDI_DOMINATORS, set_zero,
recount_dominator (CDI_DOMINATORS,
set_zero));
}
set_immediate_dominator (CDI_DOMINATORS, new_preheader,
recount_dominator (CDI_DOMINATORS,
new_preheader));
}
/* Some targets (eg, C4x) need to initialize special looping

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2006-05-01 Zdenek Dvorak <dvorakz@suse.cz>
PR tree-optimization/27291
* g++.dg/tree-ssa/pr27291.C: New test.
2006-05-01 Zdenek Dvorak <dvorakz@suse.cz>
PR tree-optimization/27283

363
gcc/testsuite/g++.dg/tree-ssa/pr27291.C Normal file
View File

@ -0,0 +1,363 @@
/* { dg-do compile } */
/* { dg-options "-O2" } */
namespace std
{
template < class _T1, class _T2 > struct pair
{
};
}
extern "C"
{
extern "C"
{
typedef int int32_t __attribute__ ((__mode__ (__SI__)));
struct _pthread_fastlock
{
}
pthread_mutexattr_t;
}
}
namespace std
{
struct __numeric_limits_base
{
};
template < typename _Tp >
struct numeric_limits:public __numeric_limits_base
{
static const bool is_integer = true;
};
};
typedef unsigned int uint32_t;
namespace std
{
template < typename _Alloc > class allocator;
template < class _CharT > struct char_traits;
template < typename _CharT, typename _Traits =
char_traits < _CharT >, typename _Alloc =
allocator < _CharT > >class basic_string;
typedef basic_string < char >string;
}
namespace __gnu_cxx
{
template < typename _Tp > class new_allocator
{
};
}
namespace std
{
template < typename _Tp > class allocator:public __gnu_cxx::new_allocator <
_Tp >
{
};
template < typename _CharT, typename _Traits,
typename _Alloc > class basic_string
{
public:inline basic_string ();
basic_string (const _CharT * __s, const _Alloc & __a = _Alloc ());
};
}
namespace boost
{
template < class T > class integer_traits:public std::numeric_limits < T >
{
};
namespace detail
{
template < class T, T min_val, T max_val > class integer_traits_base
{
};
}
template <> class integer_traits < int >:public std::numeric_limits < int >,
public detail::integer_traits_base < int, (-2147483647 - 1), 2147483647 >
{
};
namespace random
{
template < class IntType, IntType m > class const_mod
{
public:static IntType add (IntType x, IntType c)
{
}
static IntType mult (IntType a, IntType x)
{
return mult_schrage (a, x);
}
static IntType mult_add (IntType a, IntType x, IntType c)
{
return add (mult (a, x), c);
}
static IntType mult_schrage (IntType a, IntType value)
{
for (;;)
{
if (value > 0)
break;
value += m;
}
}
};
template < class IntType, IntType a, IntType c, IntType m,
IntType val > class linear_congruential
{
public:typedef IntType result_type;
static const IntType modulus = m;
explicit linear_congruential (IntType x0 = 1):_modulus (modulus),
_x (_modulus ? (x0 % _modulus) :
x0)
{
}
IntType operator () ()
{
_x = const_mod < IntType, m >::mult_add (a, _x, c);
}
private:IntType _modulus;
IntType _x;
};
}
typedef random::linear_congruential < int32_t, 16807, 0, 2147483647,
1043618065 > minstd_rand0;
namespace random
{
namespace detail
{
template < class T > struct ptr_helper
{
typedef T value_type;
typedef T & reference_type;
typedef const T & rvalue_type;
static reference_type ref (T & r)
{
}
};
template < class T > struct ptr_helper <T & >
{
typedef T value_type;
typedef T & rvalue_type;
};
}
}
template < class UniformRandomNumberGenerator, class RealType =
double >class uniform_01
{
public:typedef UniformRandomNumberGenerator base_type;
typedef RealType result_type;
explicit uniform_01 (base_type rng):_rng (rng),
_factor (result_type (1) /
(result_type ((_rng.max) () - (_rng.min) ()) +
result_type (std::numeric_limits <
base_result >::is_integer ? 1 : 0)))
{
}
result_type operator () ()
{
return result_type (_rng () - (_rng.min) ()) * _factor;
}
private:typedef typename base_type::result_type base_result;
base_type _rng;
result_type _factor;
};
namespace random
{
namespace detail
{
template < class UniformRandomNumberGenerator >
class pass_through_engine
{
private:typedef ptr_helper < UniformRandomNumberGenerator >
helper_type;
public:typedef typename helper_type::value_type base_type;
typedef typename base_type::result_type result_type;
explicit pass_through_engine (UniformRandomNumberGenerator
rng):_rng (static_cast <
typename helper_type::
rvalue_type > (rng))
{
}
result_type min () const
{
}
result_type max () const
{
}
base_type & base ()
{
}
result_type operator () ()
{
return base ()();
}
private:UniformRandomNumberGenerator _rng;
};
}
template < class RealType, int w, unsigned int p,
unsigned int q > class lagged_fibonacci_01
{
public:typedef RealType result_type;
static const unsigned int long_lag = p;
lagged_fibonacci_01 ()
{
seed ();
}
public:void seed (uint32_t value = 331u)
{
minstd_rand0 intgen (value);
seed (intgen);
}
template < class Generator > void seed (Generator & gen)
{
typedef detail::pass_through_engine < Generator & >ref_gen;
uniform_01 < ref_gen, RealType > gen01 =
uniform_01 < ref_gen, RealType > (ref_gen (gen));
for (unsigned int j = 0; j < long_lag; ++j)
x[j] = gen01 ();
}
RealType x[long_lag];
};
}
typedef random::lagged_fibonacci_01 < double, 48, 607,
273 > lagged_fibonacci607;
namespace random
{
namespace detail
{
template < bool have_int, bool want_int > struct engine_helper;
template <> struct engine_helper <true, true >
{
template < class Engine, class DistInputType > struct impl
{
typedef pass_through_engine < Engine > type;
};
};
}
}
template < class Engine, class Distribution > class variate_generator
{
private:typedef random::detail::pass_through_engine < Engine >
decorated_engine;
public:typedef typename decorated_engine::base_type engine_value_type;
typedef Distribution distribution_type;
variate_generator (Engine e, Distribution d):_eng (decorated_engine (e)),
_dist (d)
{
}
private:enum
{
have_int =
std::numeric_limits <
typename decorated_engine::result_type >::is_integer, want_int =
std::numeric_limits < typename Distribution::input_type >::is_integer
};
typedef typename random::detail::engine_helper < have_int,
want_int >::template impl < decorated_engine,
typename Distribution::input_type >::type internal_engine_type;
internal_engine_type _eng;
distribution_type _dist;
};
template < class RealType = double >class uniform_real
{
public:typedef RealType input_type;
};
}
namespace alps
{
class BufferedRandomNumberGeneratorBase
{
};
template < class RNG >
class BufferedRandomNumberGenerator:public
BufferedRandomNumberGeneratorBase
{
public: BufferedRandomNumberGenerator ():rng_ (), gen_ (rng_,
boost::
uniform_real <> ())
{
}
protected: RNG rng_;
boost::variate_generator < RNG &, boost::uniform_real <> >gen_;
};
}
namespace boost
{
namespace detail
{
class sp_counted_base
{
};
class shared_count
{
private:sp_counted_base * pi_;
public:shared_count ():pi_ (0)
{
}
template < class Y > explicit shared_count (Y * p):pi_ (0)
{
}
};
}
template < class T > class shared_ptr
{
public:typedef T element_type;
template < class Y > explicit shared_ptr (Y * p):px (p), pn (p)
{
}
T *px;
detail::shared_count pn;
};
}
namespace std
{
template < typename _Key, typename _Tp, typename _Compare =
std::allocator < std::pair < const _Key, _Tp > > > class map
{
public:typedef _Key key_type;
typedef _Tp mapped_type;
mapped_type & operator[] (const key_type & __k)
{
}
};
}
namespace alps
{
namespace detail
{
template < class BASE > class abstract_creator
{
public:typedef BASE base_type;
virtual base_type *create () const = 0;
};
template < class BASE,
class T > class creator:public abstract_creator < BASE >
{
public:typedef BASE base_type;
base_type *create () const
{
return new T ();
}
};
}
template < class KEY, class BASE > class factory
{
public:typedef BASE base_type;
typedef KEY key_type;
typedef boost::shared_ptr < detail::abstract_creator < base_type >
>pointer_type;
template < class T > bool register_type (key_type k)
{
creators_[k] = pointer_type (new detail::creator < BASE, T > ());
}
private:typedef std::map < key_type, pointer_type > map_type;
map_type creators_;
};
class RNGFactory:public factory < std::string,
BufferedRandomNumberGeneratorBase >
{
public:RNGFactory ();
};
}
alps::RNGFactory::RNGFactory ()
{
register_type < BufferedRandomNumberGenerator < boost::lagged_fibonacci607 >
>("lagged_fibonacci607");
}