Minor refactoring

PawelJurek · igcbot · commit 55b254724beb · 2023-10-12T11:12:57.000+02:00
Minor refactoring in options parsing code.
diff --git a/IGC/Compiler/CISACodeGen/CISABuilder.cpp b/IGC/Compiler/CISACodeGen/CISABuilder.cpp
@@ -4596,7 +4596,8 @@ namespace IGC
                     ) && !ClContext->m_InternalOptions.Intel128GRFPerThread &&
                     !ClContext->m_Options.Intel128GRFPerThread &&
                     !ClContext->m_InternalOptions.Intel256GRFPerThread &&
-                    !ClContext->m_Options.Intel256GRFPerThread)
+                    !ClContext->m_Options.Intel256GRFPerThread
+                    )
                 {
                     // When user hasn't specified number of threads, we can rely on compiler heuristics
                     SaveOption(vISA_AutoGRFSelection, true);
diff --git a/IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp b/IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp
@@ -225,7 +225,8 @@ namespace IGC
         return threshold;
     }
 
-    void OpenCLProgramContext::InternalOptions::parseOptions(const char* internalOpts)
+    void OpenCLProgramContext::InternalOptions::parseOptions(
+        const char *internalOpts, OpenCLProgramContext &context)
     {
         using namespace options::internal;
         if (internalOpts == nullptr)
@@ -578,7 +579,7 @@ namespace IGC
         }
     }
 
-    void OpenCLProgramContext::Options::parseOptions(const char* opts)
+    void OpenCLProgramContext::Options::parseOptions(const char* opts, OpenCLProgramContext& context)
     {
         using namespace options::api;
         if (opts == nullptr)
diff --git a/IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.hpp b/IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.hpp
@@ -24,14 +24,14 @@ namespace IGC
         class InternalOptions
         {
         public:
-            InternalOptions(const TC::STB_TranslateInputArgs* pInputArgs)
+            InternalOptions(const TC::STB_TranslateInputArgs* pInputArgs, OpenCLProgramContext& context)
             {
                 if (pInputArgs == nullptr)
                     return;
 
                 if (pInputArgs->pInternalOptions != nullptr)
                 {
-                    parseOptions(pInputArgs->pInternalOptions);
+                    parseOptions(pInputArgs->pInternalOptions, context);
                 }
             }
 
@@ -118,20 +118,20 @@ namespace IGC
             bool EmitVisaOnly                               = false;
 
         private:
-            void parseOptions(const char* internalOpts);
+            void parseOptions(const char* internalOpts, OpenCLProgramContext& context);
         };
 
         class Options
         {
         public:
-            Options(const TC::STB_TranslateInputArgs* pInputArgs)
+            Options(const TC::STB_TranslateInputArgs* pInputArgs, OpenCLProgramContext& context)
             {
                 if (pInputArgs == nullptr)
                     return;
 
                 if (pInputArgs->pOptions != nullptr)
                 {
-                    parseOptions(pInputArgs->pOptions);
+                    parseOptions(pInputArgs->pOptions, context);
                 }
             }
 
@@ -178,7 +178,7 @@ namespace IGC
             bool EnableFP64GenEmu = false;
 
         private:
-            void parseOptions(const char* opts);
+            void parseOptions(const char* opts, OpenCLProgramContext& context);
         };
 
         // output: shader information
@@ -220,8 +220,8 @@ namespace IGC
             const bool createResourceDimTypes = true)
             : CodeGenContext(ShaderType::OPENCL_SHADER, btiLayout, platform, driverInfo, createResourceDimTypes, llvmContext),
             m_programOutput(platform.getPlatformInfo(), *this),
