Skip to content

R
riscv-gcc-1
Commit 52af3804 by Eric Botcazou Committed by Eric Botcazou
Options

re PR rtl-optimization/83030 (ICE in create_pseudo_cfg, at dwarf2cfi.c:2840) 

	PR rtl-optimization/83030
	* doc/rtl.texi (Flags in an RTL Expression): Alphabetize, add entry
	for CROSSING_JUMP_P and mention usage of 'jump' for JUMP_INSNs.
	(Insns): Delete entry for REG_CROSSING_JUMP in register notes.
	* bb-reorder.c (update_crossing_jump_flags): Do not test whether the
	CROSSING_JUMP_P flag is already set before setting it.
	* cfgrtl.c (fixup_partition_crossing): Likewise.
	* reorg.c (relax_delay_slots): Do not consider a CROSSING_JUMP_P insn
	as useless.

From-SVN: r255083
parent d5438715
Showing with 84 additions and 73 deletions
gcc/ChangeLog
2017-11-22 Eric Botcazou <ebotcazou@adacore.com>
PR rtl-optimization/83030
* doc/rtl.texi (Flags in an RTL Expression): Alphabetize, add entry
for CROSSING_JUMP_P and mention usage of 'jump' for JUMP_INSNs.
(Insns): Delete entry for REG_CROSSING_JUMP in register notes.
* bb-reorder.c (update_crossing_jump_flags): Do not test whether the
CROSSING_JUMP_P flag is already set before setting it.
* cfgrtl.c (fixup_partition_crossing): Likewise.
* reorg.c (relax_delay_slots): Do not consider a CROSSING_JUMP_P
insn as useless.
2017-11-22 Jakub Jelinek <jakub@redhat.com> 2017-11-22 Jakub Jelinek <jakub@redhat.com>
* simplify-rtx.c (simplify_binary_operation_1) <case VEC_SERIES>: * simplify-rtx.c (simplify_binary_operation_1) <case VEC_SERIES>:
gcc/bb-reorder.c
...@@ -2239,10 +2239,7 @@ update_crossing_jump_flags (void) ...@@ -2239,10 +2239,7 @@ update_crossing_jump_flags (void)
FOR_EACH_EDGE (e, ei, bb->succs) FOR_EACH_EDGE (e, ei, bb->succs)
if (e->flags & EDGE_CROSSING) if (e->flags & EDGE_CROSSING)
{ {
if (JUMP_P (BB_END (bb)) if (JUMP_P (BB_END (bb)))
/* Some flags were added during fix_up_fall_thru_edges, via
force_nonfallthru_and_redirect. */
&& !CROSSING_JUMP_P (BB_END (bb)))
CROSSING_JUMP_P (BB_END (bb)) = 1; CROSSING_JUMP_P (BB_END (bb)) = 1;
break; break;
} }
......
gcc/cfgrtl.c
...@@ -1333,8 +1333,7 @@ fixup_partition_crossing (edge e) ...@@ -1333,8 +1333,7 @@ fixup_partition_crossing (edge e)
if (BB_PARTITION (e->src) != BB_PARTITION (e->dest)) if (BB_PARTITION (e->src) != BB_PARTITION (e->dest))
{ {
e->flags |= EDGE_CROSSING; e->flags |= EDGE_CROSSING;
if (JUMP_P (BB_END (e->src)) if (JUMP_P (BB_END (e->src)))
&& !CROSSING_JUMP_P (BB_END (e->src)))
CROSSING_JUMP_P (BB_END (e->src)) = 1; CROSSING_JUMP_P (BB_END (e->src)) = 1;
} }
else if (BB_PARTITION (e->src) == BB_PARTITION (e->dest)) else if (BB_PARTITION (e->src) == BB_PARTITION (e->dest))
......
gcc/doc/rtl.texi
...@@ -565,6 +565,16 @@ that are used in certain types of expression. Most often they ...@@ -565,6 +565,16 @@ that are used in certain types of expression. Most often they
are accessed with the following macros, which expand into lvalues. are accessed with the following macros, which expand into lvalues.
@table @code @table @code
@findex CROSSING_JUMP_P
@cindex @code{jump_insn} and @samp{/j}
@item CROSSING_JUMP_P (@var{x})
Nonzero in a @code{jump_insn} if it crosses between hot and cold sections,
which could potentially be very far apart in the executable. The presence
of this flag indicates to other optimizations that this branching instruction
should not be ``collapsed'' into a simpler branching construct. It is used
when the optimization to partition basic blocks into hot and cold sections
is turned on.
@findex CONSTANT_POOL_ADDRESS_P @findex CONSTANT_POOL_ADDRESS_P
@cindex @code{symbol_ref} and @samp{/u} @cindex @code{symbol_ref} and @samp{/u}
@cindex @code{unchanging}, in @code{symbol_ref} @cindex @code{unchanging}, in @code{symbol_ref}
...@@ -577,37 +587,6 @@ In either case GCC assumes these addresses can be addressed directly, ...@@ -577,37 +587,6 @@ In either case GCC assumes these addresses can be addressed directly,
perhaps with the help of base registers. perhaps with the help of base registers.
Stored in the @code{unchanging} field and printed as @samp{/u}. Stored in the @code{unchanging} field and printed as @samp{/u}.
@findex RTL_CONST_CALL_P
@cindex @code{call_insn} and @samp{/u}
@cindex @code{unchanging}, in @code{call_insn}
@item RTL_CONST_CALL_P (@var{x})
In a @code{call_insn} indicates that the insn represents a call to a
const function. Stored in the @code{unchanging} field and printed as
@samp{/u}.
@findex RTL_PURE_CALL_P
@cindex @code{call_insn} and @samp{/i}
@cindex @code{return_val}, in @code{call_insn}
@item RTL_PURE_CALL_P (@var{x})
In a @code{call_insn} indicates that the insn represents a call to a
pure function. Stored in the @code{return_val} field and printed as
@samp{/i}.
@findex RTL_CONST_OR_PURE_CALL_P
@cindex @code{call_insn} and @samp{/u} or @samp{/i}
@item RTL_CONST_OR_PURE_CALL_P (@var{x})
In a @code{call_insn}, true if @code{RTL_CONST_CALL_P} or
@code{RTL_PURE_CALL_P} is true.
@findex RTL_LOOPING_CONST_OR_PURE_CALL_P
@cindex @code{call_insn} and @samp{/c}
@cindex @code{call}, in @code{call_insn}
@item RTL_LOOPING_CONST_OR_PURE_CALL_P (@var{x})
In a @code{call_insn} indicates that the insn represents a possibly
infinite looping call to a const or pure function. Stored in the
@code{call} field and printed as @samp{/c}. Only true if one of
@code{RTL_CONST_CALL_P} or @code{RTL_PURE_CALL_P} is true.
@findex INSN_ANNULLED_BRANCH_P @findex INSN_ANNULLED_BRANCH_P
@cindex @code{jump_insn} and @samp{/u} @cindex @code{jump_insn} and @samp{/u}
@cindex @code{call_insn} and @samp{/u} @cindex @code{call_insn} and @samp{/u}
...@@ -702,6 +681,29 @@ Stored in the @code{call} field and printed as @samp{/c}. ...@@ -702,6 +681,29 @@ Stored in the @code{call} field and printed as @samp{/c}.
Nonzero in a @code{mem} if the memory reference holds a pointer. Nonzero in a @code{mem} if the memory reference holds a pointer.
Stored in the @code{frame_related} field and printed as @samp{/f}. Stored in the @code{frame_related} field and printed as @samp{/f}.
@findex MEM_READONLY_P
@cindex @code{mem} and @samp{/u}
@cindex @code{unchanging}, in @code{mem}
@item MEM_READONLY_P (@var{x})
Nonzero in a @code{mem}, if the memory is statically allocated and read-only.
Read-only in this context means never modified during the lifetime of the
program, not necessarily in ROM or in write-disabled pages. A common
example of the later is a shared library's global offset table. This
table is initialized by the runtime loader, so the memory is technically
writable, but after control is transferred from the runtime loader to the
application, this memory will never be subsequently modified.
Stored in the @code{unchanging} field and printed as @samp{/u}.
@findex PREFETCH_SCHEDULE_BARRIER_P
@cindex @code{prefetch} and @samp{/v}
@cindex @code{volatile}, in @code{prefetch}
@item PREFETCH_SCHEDULE_BARRIER_P (@var{x})
In a @code{prefetch}, indicates that the prefetch is a scheduling barrier.
No other INSNs will be moved over it.
Stored in the @code{volatil} field and printed as @samp{/v}.
@findex REG_FUNCTION_VALUE_P @findex REG_FUNCTION_VALUE_P
@cindex @code{reg} and @samp{/i} @cindex @code{reg} and @samp{/i}
@cindex @code{return_val}, in @code{reg} @cindex @code{return_val}, in @code{reg}
...@@ -731,6 +733,37 @@ The same hard register may be used also for collecting the values of ...@@ -731,6 +733,37 @@ The same hard register may be used also for collecting the values of
functions called by this one, but @code{REG_FUNCTION_VALUE_P} is zero functions called by this one, but @code{REG_FUNCTION_VALUE_P} is zero
in this kind of use. in this kind of use.
@findex RTL_CONST_CALL_P
@cindex @code{call_insn} and @samp{/u}
@cindex @code{unchanging}, in @code{call_insn}
@item RTL_CONST_CALL_P (@var{x})
In a @code{call_insn} indicates that the insn represents a call to a
const function. Stored in the @code{unchanging} field and printed as
@samp{/u}.
@findex RTL_PURE_CALL_P
@cindex @code{call_insn} and @samp{/i}
@cindex @code{return_val}, in @code{call_insn}
@item RTL_PURE_CALL_P (@var{x})
In a @code{call_insn} indicates that the insn represents a call to a
pure function. Stored in the @code{return_val} field and printed as
@samp{/i}.
@findex RTL_CONST_OR_PURE_CALL_P
@cindex @code{call_insn} and @samp{/u} or @samp{/i}
@item RTL_CONST_OR_PURE_CALL_P (@var{x})
In a @code{call_insn}, true if @code{RTL_CONST_CALL_P} or
@code{RTL_PURE_CALL_P} is true.
@findex RTL_LOOPING_CONST_OR_PURE_CALL_P
@cindex @code{call_insn} and @samp{/c}
@cindex @code{call}, in @code{call_insn}
@item RTL_LOOPING_CONST_OR_PURE_CALL_P (@var{x})
In a @code{call_insn} indicates that the insn represents a possibly
infinite looping call to a const or pure function. Stored in the
@code{call} field and printed as @samp{/c}. Only true if one of
@code{RTL_CONST_CALL_P} or @code{RTL_PURE_CALL_P} is true.
@findex RTX_FRAME_RELATED_P @findex RTX_FRAME_RELATED_P
@cindex @code{insn} and @samp{/f} @cindex @code{insn} and @samp{/f}
@cindex @code{call_insn} and @samp{/f} @cindex @code{call_insn} and @samp{/f}
...@@ -765,21 +798,6 @@ computation performed by this instruction, i.e., one that ...@@ -765,21 +798,6 @@ computation performed by this instruction, i.e., one that
This flag is required for exception handling support on targets with RTL This flag is required for exception handling support on targets with RTL
prologues. prologues.
@findex MEM_READONLY_P
@cindex @code{mem} and @samp{/u}
@cindex @code{unchanging}, in @code{mem}
@item MEM_READONLY_P (@var{x})
Nonzero in a @code{mem}, if the memory is statically allocated and read-only.
Read-only in this context means never modified during the lifetime of the
program, not necessarily in ROM or in write-disabled pages. A common
example of the later is a shared library's global offset table. This
table is initialized by the runtime loader, so the memory is technically
writable, but after control is transferred from the runtime loader to the
application, this memory will never be subsequently modified.
Stored in the @code{unchanging} field and printed as @samp{/u}.
@findex SCHED_GROUP_P @findex SCHED_GROUP_P
@cindex @code{insn} and @samp{/s} @cindex @code{insn} and @samp{/s}
@cindex @code{call_insn} and @samp{/s} @cindex @code{call_insn} and @samp{/s}
...@@ -879,14 +897,6 @@ Stored in the @code{volatil} field and printed as @samp{/v}. ...@@ -879,14 +897,6 @@ Stored in the @code{volatil} field and printed as @samp{/v}.
Most uses of @code{SYMBOL_REF_FLAG} are historic and may be subsumed Most uses of @code{SYMBOL_REF_FLAG} are historic and may be subsumed
by @code{SYMBOL_REF_FLAGS}. Certainly use of @code{SYMBOL_REF_FLAGS} by @code{SYMBOL_REF_FLAGS}. Certainly use of @code{SYMBOL_REF_FLAGS}
is mandatory if the target requires more than one bit of storage. is mandatory if the target requires more than one bit of storage.
@findex PREFETCH_SCHEDULE_BARRIER_P
@cindex @code{prefetch} and @samp{/v}
@cindex @code{volatile}, in @code{prefetch}
@item PREFETCH_SCHEDULE_BARRIER_P (@var{x})
In a @code{prefetch}, indicates that the prefetch is a scheduling barrier.
No other INSNs will be moved over it.
Stored in the @code{volatil} field and printed as @samp{/v}.
@end table @end table
These are the fields to which the above macros refer: These are the fields to which the above macros refer:
...@@ -974,6 +984,8 @@ In a @code{set}, 1 means it is for a return. ...@@ -974,6 +984,8 @@ In a @code{set}, 1 means it is for a return.
In a @code{call_insn}, 1 means it is a sibling call. In a @code{call_insn}, 1 means it is a sibling call.
In a @code{jump_insn}, 1 means it is a crossing jump.
In an RTL dump, this flag is represented as @samp{/j}. In an RTL dump, this flag is represented as @samp{/j}.
@findex unchanging @findex unchanging
...@@ -3910,16 +3922,6 @@ multiple targets; the last label in the insn (in the highest numbered ...@@ -3910,16 +3922,6 @@ multiple targets; the last label in the insn (in the highest numbered
insn-field) goes into the @code{JUMP_LABEL} field and does not have a insn-field) goes into the @code{JUMP_LABEL} field and does not have a
@code{REG_LABEL_TARGET} note. @xref{Insns, JUMP_LABEL}. @code{REG_LABEL_TARGET} note. @xref{Insns, JUMP_LABEL}.
@findex REG_CROSSING_JUMP
@item REG_CROSSING_JUMP
This insn is a branching instruction (either an unconditional jump or
an indirect jump) which crosses between hot and cold sections, which
could potentially be very far apart in the executable. The presence
of this note indicates to other optimizations that this branching
instruction should not be ``collapsed'' into a simpler branching
construct. It is used when the optimization to partition basic blocks
into hot and cold sections is turned on.
@findex REG_SETJMP @findex REG_SETJMP
@item REG_SETJMP @item REG_SETJMP
Appears attached to each @code{CALL_INSN} to @code{setjmp} or a Appears attached to each @code{CALL_INSN} to @code{setjmp} or a
......
gcc/reorg.c
...@@ -3361,10 +3361,11 @@ relax_delay_slots (rtx_insn *first) ...@@ -3361,10 +3361,11 @@ relax_delay_slots (rtx_insn *first)
} }
/* See if we have a simple (conditional) jump that is useless. */ /* See if we have a simple (conditional) jump that is useless. */
if (! INSN_ANNULLED_BRANCH_P (delay_jump_insn) if (!CROSSING_JUMP_P (delay_jump_insn)
&& ! condjump_in_parallel_p (delay_jump_insn) && !INSN_ANNULLED_BRANCH_P (delay_jump_insn)
&& !condjump_in_parallel_p (delay_jump_insn)
&& prev_active_insn (as_a<rtx_insn *> (target_label)) == insn && prev_active_insn (as_a<rtx_insn *> (target_label)) == insn
&& ! BARRIER_P (prev_nonnote_insn (as_a<rtx_insn *> (target_label))) && !BARRIER_P (prev_nonnote_insn (as_a<rtx_insn *> (target_label)))
/* If the last insn in the delay slot sets CC0 for some insn, /* If the last insn in the delay slot sets CC0 for some insn,
various code assumes that it is in a delay slot. We could various code assumes that it is in a delay slot. We could
put it back where it belonged and delete the register notes, put it back where it belonged and delete the register notes,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment