From 31aa23df38a66c429d08c06a0005eccecc9234dc Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 2 May 2018 23:56:17 +0200 Subject: [PATCH] re PR target/85582 (wrong code at -O1 and above on x86_64-linux-gnu in 32-bit mode) PR target/85582 * config/i386/i386.md (*ashl3_doubleword_mask, *ashl3_doubleword_mask_1, *3_doubleword_mask, *3_doubleword_mask_1): In condition require that the highest significant bit of the shift count mask is clear. In check whether and[sq]i3 is needed verify that all significant bits of the shift count other than the highest are set. * gcc.c-torture/execute/pr85582-3.c: New test. From-SVN: r259862 --- gcc/ChangeLog | 10 ++++ gcc/config/i386/i386.md | 20 ++++--- gcc/testsuite/ChangeLog | 5 ++ .../gcc.c-torture/execute/pr85582-3.c | 55 +++++++++++++++++++ 4 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr85582-3.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 806f74cc3b7..9074715cf0c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2018-05-02 Jakub Jelinek + + PR target/85582 + * config/i386/i386.md (*ashl3_doubleword_mask, + *ashl3_doubleword_mask_1, *3_doubleword_mask, + *3_doubleword_mask_1): In condition require that + the highest significant bit of the shift count mask is clear. In + check whether and[sq]i3 is needed verify that all significant bits + of the shift count other than the highest are set. + 2018-05-02 Tom de Vries PR libgomp/82428 diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 5913424cfc1..3aa27331187 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -10366,7 +10366,7 @@ (match_operand:SI 2 "register_operand" "c") (match_operand:SI 3 "const_int_operand")) 0))) (clobber (reg:CC FLAGS_REG))] - "INTVAL (operands[3]) <= ( * BITS_PER_UNIT) - 1 + "(INTVAL (operands[3]) & ( * BITS_PER_UNIT)) == 0 && can_create_pseudo_p ()" "#" "&& 1" @@ -10385,7 +10385,8 @@ operands[8] = GEN_INT ( * BITS_PER_UNIT); - if (INTVAL (operands[3]) < ( * BITS_PER_UNIT) - 1) + if ((INTVAL (operands[3]) & (( * BITS_PER_UNIT) - 1)) + != (( * BITS_PER_UNIT) - 1)) { rtx tem = gen_reg_rtx (SImode); emit_insn (gen_andsi3 (tem, operands[2], operands[3])); @@ -10406,7 +10407,7 @@ (match_operand:QI 2 "register_operand" "c") (match_operand:QI 3 "const_int_operand")))) (clobber (reg:CC FLAGS_REG))] - "INTVAL (operands[3]) <= ( * BITS_PER_UNIT) - 1 + "(INTVAL (operands[3]) & ( * BITS_PER_UNIT)) == 0 && can_create_pseudo_p ()" "#" "&& 1" @@ -10425,7 +10426,8 @@ operands[8] = GEN_INT ( * BITS_PER_UNIT); - if (INTVAL (operands[3]) < ( * BITS_PER_UNIT) - 1) + if ((INTVAL (operands[3]) & (( * BITS_PER_UNIT) - 1)) + != (( * BITS_PER_UNIT) - 1)) { rtx tem = gen_reg_rtx (QImode); emit_insn (gen_andqi3 (tem, operands[2], operands[3])); @@ -11126,7 +11128,7 @@ (match_operand:SI 2 "register_operand" "c") (match_operand:SI 3 "const_int_operand")) 0))) (clobber (reg:CC FLAGS_REG))] - "INTVAL (operands[3]) <= ( * BITS_PER_UNIT) - 1 + "(INTVAL (operands[3]) & ( * BITS_PER_UNIT)) == 0 && can_create_pseudo_p ()" "#" "&& 1" @@ -11145,7 +11147,8 @@ operands[8] = GEN_INT ( * BITS_PER_UNIT); - if (INTVAL (operands[3]) < ( * BITS_PER_UNIT)-1) + if ((INTVAL (operands[3]) & (( * BITS_PER_UNIT) - 1)) + != (( * BITS_PER_UNIT) - 1)) { rtx tem = gen_reg_rtx (SImode); emit_insn (gen_andsi3 (tem, operands[2], operands[3])); @@ -11166,7 +11169,7 @@ (match_operand:QI 2 "register_operand" "c") (match_operand:QI 3 "const_int_operand")))) (clobber (reg:CC FLAGS_REG))] - "INTVAL (operands[3]) <= ( * BITS_PER_UNIT) - 1 + "(INTVAL (operands[3]) & ( * BITS_PER_UNIT)) == 0 && can_create_pseudo_p ()" "#" "&& 1" @@ -11185,7 +11188,8 @@ operands[8] = GEN_INT ( * BITS_PER_UNIT); - if (INTVAL (operands[3]) < ( * BITS_PER_UNIT) - 1) + if ((INTVAL (operands[3]) & (( * BITS_PER_UNIT) - 1)) + != (( * BITS_PER_UNIT) - 1)) { rtx tem = gen_reg_rtx (QImode); emit_insn (gen_andqi3 (tem, operands[2], operands[3])); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6ddb945c70e..670845608fa 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-05-02 Jakub Jelinek + + PR target/85582 + * gcc.c-torture/execute/pr85582-3.c: New test. + 2018-05-02 Paolo Carlini Jason Merrill diff --git a/gcc/testsuite/gcc.c-torture/execute/pr85582-3.c b/gcc/testsuite/gcc.c-torture/execute/pr85582-3.c new file mode 100644 index 00000000000..99deb47517f --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr85582-3.c @@ -0,0 +1,55 @@ +/* PR target/85582 */ + +#ifdef __SIZEOF_INT128__ +typedef __int128 S; +typedef unsigned __int128 U; +#else +typedef long long S; +typedef unsigned long long U; +#endif + +__attribute__((noipa)) U +f1 (U x, int y) +{ + return x << (y & -2); +} + +__attribute__((noipa)) S +f2 (S x, int y) +{ + return x >> (y & -2); +} + +__attribute__((noipa)) U +f3 (U x, int y) +{ + return x >> (y & -2); +} + +int +main () +{ + U a = (U) 1 << (sizeof (U) * __CHAR_BIT__ - 7); + if (f1 (a, 5) != ((U) 1 << (sizeof (S) * __CHAR_BIT__ - 3))) + __builtin_abort (); + S b = (U) 0x101 << (sizeof (S) * __CHAR_BIT__ / 2 - 7); + if (f1 (b, sizeof (S) * __CHAR_BIT__ / 2) != (U) 0x101 << (sizeof (S) * __CHAR_BIT__ - 7)) + __builtin_abort (); + if (f1 (b, sizeof (S) * __CHAR_BIT__ / 2 + 2) != (U) 0x101 << (sizeof (S) * __CHAR_BIT__ - 5)) + __builtin_abort (); + S c = (U) 1 << (sizeof (S) * __CHAR_BIT__ - 1); + if ((U) f2 (c, 5) != ((U) 0x1f << (sizeof (S) * __CHAR_BIT__ - 5))) + __builtin_abort (); + if ((U) f2 (c, sizeof (S) * __CHAR_BIT__ / 2) != ((U) -1 << (sizeof (S) * __CHAR_BIT__ / 2 - 1))) + __builtin_abort (); + if ((U) f2 (c, sizeof (S) * __CHAR_BIT__ / 2 + 2) != ((U) -1 << (sizeof (S) * __CHAR_BIT__ / 2 - 3))) + __builtin_abort (); + U d = (U) 1 << (sizeof (S) * __CHAR_BIT__ - 1); + if (f3 (c, 5) != ((U) 0x1 << (sizeof (S) * __CHAR_BIT__ - 5))) + __builtin_abort (); + if (f3 (c, sizeof (S) * __CHAR_BIT__ / 2) != ((U) 1 << (sizeof (S) * __CHAR_BIT__ / 2 - 1))) + __builtin_abort (); + if (f3 (c, sizeof (S) * __CHAR_BIT__ / 2 + 2) != ((U) 1 << (sizeof (S) * __CHAR_BIT__ / 2 - 3))) + __builtin_abort (); + return 0; +} -- 2.30.2