Change name ShaderDumpFilter to ShaderDumpRegexFilter

To avoid confusion of using file globing, we add everything w/ "Regex"

Author: elvinw-intel

Diff for: IGC/AdaptorCommon/customApi.cpp

@@ -495,7 +495,7 @@ namespace IGC
         {
             static std::mutex m;
             std::lock_guard<std::mutex> lck(m);
-            if(g_shaderOutputFolder != "" && doesRegexMatch(g_shaderOutputFolder, IGC_GET_REGKEYSTRING(ShaderDumpFilter)))
+            if(g_shaderOutputFolder != "" && doesRegexMatch(g_shaderOutputFolder, IGC_GET_REGKEYSTRING(ShaderDumpRegexFilter)))
             {
                 return g_shaderOutputFolder.c_str();
             }
@@ -526,7 +526,7 @@ namespace IGC
                     sprintf_s(dumpPath, "%sunknownProcess_%d\\", dumpPath, _getpid());
                 }
 
-                if (needMkDir() && doesRegexMatch(dumpPath, IGC_GET_REGKEYSTRING(ShaderDumpFilter)))
+                if (needMkDir() && doesRegexMatch(dumpPath, IGC_GET_REGKEYSTRING(ShaderDumpRegexFilter)))
                 {
                     if (GetFileAttributesA(dumpPath) != FILE_ATTRIBUTE_DIRECTORY)
                     {
@@ -558,7 +558,7 @@ namespace IGC
 #elif defined __linux__
             if (!IGC_IS_FLAG_ENABLED(DumpToCurrentDir) && g_shaderOutputFolder == "" && !IGC_IS_FLAG_ENABLED(DumpToCustomDir))
             {
-                bool needMkdir = needMkDir() && doesRegexMatch(GetBaseIGCOutputFolder(), IGC_GET_REGKEYSTRING(ShaderDumpFilter));
+                bool needMkdir = needMkDir() && doesRegexMatch(GetBaseIGCOutputFolder(), IGC_GET_REGKEYSTRING(ShaderDumpRegexFilter));
 
                 char path[MAX_PATH] = { 0 };
                 bool pidEnabled = IGC_IS_FLAG_DISABLED(ShaderDumpPidDisable);

Diff for: IGC/AdaptorOCL/dllInterfaceCompute.cpp

@@ -389,7 +389,7 @@ void DumpShaderFile(
         << ext;
     std::string fullFilePathStr = dstDir + fileName.str();
 
-    if (doesRegexMatch(fileName.str(), IGC_GET_REGKEYSTRING(ShaderDumpFilter)))
+    if (doesRegexMatch(fileName.str(), IGC_GET_REGKEYSTRING(ShaderDumpRegexFilter)))
     {
         FILE* pFile = NULL;
         fopen_s(&pFile, fullFilePathStr.c_str(), "wb");

Diff for: IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -4768,9 +4768,9 @@ namespace IGC
             SaveOption(vISA_Compaction, false);
         }
 
-        if (auto *regex = IGC_GET_REGKEYSTRING(ShaderDumpFilter))
+        if (auto *regex = IGC_GET_REGKEYSTRING(ShaderDumpRegexFilter))
         {
-            SaveOption(vISA_ShaderDumpFilter, regex);
+            SaveOption(vISA_ShaderDumpRegexFilter, regex);
         }
 
         auto *forceSpillVaraibles = IGC_GET_REGKEYSTRING(ForceSpillVariables);

Diff for: IGC/common/debug/Dump.cpp

@@ -429,7 +429,7 @@ std::string DumpName::RelativePath() const
 
 bool DumpName::allow() const
 {
-    return doesRegexMatch(RelativePath(), IGC_GET_REGKEYSTRING(ShaderDumpFilter));
+    return doesRegexMatch(RelativePath(), IGC_GET_REGKEYSTRING(ShaderDumpRegexFilter));
 }
 
 namespace {

Diff for: IGC/common/igc_flags.h

@@ -410,7 +410,7 @@ DECLARE_IGC_REGKEY(DWORD, ShaderDumpEnableG4,           false, "same as ShaderDu
 DECLARE_IGC_REGKEY(DWORD, ShaderDumpEnableIGAJSON,      false, "adds IGA JSON output to shader dumps (0 = off, 1 = enabled, 2 = include def/use info but causes longer compile times)", 0)
 DECLARE_IGC_REGKEY(bool, ShaderDumpEnableRAMetadata,   false, "adds RA Metadata file to shader dumps", true)
 DECLARE_IGC_REGKEY(bool,  ShaderDumpInstNamer,          false, "dump all unnamed LLVM IR instruction with variable names 'tmp' which makes easier for shaderoverriding", true)
-DECLARE_IGC_REGKEY(debugString, ShaderDumpFilter,       0,     "Only dump files matching the given regex", true)
+DECLARE_IGC_REGKEY(debugString, ShaderDumpRegexFilter,       0,     "Only dump files matching the given regex", true)
 DECLARE_IGC_REGKEY(bool, DumpZEInfoToConsole,           false, "Dump zeinfo to console", true)
 DECLARE_IGC_REGKEY(debugString, ProgbinDumpFileName,    0,     "Specify filename to use for dumping progbin file to current dir", true)
 DECLARE_IGC_REGKEY(bool, ElfDumpEnable,                 false, "dump ELF file", true)

Diff for: visa/Common_ISA_framework.cpp

@@ -124,7 +124,7 @@ int CisaInst::createCisaInstruction(ISA_Opcode opcode, unsigned char exec_size,
 }
 
 bool allowDump(const Options &options, const std::string &fullPath) {
-  const char *regex = options.getOptionCstr(vISA_ShaderDumpFilter);
+  const char *regex = options.getOptionCstr(vISA_ShaderDumpRegexFilter);
   if (!regex || *regex == '\0')
     return true;
 

Diff for: visa/include/VISAOptionsDefs.h

@@ -606,8 +606,8 @@ DEF_VISA_OPTION(vISA_ISAASMToConsole, ET_BOOL, "-isaasmToConsole",
                 "emit isaasm to stdout instead of file and do early exit", false)
 DEF_VISA_OPTION(vISA_DumpIsaVarNames, ET_BOOL, "-dumpisavarnames", UNUSED, true)
 DEF_VISA_OPTION(vISA_UniqueLabels, ET_BOOL, "-uniqueLabel", UNUSED, false)
-DEF_VISA_OPTION(vISA_ShaderDumpFilter, ET_CSTR, "-shaderDumpFilter",
-                "USAGE: -shaderDumpFilter <regex>\n", NULL)
+DEF_VISA_OPTION(vISA_ShaderDumpRegexFilter, ET_CSTR, "-shaderDumpRegexFilter",
+                "USAGE: -shaderDumpRegexFilter <regex>\n", NULL)
 DEF_VISA_OPTION(vISA_DumpvISA, ET_BOOL, "-dumpvisa",
                 "-dumpvisa is deprecated and will be removed.", false)
 DEF_VISA_OPTION(vISA_StripComments, ET_BOOL, "-stripcomments", UNUSED, false)