introduce VC controls for codegen optimization level

Previously there were no facilities to properly define the intended
optimization level of VC codegen pipeline. This commit introduces
this facilities (though it does not use them yet).

Author: aparshin-intel

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

@@ -31,6 +31,12 @@ def : PlainJoined<"optimize=">, Alias<vc_optimize>,
 def : PlainFlag<"no-optimize">, Alias<vc_optimize>,
   AliasArgs<["none"]>, HelpText<"Alias for -optimize=none">;
 
+def vc_codegen_optimize : PlainSeparate<"codegen-optimize">,
+  HelpText<"Set codegen optimization level to either 'none' or 'full'">,
+  MetaVarName<"<level>">;
+def : PlainJoined<"codegen-optimize=">, Alias<vc_codegen_optimize>,
+  HelpText<"Alias for -codegen-optimize">;
+
 // This option switches off vector splitting in parts to better fit
 // into GRF. It may have both positive and negative consequences for
 // performance so shall be used with extreme caution.

IGC/VectorCompiler/igcdeps/src/TranslationInterface.cpp

@@ -164,7 +164,7 @@ static void adjustFileType(TC::TB_DATA_FORMAT DataFormat,
 
 static void adjustOptLevel(vc::CompileOptions &Opts) {
   if (IGC_IS_FLAG_ENABLED(VCOptimizeNone))
-    Opts.OptLevel = vc::OptimizerLevel::None;
+    Opts.IROptLevel = vc::OptimizerLevel::None;
 }
 
 static void adjustStackCalls(vc::CompileOptions &Opts, BuildDiag &Diag) {

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

@@ -82,7 +82,9 @@ struct CompileOptions {
   // -fno-struct-splitting
   bool DisableStructSplitting = false;
 
-  OptimizerLevel OptLevel = OptimizerLevel::Full;
+  OptimizerLevel IROptLevel = OptimizerLevel::Full;
+  OptimizerLevel CodegenOptLevel = OptimizerLevel::Full;
+
   llvm::Optional<unsigned> StackMemSize;
   bool ForceLiveRangesLocalizationForAccUsage = false;
   bool ForceDisableNonOverlappingRegionOpt = false;

IGC/VectorCompiler/lib/Driver/Driver.cpp

@@ -177,7 +177,7 @@ static std::string getSubtargetFeatureString(const vc::CompileOptions &Opts) {
 }
 
 static CodeGenOpt::Level getCodeGenOptLevel(const vc::CompileOptions &Opts) {
-  if (Opts.OptLevel == vc::OptimizerLevel::None)
+  if (Opts.CodegenOptLevel == vc::OptimizerLevel::None)
     return CodeGenOpt::None;
   return CodeGenOpt::Default;
 }
@@ -236,7 +236,7 @@ static GenXBackendOptions createBackendOptions(const vc::CompileOptions &Opts) {
       (Opts.Binary == vc::BinaryKind::ZE);
   BackendOpts.DebuggabilityEmitBreakpoints = Opts.EmitExtendedDebug;
   bool IsOptLevel_O0 =
-      Opts.OptLevel == vc::OptimizerLevel::None && Opts.EmitExtendedDebug;
+      Opts.IROptLevel == vc::OptimizerLevel::None && Opts.EmitExtendedDebug;
   BackendOpts.DebuggabilityExtendedDebug =
       getDefaultOverridableFlag(Opts.NoOptFinalizerMode, IsOptLevel_O0);
 
@@ -302,7 +302,7 @@ static void optimizeIR(const vc::CompileOptions &Opts,
       createTargetTransformInfoWrapperPass(TM.getTargetIRAnalysis()));
 
   unsigned OptLevel;
-  if (Opts.OptLevel == vc::OptimizerLevel::None)
+  if (Opts.IROptLevel == vc::OptimizerLevel::None)
     OptLevel = 0;
   else
     OptLevel = 2;
@@ -596,6 +596,27 @@ static Error makeOptionError(const opt::Arg &A, const opt::ArgList &Opts,
   return make_error<vc::OptionError>(BadOpt, IsInternal);
 }
 
+static Optional<vc::OptimizerLevel>
+parseOptimizationLevelString(StringRef Val) {
+  return StringSwitch<Optional<vc::OptimizerLevel>>(Val)
+      .Case("none", vc::OptimizerLevel::None)
+      .Case("full", vc::OptimizerLevel::Full)
+      .Default(None);
+}
+
+template <typename OptSpecifier>
+static Optional<vc::OptimizerLevel>
+deriveOptimizationLevel(opt::Arg *A, OptSpecifier PrimaryOpt) {
+  using namespace IGC::options::api;
+  if (A->getOption().matches(PrimaryOpt)) {
+    StringRef Val = A->getValue();
+    return parseOptimizationLevelString(Val);
+  } else {
+    IGC_ASSERT(A->getOption().matches(OPT_opt_disable_ze));
+    return vc::OptimizerLevel::None;
+  }
+}
+
 static Error fillApiOptions(const opt::ArgList &ApiOptions,
                             vc::CompileOptions &Opts) {
   using namespace IGC::options::api;
@@ -636,19 +657,18 @@ static Error fillApiOptions(const opt::ArgList &ApiOptions,
 
   if (opt::Arg *A =
           ApiOptions.getLastArg(OPT_vc_optimize, OPT_opt_disable_ze)) {
-    if (A->getOption().matches(OPT_vc_optimize)) {
-      StringRef Val = A->getValue();
-      auto MaybeLevel = StringSwitch<Optional<vc::OptimizerLevel>>(Val)
-                            .Case("none", vc::OptimizerLevel::None)
-                            .Case("full", vc::OptimizerLevel::Full)
-                            .Default(None);
-      if (!MaybeLevel)
-        return makeOptionError(*A, ApiOptions, /*IsInternal=*/false);
-      Opts.OptLevel = MaybeLevel.getValue();
-    } else {
-      IGC_ASSERT(A->getOption().matches(OPT_opt_disable_ze));
-      Opts.OptLevel = vc::OptimizerLevel::None;
-    }
+    auto MaybeLevel = deriveOptimizationLevel(A, OPT_vc_optimize);
+    if (!MaybeLevel)
+      return makeOptionError(*A, ApiOptions, /*IsInternal=*/false);
+    Opts.IROptLevel = MaybeLevel.getValue();
+  }
+
+  if (opt::Arg *A =
+          ApiOptions.getLastArg(OPT_vc_codegen_optimize, OPT_opt_disable_ze)) {
+    auto MaybeLevel = deriveOptimizationLevel(A, OPT_vc_codegen_optimize);
+    if (!MaybeLevel)
+      return makeOptionError(*A, ApiOptions, /*IsInternal=*/false);
+    Opts.CodegenOptLevel = MaybeLevel.getValue();
   }
 
   if (opt::Arg *A = ApiOptions.getLastArg(OPT_vc_stateless_private_size)) {

IGC/VectorCompiler/lib/GenXCodeGen/GenXCisaBuilder.cpp

@@ -6586,8 +6586,9 @@ collectFinalizerArgs(StringSaver &Saver, const GenXSubtarget &ST,
     addArgument("-generateDebugInfo");
   if (Info.EmitCrossThreadOffsetRelocation)
     addArgument("-emitCrossThreadOffR0Reloc");
-  if (BC.emitExtendedDebugInfo())
+  if (Info.DisableFinalizerOpts)
     addArgument("-debug");
+
   if (BC.emitBreakpointAtKernelEntry()) {
     addArgument("-addKernelID");
     addArgument("-setstartbp");

IGC/VectorCompiler/lib/GenXCodeGen/GenXModule.cpp

@@ -98,14 +98,15 @@ static bool isImplicitArgsBufferUsed(const Module &M) {
  */
 bool GenXModule::runOnModule(Module &M) {
   auto FGA = &getAnalysis<FunctionGroupAnalysis>();
-  ST = &getAnalysis<TargetPassConfig>()
-            .getTM<GenXTargetMachine>()
-            .getGenXSubtarget();
+  const auto &TM = getAnalysis<TargetPassConfig>().getTM<GenXTargetMachine>();
+
+  ST = &TM.getGenXSubtarget();
   Ctx = &M.getContext();
   BC = &getAnalysis<GenXBackendConfig>();
 
   InlineAsm = CheckForInlineAsm(M);
 
+  DisableFinalizerOpts = BC->emitExtendedDebugInfo();
   EmitDebugInformation =
       BC->emitDWARFDebugInfo() && vc::DIBuilder::checkIfModuleHasDebugInfo(M);
   ImplicitArgsBufferIsUsed = isImplicitArgsBufferUsed(M);
@@ -286,6 +287,7 @@ GenXModule::getVisaMapping(const Function *F) const {
 GenXModule::InfoForFinalizer GenXModule::getInfoForFinalizer() const {
   InfoForFinalizer Info;
   Info.EmitDebugInformation = EmitDebugInformation;
+  Info.DisableFinalizerOpts = DisableFinalizerOpts;
   IGC_ASSERT_MESSAGE(
       ST,
       "GenXSubtarget must be defined to call GenXModule::getInfoForFinalizer");

IGC/VectorCompiler/lib/GenXCodeGen/GenXModule.h

@@ -85,6 +85,7 @@ namespace llvm {
     bool InlineAsm = false;
     bool CheckForInlineAsm(Module &M) const;
 
+    bool DisableFinalizerOpts = false;
     bool EmitDebugInformation = false;
     bool ImplicitArgsBufferIsUsed = false;
     // represents number of visa instructions in a *kernel*
@@ -106,6 +107,7 @@ namespace llvm {
 
     // Additional info requred to create VISABuilder.
     struct InfoForFinalizer final {
+      bool DisableFinalizerOpts = false;
       bool EmitDebugInformation = false;
       bool EmitCrossThreadOffsetRelocation = false;
     };