refactor preemption

refactor preemption. Mark movcr as uniform.

Author: scottp101

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -3006,61 +3006,6 @@ namespace IGC
         return RMEncoding::RoundToZero_int;
     }
 
-    CEncoder::PreemptionEncoding CEncoder::getEncoderPreemptionMode(EPreemptionMode preemptionMode)
-    {
-        switch (preemptionMode)
-        {
-        default:
-            break;
-        case PREEMPTION_ENABLED:
-            return PreemptionEncoding::PreemptionEnabled;
-        case PREEMPTION_DISABLED:
-            return PreemptionEncoding::PreemptionDisabled;
-        }
-
-        return PreemptionEncoding::PreemptionEnabled;
-    }
-
-    void CEncoder::SetPreemptionMode(EPreemptionMode actualPreemptionMode, EPreemptionMode newPreemptionMode)
-    {
-        if (actualPreemptionMode != newPreemptionMode)
-        {
-            PreemptionEncoding actualPreemptionMode_en = getEncoderPreemptionMode(actualPreemptionMode);
-            PreemptionEncoding newPreemptionMode_en = getEncoderPreemptionMode(newPreemptionMode);
-            SetPreemptionMode(actualPreemptionMode_en, newPreemptionMode_en);
-        }
-    }
-
-    void CEncoder::SetPreemptionMode(PreemptionEncoding actualPreemptionMode, PreemptionEncoding newPreemptionMode)
-    {
-        IGC_ASSERT_MESSAGE(
-            (actualPreemptionMode != newPreemptionMode),
-            "Only setting PreemptionMode if the new PreemptionMode is different from the current PreemptionMode!");
-
-        VISA_VectorOpnd* src0_Opnd = nullptr;
-        VISA_VectorOpnd* src1_Opnd = nullptr;
-        VISA_VectorOpnd* dst_Opnd = nullptr;
-        VISA_GenVar* cr0_var = nullptr;
-
-        uint preemptionMode = actualPreemptionMode ^ newPreemptionMode;
-
-        IGC_ASSERT(nullptr != vKernel);
-
-        V(vKernel->GetPredefinedVar(cr0_var, PREDEFINED_CR0));
-        V(vKernel->CreateVISASrcOperand(src0_Opnd, cr0_var, MODIFIER_NONE, 0, 1, 0, 0, 0));
-        V(vKernel->CreateVISAImmediate(src1_Opnd, &preemptionMode, ISA_TYPE_UD));
-        V(vKernel->CreateVISADstOperand(dst_Opnd, cr0_var, 1, 0, 0));
-        V(vKernel->AppendVISAArithmeticInst(
-            ISA_XOR,
-            nullptr,
-            false,
-            vISA_EMASK_M1_NM,
-            EXEC_SIZE_1,
-            dst_Opnd,
-            src0_Opnd,
-            src1_Opnd));
-    }
-
     VISA_LabelOpnd* CEncoder::GetLabel(uint label)
     {
         VISA_LabelOpnd* visaLabel = labelMap[label];

IGC/Compiler/CISACodeGen/CISABuilder.hpp

@@ -471,8 +471,6 @@ namespace IGC
         void SetRoundingMode_FP(ERoundingMode actualRM, ERoundingMode newRM);
         void SetRoundingMode_FPCvtInt(ERoundingMode actualRM, ERoundingMode newRM);
 
-        void SetPreemptionMode(EPreemptionMode actualPreemptionMode, EPreemptionMode newPreemptionMode);
-
         static uint GetCISADataTypeSize(VISA_Type type) {return CVariable::GetCISADataTypeSize(type);}
         static e_alignment GetCISADataTypeAlignment(VISA_Type type) {return CVariable::GetCISADataTypeAlignment(type);}
 
@@ -671,17 +669,6 @@ namespace IGC
         // Get Encoding bit values for rounding mode
         RMEncoding getEncoderRoundingMode_FP(ERoundingMode FP_RM);
         RMEncoding getEncoderRoundingMode_FPCvtInt(ERoundingMode FCvtI_RM);
-
-        enum PreemptionEncoding
-        {
-            PreemptionDisabled = 0x000,
-            PreemptionEnabled = 0x800
-        };
-
-        PreemptionEncoding getEncoderPreemptionMode(EPreemptionMode preemptionMode);
-
-        void SetPreemptionMode(PreemptionEncoding actualPreemptionMode, PreemptionEncoding newPreemptionMode);
-
         unsigned GetRawOpndSplitOffset(VISA_Exec_Size fromExecSize,
             VISA_Exec_Size toExecSize,
             unsigned thePart, CVariable* var) const;

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -126,7 +126,6 @@ EmitPass::EmitPass(CShaderProgram::KernelShaderMap& shaders, SIMDMode mode, bool
     m_canAbortOnSpill(canAbortOnSpill),
     m_roundingMode_FP(ERoundingMode::ROUND_TO_NEAREST_EVEN),
     m_roundingMode_FPCvtInt(ERoundingMode::ROUND_TO_ZERO),
-    m_preemptionMode(EPreemptionMode::PREEMPTION_ENABLED),
     m_pSignature(pSignature),
     m_isDuplicate(false)
 {
@@ -1264,8 +1263,6 @@ bool EmitPass::runOnFunction(llvm::Function& F)
         (m_currShader->GetContext()->m_instrTypes.numLoopInsts == 0) &&
         (m_currShader->ProgramOutput()->m_InstructionCount < IGC_GET_FLAG_VALUE(MidThreadPreemptionDisableThreshold)))
     {
-        m_preemptionMode = PREEMPTION_DISABLED;
-
         if (m_currShader->GetShaderType() == ShaderType::COMPUTE_SHADER)
         {
             CComputeShader* csProgram = static_cast<CComputeShader*>(m_currShader);
@@ -16928,15 +16925,6 @@ void EmitPass::SetRoundingMode_FPCvtInt(ERoundingMode newRM_FPCvtInt)
     }
 }
 
-void EmitPass::SetPreemptionMode(EPreemptionMode newPreemptionMode)
-{
-    if (newPreemptionMode != m_preemptionMode)
-    {
-        m_encoder->SetPreemptionMode(m_preemptionMode, newPreemptionMode);
-        m_preemptionMode = newPreemptionMode;
-    }
-}
-
 // Return true if inst needs specific rounding mode; false otherwise.
 //
 // Currently, only gen intrinsic needs rounding mode other than the default.

IGC/Compiler/CISACodeGen/EmitVISAPass.hpp

@@ -813,8 +813,6 @@ class EmitPass : public llvm::FunctionPass
     ERoundingMode m_roundingMode_FP;
     ERoundingMode m_roundingMode_FPCvtInt;
 
-    EPreemptionMode m_preemptionMode;
-
     uint m_currentBlock = (uint) -1;
 
     bool m_currFuncHasSubroutine = false;
@@ -890,8 +888,6 @@ class EmitPass : public llvm::FunctionPass
     bool setRMExplicitly(llvm::Instruction* inst);
     void ResetRoundingMode(llvm::Instruction* inst);
 
-    void SetPreemptionMode(EPreemptionMode newPreemptionMode);
-
     // returns true if the instruction does not care about the rounding mode settings
     bool ignoreRoundingMode(llvm::Instruction* inst) const;
 

IGC/Compiler/CISACodeGen/RayTracingShaderLowering.cpp

@@ -20,6 +20,7 @@ SPDX-License-Identifier: MIT
 #include "RayTracingShaderLowering.hpp"
 #include "AdaptorCommon/RayTracing/RTBuilder.h"
 #include "IGCPassSupport.h"
+#include "Compiler/CISACodeGen/EmitVISAPass.hpp"
 #include "common/LLVMWarningsPush.hpp"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Module.h"

IGC/Compiler/CISACodeGen/WIAnalysis.cpp

@@ -1331,6 +1331,7 @@ WIAnalysis::WIDependancy WIAnalysisRunner::calculate_dep(const CallInst* inst)
         GII_id == GenISAIntrinsic::GenISA_dual_subslice_id ||
         GII_id == GenISAIntrinsic::GenISA_eu_id        ||
         GII_id == GenISAIntrinsic::GenISA_eu_thread_id ||
+        GII_id == GenISAIntrinsic::GenISA_movcr ||
         GII_id == GenISAIntrinsic::GenISA_hw_thread_id ||
         GII_id == GenISAIntrinsic::GenISA_hw_thread_id_alloca ||
         GII_id == GenISAIntrinsic::GenISA_StackAlloca ||