On 19/08/14 16:25, Richard Henderson wrote:
On 08/19/2014 06:29 AM, Kyrill Tkachov wrote:
+(define_special_predicate "cc_register_zero"
+ (and (match_code "reg")
+ (and (match_test "REGNO (op) == CC_REGNUM")
+ (ior (match_test "mode == GET_MODE (op)")
+ (ior (match_test "mode == VOIDmode
+ && GET_MODE_CLASS (GET_MODE (op)) ==
MODE_CC")
+ (match_test "mode == CCmode || mode == CC_Zmode
+ || mode == CC_NZmode")))))
+)
Well, you're being too liberal with the modes you're accepting, since 'mode'
will always be VOIDmode.
And personally I find those match_tests quite ugly. Better as:
(define_special_predicate "cc_register_zero"
(match_code "reg")
{
return (REGNO (op) == CC_REGNUM
&& (GET_MODE (op) == CCmode
|| GET_MODE (op) == CC_Zmode
|| GET_MODE (op) == CC_NZmode));
})
Hi Richard,
Like this? I wasn't particularly confident on the difference between
'mode' and GET_MODE (op).
If 'mode' is always going to be VOIDmode, shall I fix up cc_register
above it similarly to this?
Kyrill
r~
commit f466fa0e61bf1475a925abe7031debc66c21e584
Author: Kyrylo Tkachov <kyrylo.tkac...@arm.com>
Date: Mon Aug 4 16:49:24 2014 +0100
[AArch64] Use CC_NZ in csinc pattern
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
index 3c51fd3..f172d56 100644
--- a/gcc/config/aarch64/aarch64.md
+++ b/gcc/config/aarch64/aarch64.md
@@ -2599,7 +2599,7 @@ (define_insn "aarch64_<crc_variant>"
(define_insn "*csinc2<mode>_insn"
[(set (match_operand:GPI 0 "register_operand" "=r")
(plus:GPI (match_operator:GPI 2 "aarch64_comparison_operator"
- [(match_operand:CC 3 "cc_register" "") (const_int 0)])
+ [(match_operand 3 "cc_register_zero" "") (const_int 0)])
(match_operand:GPI 1 "register_operand" "r")))]
""
"csinc\\t%<w>0, %<w>1, %<w>1, %M2"
@@ -2610,7 +2610,7 @@ (define_insn "csinc3<mode>_insn"
[(set (match_operand:GPI 0 "register_operand" "=r")
(if_then_else:GPI
(match_operator:GPI 1 "aarch64_comparison_operator"
- [(match_operand:CC 2 "cc_register" "") (const_int 0)])
+ [(match_operand 2 "cc_register_zero" "") (const_int 0)])
(plus:GPI (match_operand:GPI 3 "register_operand" "r")
(const_int 1))
(match_operand:GPI 4 "aarch64_reg_or_zero" "rZ")))]
@@ -2623,7 +2623,7 @@ (define_insn "*csinv3<mode>_insn"
[(set (match_operand:GPI 0 "register_operand" "=r")
(if_then_else:GPI
(match_operator:GPI 1 "aarch64_comparison_operator"
- [(match_operand:CC 2 "cc_register" "") (const_int 0)])
+ [(match_operand 2 "cc_register_zero" "") (const_int 0)])
(not:GPI (match_operand:GPI 3 "register_operand" "r"))
(match_operand:GPI 4 "aarch64_reg_or_zero" "rZ")))]
""
@@ -2635,7 +2635,7 @@ (define_insn "*csneg3<mode>_insn"
[(set (match_operand:GPI 0 "register_operand" "=r")
(if_then_else:GPI
(match_operator:GPI 1 "aarch64_comparison_operator"
- [(match_operand:CC 2 "cc_register" "") (const_int 0)])
+ [(match_operand 2 "cc_register_zero" "") (const_int 0)])
(neg:GPI (match_operand:GPI 3 "register_operand" "r"))
(match_operand:GPI 4 "aarch64_reg_or_zero" "rZ")))]
""
diff --git a/gcc/config/aarch64/predicates.md b/gcc/config/aarch64/predicates.md
index 3dd83ca..a2f9bd1 100644
--- a/gcc/config/aarch64/predicates.md
+++ b/gcc/config/aarch64/predicates.md
@@ -26,6 +26,15 @@ (define_special_predicate "cc_register"
&& GET_MODE_CLASS (GET_MODE (op)) == MODE_CC"))))
)
+(define_special_predicate "cc_register_zero"
+ (match_code "reg")
+{
+ return (REGNO (op) == CC_REGNUM
+ && (GET_MODE (op) == CCmode
+ || GET_MODE (op) == CC_Zmode
+ || GET_MODE (op) == CC_NZmode));
+})
+
(define_predicate "aarch64_call_insn_operand"
(ior (match_code "symbol_ref")
(match_operand 0 "register_operand")))
