[PATCH 2/2] xtensa: The use of CLAMPS instruction also requires TARGET_MINMAX, as well as TARGET_CLAMPS

[Takayuki 'January June' Suwa via Gcc-patches]

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(-)

diff --git a/gcc/config/xtensa/xtensa.cc b/gcc/config/xtensa/xtensa.cc
index dd35e63c094..3298d53493c 100644
--- a/gcc/config/xtensa/xtensa.cc
+++ b/gcc/config/xtensa/xtensa.cc
@@ -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;
 }
 
 
diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
index b1af08eba8a..664424f1239 100644
--- a/gcc/config/xtensa/xtensa.md
+++ b/gcc/config/xtensa/xtensa.md
@@ -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];
-- 
2.30.2