[AArch64] PR target/69161: Don't use special predicate for CCmode comparisons in expressions that require matching modes

PR target/69161
	* config/aarch64/predicates.md (aarch64_comparison_operator_mode):
	New predicate.
	(aarch64_comparison_operator): Break overly long line into two.
	(aarch64_comparison_operation): Likewise.
	* config/aarch64/aarch64.md (cstorecc4): Use
	aarch64_comparison_operator_mode instead of
	aarch64_comparison_operator.
	(cstore<mode>4): Likewise.
	(aarch64_cstore<mode>): Likewise.
	(*cstoresi_insn_uxtw): Likewise.
	(cstore<mode>_neg): Likewise.
	(*cstoresi_neg_uxtw): Likewise.

	* gcc.c-torture/compile/pr69161.c: New test.

From-SVN: r233496
This commit is contained in:
Kyrylo Tkachov 2016-02-17 13:42:35 +00:00 committed by Kyrylo Tkachov
parent ac4bf40708
commit a44e0ebb89
5 changed files with 57 additions and 8 deletions

View File

@ -1,3 +1,19 @@
2016-02-17 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
PR target/69161
* config/aarch64/predicates.md (aarch64_comparison_operator_mode):
New predicate.
(aarch64_comparison_operator): Break overly long line into two.
(aarch64_comparison_operation): Likewise.
* config/aarch64/aarch64.md (cstorecc4): Use
aarch64_comparison_operator_mode instead of
aarch64_comparison_operator.
(cstore<mode>4): Likewise.
(aarch64_cstore<mode>): Likewise.
(*cstoresi_insn_uxtw): Likewise.
(cstore<mode>_neg): Likewise.
(*cstoresi_neg_uxtw): Likewise.
2016-02-17 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
PR target/69161

View File

@ -3039,7 +3039,7 @@
(define_expand "cstorecc4"
[(set (match_operand:SI 0 "register_operand")
(match_operator 1 "aarch64_comparison_operator"
(match_operator 1 "aarch64_comparison_operator_mode"
[(match_operand 2 "cc_register")
(match_operand 3 "const0_operand")]))]
""
@ -3051,7 +3051,7 @@
(define_expand "cstore<mode>4"
[(set (match_operand:SI 0 "register_operand" "")
(match_operator:SI 1 "aarch64_comparison_operator"
(match_operator:SI 1 "aarch64_comparison_operator_mode"
[(match_operand:GPF 2 "register_operand" "")
(match_operand:GPF 3 "aarch64_fp_compare_operand" "")]))]
""
@ -3064,7 +3064,7 @@
(define_insn "aarch64_cstore<mode>"
[(set (match_operand:ALLI 0 "register_operand" "=r")
(match_operator:ALLI 1 "aarch64_comparison_operator"
(match_operator:ALLI 1 "aarch64_comparison_operator_mode"
[(match_operand 2 "cc_register" "") (const_int 0)]))]
""
"cset\\t%<w>0, %m1"
@ -3109,7 +3109,7 @@
(define_insn "*cstoresi_insn_uxtw"
[(set (match_operand:DI 0 "register_operand" "=r")
(zero_extend:DI
(match_operator:SI 1 "aarch64_comparison_operator"
(match_operator:SI 1 "aarch64_comparison_operator_mode"
[(match_operand 2 "cc_register" "") (const_int 0)])))]
""
"cset\\t%w0, %m1"
@ -3118,7 +3118,7 @@
(define_insn "cstore<mode>_neg"
[(set (match_operand:ALLI 0 "register_operand" "=r")
(neg:ALLI (match_operator:ALLI 1 "aarch64_comparison_operator"
(neg:ALLI (match_operator:ALLI 1 "aarch64_comparison_operator_mode"
[(match_operand 2 "cc_register" "") (const_int 0)])))]
""
"csetm\\t%<w>0, %m1"
@ -3129,7 +3129,7 @@
(define_insn "*cstoresi_neg_uxtw"
[(set (match_operand:DI 0 "register_operand" "=r")
(zero_extend:DI
(neg:SI (match_operator:SI 1 "aarch64_comparison_operator"
(neg:SI (match_operator:SI 1 "aarch64_comparison_operator_mode"
[(match_operand 2 "cc_register" "") (const_int 0)]))))]
""
"csetm\\t%w0, %m1"

View File

@ -229,10 +229,19 @@
;; True for integer comparisons and for FP comparisons other than LTGT or UNEQ.
(define_special_predicate "aarch64_comparison_operator"
(match_code "eq,ne,le,lt,ge,gt,geu,gtu,leu,ltu,unordered,ordered,unlt,unle,unge,ungt"))
(match_code "eq,ne,le,lt,ge,gt,geu,gtu,leu,ltu,unordered,
ordered,unlt,unle,unge,ungt"))
;; Same as aarch64_comparison_operator but don't ignore the mode.
;; RTL SET operations require their operands source and destination have
;; the same modes, so we can't ignore the modes there. See PR target/69161.
(define_predicate "aarch64_comparison_operator_mode"
(match_code "eq,ne,le,lt,ge,gt,geu,gtu,leu,ltu,unordered,
ordered,unlt,unle,unge,ungt"))
(define_special_predicate "aarch64_comparison_operation"
(match_code "eq,ne,le,lt,ge,gt,geu,gtu,leu,ltu,unordered,ordered,unlt,unle,unge,ungt")
(match_code "eq,ne,le,lt,ge,gt,geu,gtu,leu,ltu,unordered,
ordered,unlt,unle,unge,ungt")
{
if (XEXP (op, 1) != const0_rtx)
return false;

View File

@ -1,3 +1,8 @@
2016-02-17 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
PR target/69161
* gcc.c-torture/compile/pr69161.c: New test.
2016-02-17 David Sherwood <david.sherwood@arm.com>
PR target/69532

View File

@ -0,0 +1,19 @@
/* PR target/69161. */
char a;
int b, c, d, e;
void
foo (void)
{
int f;
for (f = 0; f <= 4; f++)
{
for (d = 0; d < 20; d++)
{
__INTPTR_TYPE__ g = (__INTPTR_TYPE__) & c;
b &= (0 != g) > e;
}
e &= a;
}
}