diff mbox series

[committed] rs6000: Fix the wrong location of OPTION_MASK_P10_FUSION setting hunk

Message ID 6f698424-9e14-85d5-1af6-9b2b7bbaed4a@linux.ibm.com
State Repeat Merge
Headers
Series [committed] rs6000: Fix the wrong location of OPTION_MASK_P10_FUSION setting hunk |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Kewen.Lin Dec. 21, 2022, 3:16 a.m. UTC 
  Hi,
 
The hunk for setting flag OPTION_MASK_P10_FUSION locates wrongly
between the if and else if block for OPTION_MASK_MMA.  This is
to fix this oversight accordingly.

Bootstrapped and regtested on powerpc64-linux-gnu P8 and
powerpc64le-linux-gnu P9 and P10.

IMO this is obvious, already committed in r13-4816-gfb73bfdb67789f.

BR,
Kewen
-----
gcc/ChangeLog:

	* config/rs6000/rs6000.cc (rs6000_option_override_internal): Fix the
	location for OPTION_MASK_P10_FUSION flag setting.
---
 gcc/config/rs6000/rs6000.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--
2.27.0
diff mbox series

Patch

diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index eb7ad5e954f..88c865b6b4b 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -4369,10 +4369,6 @@  rs6000_option_override_internal (bool global_init_p)
   if (TARGET_POWER10 && (rs6000_isa_flags_explicit & OPTION_MASK_MMA) == 0)
     rs6000_isa_flags |= OPTION_MASK_MMA;

-  if (TARGET_POWER10
-      && (rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION) == 0)
-    rs6000_isa_flags |= OPTION_MASK_P10_FUSION;
-
   /* Turn off vector pair/mma options on non-power10 systems.  */
   else if (!TARGET_POWER10 && TARGET_MMA)
     {
@@ -4382,6 +4378,10 @@  rs6000_option_override_internal (bool global_init_p)
       rs6000_isa_flags &= ~OPTION_MASK_MMA;
     }

+  if (TARGET_POWER10
+      && (rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION) == 0)
+    rs6000_isa_flags |= OPTION_MASK_P10_FUSION;
+
   /* MMA requires SIMD support as ISA 3.1 claims and our implementation
      such as "*movoo" uses vector pair access which use VSX registers.
      So make MMA require VSX support here.  */