On Mon, Jul 25, 2011 at 2:58 AM, Paolo Bonzini <bonz...@gnu.org> wrote:
> On 07/13/2011 07:48 PM, H.J. Lu wrote:
>>
>> Here is the patch. OK for trunk?
>
> Again, at least you should explain clearly _why_ you need
> ignore_address_wrap_around. You said elsewhere x32 should be first clean,
> then fast.
>
>> if (GET_CODE (x) == SUBREG && SUBREG_PROMOTED_VAR_P (x)
>> && GET_MODE_SIZE (GET_MODE (SUBREG_REG (x))) >= GET_MODE_SIZE (mode)
>> && SUBREG_PROMOTED_UNSIGNED_P (x) == unsignedp)
>> + {
>> + if (no_emit)
>> + x = rtl_hooks.gen_lowpart_no_emit (mode, x);
>> + else
>> + x = gen_lowpart (mode, x);
>> + }
>> @@ -773,7 +781,10 @@ convert_modes (enum machine_mode mode, enum
>> machine_mode oldmode, rtx x, int uns
>> return gen_int_mode (val, mode);
>> }
>>
>> - return gen_lowpart (mode, x);
>> + if (no_emit)
>> + return rtl_hooks.gen_lowpart_no_emit (mode, x);
>> + else
>> + return gen_lowpart (mode, x);
>> }
>
> These should be
>
> rtx tem = rtl_hooks.gen_lowpart_no_emit (mode, x);
> if (tem)
> x = tem;
>
> rtx tem = rtl_hooks.gen_lowpart_no_emit (mode, x);
> if (tem)
> return x;
>
> since the "emitting" case can just reuse the code below. However, see the
> patch I'm sending now.
>
> Paolo
>
Here is the updated patch. OK for trunk?
Thanks.
--
H.J.
----
2011-07-27 H.J. Lu <hongjiu...@intel.com>
PR middle-end/49721
* explow.c (convert_memory_address_addr_space_1): New.
(convert_memory_address_addr_space): Use it.
* expr.c (convert_modes_1): New.
(convert_modes): Use it.
* expr.h (convert_modes_1): New.
* rtl.h (convert_memory_address_addr_space_1): New.
(convert_memory_address_1): Likewise.
* simplify-rtx.c (simplify_unary_operation_1): Call
convert_memory_address_1 instead of convert_memory_address.
2011-07-27 H.J. Lu <hongjiu...@intel.com>
PR middle-end/49721
* explow.c (convert_memory_address_addr_space_1): New.
(convert_memory_address_addr_space): Use it.
* expr.c (convert_modes_1): New.
(convert_modes): Use it.
* expr.h (convert_modes_1): New.
* rtl.h (convert_memory_address_addr_space_1): New.
(convert_memory_address_1): Likewise.
* simplify-rtx.c (simplify_unary_operation_1): Call
convert_memory_address_1 instead of convert_memory_address.
diff --git a/gcc/explow.c b/gcc/explow.c
index 3c692f4..1b2b4e9 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -317,11 +317,16 @@ break_out_memory_refs (rtx x)
an address in the address space's address mode, or vice versa (TO_MODE says
which way). We take advantage of the fact that pointers are not allowed to
overflow by commuting arithmetic operations over conversions so that address
- arithmetic insns can be used. */
+ arithmetic insns can be used. If IRNORE_ADDRESS_WRAP_AROUND is TRUE, we
+ also permute the conversion and addition of a constant. It is used to
+ optimize cases where overflow of base + constant offset won't happen or
+ its behavior is implementation-defined for a given target. */
rtx
-convert_memory_address_addr_space (enum machine_mode to_mode ATTRIBUTE_UNUSED,
- rtx x, addr_space_t as ATTRIBUTE_UNUSED)
+convert_memory_address_addr_space_1 (enum machine_mode to_mode ATTRIBUTE_UNUSED,
+ rtx x, addr_space_t as ATTRIBUTE_UNUSED,
+ bool no_emit ATTRIBUTE_UNUSED,
+ bool ignore_address_wrap_around ATTRIBUTE_UNUSED)
{
#ifndef POINTERS_EXTEND_UNSIGNED
gcc_assert (GET_MODE (x) == to_mode || GET_MODE (x) == VOIDmode);
@@ -377,28 +382,28 @@ convert_memory_address_addr_space (enum machine_mode to_mode ATTRIBUTE_UNUSED,
break;
case CONST:
- return gen_rtx_CONST (to_mode,
- convert_memory_address_addr_space
- (to_mode, XEXP (x, 0), as));
+ temp = convert_memory_address_addr_space_1 (to_mode, XEXP (x, 0),
+ as, no_emit,
+ ignore_address_wrap_around);
+ return temp ? gen_rtx_CONST (to_mode, temp) : temp;
break;
case PLUS:
case MULT:
- /* For addition we can safely permute the conversion and addition
- operation if one operand is a constant and converting the constant
- does not change it or if one operand is a constant and we are
- using a ptr_extend instruction (POINTERS_EXTEND_UNSIGNED < 0).
- We can always safely permute them if we are making the address
- narrower. */
+ /* For addition, we can safely permute the conversion and addition
+ operation if one operand is a constant and we are using a
+ ptr_extend instruction (POINTERS_EXTEND_UNSIGNED < 0) or address
+ wrap-around is ignored. We can always safely permute them if
+ we are making the address narrower. */
if (GET_MODE_SIZE (to_mode) < GET_MODE_SIZE (from_mode)
|| (GET_CODE (x) == PLUS
&& CONST_INT_P (XEXP (x, 1))
- && (XEXP (x, 1) == convert_memory_address_addr_space
- (to_mode, XEXP (x, 1), as)
- || POINTERS_EXTEND_UNSIGNED < 0)))
+ && (POINTERS_EXTEND_UNSIGNED < 0
+ || ignore_address_wrap_around)))
return gen_rtx_fmt_ee (GET_CODE (x), to_mode,
- convert_memory_address_addr_space
- (to_mode, XEXP (x, 0), as),
+ convert_memory_address_addr_space_1
+ (to_mode, XEXP (x, 0), as, no_emit,
+ ignore_address_wrap_around),
XEXP (x, 1));
break;
@@ -406,10 +411,17 @@ convert_memory_address_addr_space (enum machine_mode to_mode ATTRIBUTE_UNUSED,
break;
}
- return convert_modes (to_mode, from_mode,
- x, POINTERS_EXTEND_UNSIGNED);
+ return convert_modes_1 (to_mode, from_mode, x,
+ POINTERS_EXTEND_UNSIGNED, no_emit);
#endif /* defined(POINTERS_EXTEND_UNSIGNED) */
}
+
+rtx
+convert_memory_address_addr_space (enum machine_mode to_mode,
+ rtx x, addr_space_t as)
+{
+ return convert_memory_address_addr_space_1 (to_mode, x, as, false, true);
+}
/* Return something equivalent to X but valid as a memory address for something
of mode MODE in the named address space AS. When X is not itself valid,
diff --git a/gcc/expr.c b/gcc/expr.c
index 27bca17..d57651b 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -693,13 +693,16 @@ convert_to_mode (enum machine_mode mode, rtx x, int unsignedp)
Both modes may be floating, or both integer.
UNSIGNEDP is nonzero if X is an unsigned value.
+ If NO_EMIT is true, don't emit any instructions.
+
This can be done by referring to a part of X in place
or by copying to a new temporary with conversion.
You can give VOIDmode for OLDMODE, if you are sure X has a nonvoid mode. */
rtx
-convert_modes (enum machine_mode mode, enum machine_mode oldmode, rtx x, int unsignedp)
+convert_modes_1 (enum machine_mode mode, enum machine_mode oldmode,
+ rtx x, int unsignedp, bool no_emit)
{
rtx temp;
@@ -709,7 +712,16 @@ convert_modes (enum machine_mode mode, enum machine_mode oldmode, rtx x, int uns
if (GET_CODE (x) == SUBREG && SUBREG_PROMOTED_VAR_P (x)
&& GET_MODE_SIZE (GET_MODE (SUBREG_REG (x))) >= GET_MODE_SIZE (mode)
&& SUBREG_PROMOTED_UNSIGNED_P (x) == unsignedp)
- x = gen_lowpart (mode, x);
+ {
+ temp = rtl_hooks.gen_lowpart_no_emit (mode, x);
+ if (temp)
+ x = temp;
+ else
+ {
+ gcc_assert (!no_emit);
+ x = gen_lowpart (mode, x);
+ }
+ }
if (GET_MODE (x) != VOIDmode)
oldmode = GET_MODE (x);
@@ -773,6 +785,10 @@ convert_modes (enum machine_mode mode, enum machine_mode oldmode, rtx x, int uns
return gen_int_mode (val, mode);
}
+ temp = rtl_hooks.gen_lowpart_no_emit (mode, x);
+ if (temp)
+ return temp;
+ gcc_assert (!no_emit);
return gen_lowpart (mode, x);
}
@@ -784,10 +800,20 @@ convert_modes (enum machine_mode mode, enum machine_mode oldmode, rtx x, int uns
return simplify_gen_subreg (mode, x, oldmode, 0);
}
+ if (no_emit)
+ return NULL_RTX;
+
temp = gen_reg_rtx (mode);
convert_move (temp, x, unsignedp);
return temp;
}
+
+rtx
+convert_modes (enum machine_mode mode, enum machine_mode oldmode,
+ rtx x, int unsignedp)
+{
+ return convert_modes_1 (mode, oldmode, x, unsignedp, false);
+}
/* Return the largest alignment we can use for doing a move (or store)
of MAX_PIECES. ALIGN is the largest alignment we could use. */
diff --git a/gcc/expr.h b/gcc/expr.h
index cb4050d..2ac9788 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -267,6 +267,8 @@ extern rtx convert_to_mode (enum machine_mode, rtx, int);
/* Convert an rtx to MODE from OLDMODE and return the result. */
extern rtx convert_modes (enum machine_mode, enum machine_mode, rtx, int);
+extern rtx convert_modes_1 (enum machine_mode, enum machine_mode, rtx,
+ int, bool);
/* Emit code to move a block Y to a block X. */
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 1490bfe..3818db4 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1658,8 +1658,14 @@ extern int byte_lowpart_offset (enum machine_mode, enum machine_mode);
extern rtx make_safe_from (rtx, rtx);
extern rtx convert_memory_address_addr_space (enum machine_mode, rtx,
addr_space_t);
+extern rtx convert_memory_address_addr_space_1 (enum machine_mode, rtx,
+ addr_space_t, bool, bool);
#define convert_memory_address(to_mode,x) \
convert_memory_address_addr_space ((to_mode), (x), ADDR_SPACE_GENERIC)
+#define convert_memory_address_1(to_mode,x,no_emit,ignore_address_wrap_around) \
+ convert_memory_address_addr_space_1 ((to_mode), (x), \
+ ADDR_SPACE_GENERIC, (no_emit), \
+ (ignore_address_wrap_around))
extern const char *get_insn_name (int);
extern rtx get_last_insn_anywhere (void);
extern rtx get_first_nonnote_insn (void);
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 2d7d8dd..3a93ce0 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -1150,7 +1150,7 @@ simplify_unary_operation_1 (enum rtx_code code, enum machine_mode mode, rtx op)
&& REG_P (SUBREG_REG (op))
&& REG_POINTER (SUBREG_REG (op))
&& GET_MODE (SUBREG_REG (op)) == Pmode)))
- return convert_memory_address (Pmode, op);
+ return convert_memory_address_1 (Pmode, op, true, false);
#endif
break;
@@ -1243,7 +1243,7 @@ simplify_unary_operation_1 (enum rtx_code code, enum machine_mode mode, rtx op)
&& REG_P (SUBREG_REG (op))
&& REG_POINTER (SUBREG_REG (op))
&& GET_MODE (SUBREG_REG (op)) == Pmode)))
- return convert_memory_address (Pmode, op);
+ return convert_memory_address_1 (Pmode, op, true, false);
#endif
break;
