[2/2] xtensa: The use of CLAMPS instruction also requires TARGET_MINMAX, as well as TARGET_CLAMPS
Checks
Commit Message
Because both smin and smax requiring TARGET_MINMAX are essential to the
RTL representation.
gcc/ChangeLog:
* config/xtensa/xtensa.cc (xtensa_match_CLAMPS_imms_p):
Simplify.
* config/xtensa/xtensa.md (*xtensa_clamps):
Add TARGET_MINMAX to the condition.
---
gcc/config/xtensa/xtensa.cc | 7 ++-----
gcc/config/xtensa/xtensa.md | 4 ++--
2 files changed, 4 insertions(+), 7 deletions(-)
Comments
On Sat, Jul 1, 2023 at 10:21 AM Takayuki 'January June' Suwa
<jjsuwa_sys3175@yahoo.co.jp> wrote:
>
> Because both smin and smax requiring TARGET_MINMAX are essential to the
> RTL representation.
>
> gcc/ChangeLog:
>
> * config/xtensa/xtensa.cc (xtensa_match_CLAMPS_imms_p):
> Simplify.
> * config/xtensa/xtensa.md (*xtensa_clamps):
> Add TARGET_MINMAX to the condition.
> ---
> gcc/config/xtensa/xtensa.cc | 7 ++-----
> gcc/config/xtensa/xtensa.md | 4 ++--
> 2 files changed, 4 insertions(+), 7 deletions(-)
Regtested for target=xtensa-linux-uclibc, no new regressions.
Committed to master.
@@ -2649,11 +2649,8 @@ xtensa_emit_add_imm (rtx dst, rtx src, HOST_WIDE_INT imm, rtx scratch,
bool
xtensa_match_CLAMPS_imms_p (rtx cst_max, rtx cst_min)
{
- int max, min;
-
- return IN_RANGE (max = exact_log2 (-INTVAL (cst_max)), 7, 22)
- && IN_RANGE (min = exact_log2 (INTVAL (cst_min) + 1), 7, 22)
- && max == min;
+ return IN_RANGE (exact_log2 (-INTVAL (cst_max)), 7, 22)
+ && (INTVAL (cst_max) + INTVAL (cst_min)) == -1;
}
@@ -522,7 +522,7 @@
(smax:SI (smin:SI (match_operand:SI 1 "register_operand" "r")
(match_operand:SI 2 "const_int_operand" "i"))
(match_operand:SI 3 "const_int_operand" "i")))]
- "TARGET_CLAMPS
+ "TARGET_MINMAX && TARGET_CLAMPS
&& xtensa_match_CLAMPS_imms_p (operands[3], operands[2])"
"#"
"&& 1"
@@ -540,7 +540,7 @@
(smin:SI (smax:SI (match_operand:SI 1 "register_operand" "r")
(match_operand:SI 2 "const_int_operand" "i"))
(match_operand:SI 3 "const_int_operand" "i")))]
- "TARGET_CLAMPS
+ "TARGET_MINMAX && TARGET_CLAMPS
&& xtensa_match_CLAMPS_imms_p (operands[2], operands[3])"
{
static char result[64];