From: liuhongt <hongtao.liu@intel.com>
Date: Tue, 25 Nov 2025 05:33:46 +0000 (-0800)
Subject: Refactor mgather/mscatter implementation.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=319a956cd25ccc05c9447d55d76f0c98e8f6b598;p=thirdparty%2Fgcc.git

Refactor mgather/mscatter implementation.

Current implementation is an alias to -mtune-crtl=(Alias(mtune-ctrl=,
use_gather, ^use_gather)), and maybe override by another -mtune-crtl=
.i.e -mgather -mscatter will only enable mscatter

The patch fixes the issue.

gcc/ChangeLog:

	* config/i386/i386-options.cc (set_ix86_tune_features): Set
	gather/scatter tune if OPTION_SET_P.
	* config/i386/i386.opt: Refactor mgather/mscatter.
---

diff --git a/gcc/config/i386/i386-options.cc b/gcc/config/i386/i386-options.cc
index ba598a817f3..35064d83a00 100644
--- a/gcc/config/i386/i386-options.cc
+++ b/gcc/config/i386/i386-options.cc
@@ -1837,6 +1837,21 @@ set_ix86_tune_features (struct gcc_options *opts,
     }
 
   parse_mtune_ctrl_str (opts, dump);
+
+  /* mgather/mscatter option would overwrite -mtune-crtl option.  */
+  if (OPTION_SET_P (ix86_use_gather))
+    {
+      ix86_tune_features[X86_TUNE_USE_GATHER_2PARTS] = ix86_use_gather;
+      ix86_tune_features[X86_TUNE_USE_GATHER_4PARTS] = ix86_use_gather;
+      ix86_tune_features[X86_TUNE_USE_GATHER_8PARTS] = ix86_use_gather;
+    }
+
+  if (OPTION_SET_P (ix86_use_scatter))
+    {
+      ix86_tune_features[X86_TUNE_USE_SCATTER_2PARTS] = ix86_use_scatter;
+      ix86_tune_features[X86_TUNE_USE_SCATTER_4PARTS] = ix86_use_scatter;
+      ix86_tune_features[X86_TUNE_USE_SCATTER_8PARTS] = ix86_use_scatter;
+    }
 }
 
 
diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt
index 84494502345..c0093ef1243 100644
--- a/gcc/config/i386/i386.opt
+++ b/gcc/config/i386/i386.opt
@@ -1290,11 +1290,11 @@ Support MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2, AVX and
 SM4 built-in functions and code generation.
 
 mgather
-Target Alias(mtune-ctrl=, use_gather, ^use_gather)
+Target Var(ix86_use_gather) Init(0) Optimization.
 Enable vectorization for gather instruction.
 
 mscatter
-Target Alias(mtune-ctrl=, use_scatter, ^use_scatter)
+Target Var(ix86_use_scatter) Init(0) Optimization
 Enable vectorization for scatter instruction.
 
 mapxf