diff mbox series

xtensa: Minor fix for FP constant synthesis

Message ID 4341501e-8903-baf9-f831-3328bb86907d@yahoo.co.jp
State Committed
Commit e85c94d1c83072d7b894e44009e876dd41ff778a
Headers
Series xtensa: Minor fix for FP constant synthesis |

Commit Message

Takayuki 'January June' Suwa July 13, 2022, 11:40 a.m. UTC 
  This patch fixes an non-fatal issue about negative constant values derived
from FP constant synthesis on hosts whose 'long' is wider than 'int32_t'.

And also replaces the dedicated code in FP constant synthesis split
pattern with the appropriate existing function call.

gcc/ChangeLog:

	* config/xtensa/xtensa.md:
	In FP constant synthesis split pattern, subcontract to
	avoid_constant_pool_reference() as in the case of integer,
	because it can handle well too.  And cast to int32_t before
	calling xtensa_constantsynth() in order to ignore upper 32-bit.

gcc/testsuite/ChangeLog:

	* gcc.target/xtensa/constsynth_double.c:
	Modify in order to catch the issue.
---
 gcc/config/xtensa/xtensa.md                   | 35 +++++--------------
 .../gcc.target/xtensa/constsynth_double.c     |  2 +-
 2 files changed, 9 insertions(+), 28 deletions(-)

Comments

Max Filippov July 14, 2022, 7:25 a.m. UTC | #1 
On Wed, Jul 13, 2022 at 4:41 AM Takayuki 'January June' Suwa
<jjsuwa_sys3175@yahoo.co.jp> wrote:
>
> This patch fixes an non-fatal issue about negative constant values derived
> from FP constant synthesis on hosts whose 'long' is wider than 'int32_t'.
>
> And also replaces the dedicated code in FP constant synthesis split
> pattern with the appropriate existing function call.
>
> gcc/ChangeLog:
>
>         * config/xtensa/xtensa.md:
>         In FP constant synthesis split pattern, subcontract to
>         avoid_constant_pool_reference() as in the case of integer,
>         because it can handle well too.  And cast to int32_t before
>         calling xtensa_constantsynth() in order to ignore upper 32-bit.
>
> gcc/testsuite/ChangeLog:
>
>         * gcc.target/xtensa/constsynth_double.c:
>         Modify in order to catch the issue.
> ---
>  gcc/config/xtensa/xtensa.md                   | 35 +++++--------------
>  .../gcc.target/xtensa/constsynth_double.c     |  2 +-
>  2 files changed, 9 insertions(+), 28 deletions(-)

Regtested for target=xtensa-linux-uclibc, no new regressions.
Committed to master.
diff mbox series

Patch

diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
index 9d998589631..6a58d3e2776 100644
--- a/gcc/config/xtensa/xtensa.md
+++ b/gcc/config/xtensa/xtensa.md
@@ -1244,35 +1244,16 @@ 
   "! optimize_debug && reload_completed"
   [(const_int 0)]
 {
-  int i = 0;
-  rtx x = XEXP (operands[1], 0);
-  long l[2];
-  if (SYMBOL_REF_P (x)
-      && CONSTANT_POOL_ADDRESS_P (x))
-    x = get_pool_constant (x);
-  else if (GET_CODE (x) == CONST)
-    {
-      x = XEXP (x, 0);
-      gcc_assert (GET_CODE (x) == PLUS
-		  && SYMBOL_REF_P (XEXP (x, 0))
-		  && CONSTANT_POOL_ADDRESS_P (XEXP (x, 0))
-		  && CONST_INT_P (XEXP (x, 1)));
-      i = INTVAL (XEXP (x, 1));
-      gcc_assert (i == 0 || i == 4);
-      i /= 4;
-      x = get_pool_constant (XEXP (x, 0));
-    }
-  else
-    gcc_unreachable ();
-  if (GET_MODE (x) == SFmode)
-    REAL_VALUE_TO_TARGET_SINGLE (*CONST_DOUBLE_REAL_VALUE (x), l[0]);
-  else if (GET_MODE (x) == DFmode)
-    REAL_VALUE_TO_TARGET_DOUBLE (*CONST_DOUBLE_REAL_VALUE (x), l);
-  else
+  rtx x = avoid_constant_pool_reference (operands[1]);
+  long l;
+  HOST_WIDE_INT value;
+  if (! CONST_DOUBLE_P (x) || GET_MODE (x) != SFmode)
     FAIL;
+  REAL_VALUE_TO_TARGET_SINGLE (*CONST_DOUBLE_REAL_VALUE (x), l);
   x = gen_rtx_REG (SImode, REGNO (operands[0]));
-  if (! xtensa_constantsynth (x, l[i]))
-    emit_move_insn (x, GEN_INT (l[i]));
+  value = (int32_t)l;
+  if (! xtensa_constantsynth (x, value))
+    emit_move_insn (x, GEN_INT (value));
   DONE;
 })
 
diff --git a/gcc/testsuite/gcc.target/xtensa/constsynth_double.c b/gcc/testsuite/gcc.target/xtensa/constsynth_double.c
index 890ca504780..5fba6a98650 100644
--- a/gcc/testsuite/gcc.target/xtensa/constsynth_double.c
+++ b/gcc/testsuite/gcc.target/xtensa/constsynth_double.c
@@ -5,7 +5,7 @@  void test(unsigned int count, double array[])
 {
   unsigned int i;
   for (i = 0; i < count; ++i)
-    array[i] = 1.0;
+    array[i] = 8.988474246316506e+307;
 }
 
 /* { dg-final { scan-assembler-not "l32r" } } */