Enable clear scratch write before EOT WA for selected APIs

Change-Id: I2b202bc48b73ef41edbbaea22903b2b8a54bbd27

Author: weiyu-chen

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -3495,14 +3495,10 @@ void CEncoder::InitEncoder( bool canAbortOnSpill )
         vbuilder->SetOption(vISA_foldEOTtoPrevSend, true);
     }
 
-    if (context->type == ShaderType::PIXEL_SHADER || context->type == ShaderType::OPENCL_SHADER ||
-        context->type == ShaderType::COMPUTE_SHADER)
+    if (m_program->m_DriverInfo->clearScratchWriteBeforeEOT() &&
+        (context->type == ShaderType::PIXEL_SHADER || context->type == ShaderType::OPENCL_SHADER))
     {
-        vbuilder->SetOption(vISA_clearScratchWritesBeforeEOT, false);
-    }
-    else
-    {
-        vbuilder->SetOption(vISA_clearScratchWritesBeforeEOT, false);
+        vbuilder->SetOption(vISA_clearScratchWritesBeforeEOT, true);
     }
 
     // Disable multi-threaded latencies in the vISA scheduler when not in 3D
@@ -3859,7 +3855,6 @@ void CEncoder::InitEncoder( bool canAbortOnSpill )
         vbuilder->SetOption(vISA_ReorderDPSendToDifferentBti, false);
     }
 
-
     vKernel = nullptr;
 
     const char* kernelName = m_program->entry->getName().data();

IGC/Compiler/CISACodeGen/DriverInfo.hpp

@@ -222,6 +222,10 @@ class CDriverInfo
 
     /// Disables dual patch dispatch for APIs that don't use it
     virtual bool APIDisableDSDualPatchDispatch() const { return false; }
+
+    /// WA to make sure scratch writes are globally observed before EOT
+    virtual bool clearScratchWriteBeforeEOT() const { return false; }
+
 };
 
 }//namespace IGC

visa/include/VISAOptions.def

@@ -192,7 +192,7 @@ DEF_VISA_OPTION(vISA_ReRAPostSchedule,    ET_BOOL,  "-rerapostschedule",  UNUSED
 DEF_VISA_OPTION(vISA_GetFreeGRFInfo,      ET_BOOL,  "-getfreegrfinfo",    UNUSED, false)
 
 //=== HW Workarounds ===
-DEF_VISA_OPTION(vISA_clearScratchWritesBeforeEOT,   ET_BOOL,  NULLSTR, UNUSED, true)
+DEF_VISA_OPTION(vISA_clearScratchWritesBeforeEOT,   ET_BOOL,  NULLSTR, UNUSED, false)
 
 //=== HW debugging options ===
 DEF_VISA_OPTION(vISA_GenerateDebugInfo,   ET_BOOL,  "-generateDebugInfo", UNUSED, false)