Fix relocation and symbol table generation for SIMD1 mode

zuban32 · sys_zuul · commit eaff1117e1a6 · 2020-05-19T04:30:05.000-07:00
Change-Id: I3201bbd933f79e2085ee762e4358a40566903f33
diff --git a/IGC/AdaptorOCL/OCL/sp/sp_g8.cpp b/IGC/AdaptorOCL/OCL/sp/sp_g8.cpp
@@ -2186,7 +2186,8 @@ RETVAL CGen8OpenCLStateProcessor::CreatePatchList(
             size = program->simd16.m_funcSymbolTableSize;
             entries = program->simd16.m_funcSymbolTableEntries;
         }
-        else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32)
+        else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32 ||
+                 annotations.m_executionEnivronment.CompiledSIMDSize == 1)
         {
             buffer = program->simd32.m_funcSymbolTable;
             size = program->simd32.m_funcSymbolTableSize;
@@ -2240,7 +2241,10 @@ RETVAL CGen8OpenCLStateProcessor::CreatePatchList(
             size = program->simd16.m_funcRelocationTableSize;
             entries = program->simd16.m_funcRelocationTableEntries;
         }
-        else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32)
+        // 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)
         {
             buffer = program->simd32.m_funcRelocationTable;
             size = program->simd32.m_funcRelocationTableSize;

Original file line number	Diff line number	Diff line change
`@@ -2186,7 +2186,8 @@ RETVAL CGen8OpenCLStateProcessor::CreatePatchList(`
`2186`	`2186`	`size = program->simd16.m_funcSymbolTableSize;`
`2187`	`2187`	`entries = program->simd16.m_funcSymbolTableEntries;`
`2188`	`2188`	`}`
`2189`		`- else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32)`
	`2189`	`+ else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32 \|\|`
	`2190`	`+ annotations.m_executionEnivronment.CompiledSIMDSize == 1)`
`2190`	`2191`	`{`
`2191`	`2192`	`buffer = program->simd32.m_funcSymbolTable;`
`2192`	`2193`	`size = program->simd32.m_funcSymbolTableSize;`
`@@ -2240,7 +2241,10 @@ RETVAL CGen8OpenCLStateProcessor::CreatePatchList(`
`2240`	`2241`	`size = program->simd16.m_funcRelocationTableSize;`
`2241`	`2242`	`entries = program->simd16.m_funcRelocationTableEntries;`
`2242`	`2243`	`}`
`2243`		`- else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32)`
	`2244`	`+ // CM kernels are dispatched with CompiledSIMDSize == 1, this is just a contract`
	`2245`	`+ // between igcmc and patch token generator, shouldn't break existing scenarios for IGC`
	`2246`	`+ else if (annotations.m_executionEnivronment.CompiledSIMDSize == 32 \|\|`
	`2247`	`+ annotations.m_executionEnivronment.CompiledSIMDSize == 1)`
`2244`	`2248`	`{`
`2245`	`2249`	`buffer = program->simd32.m_funcRelocationTable;`
`2246`	`2250`	`size = program->simd32.m_funcRelocationTableSize;`