rs6000: Imply VSX early to adopt some checkings on conflict [PR108240]
Commit Message
Hi,
As PR108240 shows, some options like -mmodulo can enable some
flags implicitly including OPTION_MASK_VSX. But the enabled
flag can conflict with some existing setting like soft float,
it would result in some unexpected cases and consequent ICE.
Actually there are already some checkings for VSX vs. soft
float and no altivec etc., but unfortunately they happens
ahead of the implicit enablements, and we can not postpone them
since they can affect the generation of ignore_masks which is
used in the following implicit enablements.
This patch is to imply OPTION_MASK_VSX early for those options
which will enable it implicitly later, put it right before the
checkings for the possible conflicts with TARGET_VSX, then it's
able to check if there are some possible conflicts, and prevent
the unexpected (incompatible) cases if yes, otherwise it would
be just the same as before (both would have it implied just at
the different timings).
Bootstrapped and regtested on powerpc64-linux-gnu P8 and
powerpc64le-linux-gnu P9 and P10.
Is it ok for trunk?
BR,
Kewen
-----
PR target/108240
gcc/ChangeLog:
* config/rs6000/rs6000.cc (rs6000_option_override_internal): Enable
OPTION_MASK_VSX early to make the checkings on VSX conflicts take
effect.
gcc/testsuite/ChangeLog:
* gcc.target/powerpc/ppc-fortran/pr108240.f90: New test.
---
gcc/config/rs6000/rs6000.cc | 17 ++++++++++++
.../powerpc/ppc-fortran/pr108240.f90 | 27 +++++++++++++++++++
2 files changed, 44 insertions(+)
create mode 100644 gcc/testsuite/gcc.target/powerpc/ppc-fortran/pr108240.f90
--
2.37.0
@@ -3794,6 +3794,23 @@ rs6000_option_override_internal (bool global_init_p)
& OPTION_MASK_DIRECT_MOVE))
rs6000_isa_flags |= ~rs6000_isa_flags_explicit & OPTION_MASK_STRICT_ALIGN;
+ /* Some options can enable OPTION_MASK_VSX implicitly, but the implicit
+ enablement is after the below checking and adjustment for TARGET_VSX,
+ it can result in some unexpected situation, like PR108240 without
+ hard float but vsx support, which is supposed to be checked and then
+ prevented in the below handlings for TARGET_VSX. So for any options
+ which can imply OPTION_MASK_VSX later, we want to imply it first here
+ to make the following checking take effects. */
+ if (!(rs6000_isa_flags_explicit & OPTION_MASK_VSX)
+ && (TARGET_P9_VECTOR
+ || TARGET_MODULO
+ || TARGET_P9_MISC
+ || TARGET_P9_MINMAX
+ || TARGET_P8_VECTOR
+ || TARGET_DIRECT_MOVE
+ || TARGET_CRYPTO))
+ rs6000_isa_flags |= OPTION_MASK_VSX;
+
/* Add some warnings for VSX. */
if (TARGET_VSX)
{
new file mode 100644
@@ -0,0 +1,27 @@
+! { dg-options "-mmodulo -mcpu=401" }
+! This need one explicit 64 bit option on 64 bit environment
+! to avoid possible error or warning message.
+! { dg-additional-options "-m64" { target lp64 } }
+
+! Verify there is no ICE on 64 bit environment.
+
+program main
+ implicit none
+ integer, parameter :: n=4
+ character(len=4), dimension(n,n) :: c
+ integer, dimension(n,n) :: a
+ integer, dimension(2) :: res1, res2
+ real, dimension(n,n) :: r
+ integer :: i,j
+ character(len=4,kind=4), dimension(n,n) :: c4
+
+ call random_number (r)
+ a = int(r*100)
+
+ do j=1,n
+ do i=1,n
+ write (*,*) a(i,j)
+ end do
+ end do
+
+end program main