[committed]: i386: Generalize x >> 32-y to x >> -y conversion with multiples of 32

[Uros Bizjak]

Optimize also cases where immediate value is a multiple of 32 for 32-bit
shifts (or multiple of 64 for 64-bit shifts).

gcc/ChangeLog:

    * config/i386/i386.md (*ashl<mode>3_negcnt):
    For SImode shifts allow multiples of 32 (or multiples
    of 64 for DImode shifts) for immediate operand 3.
    (*ashl<mode>3_negcnt_1): Ditto.
    (*<insn><mode>3_negcnt): Ditto.
    (*<insn><mode>3_negcnt_1): Ditto.

Bootstrapped and regression tested on x86_64-linux-gnu {,-m32}.

Uros.

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 399a6a81f9c..df78e4df9d8 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -15906,7 +15906,7 @@ (define_insn_and_split "*ashl<mode>3_negcnt"
              (match_operand 2 "int248_register_operand" "c,r")) 0)))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFT, <MODE>mode, operands)
-   && INTVAL (operands[3]) == <MODE_SIZE> * BITS_PER_UNIT
+   && (INTVAL (operands[3]) & (<MODE_SIZE> * BITS_PER_UNIT - 1)) == 0
    && ix86_pre_reload_split ()"
   "#"
   "&& 1"
@@ -15936,7 +15936,7 @@ (define_insn_and_split "*ashl<mode>3_negcnt_1"
            (match_operand:QI 2 "register_operand" "c,r"))))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (ASHIFT, <MODE>mode, operands)
-   && INTVAL (operands[3]) == <MODE_SIZE> * BITS_PER_UNIT
+   && (INTVAL (operands[3]) & (<MODE_SIZE> * BITS_PER_UNIT - 1)) == 0
    && ix86_pre_reload_split ()"
   "#"
   "&& 1"
@@ -16688,7 +16688,7 @@ (define_insn_and_split "*<insn><mode>3_negcnt"
              (match_operand 2 "int248_register_operand" "c,r")) 0)))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)
-   && INTVAL (operands[3]) == <MODE_SIZE> * BITS_PER_UNIT
+   && (INTVAL (operands[3]) & (<MODE_SIZE> * BITS_PER_UNIT - 1)) == 0
    && ix86_pre_reload_split ()"
   "#"
   "&& 1"
@@ -16718,7 +16718,7 @@ (define_insn_and_split "*<insn><mode>3_negcnt_1"
            (match_operand:QI 2 "register_operand" "c,r"))))
    (clobber (reg:CC FLAGS_REG))]
   "ix86_binary_operator_ok (<CODE>, <MODE>mode, operands)
-   && INTVAL (operands[3]) == <MODE_SIZE> * BITS_PER_UNIT
+   && (INTVAL (operands[3]) & (<MODE_SIZE> * BITS_PER_UNIT - 1)) == 0
    && ix86_pre_reload_split ()"
   "#"
   "&& 1"