Changes in code.

Author: iwwu

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -5365,7 +5365,6 @@ void EmitPass::emitLdInstruction(llvm::Instruction* inst)
     IGC_ASSERT_MESSAGE(numOperands < 11, "Wrong number of operands");
 
     EOPCODE opCode = GetOpCode(inst);
-    m_currShader->m_State.SetHasLoadInst();
     //Subtract the offsets, resource sources to get
     //the number of texture coordinates and index to texture source
     uint numSources = numOperands - 6;
@@ -8821,7 +8820,6 @@ void EmitPass::emitLdmsInstruction(llvm::Instruction* inst)
 {
     uint numOperands = inst->getNumOperands();
     EOPCODE opCode = GetOpCode(inst);
-    m_currShader->m_State.SetHasLoadInst();
     //Subtract the offsets, and texture resource, lod to get
     //the number of texture coordinates and index to texture source
     uint numSources = numOperands - 5;

IGC/Compiler/CISACodeGen/GenericShaderState.hpp

@@ -50,13 +50,9 @@ namespace IGC
         void SetBarrierNumber(int BarrierNumber) { m_BarrierNumber = BarrierNumber; }
         int  GetBarrierNumber() const { return m_BarrierNumber; }
 
-        bool GetHasSampleLoadGather4() const
-        {
-            return (m_HasSampleInst || m_HasGather4Inst || m_HasLoadInst);
-        }
-        void SetHasSampleInst()  { m_HasSampleInst  = true; }
-        void SetHasGather4Inst() { m_HasGather4Inst = true; }
-        void SetHasLoadInst()    { m_HasLoadInst    = true; }
+        bool GetHasSample() const { return m_HasSample; }
+        void SetHasSampleInst()  { m_HasSampleInst = true;  m_HasSample = true; }
+        void SetHasGather4Inst() { m_HasGather4Inst = true; m_HasSample = true; }
 
         bool GetHasDPAS() const { return m_HasDPAS; }
         void SetHasDPAS() { m_HasDPAS = true; }
@@ -119,9 +115,9 @@ namespace IGC
                 (NumInst < IGC_GET_FLAG_VALUE(MidThreadPreemptionDisableThreshold)));
         }
     private:
+        bool m_HasSample = false;
         bool m_HasSampleInst = false;
         bool m_HasGather4Inst = false;
-        bool m_HasLoadInst = false;
         int m_BarrierNumber = 0;
         bool m_HasDPAS = false;
         // Shader has LSC store messages with non-default L1 cache control

IGC/Compiler/CISACodeGen/OpenCLKernelCodeGen.cpp

@@ -2873,7 +2873,7 @@ namespace IGC
 
         // TODO: need to change misleading HasBarriers to NumberofBarriers
         m_kernelInfo.m_executionEnvironment.HasBarriers = m_State.GetBarrierNumber();
-        m_kernelInfo.m_executionEnvironment.HasSample = m_State.GetHasSampleLoadGather4();
+        m_kernelInfo.m_executionEnvironment.HasSample = m_State.GetHasSample();
         m_kernelInfo.m_executionEnvironment.DisableMidThreadPreemption = GetDisableMidThreadPreemption();
         m_kernelInfo.m_executionEnvironment.SubgroupIndependentForwardProgressRequired =
             m_Context->getModuleMetaData()->compOpt.SubgroupIndependentForwardProgressRequired;