Sync Change

Sync Change

Author: jwarumze

IGC/CMakeLists.txt

@@ -256,6 +256,7 @@ if (FCL_ENABLED)
   unset(_allowBifLink)
 endif()
 
+
 # Currently IGC uses 2 legacy SPIRV-LLVM-Translators
 # First one is located at gfx-driver/Source/IGC/AdaptorOCL/SPIRV
 # Second one is taken as prebuilt shared library called SPIRVDLL

IGC/Options/include/igc/Options/VCApiOptions.td

@@ -44,6 +44,9 @@ def : PlainFlag<"no_vector_decomposition">, Alias<no_vector_decomposition>,
 def : PlainFlag<"no-vector-decomposition">, Alias<no_vector_decomposition>,
   HelpText<"Alias for -ze-no-vector-decomposition">;
 
+def vc_fno_struct_splitting : PlainFlag<"fno-struct-splitting">,
+  HelpText<"Disable StructSplitter pass">;
+
 def vc_fno_jump_tables : PlainFlag<"fno-jump-tables">,
   HelpText<"Disable the use of jump tables for lowering switches">;
 

IGC/VectorCompiler/include/vc/Driver/Driver.h

@@ -74,6 +74,8 @@ struct CompileOptions {
   bool TranslateLegacyMemoryIntrinsics = false;
   // -disable-finalizer-msg 
   bool DisableFinalizerMsg = false;
+  // -fno-struct-splitting
+  bool DisableStructSplitting = false;
 
   OptimizerLevel OptLevel = OptimizerLevel::Full;
   llvm::Optional<unsigned> StackMemSize;

IGC/VectorCompiler/include/vc/Support/BackendConfig.h

@@ -68,6 +68,9 @@ struct GenXBackendOptions {
   // Non-owning pointer to ShaderOverride interface
   vc::ShaderOverrider *ShaderOverrider = nullptr;
 
+  // Flag to turn off StructSpliter pass
+  bool DisableStructSplitting = false;
+
   // Whether to enable finalizer dumps.
   bool EnableAsmDumps;
   // Whether to enable dumps of kernel debug information
@@ -238,6 +241,8 @@ class GenXBackendConfig : public ImmutablePass {
     return Options.WATable;
   }
 
+  bool doStructSplitting() const { return !Options.DisableStructSplitting; }
+
   bool useBindlessBuffers() const { return Options.UseBindlessBuffers; }
 
   bool saveStackCallLinkage() const { return Options.SaveStackCallLinkage; }

IGC/VectorCompiler/lib/Driver/Driver.cpp

@@ -223,6 +223,7 @@ static GenXBackendOptions createBackendOptions(const vc::CompileOptions &Opts) {
   BackendOpts.EnableDebugInfoDumps = Opts.DumpDebugInfo;
   BackendOpts.Dumper = Opts.Dumper.get();
   BackendOpts.ShaderOverrider = Opts.ShaderOverrider.get();
+  BackendOpts.DisableStructSplitting = Opts.DisableStructSplitting;
   BackendOpts.ForceArrayPromotion = (Opts.Binary == vc::BinaryKind::CM);
   if (Opts.ForceLiveRangesLocalizationForAccUsage)
     BackendOpts.LocalizeLRsForAccUsage = true;
@@ -584,6 +585,8 @@ static Error fillApiOptions(const opt::ArgList &ApiOptions,
     Opts.EmitDebugInformation = true;
     Opts.EmitDebuggableKernels = true;
   }
+  if (ApiOptions.hasArg(OPT_vc_fno_struct_splitting))
+    Opts.DisableStructSplitting = true;
   if (ApiOptions.hasArg(OPT_vc_fno_jump_tables))
     Opts.NoJumpTables = true;
   if (ApiOptions.hasArg(OPT_vc_ftranslate_legacy_memory_intrinsics))

IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt

@@ -82,6 +82,7 @@ set(CODEGEN_SOURCES
   GenXVisaRegAlloc.cpp
   GenXVisa.cpp
   OCLRuntimeInfoPrinter.cpp
+  GenXStructSplitter.cpp
 )
 
 add_library(VCCodeGen ${CODEGEN_SOURCES})

IGC/VectorCompiler/lib/GenXCodeGen/GenX.h

@@ -115,6 +115,7 @@ ModulePass *createGenXDebugInfoPass();
 ModulePass *createGenXGlobalValueLoweringPass();
 ModulePass *createGenXPromoteStatefulToBindlessPass();
 ModulePass *createGenXStackUsagePass();
+ModulePass *createGenXStructSplitterPass();
 
 namespace genx {