Create new HW Debug pass to unify various functions

Author: jfuentes

IGC/common/igc_flags.h

@@ -286,8 +286,8 @@ DECLARE_IGC_REGKEY(DWORD, GEPLSRNewInstructionThreshold, 32, "Threshold for max
 DECLARE_IGC_REGKEY(bool, EnableGEPLSRToPreheader, true, "Enables reduction to loop's preheader in GEP Loop Strength Reduction pass", false)
 
 DECLARE_IGC_GROUP("Shader debugging")
-DECLARE_IGC_REGKEY(bool, CopyA0ToDBG0,                           false, " Copy a0 used for extended msg descriptor to dbg0 to help debug", false)
-DECLARE_IGC_REGKEY(bool, EnableDebugging,                           false, " Enable shader debugging for release internal", false)
+DECLARE_IGC_REGKEY(bool, CopyA0ToDBG0,                  false, " Copy a0 used for extended msg descriptor to dbg0 to help debug", false)
+DECLARE_IGC_REGKEY(bool, EnableDebugging,               false, " Enable shader debugging for release internal", false)
 DECLARE_IGC_REGKEY_BITMASK(GenerateOptionsFile, 0, "Create Options.txt(usually for SIMD related bugs to narrow down shaders), in the shader dump folder.", SHADER_TYPE_MASKS, false)
 DECLARE_IGC_REGKEY(bool, ForceDisableShaderDebugHashCodeInKernel,   false,  "Disable hash code addition to the binary after EOT", false)
 DECLARE_IGC_REGKEY(bool, EnableHashMovsAtPrologue,      false, "Rather than after EOT, insert hash code movs at shader entry", false)

visa/Optimizer.cpp

@@ -338,6 +338,12 @@ void Optimizer::addSWSBInfo() {
   return;
 }
 
+// Common pass for HW debug functions
+void Optimizer::HWDebug() {
+  if (builder.getOption(vISA_InsertHashMovs))
+    insertHashMovs();
+}
+
 void Optimizer::insertHashMovs() {
   // As per request from IGC team, we want to conditionally insert
   // two mov instructions like following:
@@ -671,7 +677,7 @@ void Optimizer::initOptimizations() {
   OPT_INITIALIZE_PASS(localSchedule, vISA_LocalScheduling, TimerID::SCHEDULING);
   OPT_INITIALIZE_PASS(HWWorkaround, vISA_EnableAlways, TimerID::MISC_OPTS);
   OPT_INITIALIZE_PASS(fixEndIfWhileLabels, vISA_EnableAlways, TimerID::NUM_TIMERS);
-  OPT_INITIALIZE_PASS(insertHashMovs, vISA_InsertHashMovs, TimerID::NUM_TIMERS);
+  OPT_INITIALIZE_PASS(HWDebug, vISA_EnableAlways, TimerID::NUM_TIMERS);
   OPT_INITIALIZE_PASS(insertDummyMovForHWRSWA, vISA_InsertDummyMovForHWRSWA,
                   TimerID::NUM_TIMERS);
   OPT_INITIALIZE_PASS(insertDummyCompactInst, vISA_InsertDummyCompactInst,
@@ -993,7 +999,7 @@ int Optimizer::optimization() {
   // the CFG assumption
   runPass(PI_fixEndIfWhileLabels);
 
-  runPass(PI_insertHashMovs);
+  runPass(PI_HWDebug);
 
   runPass(PI_insertDummyMovForHWRSWA);
 

visa/Optimizer.h

@@ -134,7 +134,6 @@ class Optimizer {
   void dumpPayload();
   void collectStats();
   void createR0Copy();
-
   void fixEndIfWhileLabels();
   void mergeScalarInst();
   void EmulateInt64Add() { ::EmulateInt64Add(builder, kernel); }
@@ -189,6 +188,8 @@ class Optimizer {
 
   void accSubBeforeRA();
 
+  void HWDebug();
+
 
   // return true if BuiltInR0 gets a different allocation than r0
   bool R0CopyNeeded();
@@ -362,7 +363,7 @@ class Optimizer {
     PI_localSchedule,
     PI_HWWorkaround,        // always
     PI_fixEndIfWhileLabels, // always
-    PI_insertHashMovs,
+    PI_HWDebug,
     PI_insertDummyMovForHWRSWA,
     PI_insertDummyCompactInst,
     PI_mergeScalarInst,