Skip to content

R
riscv-gcc-1
Commit ab758510 by Georg-Johann Lay Committed by Georg-Johann Lay
Options

re PR target/50566 ([avr]: Add support for better logging similar to -mdeb) 

	PR target/50566
	* config/avr/avr-log.c (avr_log_vadump): Use %b to print bool.
	* config/avr/avr.c (avr_rtx_costs_1): New static function, renamed
	from avr_rtx_costs.
	(avr_legitimate_address_p): Use avr_edump to print log information
	filtered by avr_log.
	(extra_constraint_Q): Ditto.
	(avr_legitimize_address): Ditto.
	(avr_rtx_costs): Ditto.  Rewrite as wrapper for avr_rtx_costs_1.
	(final_prescan_insn): Use avr_log.rtx_costs as filter.

From-SVN: r179359
parent 39ffb1f9
Showing with 105 additions and 65 deletions
gcc/ChangeLog
2011-09-29 Georg-Johann Lay <avr@gjlay.de>
PR target/50566
* config/avr/avr-log.c (avr_log_vadump): Use %b to print bool.
* config/avr/avr.c (avr_rtx_costs_1): New static function, renamed
from avr_rtx_costs.
(avr_legitimate_address_p): Use avr_edump to print log information
filtered by avr_log.
(extra_constraint_Q): Ditto.
(avr_legitimize_address): Ditto.
(avr_rtx_costs): Ditto. Rewrite as wrapper for avr_rtx_costs_1.
(final_prescan_insn): Use avr_log.rtx_costs as filter.
2011-09-29 Richard Sandiford <richard.sandiford@linaro.org> 2011-09-29 Richard Sandiford <richard.sandiford@linaro.org>
* config/arm/arm-protos.h (arm_modes_tieable_p): Declare. * config/arm/arm-protos.h (arm_modes_tieable_p): Declare.
gcc/config/avr/avr-log.c
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
== known %-codes == == known %-codes ==
b: bool
r: rtx r: rtx
t: tree t: tree
T: tree (brief) T: tree (brief)
...@@ -132,7 +133,7 @@ avr_log_set_caller_f (const char *caller) ...@@ -132,7 +133,7 @@ avr_log_set_caller_f (const char *caller)
return avr_log_fdump_f; return avr_log_fdump_f;
} }
/* Worker function implementing the %-codes and forwarning to /* Worker function implementing the %-codes and forwarding to
respective print/dump function. */ respective print/dump function. */
static void static void
...@@ -190,6 +191,10 @@ avr_log_vadump (FILE *file, const char *fmt, va_list ap) ...@@ -190,6 +191,10 @@ avr_log_vadump (FILE *file, const char *fmt, va_list ap)
fprintf (file, "%x", va_arg (ap, int)); fprintf (file, "%x", va_arg (ap, int));
break; break;
case 'b':
fprintf (file, "%s", va_arg (ap, int) ? "true" : "false");
break;
case 'c': case 'c':
fputc (va_arg (ap, int), file); fputc (va_arg (ap, int), file);
break; break;
......
gcc/config/avr/avr.c
...@@ -1193,27 +1193,7 @@ avr_cannot_modify_jumps_p (void) ...@@ -1193,27 +1193,7 @@ avr_cannot_modify_jumps_p (void)
bool bool
avr_legitimate_address_p (enum machine_mode mode, rtx x, bool strict) avr_legitimate_address_p (enum machine_mode mode, rtx x, bool strict)
{ {
enum reg_class r = NO_REGS; reg_class_t r = NO_REGS;
if (TARGET_ALL_DEBUG)
{
fprintf (stderr, "mode: (%s) %s %s %s %s:",
GET_MODE_NAME(mode),
strict ? "(strict)": "",
reload_completed ? "(reload_completed)": "",
reload_in_progress ? "(reload_in_progress)": "",
reg_renumber ? "(reg_renumber)" : "");
if (GET_CODE (x) == PLUS
&& REG_P (XEXP (x, 0))
&& GET_CODE (XEXP (x, 1)) == CONST_INT
&& INTVAL (XEXP (x, 1)) >= 0
&& INTVAL (XEXP (x, 1)) <= MAX_LD_OFFSET (mode)
&& reg_renumber
)
fprintf (stderr, "(r%d ---> r%d)", REGNO (XEXP (x, 0)),
true_regnum (XEXP (x, 0)));
debug_rtx (x);
}
if (REG_P (x) && (strict ? REG_OK_FOR_BASE_STRICT_P (x) if (REG_P (x) && (strict ? REG_OK_FOR_BASE_STRICT_P (x)
: REG_OK_FOR_BASE_NOSTRICT_P (x))) : REG_OK_FOR_BASE_NOSTRICT_P (x)))
...@@ -1247,10 +1227,27 @@ avr_legitimate_address_p (enum machine_mode mode, rtx x, bool strict) ...@@ -1247,10 +1227,27 @@ avr_legitimate_address_p (enum machine_mode mode, rtx x, bool strict)
{ {
r = POINTER_REGS; r = POINTER_REGS;
} }
if (TARGET_ALL_DEBUG)
if (avr_log.legitimate_address_p)
{ {
fprintf (stderr, " ret = %c\n", r + '0'); avr_edump ("\n%?: ret=%d=%R, mode=%m strict=%d "
"reload_completed=%d reload_in_progress=%d %s:",
!!r, r, mode, strict, reload_completed, reload_in_progress,
reg_renumber ? "(reg_renumber)" : "");
if (GET_CODE (x) == PLUS
&& REG_P (XEXP (x, 0))
&& CONST_INT_P (XEXP (x, 1))
&& IN_RANGE (INTVAL (XEXP (x, 1)), 0, MAX_LD_OFFSET (mode))
&& reg_renumber)
{
avr_edump ("(r%d ---> r%d)", REGNO (XEXP (x, 0)),
true_regnum (XEXP (x, 0)));
}
avr_edump ("\n%r\n", x);
} }
return r == NO_REGS ? 0 : (int)r; return r == NO_REGS ? 0 : (int)r;
} }
...@@ -1260,30 +1257,35 @@ avr_legitimate_address_p (enum machine_mode mode, rtx x, bool strict) ...@@ -1260,30 +1257,35 @@ avr_legitimate_address_p (enum machine_mode mode, rtx x, bool strict)
rtx rtx
avr_legitimize_address (rtx x, rtx oldx, enum machine_mode mode) avr_legitimize_address (rtx x, rtx oldx, enum machine_mode mode)
{ {
bool big_offset_p = false;
x = oldx; x = oldx;
if (TARGET_ALL_DEBUG)
if (GET_CODE (oldx) == PLUS
&& REG_P (XEXP (oldx, 0)))
{ {
fprintf (stderr, "legitimize_address mode: %s", GET_MODE_NAME(mode)); if (REG_P (XEXP (oldx, 1)))
debug_rtx (oldx); x = force_reg (GET_MODE (oldx), oldx);
else if (CONST_INT_P (XEXP (oldx, 1)))
{
int offs = INTVAL (XEXP (oldx, 1));
if (frame_pointer_rtx != XEXP (oldx, 0)
&& offs > MAX_LD_OFFSET (mode))
{
big_offset_p = true;
x = force_reg (GET_MODE (oldx), oldx);
}
}
} }
if (GET_CODE (oldx) == PLUS if (avr_log.legitimize_address)
&& REG_P (XEXP (oldx,0)))
{ {
if (REG_P (XEXP (oldx,1))) avr_edump ("\n%?: mode=%m\n %r\n", mode, oldx);
x = force_reg (GET_MODE (oldx), oldx);
else if (GET_CODE (XEXP (oldx, 1)) == CONST_INT) if (x != oldx)
{ avr_edump (" %s --> %r\n", big_offset_p ? "(big offset)" : "", x);
int offs = INTVAL (XEXP (oldx,1));
if (frame_pointer_rtx != XEXP (oldx,0))
if (offs > MAX_LD_OFFSET (mode))
{
if (TARGET_ALL_DEBUG)
fprintf (stderr, "force_reg (big offset)\n");
x = force_reg (GET_MODE (oldx), oldx);
}
}
} }
return x; return x;
} }
...@@ -1711,7 +1713,7 @@ void ...@@ -1711,7 +1713,7 @@ void
final_prescan_insn (rtx insn, rtx *operand ATTRIBUTE_UNUSED, final_prescan_insn (rtx insn, rtx *operand ATTRIBUTE_UNUSED,
int num_operands ATTRIBUTE_UNUSED) int num_operands ATTRIBUTE_UNUSED)
{ {
if (TARGET_ALL_DEBUG) if (avr_log.rtx_costs)
{ {
rtx set = single_set (insn); rtx set = single_set (insn);
...@@ -5825,14 +5827,15 @@ avr_operand_rtx_cost (rtx x, enum machine_mode mode, enum rtx_code outer, ...@@ -5825,14 +5827,15 @@ avr_operand_rtx_cost (rtx x, enum machine_mode mode, enum rtx_code outer,
return total; return total;
} }
/* The AVR backend's rtx_cost function. X is rtx expression whose cost /* Worker function for AVR backend's rtx_cost function.
is to be calculated. Return true if the complete cost has been X is rtx expression whose cost is to be calculated.
computed, and false if subexpressions should be scanned. In either Return true if the complete cost has been computed.
case, *TOTAL contains the cost result. */ Return false if subexpressions should be scanned.
In either case, *TOTAL contains the cost result. */
static bool static bool
avr_rtx_costs (rtx x, int codearg, int outer_code ATTRIBUTE_UNUSED, avr_rtx_costs_1 (rtx x, int codearg, int outer_code ATTRIBUTE_UNUSED,
int opno ATTRIBUTE_UNUSED, int *total, bool speed) int opno ATTRIBUTE_UNUSED, int *total, bool speed)
{ {
enum rtx_code code = (enum rtx_code) codearg; enum rtx_code code = (enum rtx_code) codearg;
enum machine_mode mode = GET_MODE (x); enum machine_mode mode = GET_MODE (x);
...@@ -6551,6 +6554,25 @@ avr_rtx_costs (rtx x, int codearg, int outer_code ATTRIBUTE_UNUSED, ...@@ -6551,6 +6554,25 @@ avr_rtx_costs (rtx x, int codearg, int outer_code ATTRIBUTE_UNUSED,
return false; return false;
} }
/* Implement `TARGET_RTX_COSTS'. */
static bool
avr_rtx_costs (rtx x, int codearg, int outer_code,
int opno, int *total, bool speed)
{
bool done = avr_rtx_costs_1 (x, codearg, outer_code,
opno, total, speed);
if (avr_log.rtx_costs)
{
avr_edump ("\n%?=%b (%s) total=%d, outer=%C:\n%r\n",
done, speed ? "speed" : "size", *total, outer_code, x);
}
return done;
}
/* Calculate the cost of a memory address. */ /* Calculate the cost of a memory address. */
static int static int
...@@ -6576,6 +6598,8 @@ avr_address_cost (rtx x, bool speed ATTRIBUTE_UNUSED) ...@@ -6576,6 +6598,8 @@ avr_address_cost (rtx x, bool speed ATTRIBUTE_UNUSED)
int int
extra_constraint_Q (rtx x) extra_constraint_Q (rtx x)
{ {
int ok = 0;
if (GET_CODE (XEXP (x,0)) == PLUS if (GET_CODE (XEXP (x,0)) == PLUS
&& REG_P (XEXP (XEXP (x,0), 0)) && REG_P (XEXP (XEXP (x,0), 0))
&& GET_CODE (XEXP (XEXP (x,0), 1)) == CONST_INT && GET_CODE (XEXP (XEXP (x,0), 1)) == CONST_INT
...@@ -6584,23 +6608,21 @@ extra_constraint_Q (rtx x) ...@@ -6584,23 +6608,21 @@ extra_constraint_Q (rtx x)
{ {
rtx xx = XEXP (XEXP (x,0), 0); rtx xx = XEXP (XEXP (x,0), 0);
int regno = REGNO (xx); int regno = REGNO (xx);
if (TARGET_ALL_DEBUG)
{ ok = (/* allocate pseudos */
fprintf (stderr, ("extra_constraint:\n" regno >= FIRST_PSEUDO_REGISTER
"reload_completed: %d\n" /* strictly check */
"reload_in_progress: %d\n"), || regno == REG_Z || regno == REG_Y
reload_completed, reload_in_progress); /* XXX frame & arg pointer checks */
debug_rtx (x); || xx == frame_pointer_rtx
} || xx == arg_pointer_rtx);
if (regno >= FIRST_PSEUDO_REGISTER)
return 1; /* allocate pseudos */ if (avr_log.constraints)
else if (regno == REG_Z || regno == REG_Y) avr_edump ("\n%?=%d reload_completed=%d reload_in_progress=%d\n %r\n",
return 1; /* strictly check */ ok, reload_completed, reload_in_progress, x);
else if (xx == frame_pointer_rtx
|| xx == arg_pointer_rtx)
return 1; /* XXX frame & arg pointer checks */
} }
return 0;
return ok;
} }
/* Convert condition code CONDITION to the valid AVR condition code. */ /* Convert condition code CONDITION to the valid AVR condition code. */
......
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