From cd04e829c3ae244abd711e2597f8b72d6c58c713 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Fri, 6 Aug 2021 14:21:27 +0200 Subject: [PATCH] i386: Fix conditional move reg-to-reg move elimination peepholes [PR101797] MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add missing operand predicate, otherwise any RTX will match. 2021-08-06 Uroš Bizjak gcc/ PR target/101797 * config/i386/i386.md (cmove reg-to-reg move elimination peephole2s): Add general_gr_operand predicate to operand 3. gcc/testsuite/ PR target/101797 * gcc.target/i386/pr101797.c: New test. --- gcc/config/i386/i386.md | 4 ++-- gcc/testsuite/gcc.target/i386/pr101797.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr101797.c diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 51e8b475bca3..bc1c30b77f48 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -19428,7 +19428,7 @@ (parallel [(set (reg FLAGS_REG) (match_operand 5)) (set (match_dup 0) (match_operand:SWI248 6))]) (set (match_operand:SWI248 2 "general_reg_operand") - (match_operand:SWI248 3)) + (match_operand:SWI248 3 "general_gr_operand")) (set (match_dup 0) (if_then_else:SWI248 (match_operator 4 "ix86_comparison_operator" [(reg FLAGS_REG) (const_int 0)]) @@ -19456,7 +19456,7 @@ ;; mov r2,r3; mov r0,r1; dec r0; cmov r0,r2 -> dec r1; mov r0,r3; cmov r0, r1 (define_peephole2 [(set (match_operand:SWI248 2 "general_reg_operand") - (match_operand:SWI248 3)) + (match_operand:SWI248 3 "general_gr_operand")) (set (match_operand:SWI248 0 "general_reg_operand") (match_operand:SWI248 1 "general_reg_operand")) (parallel [(set (reg FLAGS_REG) (match_operand 5)) diff --git a/gcc/testsuite/gcc.target/i386/pr101797.c b/gcc/testsuite/gcc.target/i386/pr101797.c new file mode 100644 index 000000000000..d5cc34e54a84 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr101797.c @@ -0,0 +1,15 @@ +/* PR target/101797 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +int a; +int main() { + int b, c, d, e = 0; + if (a) { + c += a; + e = ~(a % c); + e || c || (b & d); + } + a = e; + return 0; +} -- 2.47.3