Parsing Options for internal options

As NEO passes internal options via Options as well as internalOptions, this
change will parse Options for internal options as well. As result, some of
options that are defined under Options class are moved to InternalOptions class
as they are internal options.

Author: jgu222

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -3741,23 +3741,18 @@ namespace IGC
             ForceNonCoherentStatelessBti = ClContext->m_ShouldUseNonCoherentStatelessBTI;
             AllowSpill = !ClContext->m_InternalOptions.NoSpill;
 
-            if (ClContext->m_InternalOptions.DoReRA &&
-                !ClContext->gtpin_init)
-            {
-                SaveOption(vISA_ReRAPostSchedule, true);
-            }
-            if (ClContext->m_Options.GTPinReRA)
+            if (ClContext->m_InternalOptions.GTPinReRA)
             {
                 SaveOption(vISA_GTPinReRA, true);
                 SaveOption(vISA_ReRAPostSchedule, true);
             }
-            if (ClContext->m_Options.GTPinGRFInfo)
+            if (ClContext->m_InternalOptions.GTPinGRFInfo)
             {
                 SaveOption(vISA_GetFreeGRFInfo, true);
             }
-            if (ClContext->m_Options.GTPinScratchAreaSize)
+            if (ClContext->m_InternalOptions.GTPinScratchAreaSize)
             {
-                SaveOption(vISA_GTPinScratchAreaSize, ClContext->m_Options.GTPinScratchAreaSizeValue);
+                SaveOption(vISA_GTPinScratchAreaSize, ClContext->m_InternalOptions.GTPinScratchAreaSizeValue);
             }
         }
 

IGC/Compiler/CodeGenContext.cpp

@@ -554,7 +554,7 @@ namespace IGC
 
     bool OpenCLProgramContext::forceGlobalMemoryAllocation() const
     {
-        return m_Options.ForceGlobalMemoryAllocation;
+        return m_InternalOptions.ForceGlobalMemoryAllocation;
     }
 
     bool OpenCLProgramContext::allocatePrivateAsGlobalBuffer() const
@@ -564,7 +564,7 @@ namespace IGC
 
     bool OpenCLProgramContext::hasNoLocalToGenericCast() const
     {
-        return m_Options.HasNoLocalToGeneric || getModuleMetaData()->hasNoLocalToGenericCast;
+        return m_InternalOptions.HasNoLocalToGeneric || getModuleMetaData()->hasNoLocalToGenericCast;
     }
 
     bool OpenCLProgramContext::hasNoPrivateToGenericCast() const
@@ -695,16 +695,45 @@ namespace IGC
                 IntelForceEnableA64WA = true;
             }
 
+            // GTPin flags used by L0 driver runtime
             // -cl-intel-gtpin-rera
             else if (suffix.equals("-gtpin-rera"))
             {
-                DoReRA = true;
+                GTPinReRA = true;
             }
+            else if (suffix.equals("-gtpin-grf-info"))
+            {
+                GTPinGRFInfo = true;
+            }
+            else if (suffix.equals("-gtpin-scratch-area-size"))
+            {
+                GTPinScratchAreaSize = true;
+                size_t valStart = opts.find_first_not_of(' ', ePos + 1);
+                size_t valEnd = opts.find_first_of(' ', valStart);
+                llvm::StringRef valStr = opts.substr(valStart, valEnd - valStart);
+                if (valStr.getAsInteger(10, GTPinScratchAreaSizeValue))
+                {
+                    IGC_ASSERT(false);
+                }
+                Pos = valEnd;
+                continue;
+            }
+
             // -cl-intel-no-prera-scheduling
             else if (suffix.equals("-no-prera-scheduling"))
             {
                 IntelEnablePreRAScheduling = false;
             }
+            // -cl-intel-no-local-to-generic
+            else if (suffix.equals("-no-local-to-generic"))
+            {
+                HasNoLocalToGeneric = true;
+            }
+            // -cl-intel-force-global-mem-allocation
+            else if (suffix.equals("-force-global-mem-allocation"))
+            {
+                ForceGlobalMemoryAllocation = true;
+            }
 
             //
             // Options to set the number of GRF and threads

IGC/Compiler/CodeGenPublic.h

