Avoid hard-coding SIMD size for hull shader and domain shader.

weiyu-chen · sys_zuul · commit aefce6dd8b93 · 2020-05-18T15:05:14.000-07:00
Change-Id: I752ac60a1cd6a72a979b2c80a610078148e7fdd8
diff --git a/IGC/Compiler/CISACodeGen/DomainShaderCodeGen.cpp b/IGC/Compiler/CISACodeGen/DomainShaderCodeGen.cpp
@@ -170,7 +170,7 @@ namespace IGC
         }
         else if (m_ShaderDispatchMode == ShaderDispatchMode::DUAL_PATCH)
         {
-            encoder.SetSimdSize(SIMDMode::SIMD8);
+            encoder.SetSimdSize(m_Platform->getMinDispatchMode());
             encoder.SetSrcRegion(0, 1, 4, 0);
             encoder.SetSrcSubReg(0, 0);
 
@@ -244,11 +244,15 @@ namespace IGC
 
     void CShaderProgram::FillProgram(SDomainShaderKernelProgram* pKernelProgram)
     {
-        CDomainShader* pShader = static_cast<CDomainShader*>(GetShader(SIMDMode::SIMD8));
+        auto simdMode = m_context->platform.getMinDispatchMode();
+        CDomainShader* pShader = static_cast<CDomainShader*>(GetShader(simdMode));
         pShader->FillProgram(pKernelProgram);
-        pKernelProgram->simd8 = *pShader->ProgramOutput();
 
-        CDomainShader* dualPatchShader = static_cast<CDomainShader*>(GetShader(SIMDMode::SIMD8, ShaderDispatchMode::DUAL_PATCH));
+        SProgramOutput* output  = &pKernelProgram->simd8;
+
+        *output = *pShader->ProgramOutput();
+
+        CDomainShader* dualPatchShader = static_cast<CDomainShader*>(GetShader(simdMode, ShaderDispatchMode::DUAL_PATCH));
         if (dualPatchShader)
         {
             pKernelProgram->simd8DualPatch = *dualPatchShader->ProgramOutput();
diff --git a/IGC/Compiler/CISACodeGen/GeometryShaderCodeGen.cpp b/IGC/Compiler/CISACodeGen/GeometryShaderCodeGen.cpp
@@ -335,7 +335,7 @@ namespace IGC
 
     void CShaderProgram::FillProgram(SGeometryShaderKernelProgram* pKernelProgram)
     {
-        CGeometryShader* pShader = static_cast<CGeometryShader*>(GetShader(SIMDMode::SIMD8));
+        CGeometryShader* pShader = static_cast<CGeometryShader*>(GetShader(m_context->platform.getMinDispatchMode()));
         pShader->FillProgram(pKernelProgram);
     }
 
diff --git a/IGC/Compiler/CISACodeGen/HullShaderCodeGen.cpp b/IGC/Compiler/CISACodeGen/HullShaderCodeGen.cpp
@@ -264,7 +264,7 @@ namespace IGC
 
     void CShaderProgram::FillProgram(SHullShaderKernelProgram* pKernelProgram)
     {
-        CHullShader* pShader = static_cast<CHullShader*>(GetShader(SIMDMode::SIMD8));
+        CHullShader* pShader = static_cast<CHullShader*>(GetShader(m_context->platform.getMinDispatchMode()));
         pShader->FillProgram(pKernelProgram);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ namespace IGC`
`170`	`170`	`}`
`171`	`171`	`else if (m_ShaderDispatchMode == ShaderDispatchMode::DUAL_PATCH)`
`172`	`172`	`{`
`173`		`- encoder.SetSimdSize(SIMDMode::SIMD8);`
	`173`	`+ encoder.SetSimdSize(m_Platform->getMinDispatchMode());`
`174`	`174`	`encoder.SetSrcRegion(0, 1, 4, 0);`
`175`	`175`	`encoder.SetSrcSubReg(0, 0);`
`176`	`176`
`@@ -244,11 +244,15 @@ namespace IGC`
`244`	`244`
`245`	`245`	`void CShaderProgram::FillProgram(SDomainShaderKernelProgram* pKernelProgram)`
`246`	`246`	`{`
`247`		`- CDomainShader* pShader = static_cast<CDomainShader*>(GetShader(SIMDMode::SIMD8));`
	`247`	`+ auto simdMode = m_context->platform.getMinDispatchMode();`
	`248`	`+ CDomainShader* pShader = static_cast<CDomainShader*>(GetShader(simdMode));`
`248`	`249`	`pShader->FillProgram(pKernelProgram);`
`249`		`- pKernelProgram->simd8 = *pShader->ProgramOutput();`
`250`	`250`
`251`		`- CDomainShader* dualPatchShader = static_cast<CDomainShader*>(GetShader(SIMDMode::SIMD8, ShaderDispatchMode::DUAL_PATCH));`
	`251`	`+ SProgramOutput* output = &pKernelProgram->simd8;`
	`252`	`+`
	`253`	`+ output = pShader->ProgramOutput();`
	`254`	`+`
	`255`	`+ CDomainShader* dualPatchShader = static_cast<CDomainShader*>(GetShader(simdMode, ShaderDispatchMode::DUAL_PATCH));`
`252`	`256`	`if (dualPatchShader)`
`253`	`257`	`{`
`254`	`258`	`pKernelProgram->simd8DualPatch = *dualPatchShader->ProgramOutput();`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ namespace IGC`
`335`	`335`
`336`	`336`	`void CShaderProgram::FillProgram(SGeometryShaderKernelProgram* pKernelProgram)`
`337`	`337`	`{`
`338`		`- CGeometryShader* pShader = static_cast<CGeometryShader*>(GetShader(SIMDMode::SIMD8));`
	`338`	`+ CGeometryShader* pShader = static_cast<CGeometryShader*>(GetShader(m_context->platform.getMinDispatchMode()));`
`339`	`339`	`pShader->FillProgram(pKernelProgram);`
`340`	`340`	`}`
`341`	`341`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ namespace IGC`
`264`	`264`
`265`	`265`	`void CShaderProgram::FillProgram(SHullShaderKernelProgram* pKernelProgram)`
`266`	`266`	`{`
`267`		`- CHullShader* pShader = static_cast<CHullShader*>(GetShader(SIMDMode::SIMD8));`
	`267`	`+ CHullShader* pShader = static_cast<CHullShader*>(GetShader(m_context->platform.getMinDispatchMode()));`
`268`	`268`	`pShader->FillProgram(pKernelProgram);`
`269`	`269`	`}`
`270`	`270`