[Autobackout][FuncReg]Revert of change: 8e150f6

jgu222 · jgu222 · commit f81761cdca4c · 2020-02-07T04:12:57.000-08:00
When NoMask WA is needed, disable jmpi completely as
there is no way to apply WA to jmpi.

So far, no issue is seen, but it could be potentially
infinite looping within a shader.

Change-Id: I6a739010d6d50f4e8e6253e5482237ef79cb6bb1
diff --git a/IGC/Compiler/CISACodeGen/CISABuilder.cpp b/IGC/Compiler/CISACodeGen/CISABuilder.cpp
@@ -3971,14 +3971,11 @@ namespace IGC
 
         if (IGC_IS_FLAG_ENABLED(ForceNoMaskWA)) {
             SaveOption(vISA_forceNoMaskWA, true);
-            SaveOption(vISA_EnableScalarJmp, false);
         }
         if (m_program->m_Platform->getWATable().Wa_1407528679 != 0 &&
             IGC_GET_FLAG_VALUE(NoMaskWA) > 0)
         {
             SaveOption(vISA_noMaskWA, IGC_GET_FLAG_VALUE(NoMaskWA));
-            // turn off jmpi as there is no wa for jmpi
-            SaveOption(vISA_EnableScalarJmp, false);
         }
 
         if (IGC_IS_FLAG_ENABLED(DisableCSEL))

Original file line number	Diff line number	Diff line change
`@@ -3971,14 +3971,11 @@ namespace IGC`
`3971`	`3971`
`3972`	`3972`	`if (IGC_IS_FLAG_ENABLED(ForceNoMaskWA)) {`
`3973`	`3973`	`SaveOption(vISA_forceNoMaskWA, true);`
`3974`		`- SaveOption(vISA_EnableScalarJmp, false);`
`3975`	`3974`	`}`
`3976`	`3975`	`if (m_program->m_Platform->getWATable().Wa_1407528679 != 0 &&`
`3977`	`3976`	`IGC_GET_FLAG_VALUE(NoMaskWA) > 0)`
`3978`	`3977`	`{`
`3979`	`3978`	`SaveOption(vISA_noMaskWA, IGC_GET_FLAG_VALUE(NoMaskWA));`
`3980`		`- // turn off jmpi as there is no wa for jmpi`
`3981`		`- SaveOption(vISA_EnableScalarJmp, false);`
`3982`	`3979`	`}`
`3983`	`3980`
`3984`	`3981`	`if (IGC_IS_FLAG_ENABLED(DisableCSEL))`