[gcc(refs/users/meissner/heads/work078)] Revert patch.

[gcc(refs/users/meissner/heads/work078)] Revert patch.

[Michael Meissner]

https://gcc.gnu.org/g:a02470bb51294b1b6d2634aca0a787584bbc5cd6

commit a02470bb51294b1b6d2634aca0a787584bbc5cd6
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Thu Feb 17 00:46:48 2022 -0500

    Revert patch.
    
    2022-02-16  Michael Meissner  <meissner@the-meissners.org>
    
    gcc/
            Revert patch
            PR target/104256
            * config/rs6000/rs6000.cc (rs6000_emit_int_cmove): Don't do
            integer conditional moves if the test involves IEEE comparisons.

Diff:
---
 gcc/config/rs6000/rs6000.cc | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index 10af34fca69..f56cf66313a 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -16181,15 +16181,6 @@ rs6000_emit_int_cmove (rtx dest, rtx op, rtx true_cond, rtx false_cond)
   if (mode != SImode && (!TARGET_POWERPC64 || mode != DImode))
     return false;
 
-  /* Don't do int cmoves for IEEE comparisons.  The rs6000_generate_compare
-     function will eventually raise an exception because the mode used is
-     CCmode (due to this being an int cmove), but you can only do these
-     comparsions with CCFP mode.  */
-  enum rtx_code op_code = GET_CODE (op);
-  if (op_code == ORDERED || op_code == UNORDERED || op_code == UNEQ || op_code == LTGT
-      || op_code == UNGT || op_code == UNLT || op_code == UNGE || op_code == UNLE)
-    return false;
-					
   /* We still have to do the compare, because isel doesn't do a
      compare, it just looks at the CRx bits set by a previous compare
      instruction.  */

[gcc(refs/users/meissner/heads/work078)] Revert patch.

[Michael Meissner]

https://gcc.gnu.org/g:62fe8284eb5e6c15cb666e7cef2b80fc08185ae7

commit 62fe8284eb5e6c15cb666e7cef2b80fc08185ae7
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Thu Feb 17 11:58:11 2022 -0500

    Revert patch.
    
    2022-02-17  Michael Meissner  <meissner@the-meissners.org>
    
    gcc/
            Revert patch.
            PR target/104256
            * config/rs6000/rs6000.cc (rs6000_emit_int_cmove): Don't do
            integer conditional moves if the test involves floating point
            comparisons that can't easily be reversed.
    
    gcc/testsuite/
            Revert patch.
            PR target/104256
            * gcc.target/powerpc/ppc-fortran/pr104254.f90: New test.

Diff:
---
 gcc/config/rs6000/rs6000.cc                        |  9 --------
 .../gcc.target/powerpc/ppc-fortran/pr104254.f90    | 25 ----------------------
 2 files changed, 34 deletions(-)

diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index 820a6ed77b8..f56cf66313a 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -16181,15 +16181,6 @@ rs6000_emit_int_cmove (rtx dest, rtx op, rtx true_cond, rtx false_cond)
   if (mode != SImode && (!TARGET_POWERPC64 || mode != DImode))
     return false;
 
