start using SKernelProgram::simd1 for SIMD1 dispatch

Change-Id: Ifee45d0d521d0577b583cd19004394fbb60e1cfd

Author: dmitryryintel

IGC/AdaptorOCL/OCL/sp/sp_g8.cpp

@@ -2187,13 +2187,18 @@ RETVAL CGen8OpenCLStateProcessor::CreatePatchList(
             size = program->simd16.m_funcSymbolTableSize;
             entries = program->simd16.m_funcSymbolTableEntries;
         }
-        else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32 ||
-                 annotations.m_executionEnivronment.CompiledSIMDSize == 1)
+        else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32)
         {
             buffer = program->simd32.m_funcSymbolTable;
             size = program->simd32.m_funcSymbolTableSize;
             entries = program->simd32.m_funcSymbolTableEntries;
         }
+        else if (annotations.m_executionEnivronment.CompiledSIMDSize == 1)
+        {
+            buffer = program->simd1.m_funcSymbolTable;
+            size = program->simd1.m_funcSymbolTableSize;
+            entries = program->simd1.m_funcSymbolTableEntries;
+        }
 
         if (size > 0)
         {
@@ -2242,15 +2247,20 @@ RETVAL CGen8OpenCLStateProcessor::CreatePatchList(
             size = program->simd16.m_funcRelocationTableSize;
             entries = program->simd16.m_funcRelocationTableEntries;
         }
-        // CM kernels are dispatched with CompiledSIMDSize == 1, this is just a contract
-        // between igcmc and patch token generator, shouldn't break existing scenarios for IGC
-        else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32 ||
-                 annotations.m_executionEnivronment.CompiledSIMDSize == 1)
+        else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32)
         {
             buffer = program->simd32.m_funcRelocationTable;
             size = program->simd32.m_funcRelocationTableSize;
             entries = program->simd32.m_funcRelocationTableEntries;
         }
+        // CM kernels are dispatched with CompiledSIMDSize == 1, this is just a contract
+        // between igcmc and patch token generator, shouldn't break existing scenarios for IGC
+        else if (annotations.m_executionEnivronment.CompiledSIMDSize == 1)
+        {
+            buffer = program->simd1.m_funcRelocationTable;
+            size = program->simd1.m_funcRelocationTableSize;
+            entries = program->simd1.m_funcRelocationTableEntries;
+        }
 
         if (size > 0)
         {

IGC/AdaptorOCL/cmc.cpp

@@ -410,6 +410,22 @@ const char* cmc::getPlatformStr(PLATFORM platform)
     return "SKL";
 }
 
+static void generateSymbols(const cmc_kernel_info_v2 &info,
+                            IGC::SProgramOutput &kernelProgram)
+{
+    if (info.RelocationTable.Size > 0) {
+      kernelProgram.m_funcRelocationTable = info.RelocationTable.Buf;
+      kernelProgram.m_funcRelocationTableSize = info.RelocationTable.Size;
+      kernelProgram.m_funcRelocationTableEntries =
+          info.RelocationTable.NumEntries;
+    }
+    if (info.SymbolTable.Size > 0) {
+      kernelProgram.m_funcSymbolTable = info.SymbolTable.Buf;
+      kernelProgram.m_funcSymbolTableSize = info.SymbolTable.Size;
+      kernelProgram.m_funcSymbolTableEntries = info.SymbolTable.NumEntries;
+    }
+}
+
 static void generatePatchTokens_v2(const cmc_kernel_info_v2 *info,
                                    CMKernel& kernel)
 {
@@ -514,25 +530,10 @@ static void generatePatchTokens_v2(const cmc_kernel_info_v2 *info,
     ConstantBufferLength = iSTD::Align(ConstantBufferLength, info->GRFByteSize) / info->GRFByteSize;
     kernel.m_kernelInfo.m_kernelProgram.ConstantBufferLength = ConstantBufferLength;
 
-    IGC::SProgramOutput *kernelProgram = nullptr;
-    if (info->CompiledSIMDSize == 8)
-      kernelProgram = &kernel.m_kernelInfo.m_kernelProgram.simd8;
-    else if (info->CompiledSIMDSize == 16)
-      kernelProgram = &kernel.m_kernelInfo.m_kernelProgram.simd16;
-    else if (info->CompiledSIMDSize == 32 || info->CompiledSIMDSize == 1)
-      kernelProgram = &kernel.m_kernelInfo.m_kernelProgram.simd32;
-    IGC_ASSERT(kernelProgram);
-    if (info->RelocationTable.Size > 0) {
-      kernelProgram->m_funcRelocationTable = info->RelocationTable.Buf;
-      kernelProgram->m_funcRelocationTableSize = info->RelocationTable.Size;
-      kernelProgram->m_funcRelocationTableEntries =
-          info->RelocationTable.NumEntries;
-    }
-    if (info->SymbolTable.Size > 0) {
-      kernelProgram->m_funcSymbolTable = info->SymbolTable.Buf;
-      kernelProgram->m_funcSymbolTableSize = info->SymbolTable.Size;
-      kernelProgram->m_funcSymbolTableEntries = info->SymbolTable.NumEntries;
-    }
+    IGC_ASSERT_MESSAGE(info->CompiledSIMDSize == 1, "CM code must be dispatched in SIMD1 mode");
+    IGC::SProgramOutput &kernelProgram = kernel.m_kernelInfo.m_kernelProgram.simd1;
+
+    generateSymbols(*info, kernelProgram);
 
 }
 

IGC/Compiler/CodeGenPublic.h

@@ -321,6 +321,7 @@ namespace IGC
 
     struct SKernelProgram
     {
+        SProgramOutput simd1;
         SProgramOutput simd8;
         SProgramOutput simd16;
         SProgramOutput simd32;