-            m_InternalOptions(pInputArgs),
-            m_Options(pInputArgs),
+            m_InternalOptions(pInputArgs, *this),
+            m_Options(pInputArgs, *this),
             isSpirV(false),
             m_ShouldUseNonCoherentStatelessBTI(shouldUseNonCoherentStatelessBTI)
         {
diff --git a/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp b/IGC/OCLFE/igd_fcl_mcl/source/clang_tb.cpp
@@ -1330,6 +1330,7 @@ namespace TC
                             (strcmp(pParam, "-igc_opts") == 0) || //temporary options
                             (strcmp(pParam, "-cl-intel-gtpin-rera") == 0) || //temporary options
                             (strcmp(pParam, "-cl-intel-256-GRF-per-thread") == 0) || //temporary options
+                            (strcmp(pParam, "-ze-opt-256-GRF-per-thread") == 0) || //temporary options
                             (strcmp(pParam, "-ze-opt-large-register-file") == 0) || //temporary options
                             (strcmp(pParam, "-ze-opt-disable-recompilation") == 0) || //temporary options
                             (strcmp(pParam, "-cl-intel-num-thread-per-eu") == 0) || //temporary options

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,8 @@ namespace IGC`
`225`	`225`	`return threshold;`
`226`	`226`	`}`
`227`	`227`
`228`		`- void OpenCLProgramContext::InternalOptions::parseOptions(const char* internalOpts)`
	`228`	`+ void OpenCLProgramContext::InternalOptions::parseOptions(`
	`229`	`+ const char *internalOpts, OpenCLProgramContext &context)`
`229`	`230`	`{`
`230`	`231`	`using namespace options::internal;`
`231`	`232`	`if (internalOpts == nullptr)`
`@@ -578,7 +579,7 @@ namespace IGC`
`578`	`579`	`}`
`579`	`580`	`}`
`580`	`581`
`581`		`- void OpenCLProgramContext::Options::parseOptions(const char* opts)`
	`582`	`+ void OpenCLProgramContext::Options::parseOptions(const char* opts, OpenCLProgramContext& context)`
`582`	`583`	`{`
`583`	`584`	`using namespace options::api;`
`584`	`585`	`if (opts == nullptr)`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ namespace IGC`
`24`	`24`	`class InternalOptions`
`25`	`25`	`{`
`26`	`26`	`public:`
`27`		`- InternalOptions(const TC::STB_TranslateInputArgs* pInputArgs)`
	`27`	`+ InternalOptions(const TC::STB_TranslateInputArgs* pInputArgs, OpenCLProgramContext& context)`
`28`	`28`	`{`
`29`	`29`	`if (pInputArgs == nullptr)`
`30`	`30`	`return;`
`31`	`31`
`32`	`32`	`if (pInputArgs->pInternalOptions != nullptr)`
`33`	`33`	`{`
`34`		`- parseOptions(pInputArgs->pInternalOptions);`
	`34`	`+ parseOptions(pInputArgs->pInternalOptions, context);`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`@@ -118,20 +118,20 @@ namespace IGC`
`118`	`118`	`bool EmitVisaOnly = false;`
`119`	`119`
`120`	`120`	`private:`
`121`		`- void parseOptions(const char* internalOpts);`
	`121`	`+ void parseOptions(const char* internalOpts, OpenCLProgramContext& context);`
`122`	`122`	`};`
`123`	`123`
`124`	`124`	`class Options`
`125`	`125`	`{`
`126`	`126`	`public:`
`127`		`- Options(const TC::STB_TranslateInputArgs* pInputArgs)`
	`127`	`+ Options(const TC::STB_TranslateInputArgs* pInputArgs, OpenCLProgramContext& context)`
`128`	`128`	`{`
`129`	`129`	`if (pInputArgs == nullptr)`
`130`	`130`	`return;`
`131`	`131`
`132`	`132`	`if (pInputArgs->pOptions != nullptr)`
`133`	`133`	`{`
`134`		`- parseOptions(pInputArgs->pOptions);`
	`134`	`+ parseOptions(pInputArgs->pOptions, context);`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`@@ -178,7 +178,7 @@ namespace IGC`
`178`	`178`	`bool EnableFP64GenEmu = false;`
`179`	`179`
`180`	`180`	`private:`
`181`		`- void parseOptions(const char* opts);`
	`181`	`+ void parseOptions(const char* opts, OpenCLProgramContext& context);`
`182`	`182`	`};`
`183`	`183`
`184`	`184`	`// output: shader information`
`@@ -220,8 +220,8 @@ namespace IGC`
`220`	`220`	`const bool createResourceDimTypes = true)`
`221`	`221`	`: CodeGenContext(ShaderType::OPENCL_SHADER, btiLayout, platform, driverInfo, createResourceDimTypes, llvmContext),`
`222`	`222`	`m_programOutput(platform.getPlatformInfo(), *this),`
`223`		`- m_InternalOptions(pInputArgs),`
`224`		`- m_Options(pInputArgs),`
	`223`	`+ m_InternalOptions(pInputArgs, *this),`
	`224`	`+ m_Options(pInputArgs, *this),`
`225`	`225`	`isSpirV(false),`
`226`	`226`	`m_ShouldUseNonCoherentStatelessBTI(shouldUseNonCoherentStatelessBTI)`
`227`	`227`	`{`