-  /* Don't generate int cmoves for floating point comparisons that might
-     involve NaNs and generate conditions that can't be reversed.  */
-  enum rtx_code op_code = GET_CODE (op);
-  if (GET_MODE (XEXP (op, 0)) == CCFPmode
-      && (!flag_finite_math_only
-	  || op_code == UNLT || op_code == UNLE || op_code == UNGT
-	  || op_code == UNGE || op_code == UNEQ || op_code == LTGT))
-    return false;
-
   /* We still have to do the compare, because isel doesn't do a
      compare, it just looks at the CRx bits set by a previous compare
      instruction.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr104254.f90 b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr104254.f90
deleted file mode 100644
index d1bfab23482..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr104254.f90
+++ /dev/null
@@ -1,25 +0,0 @@
-! { dg-do compile }
-! { dg-require-effective-target powerpc_p9vector_ok }
-! { dg-options "-mdejagnu-cpu=power9 -O1 -fnon-call-exceptions" }
-
-! PR target/104254.  GCC would raise an assertion error if this program was
-! compiled with -O1 and -fnon-call-exceptions on a power9 or higher.  The issue
-! occurs because at this optimization level, the compiler is trying to make
-! a conditional move to store integers using a 32-bit floating point compare.
-! It wants to use UNLE, which is not supported for integer modes.
-  
-  real :: a(2), nan
-  real, allocatable :: c(:)
-  integer :: ia(1)
-
-  nan = 0.0
-  nan = 0.0/nan
-
-  a(:) = nan
-  ia = maxloc (a)
-  if (ia(1).ne.1) STOP 1
-
-  allocate (c(1))
-  c(:) = nan
-  deallocate (c)
-end

[gcc(refs/users/meissner/heads/work078)] Revert patch.

[Michael Meissner]

https://gcc.gnu.org/g:51212c3e384634cdf534394c78268f1d2b313027

commit 51212c3e384634cdf534394c78268f1d2b313027
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Thu Feb 17 10:27:06 2022 -0500

    Revert patch.
    
    2022-02-17  Michael Meissner  <meissner@the-meissners.org>
    
    gcc/
            Revert patch.
            PR target/104256
            * config/rs6000/rs6000.cc (rs6000_emit_int_cmove): Don't do
            integer conditional moves if the test involves IEEE comparisons.
    
    gcc/testsuite/
            Revert patch.
            PR target/104256
            * gcc.target/powerpc/ppc-fortran/pr104254.f90: New test.

Diff:
---
 gcc/config/rs6000/rs6000.cc                        |  9 --------
 .../gcc.target/powerpc/ppc-fortran/pr104254.f90    | 25 ----------------------
 2 files changed, 34 deletions(-)

diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index 10af34fca69..f56cf66313a 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -16181,15 +16181,6 @@ rs6000_emit_int_cmove (rtx dest, rtx op, rtx true_cond, rtx false_cond)
   if (mode != SImode && (!TARGET_POWERPC64 || mode != DImode))
     return false;
 
-  /* Don't do int cmoves for IEEE comparisons.  The rs6000_generate_compare
-     function will eventually raise an exception because the mode used is
-     CCmode (due to this being an int cmove), but you can only do these
-     comparsions with CCFP mode.  */
-  enum rtx_code op_code = GET_CODE (op);
-  if (op_code == ORDERED || op_code == UNORDERED || op_code == UNEQ || op_code == LTGT
-      || op_code == UNGT || op_code == UNLT || op_code == UNGE || op_code == UNLE)
-    return false;
-					
   /* We still have to do the compare, because isel doesn't do a
      compare, it just looks at the CRx bits set by a previous compare
      instruction.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr104254.f90 b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr104254.f90
deleted file mode 100644
index d1bfab23482..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr104254.f90
+++ /dev/null
@@ -1,25 +0,0 @@
-! { dg-do compile }
-! { dg-require-effective-target powerpc_p9vector_ok }
-! { dg-options "-mdejagnu-cpu=power9 -O1 -fnon-call-exceptions" }
-
-! PR target/104254.  GCC would raise an assertion error if this program was
-! compiled with -O1 and -fnon-call-exceptions on a power9 or higher.  The issue
-! occurs because at this optimization level, the compiler is trying to make
-! a conditional move to store integers using a 32-bit floating point compare.
-! It wants to use UNLE, which is not supported for integer modes.
-  
-  real :: a(2), nan
-  real, allocatable :: c(:)
-  integer :: ia(1)
-
-  nan = 0.0
-  nan = 0.0/nan
-
-  a(:) = nan
-  ia = maxloc (a)
-  if (ia(1).ne.1) STOP 1
-
-  allocate (c(1))
-  c(:) = nan
-  deallocate (c)
-end

[gcc(refs/users/meissner/heads/work078)] Revert patch.

[Michael Meissner]

https://gcc.gnu.org/g:9381a7655bc1a4683bbbd2c0eebfd435ba59dcef

commit 9381a7655bc1a4683bbbd2c0eebfd435ba59dcef
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Wed Feb 16 19:32:39 2022 -0500

    Revert patch.
    
    Define __SIZEOF_FLOAT128__ and __SIZEOF_IBM128__.
    
    Define the sizes of the PowerPC specific types __float128 and __ibm128 if those
    types are enabled.
    
    This patch will define __SIZEOF_IBM128__ and __SIZEOF_FLOAT128__ if their
    respective types are created in the compiler.  Currently, this means both of
    these will be defined if float128 support is enabled.  But at some point in
    the future, __ibm128 could be enabled without enabling float128 support and
    __SIZEOF_IBM128__ would be defined.
    
    2022-02-16  Michael Meissner  <meissner@the-meissners.org>
    
    gcc/
            Revert patch.
            PR target/99708
            * config/rs6000/rs6000-c.cc (rs6000_cpu_cpp_builtins): Define
            __SIZEOF_IBM128__ if the IBM 128-bit long double type is created.
            Define __SIZEOF_FLOAT128__ if we have float128 support.
    
    gcc/testsuite/
            Revert patch.
            PR target/99708
            * gcc.target/powerpc/pr99708.c: New test.

Diff:
---
 gcc/config/rs6000/rs6000-c.cc              |  7 +------
 gcc/testsuite/gcc.target/powerpc/pr99708.c | 21 ---------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-c.cc b/gcc/config/rs6000/rs6000-c.cc
index ec4e5c3f53a..15251efc209 100644
--- a/gcc/config/rs6000/rs6000-c.cc
+++ b/gcc/config/rs6000/rs6000-c.cc
@@ -622,13 +622,8 @@ rs6000_cpu_cpp_builtins (cpp_reader *pfile)
     builtin_define ("__RSQRTE__");
   if (TARGET_FRSQRTES)
     builtin_define ("__RSQRTEF__");
-  if (ibm128_float_type_node)
-    builtin_define ("__SIZEOF_IBM128__=16");
   if (TARGET_FLOAT128_TYPE)
-    {
-      builtin_define ("__FLOAT128_TYPE__");
-      builtin_define ("__SIZEOF_FLOAT128__=16");
-    }
+    builtin_define ("__FLOAT128_TYPE__");
 #ifdef TARGET_LIBC_PROVIDES_HWCAP_IN_TCB
   builtin_define ("__BUILTIN_CPU_SUPPORTS__");
 #endif
diff --git a/gcc/testsuite/gcc.target/powerpc/pr99708.c b/gcc/testsuite/gcc.target/powerpc/pr99708.c
deleted file mode 100644
index d478f7bc4c0..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/pr99708.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* { dg-do run } */
-/* { require-effective-target ppc_float128_sw } */
-/* { dg-options "-O2 -mvsx -mfloat128" } */
-
-/*
- * PR target/99708
- *
- * Verify that __SIZEOF_FLOAT128__ and __SIZEOF_IBM128__ are properly defined.
- */
-
-#include <stdlib.h>
-
-int main (void)
-{
-  if (__SIZEOF_FLOAT128__ != sizeof (__float128)
-      || __SIZEOF_IBM128__ != sizeof (__ibm128))
-    abort ();
-
-  return 0;
-}
-

