Attachment 876303 Details for Bug 1078173 – hdf5-ldouble-ppc64le.patch

[patch] hdf5-ldouble-ppc64le.patch

hdf5-ldouble-ppc64le.patch (text/plain), 4.99 KB, created by Menanteau Guy on 2014-03-19 10:39:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Menanteau Guy

Created: 2014-03-19 10:39:25 UTC

Size: 4.99 KB

patch

obsolete

>--- hdf5-1.8.12/configure.orig
>+++ hdf5-1.8.12/configure
>@@ -30364,6 +30364,13 @@ else
>             unsigned char       s2[8];
>             int                 ret = 1;
>
>+#if defined __powerpc64__ && defined _LITTLE_ENDIAN
>+           /* Don't bother checking on ppc64le, we know it'll work, and
>+              that what hdf5 calls 'special algorithm' simply is
>+              IBM ldouble 128 (i.e. two seperately scaled doubles).
>+              The check below assumes big endian.  */
>+           ret = 0;
>+#endif
>             if(sizeof(long double) == 16 && sizeof(long) == 8) {
>                 /*make sure the long double type has 16 bytes in size and
>                  * 11 bits of exponent.  If it is,
>@@ -30468,6 +30475,13 @@ else
>             unsigned char       s[16];
>             int                 flag=0, ret=1;
>
>+#if defined __powerpc64__ && defined _LITTLE_ENDIAN
>+           /* Don't bother checking on ppc64le, we know it'll work, and
>+              that what hdf5 calls 'special algorithm' simply is
>+              IBM ldouble 128 (i.e. two seperately scaled doubles).
>+              The check below assumes big endian.  */
>+           ret = 0;
>+#endif
>             /*Determine if long double has 16 byte in size, 11 bit exponent, and
>              *the bias is 0x3ff */
>             if(sizeof(long double) == 16) {
>===================================================================
>--- hdf5-1.8.12/configure.ac.orig
>+++ hdf5-1.8.12/configure.ac
>@@ -3768,6 +3768,13 @@ else
>             unsigned char       s2[8];
>             int                 ret = 1;
>
>+#if defined __powerpc64__ && defined _LITTLE_ENDIAN
>+           /* Don't bother checking on ppc64le, we know it'll work, and
>+              that what hdf5 calls 'special algorithm' simply is
>+              IBM ldouble 128 (i.e. two seperately scaled doubles).
>+              The check below assumes big endian.  */
>+           ret = 0;
>+#endif
>             if(sizeof(long double) == 16 && sizeof(long) == 8) {
>                 /*make sure the long double type has 16 bytes in size and
>                  * 11 bits of exponent.  If it is,
>@@ -3846,6 +3853,13 @@ else
>             unsigned char       s[16];
>             int                 flag=0, ret=1;
>
>+#if defined __powerpc64__ && defined _LITTLE_ENDIAN
>+           /* Don't bother checking on ppc64le, we know it'll work, and
>+              that what hdf5 calls 'special algorithm' simply is
>+              IBM ldouble 128 (i.e. two seperately scaled doubles).
>+              The check below assumes big endian.  */
>+           ret = 0;
>+#endif
>             /*Determine if long double has 16 byte in size, 11 bit exponent, and
>              *the bias is 0x3ff */
>             if(sizeof(long double) == 16) {
>===================================================================
>--- hdf5-1.8.12/test/dt_arith.c.orig
>+++ hdf5-1.8.12/test/dt_arith.c
>@@ -3072,7 +3072,18 @@ test_conv_flt_1 (const char *name, int r
>                         buf, saved, nelmts);
> #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
>             } else if(src_type == FLT_LDOUBLE) {
>-                 INIT_FP_SPECIAL(src_size, src_nbits, sendian, LDBL_MANT_DIG, dst_size,
>+                size_t mant_dig = LDBL_MANT_DIG;
>+                if (mant_dig >= src_nbits) {
>+                    /* This happens for IBM long double in little endian.
>+                       The macro LDBL_MANT_DIG says 106 mantissa bits, but the
>+                       HDF5 detection code actually represents it as a normal 64bit
>+                       double (52 bit mantissa) with the upper double being
>+                       unspec bits (which is sort of okay as the testsuite
>+                       wouldn't deal with that format correctly anyway).  So
>+                       override the mantissa size.  */
>+                    mant_dig = 52;
>+                }
>+                 INIT_FP_SPECIAL(src_size, src_nbits, sendian, mant_dig, dst_size,
>                         buf, saved, nelmts);
> #endif
>             } else
>@@ -3808,7 +3819,18 @@ test_conv_int_fp(const char *name, int r
>             INIT_FP_DENORM(long double, LDBL_MANT_DIG, src_size, src_nbits, sendian, dst_size,
>                     buf, saved, nelmts);
>         } else {
>-            INIT_FP_SPECIAL(src_size, src_nbits, sendian, LDBL_MANT_DIG, dst_size, buf, saved, nelmts);
>+           size_t mant_dig = LDBL_MANT_DIG;
>+           if (mant_dig >= src_nbits) {
>+               /* This happens for IBM long double in little endian.
>+                  The macro LDBL_MANT_DIG says 106 mantissa bits, but the
>+                  HDF5 detection code actually represents it as a normal 64bit
>+                  double (52 bit mantissa) with the upper double being
>+                  unspec bits (which is sort of okay as the testsuite
>+                  wouldn't deal with that format correctly anyway).  So
>+                  override the mantissa size.  */
>+               mant_dig = 52;
>+           }
>+            INIT_FP_SPECIAL(src_size, src_nbits, sendian, mant_dig, dst_size, buf, saved, nelmts);
>         }
> #endif
>     } else

Actions: View | Diff

Attachments on bug 1078173: 876303