@@ -1262,7 +1262,6 @@ namespace IGC
                 IntelGreaterThan4GBBufferRequired(false),
                 Use32BitPtrArith(false),
                 IncludeSIPKernelDebugWithLocalMemory(false),
-                DoReRA(false),
                 IntelHasPositivePointerOffset(false),
                 IntelHasBufferOffsetArg(false),
                 IntelBufferOffsetArgOptional(true),
@@ -1271,10 +1270,16 @@ namespace IGC
                 if (pInputArgs == nullptr)
                     return;
 
-                if (pInputArgs->pInternalOptions == nullptr)
-                    return;
+                if (pInputArgs->pInternalOptions != nullptr)
+                {
+                    parseOptions(pInputArgs->pInternalOptions);
+                }
 
-                parseOptions(pInputArgs->pInternalOptions);
+                // Internal options are passed in via pOptions as well.
+                if (pInputArgs->pOptions != nullptr)
+                {
+                    parseOptions(pInputArgs->pOptions);
+                }
             }
 
             bool KernelDebugEnable;
@@ -1285,7 +1290,11 @@ namespace IGC
             bool IntelForceEnableA64WA = false;
             bool Use32BitPtrArith = false;
             bool IncludeSIPKernelDebugWithLocalMemory;
-            bool DoReRA;
+
+            bool GTPinReRA = false;
+            bool GTPinGRFInfo = false;
+            bool GTPinScratchAreaSize = false;
+            uint32_t GTPinScratchAreaSizeValue = 0;
 
             // stateless to stateful optimization
             bool IntelHasPositivePointerOffset; // default: false
@@ -1306,6 +1315,10 @@ namespace IGC
             bool EnableZEBinary = false;
             bool NoSpill = false;
 
+            // Generic address related
+            bool HasNoLocalToGeneric = false;
+            bool ForceGlobalMemoryAllocation = false;
+
             // -1 : initial value that means it is not set from cmdline
             // 0-5: valid values set from the cmdline
             int16_t VectorCoalescingControl = -1;
@@ -1336,6 +1349,8 @@ namespace IGC
                 // Build options are of the form -cl-xxxx and -ze-xxxx
                 // So we skip these prefixes when reading the options to be agnostic of their source
 
+                // Runtime passes internal options via pOptions as well, and those
+                // internal options will be handled by InternalOptions class.
                 const char* options = pInputArgs->pOptions;
                 if (strstr(options, "-fp32-correctly-rounded-divide-sqrt"))
                 {
@@ -1362,34 +1377,6 @@ namespace IGC
                 {
                     IsLibraryCompilation = true;
                 }
-                if (strstr(options, "-no-local-to-generic"))
-                {
-                    HasNoLocalToGeneric = true;
-                }
-                if (strstr(options, "-force-global-mem-allocation"))
-                {
-                    ForceGlobalMemoryAllocation = true;
-                }
-
-                // GTPin flags used by L0 driver runtime
-                if (strstr(options, "-gtpin-rera"))
-                {
-                    GTPinReRA = true;
-                }
-                if (strstr(options, "-gtpin-grf-info"))
-                {
-                    GTPinGRFInfo = true;
-                }
-                if (const char* op = strstr(options, "-gtpin-scratch-area-size"))
-                {
-                    GTPinScratchAreaSize = true;
-                    const char* optionVal = op + strlen("-gtpin-scratch-area-size");
-                    if ((*optionVal == '=' || *optionVal == ' ') && isdigit(*(optionVal + 1)))
-                    {
-                        ++optionVal;
-                        GTPinScratchAreaSizeValue = atoi(optionVal);
-                    }
-                }
                 if (const char* op = strstr(options, IGC_MANGLE("-intel-reqd-eu-thread-count")))
                 {
                     IntelRequiredEUThreadCount = true;
@@ -1404,12 +1391,6 @@ namespace IGC
             bool UniformWGS;
             bool EnableTakeGlobalAddress = false;
             bool IsLibraryCompilation = false;
-            bool HasNoLocalToGeneric = false;
-            bool ForceGlobalMemoryAllocation = false;
-            bool GTPinReRA = false;
-            bool GTPinGRFInfo = false;
-            bool GTPinScratchAreaSize = false;
-            uint32_t GTPinScratchAreaSizeValue = 0;
             bool IntelRequiredEUThreadCount = false;
             uint32_t requiredEUThreadCount = 0;
         };