[gcc(refs/users/meissner/heads/work078)] Revert patch.

[Michael Meissner]

https://gcc.gnu.org/g:aefa2b5452ec2d9abb80abd70061fc6a2f95c644

commit aefa2b5452ec2d9abb80abd70061fc6a2f95c644
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Wed Feb 16 15:23:32 2022 -0500

    Revert patch.
    
    Define __SIZEOF_FLOAT128__ and __SIZEOF_IBM128__.
    
    Define the sizes of the PowerPC specific types __float128 and __ibm128 if those
    types are enabled.
    
    2022-02-16  Michael Meissner  <meissner@the-meissners.org>
    
    gcc/
            Revert patch.
            PR target/99708
            * config/rs6000/rs6000-c.cc (rs6000_cpu_cpp_builtins): Define
            __SIZEOF_IBM128__ if the IBM 128-bit long double type is created.
            Define __SIZEOF_FLOAT128__ if we have float128 support.
    
    gcc/testsuite/
            Revert patch.
            PR target/99708
            * gcc.target/powerpc/pr99708.c: New test.

Diff:
---
 gcc/config/rs6000/rs6000-c.cc              |  7 +------
 gcc/testsuite/gcc.target/powerpc/pr99708.c | 21 ---------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-c.cc b/gcc/config/rs6000/rs6000-c.cc
