Correct algorithm to compute HWTID

This change is to use state registers if WMTP is not supported by the shader type.

Author: krystian-andrzejewski

IGC/Compiler/CISACodeGen/CShader.cpp

@@ -895,7 +895,7 @@ CVariable* CShader::GetHWTID()
                     m_HW_TID = GetNewVariable(1, ISA_TYPE_UD, EALIGN_DWORD, true, 1, "HWTID");
                     encoder.SetNoMask();
                     encoder.SetSrcSubReg(0, 0);
-                    encoder.And(m_HW_TID, GetSR0(), ImmToVariable(bitmask, ISA_TYPE_D));
+                    encoder.And(m_HW_TID, GetSR0(), ImmToVariable(bitmask, ISA_TYPE_UD));
                     encoder.Push();
 
                     // Remove bit [10]
@@ -924,7 +924,7 @@ CVariable* CShader::GetHWTID()
                 m_HW_TID = GetNewVariable(1, ISA_TYPE_UD, EALIGN_DWORD, true, 1, "HWTID");
                 encoder.SetNoMask();
                 encoder.SetSrcSubReg(0, 0);
-                encoder.And(m_HW_TID, GetSR0(), ImmToVariable(bitmask, ISA_TYPE_D));
+                encoder.And(m_HW_TID, GetSR0(), ImmToVariable(bitmask, ISA_TYPE_UD));
                 encoder.Push();
 
                 // Remove bit [7:6]
@@ -946,42 +946,60 @@ CVariable* CShader::GetHWTID()
                 // directly. HWTID is calculated by:
                 // TID + 10 * [EUID:LogicalSSID]
 
-                m_HW_TID = GetNewVariable(1, ISA_TYPE_UD, EALIGN_DWORD, true, 1,
-                                          "HWTID");
-                encoder.SetNoMask();
-                encoder.SetSrcSubReg(0, 0);
+                if (m_Platform->supportsWMTPForShaderType(m_ctx->type))
+                {
+                    m_HW_TID = GetNewVariable(1, ISA_TYPE_UD, EALIGN_DWORD, true, 1,
+                        "HWTID");
+                    encoder.SetNoMask();
+                    encoder.SetSrcSubReg(0, 0);
 
-                // m_HW_TID = msg0 & BITMASK(8)
-                encoder.And(m_HW_TID, GetMSG0(), ImmToVariable(BITMASK(8), ISA_TYPE_UD));
-                encoder.Push();
+                    // m_HW_TID = msg0 & BITMASK(8)
+                    encoder.And(m_HW_TID, GetMSG0(), ImmToVariable(BITMASK(8), ISA_TYPE_UD));
+                    encoder.Push();
 
-                CVariable *euID = GetNewVariable(1, ISA_TYPE_UD, EALIGN_DWORD,
-                                                 true, 1, "SR_4_6");
-                // euID = sr0 & BITMASK(7)
-                encoder.And(euID, GetSR0(), ImmToVariable(BITMASK(7), ISA_TYPE_UD));
-                encoder.Push();
+                    CVariable* euID = GetNewVariable(1, ISA_TYPE_UD, EALIGN_DWORD,
+                        true, 1, "SR_4_6");
+                    // euID = sr0 & BITMASK(7)
+                    encoder.And(euID, GetSR0(), ImmToVariable(BITMASK(7), ISA_TYPE_UD));
+                    encoder.Push();
 
-                // m_HW_TID  = m_HW_TID << 3
-                encoder.Shl(m_HW_TID, m_HW_TID, ImmToVariable(3, ISA_TYPE_UD));
-                encoder.Push();
+                    // m_HW_TID  = m_HW_TID << 3
+                    encoder.Shl(m_HW_TID, m_HW_TID, ImmToVariable(3, ISA_TYPE_UD));
+                    encoder.Push();
 
-                // euID = euID >> 4
-                encoder.Shr(euID, euID, ImmToVariable(4, ISA_TYPE_UD));
-                encoder.Push();
+                    // euID = euID >> 4
+                    encoder.Shr(euID, euID, ImmToVariable(4, ISA_TYPE_UD));
+                    encoder.Push();
 
-                CVariable *tID = GetNewVariable(1, ISA_TYPE_UD, EALIGN_DWORD,
-                                                true, 1, "SR_0_3");
-                // tID = sr0 & BITMASK(4)
-                encoder.And(tID, GetSR0(), ImmToVariable(BITMASK(4), ISA_TYPE_UD));
-                encoder.Push();
+                    CVariable* tID = GetNewVariable(1, ISA_TYPE_UD, EALIGN_DWORD,
+                        true, 1, "SR_0_3");
+                    // tID = sr0 & BITMASK(4)
+                    encoder.And(tID, GetSR0(), ImmToVariable(BITMASK(4), ISA_TYPE_UD));
+                    encoder.Push();
 
-                // m_HW_TID = m_HW_TID | euID
-                encoder.Or(m_HW_TID, m_HW_TID, euID);
-                encoder.Push();
+                    // m_HW_TID = m_HW_TID | euID
+                    encoder.Or(m_HW_TID, m_HW_TID, euID);
+                    encoder.Push();
+
+                    // m_HW_TID = m_HW_TID * 10 + tID
+                    encoder.Mad(m_HW_TID, m_HW_TID, ImmToVariable(10, ISA_TYPE_UD), tID);
+                    encoder.Push();
+                }
+                else
+                {
+                    uint32_t bitmask = BITMASK(18);
+                    m_HW_TID = GetNewVariable(1, ISA_TYPE_UD, EALIGN_DWORD, true, 1, "HWTID");
+                    encoder.SetNoMask();
+                    encoder.SetSrcSubReg(0, 0);
+                    encoder.And(m_HW_TID, GetSR0(), ImmToVariable(bitmask, ISA_TYPE_UD));
+                    encoder.Push();
+
+                    // Remove bit [13:12]
+                    RemoveBitRange(m_HW_TID, 12, 2);
+                    // Remove bit [7]
+                    RemoveBitRange(m_HW_TID, 7, 1);
+                }
 
-                // m_HW_TID = m_HW_TID * 10 + tID
-                encoder.Mad(m_HW_TID, m_HW_TID, ImmToVariable(10, ISA_TYPE_UD), tID);
-                encoder.Push();
                 return m_HW_TID;
             }