aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Earnshaw <rearnsha@arm.com>2015-09-24 09:40:06 +0000
committerRichard Earnshaw <rearnsha@gcc.gnu.org>2015-09-24 09:40:06 +0000
commit4dfe21acc2072b7dd35cd57ced94cf880b896158 (patch)
treefebf915b6babe064024fc102cdb1a878c5287c89
parent60dd79ca89f7eb0c4bded86766c7d17d171aba7f (diff)
downloadgcc-4dfe21acc2072b7dd35cd57ced94cf880b896158.zip
gcc-4dfe21acc2072b7dd35cd57ced94cf880b896158.tar.gz
gcc-4dfe21acc2072b7dd35cd57ced94cf880b896158.tar.bz2
ARM: fp16 Fix PR 67624 - Incorrect conversion of float Infinity to __fp16
PR libgcc/67624 libgcc: * config/arm/fp16.c (__gnu_f2h_internal): Handle infinity correctly. gcc/testsuite: * gcc.target/arm/fp16-inf.c: New test. From-SVN: r228082
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.target/arm/fp16-inf.c14
-rw-r--r--libgcc/ChangeLog5
-rw-r--r--libgcc/config/arm/fp16.c7
4 files changed, 29 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6dc9d9e..fe4f67f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-24 Richard Earnshaw <rearnsha@arm.com>
+
+ PR libgcc/67624
+ * gcc.target/arm/fp16-inf.c: New test.
+
2015-09-24 Kirill Yukhin <kirill.yukhin@intel.com>
* gcc.target/i386/avx512vbmi-check.h (main): Fix register
diff --git a/gcc/testsuite/gcc.target/arm/fp16-inf.c b/gcc/testsuite/gcc.target/arm/fp16-inf.c
new file mode 100644
index 0000000..ce5c197
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/fp16-inf.c
@@ -0,0 +1,14 @@
+/* { dg-do run } */
+/* { dg-options "-O -mfp16-format=ieee" } */
+
+/* Conversion of infinity to __fp16 and back again should preserve the
+ value. */
+volatile float f = __builtin_inf ();
+
+int main ()
+{
+ __fp16 h = f;
+ if (h != __builtin_inf ())
+ __builtin_abort ();
+ return 0;
+}
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index cc5c2c3..dee1c11 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-24 Richard Earnshaw <rearnsha@arm.com>
+
+ PR libgcc/67624
+ * config/arm/fp16.c (__gnu_f2h_internal): Handle infinity correctly.
+
2015-09-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* config.host (*-*-solaris2*): Add t-crtstuff-pic to tmake_file.
diff --git a/libgcc/config/arm/fp16.c b/libgcc/config/arm/fp16.c
index 86a6348..8eaae2b 100644
--- a/libgcc/config/arm/fp16.c
+++ b/libgcc/config/arm/fp16.c
@@ -35,9 +35,12 @@ __gnu_f2h_internal(unsigned int a, int ieee)
{
if (!ieee)
return sign;
+ if (mantissa == 0)
+ return sign | 0x7c00; /* Infinity. */
+ /* Remaining cases are NaNs. Convert SNaN to QNaN. */
return sign | 0x7e00 | (mantissa >> 13);
}
-
+
if (aexp == 0 && mantissa == 0)
return sign;
@@ -49,7 +52,7 @@ __gnu_f2h_internal(unsigned int a, int ieee)
{
mask = 0x00ffffff;
if (aexp >= -25)
- mask >>= 25 + aexp;
+ mask >>= 25 + aexp;
}
else
mask = 0x00001fff;