index 17f3d1d92eb..15251efc209 100644
--- a/gcc/config/rs6000/rs6000-c.cc
+++ b/gcc/config/rs6000/rs6000-c.cc
@@ -622,13 +622,8 @@ rs6000_cpu_cpp_builtins (cpp_reader *pfile)
     builtin_define ("__RSQRTE__");
   if (TARGET_FRSQRTES)
     builtin_define ("__RSQRTEF__");
-  if (ibm128_float_type_node)
-    builtin_define ("__SIZEOF_IBM128__");
   if (TARGET_FLOAT128_TYPE)
-    {
-      builtin_define ("__FLOAT128_TYPE__");
-      builtin_define ("__SIZEOF_FLOAT128__=16");
-    }
+    builtin_define ("__FLOAT128_TYPE__");
 #ifdef TARGET_LIBC_PROVIDES_HWCAP_IN_TCB
   builtin_define ("__BUILTIN_CPU_SUPPORTS__");
 #endif
diff --git a/gcc/testsuite/gcc.target/powerpc/pr99708.c b/gcc/testsuite/gcc.target/powerpc/pr99708.c
deleted file mode 100644
index d478f7bc4c0..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/pr99708.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* { dg-do run } */
-/* { require-effective-target ppc_float128_sw } */
-/* { dg-options "-O2 -mvsx -mfloat128" } */
-
-/*
- * PR target/99708
- *
- * Verify that __SIZEOF_FLOAT128__ and __SIZEOF_IBM128__ are properly defined.
- */
-
-#include <stdlib.h>
-
-int main (void)
-{
-  if (__SIZEOF_FLOAT128__ != sizeof (__float128)
-      || __SIZEOF_IBM128__ != sizeof (__ibm128))
-    abort ();
-
-  return 0;
-}
-

[gcc(refs/users/meissner/heads/work078)] Revert patch.

[Michael Meissner]

https://gcc.gnu.org/g:9a4cc0c45f7c0f73ec84bc2716e1588fc40aead7

commit 9a4cc0c45f7c0f73ec84bc2716e1588fc40aead7
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Wed Feb 16 12:51:15 2022 -0500

    Revert patch.
    
    2022-02-15  Michael Meissner  <meissner@the-meissners.org>
    
    gcc/
            Revert patch.
            PR target/99708
            * config/rs6000/rs6000-c.cc (rs6000_target_modify_macros): Define
            __SIZEOF_FLOAT128__ and __SIZEOF_IBM128__ if we have float128
            support.
    
    gcc/testsuite/
            Revert patch.
            PR target/99708
            * gcc.target/powerpc/pr99708.c: New test.

Diff:
---
 gcc/config/rs6000/rs6000-c.cc              | 12 ++----------
 gcc/testsuite/gcc.target/powerpc/pr99708.c | 21 ---------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-c.cc b/gcc/config/rs6000/rs6000-c.cc
