Add missing code for XEHP

 Add missing code for XEHP

Author: lwesiers

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -9019,6 +9019,9 @@ void EmitPass::EmitGenIntrinsicMessage(llvm::GenIntrinsicInst* inst)
         if (m_currShader->m_Platform->GetPlatformFamily() == IGFX_GEN8_CORE ||
             m_currShader->m_Platform->GetPlatformFamily() == IGFX_GEN9_CORE)
             emitStateRegID(14, 15);
+        else if (m_currShader->m_Platform->GetPlatformFamily() == IGFX_GEN12_CORE ||
+            m_currShader->m_Platform->GetPlatformFamily() == IGFX_XE_HP_CORE)
+            emitStateRegID(11, 13);
         else
             emitStateRegID(12, 14);
         break;

IGC/Compiler/igc_workaround.cpp

@@ -98,6 +98,10 @@ namespace IGC
             InitAdlpHwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
             InitAdlpSwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
             break;
+        case IGFX_XE_HP_SDV:
+            InitXeHPSDVHwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
+            InitXeHPSDVSwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
+            break;
         default:
             IGC_ASSERT(0);
             break;

IGC/common/SIPKernels/XeHPSIPCSR.h

@@ -124,6 +124,7 @@ iga_gen_t GetIGAPlatform(PLATFORM const & platform)
             return IGA_GEN11;
     case IGFX_GEN12_CORE:
     case IGFX_GEN12LP_CORE:
+    case IGFX_XE_HP_CORE:
         if (   ProductFamily == IGFX_TIGERLAKE_LP
             || ProductFamily == IGFX_DG1
             || ProductFamily == IGFX_ROCKETLAKE
@@ -133,6 +134,10 @@ iga_gen_t GetIGAPlatform(PLATFORM const & platform)
         {
             return IGA_GEN12p1;
         }
+        else if (ProductFamily == IGFX_XE_HP_SDV)
+        {
+            return IGA_XE_HP;
+        }
     default:
         IGC_ASSERT_MESSAGE(0, "unsupported platform");
         break;

IGC/common/SIPKernels/XeHPSIPCSRDebug.h

@@ -32,6 +32,9 @@ SPDX-License-Identifier: MIT
 #include "common/SIPKernels/Gen12LPSIPCSRDebug.h"
 #include "common/SIPKernels/Gen12LPSIPCSRDebugBindless.h"
 #include "Probe/Assertion.h"
+#include "common/SIPKernels/XeHPSIPCSR.h"
+#include "common/SIPKernels/XeHPSIPCSRDebug.h"
+#include "common/SIPKernels/XeHPSIPCSRDebugBindless.h"
 
 using namespace llvm;
 using namespace USC;
@@ -206,6 +209,7 @@ bool SIPSuppoertedOnPlatformFamily(const GFXCORE_FAMILY& family)
     case IGFX_GEN11_CORE:
     case IGFX_GEN12_CORE:
     case IGFX_GEN12LP_CORE:
+    case IGFX_XE_HP_CORE:
         return true;
     default:
         return false;
@@ -394,6 +398,11 @@ void populateSIPKernelInfo(const IGC::CPlatform &platform,
             (void*)&Gen12SIPCSRDebugBindlessDebugHeader,
             (int)sizeof(Gen12SIPCSRDebugBindlessDebugHeader));
 
+    SIPKernelInfo[XE_HP_CSR_DEBUG_BINDLESS] = std::make_tuple((void*)&XeHPSIPCSRDebugBindless,
+        (int)sizeof(XeHPSIPCSRDebugBindless),
+        (void*)&Gen12SIPCSRDebugBindlessDebugHeader,
+        (int)sizeof(Gen12SIPCSRDebugBindlessDebugHeader));
+
 
     GT_SYSTEM_INFO sysInfo = platform.GetGTSystemInfo();
     Gen12SIPCSRDebugBindlessDebugHeader.regHeader.num_slices = sysInfo.MaxSlicesSupported;
@@ -416,6 +425,8 @@ void populateSIPKernelInfo(const IGC::CPlatform &platform,
         Gen12SIPCSRDebugBindlessDebugHeader.versionHeader.size * 8) / 16 == 0x14),
         "Gen12 Bindless SIP header size alignment mismatch.");
 
+    SIPKernelInfo[XE_HP_CSR] = std::make_tuple((void*)&XeHPSIPCSR, (int)sizeof(XeHPSIPCSR), nullptr, 0);
+    SIPKernelInfo[XE_HP_CSR_DEBUG] = std::make_tuple((void*)&XeHPSIPCSRDebug, (int)sizeof(XeHPSIPCSRDebug), nullptr, 0);
 }
 
 CGenSystemInstructionKernelProgram* CGenSystemInstructionKernelProgram::Create(
@@ -509,6 +520,7 @@ CGenSystemInstructionKernelProgram* CGenSystemInstructionKernelProgram::Create(
     }
     case IGFX_GEN12_CORE:
     case IGFX_GEN12LP_CORE:
+    case IGFX_XE_HP_CORE:
     {
         if (mode & SYSTEM_THREAD_MODE_DEBUG)
         {
@@ -520,7 +532,9 @@ CGenSystemInstructionKernelProgram* CGenSystemInstructionKernelProgram::Create(
             case IGFX_ALDERLAKE_S:
                 SIPIndex = bindlessMode ? GEN12_LP_CSR_DEBUG_BINDLESS : GEN12_LP_CSR_DEBUG;
                 break;
-
+            case IGFX_XE_HP_SDV:
+                SIPIndex = bindlessMode ? XE_HP_CSR_DEBUG_BINDLESS : XE_HP_CSR_DEBUG;
+                break;
 
             default:
                 break;
@@ -541,7 +555,8 @@ CGenSystemInstructionKernelProgram* CGenSystemInstructionKernelProgram::Create(
             case IGFX_ALDERLAKE_P:
                 SIPIndex = GEN12_LP_CSR;
                 break;
-
+            case IGFX_XE_HP_SDV:
+                SIPIndex = XE_HP_CSR;
 
             default:
                 break;

IGC/common/SIPKernels/XeHPSIPCSRDebugBindless.h

@@ -58,6 +58,9 @@ namespace SIP
         GEN12_LP_CSR,
         GEN12_LP_CSR_DEBUG,
         GEN12_LP_CSR_DEBUG_BINDLESS,
+        XE_HP_CSR,
+        XE_HP_CSR_DEBUG,
+        XE_HP_CSR_DEBUG_BINDLESS,
         GEN_SIP_MAX_INDEX
     };
 

IGC/common/ShaderOverride.cpp

@@ -331,6 +331,10 @@ void InitXeHPSDVHwWaTable(
         PWA_TABLE                       pWaTable,
         PSKU_FEATURE_TABLE              pSkuTable,
         PWA_INIT_PARAM                  pWaParam);
+void InitXeHPSDVSwWaTable(
+        PWA_TABLE                       pWaTable,
+        PSKU_FEATURE_TABLE              pSkuTable,
+        PWA_INIT_PARAM                  pWaParam);
 #ifdef __cplusplus
 } // extern "C"
 #endif