diff mbox

[alpha] : Some further HWI == 64 improvements

Message ID CAFULd4ZSmtLLZQTGPOP4W5mt7nATT_zZdad8OCqHBhnsp_d9cA@mail.gmail.com
State New
Headers show

Commit Message

Uros Bizjak May 14, 2015, 3:32 p.m. UTC 
On Wed, May 13, 2015 at 9:05 PM, Richard Henderson <rth@redhat.com> wrote:
> On 05/13/2015 10:53 AM, Uros Bizjak wrote:
>> The only part that actually processes CONST_WIDE_INT is
>> alpha_legitimate_constant and movti expander. The latter immediately
>> splits any TImode CONST_WIDE_INTs.
>>
>
> Indeed.  Also probably worth cleaning up is using CONST_SCALAR_INT_P, where
> both CONST_INT and CONST_WIDE_INT are allowed.

I will do this in the last patch, when all uses of CONST_WIDE_INT and
CONST_DOUBLE are reviewed.

For now, I have prepared following patch that cleans
alpha_extract_integer and callers.  Please also note that
alpha_legitimate_constant_p now checks full 128 bit constant.

2015-05-14  Uros Bizjak  <ubizjak@gmail.com>

    * config/alpha/alpha.c (alpha_extract_integer): Do not handle
    CONST_WIDE_INT and CONST_DOUBLE.  Assert CONST_INT_P (x).
    (alpha_legitimate_constant_p) <case CONST_WIDE_INT>: Check high and
    low part of the constant using alpha_emit_set_const_1.
    (alpha_expand_mov): Do not handle CONST_WIDE_INT and CONST_DOUBLE.

The patch passes bootstrap on alphaev68-linux-gnu, regression test is
in progress.

OK if regtest passes?

Uros.

Comments

Richard Henderson May 14, 2015, 3:43 p.m. UTC | #1 
On 05/14/2015 08:32 AM, Uros Bizjak wrote:
> 2015-05-14  Uros Bizjak  <ubizjak@gmail.com>
> 
>     * config/alpha/alpha.c (alpha_extract_integer): Do not handle
>     CONST_WIDE_INT and CONST_DOUBLE.  Assert CONST_INT_P (x).
>     (alpha_legitimate_constant_p) <case CONST_WIDE_INT>: Check high and
>     low part of the constant using alpha_emit_set_const_1.
>     (alpha_expand_mov): Do not handle CONST_WIDE_INT and CONST_DOUBLE.
> 
> The patch passes bootstrap on alphaev68-linux-gnu, regression test is
> in progress.
> 
> OK if regtest passes?

Looks good.


r~
diff mbox

Patch

Index: config/alpha/alpha.c
===================================================================
--- config/alpha/alpha.c	(revision 223190)
+++ config/alpha/alpha.c	(working copy)
@@ -2105,8 +2105,7 @@  alpha_emit_set_long_const (rtx target, HOST_WIDE_I
   return target;
 }
 
-/* Given an integral CONST_INT, CONST_WIDE_INT, CONST_DOUBLE,
-   or CONST_VECTOR, return the low 64 bits.  */
+/* Given an integral CONST_INT or CONST_VECTOR, return the low 64 bits.  */
 
 static HOST_WIDE_INT
 alpha_extract_integer (rtx x)
@@ -2114,17 +2113,9 @@  alpha_extract_integer (rtx x)
   if (GET_CODE (x) == CONST_VECTOR)
     x = simplify_subreg (DImode, x, GET_MODE (x), 0);
 
-  switch (GET_CODE (x))
-    {
-    case CONST_INT:
-      return INTVAL (x);
-    case CONST_WIDE_INT:
-      return CONST_WIDE_INT_ELT (x, 0);
-    case CONST_DOUBLE:
-      return CONST_DOUBLE_LOW (x);
-    default:
-      gcc_unreachable ();
-    }
+  gcc_assert (CONST_INT_P (x));
+
+  return INTVAL (x);
 }
 
 /* Implement TARGET_LEGITIMATE_CONSTANT_P.  This is all constants for which
@@ -2152,7 +2143,6 @@  alpha_legitimate_constant_p (machine_mode mode, rt
 
       if (GET_CODE (x) != SYMBOL_REF)
 	return true;
-
       /* FALLTHRU */
 
     case SYMBOL_REF:
@@ -2160,8 +2150,16 @@  alpha_legitimate_constant_p (machine_mode mode, rt
       return SYMBOL_REF_TLS_MODEL (x) == 0;
 
     case CONST_WIDE_INT:
+      if (TARGET_BUILD_CONSTANTS)
+	return true;
       if (x == CONST0_RTX (mode))
 	return true;
+      mode = DImode;
+      gcc_assert (CONST_WIDE_INT_NUNITS (x) == 2);
+      i0 = CONST_WIDE_INT_ELT (x, 1);
+      if (alpha_emit_set_const_1 (NULL_RTX, mode, i0, 3, true) == NULL)
+	return false;
+      i0 = CONST_WIDE_INT_ELT (x, 0);
       goto do_integer;
 
     case CONST_DOUBLE:
@@ -2176,14 +2174,14 @@  alpha_legitimate_constant_p (machine_mode mode, rt
 	return false;
       if (GET_MODE_SIZE (mode) != 8)
 	return false;
-      goto do_integer;
+      /* FALLTHRU */
 
     case CONST_INT:
-    do_integer:
       if (TARGET_BUILD_CONSTANTS)
 	return true;
       i0 = alpha_extract_integer (x);
-      return alpha_emit_set_const_1 (x, mode, i0, 3, true) != NULL;
+    do_integer:
+      return alpha_emit_set_const_1 (NULL_RTX, mode, i0, 3, true) != NULL;
 
     default:
       return false;
@@ -2248,8 +2246,6 @@  alpha_expand_mov (machine_mode mode, rtx *operands
 
   /* Split large integers.  */
   if (CONST_INT_P (operands[1])
-      || GET_CODE (operands[1]) == CONST_WIDE_INT
-      || GET_CODE (operands[1]) == CONST_DOUBLE
       || GET_CODE (operands[1]) == CONST_VECTOR)
     {
       if (alpha_split_const_mov (mode, operands))