* config/i386/i386-features.c

	(general_scalar_chain::compute_convert_gain):
	Correct cost for double-word shifts.
	(general_scalar_to_vector_candidate_p): Reject count operands
	greater or equal to mode bitsize.

From-SVN: r275055

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f73e8be7df2ae6572369cd237322dc6d5dedd692..e09649766e321c0d9a6722abf4ce4925da01a021 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-08-29  Uroš Bizjak  <ubizjak@gmail.com>
+
+       * config/i386/i386-features.c
+       (general_scalar_chain::compute_convert_gain):
+       Correct cost for double-word shifts.
+       (general_scalar_to_vector_candidate_p): Reject count operands
+       greater or equal to mode bitsize.
+
 2019-08-29  Uroš Bizjak  <ubizjak@gmail.com>
 
        * config/i386/i386.c (inline_secondary_memory_needed): Return true

diff --git a/gcc/config/i386/i386-features.c b/gcc/config/i386/i386-features.c
index 03f33f8b0b03b6780b67b085ef8dbfa4d7b1d4d3..454eeaebef9f2a2e3b2abf00cd66abd7f5327943 100644 (file)
--- a/gcc/config/i386/i386-features.c
+++ b/gcc/config/i386/i386-features.c
@@ -549,11 +549,18 @@ general_scalar_chain::compute_convert_gain ()
               || GET_CODE (src) == ASHIFTRT
               || GET_CODE (src) == LSHIFTRT)
        {
+         if (m == 2)
+           {
+             if (INTVAL (XEXP (src, 1)) >= 32)
+               igain += ix86_cost->add;
+             else
+               igain += ix86_cost->shift_const;
+           }
+
+         igain += ix86_cost->shift_const - ix86_cost->sse_op;
+
          if (CONST_INT_P (XEXP (src, 0)))
            igain -= vector_const_cost (XEXP (src, 0));
-         igain += m * ix86_cost->shift_const - ix86_cost->sse_op;
-         if (INTVAL (XEXP (src, 1)) >= 32)
-           igain -= COSTS_N_INSNS (1);
        }
       else if (GET_CODE (src) == PLUS
               || GET_CODE (src) == MINUS
@@ -1359,7 +1366,7 @@ general_scalar_to_vector_candidate_p (rtx_insn *insn, enum machine_mode mode)
     case ASHIFT:
     case LSHIFTRT:
       if (!CONST_INT_P (XEXP (src, 1))
-         || !IN_RANGE (INTVAL (XEXP (src, 1)), 0, 63))
+         || !IN_RANGE (INTVAL (XEXP (src, 1)), 0, GET_MODE_BITSIZE (mode)-1))
        return false;
       break;