index b5f771d1308..15251efc209 100644
--- a/gcc/config/rs6000/rs6000-c.cc
+++ b/gcc/config/rs6000/rs6000-c.cc
@@ -581,17 +581,9 @@ rs6000_target_modify_macros (bool define_p, HOST_WIDE_INT flags,
     {
       rs6000_define_or_undefine_macro (define_p, "__FLOAT128__");
       if (define_p)
-	{
-	  rs6000_define_or_undefine_macro (true, "__float128=__ieee128");
-	  rs6000_define_or_undefine_macro (true, "__SIZEOF_FLOAT128__=16");
-	  rs6000_define_or_undefine_macro (true, "__SIZEOF_IBM128__=16");
-	}
+	rs6000_define_or_undefine_macro (true, "__float128=__ieee128");
       else
-	{
-	  rs6000_define_or_undefine_macro (false, "__float128");
-	  rs6000_define_or_undefine_macro (false, "__SIZEOF_FLOAT128__");
-	  rs6000_define_or_undefine_macro (false, "__SIZEOF_IBM128__");
-	}
+	rs6000_define_or_undefine_macro (false, "__float128");
     }
   /* OPTION_MASK_FLOAT128_HARDWARE can be turned on if -mcpu=power9 is used or
      via the target attribute/pragma.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr99708.c b/gcc/testsuite/gcc.target/powerpc/pr99708.c
deleted file mode 100644
index d478f7bc4c0..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/pr99708.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* { dg-do run } */
-/* { require-effective-target ppc_float128_sw } */
-/* { dg-options "-O2 -mvsx -mfloat128" } */
-
-/*
- * PR target/99708
- *
- * Verify that __SIZEOF_FLOAT128__ and __SIZEOF_IBM128__ are properly defined.
- */
-
-#include <stdlib.h>
-
-int main (void)
-{
-  if (__SIZEOF_FLOAT128__ != sizeof (__float128)
-      || __SIZEOF_IBM128__ != sizeof (__ibm128))
-    abort ();
-
-  return 0;
-}
-

[gcc(refs/users/meissner/heads/work078)] Revert patch.

[Michael Meissner]

https://gcc.gnu.org/g:312b697c87ebc85f1ed423670e6ead5c6d1ccc62

commit 312b697c87ebc85f1ed423670e6ead5c6d1ccc62
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Tue Feb 15 11:56:08 2022 -0500

    Revert patch.
    
    2022-02-15  Michael Meissner  <meissner@the-meissners.org>
    
    gcc/
            Revert patch.
            PR target/99708
            * config/rs6000/rs6000-c.cc (rs6000_target_modify_macros): Define
            __SIZEOF_FLOAT128__ and __SIZEOF_IBM128__ if we have float128
            support.
    
    gcc/testsuite/
            Revert patch.
            PR target/99708
            * gcc.target/powerpc/pr99708.c: New test.

Diff:
---
 gcc/config/rs6000/rs6000-c.cc              | 12 ++----------
 gcc/testsuite/gcc.target/powerpc/pr99708.c | 19 -------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-c.cc b/gcc/config/rs6000/rs6000-c.cc
index b5f771d1308..15251efc209 100644
--- a/gcc/config/rs6000/rs6000-c.cc
+++ b/gcc/config/rs6000/rs6000-c.cc
@@ -581,17 +581,9 @@ rs6000_target_modify_macros (bool define_p, HOST_WIDE_INT flags,
     {
       rs6000_define_or_undefine_macro (define_p, "__FLOAT128__");
       if (define_p)
-	{
-	  rs6000_define_or_undefine_macro (true, "__float128=__ieee128");
-	  rs6000_define_or_undefine_macro (true, "__SIZEOF_FLOAT128__=16");
-	  rs6000_define_or_undefine_macro (true, "__SIZEOF_IBM128__=16");
-	}
+	rs6000_define_or_undefine_macro (true, "__float128=__ieee128");
       else
-	{
-	  rs6000_define_or_undefine_macro (false, "__float128");
-	  rs6000_define_or_undefine_macro (false, "__SIZEOF_FLOAT128__");
-	  rs6000_define_or_undefine_macro (false, "__SIZEOF_IBM128__");
-	}
+	rs6000_define_or_undefine_macro (false, "__float128");
     }
   /* OPTION_MASK_FLOAT128_HARDWARE can be turned on if -mcpu=power9 is used or
      via the target attribute/pragma.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr99708.c b/gcc/testsuite/gcc.target/powerpc/pr99708.c
deleted file mode 100644
index dd7a3bccc03..00000000000
--- a/gcc/testsuite/gcc.target/powerpc/pr99708.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* { dg-do run } */
-/* { require-effective-target ppc_float128_sw } */
-/* { dg-options "-O2 -mvsx -mfloat128" } */
-
-/*
- * PR target/99708
- *
- * Verify that __SIZEOF_FLOAT128__ and __SIZEOF_IBM128__ are properly defined.
- */
-
-int main (void)
-{
-  if (__SIZEOF_FLOAT128__ != sizeof (__float128)
-      || __SIZEOF_IBM128 != sizeof (__ibm128))
-    abort ();
-
-  return 0;
-}
-