Add ARL functionality

intel · Nov 23, 2023 · 27c8082 · 27c8082
1 parent 0f62beb
commit 27c8082
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 0 deletions.
diff --git a/IGC/Compiler/CISACodeGen/Platform.hpp b/IGC/Compiler/CISACodeGen/Platform.hpp
@@ -695,6 +695,14 @@ bool supportHWGenerateTID() const
     return IGC_IS_FLAG_ENABLED(EnableHWGenerateThreadID) && isProductChildOf(IGFX_DG2);
 }
 
+bool supportHWDispatchWalkOrder() const
+{
+    const bool hasHWDispatchWalkOrder =
+        (m_platformInfo.eProductFamily == IGFX_ARROWLAKE && !(GFX_IS_ARL_S(m_platformInfo.usDeviceID)))
+        || isCoreChildOf(IGFX_XE2_LPG_CORE);
+    return hasHWDispatchWalkOrder;
+}
+
 bool hasHalfSIMDLSC() const
 {
     return (m_platformInfo.eProductFamily == IGFX_DG2 && SI_WA_FROM(m_platformInfo.usRevId, ACM_G10_GT_REV_ID_B0)) ||

diff --git a/IGC/Compiler/CMakeLists.txt b/IGC/Compiler/CMakeLists.txt
@@ -109,6 +109,7 @@ set(IGC_BUILD__SRC__Compiler
     "${IGC_BUILD__GFX_DEV_SRC_DIR}/skuwa/igt_12_70_hw_wa.c"
     "${IGC_BUILD__GFX_DEV_SRC_DIR}/skuwa/igt_12_70_sw_wa.c"
     "${IGC_BUILD__GFX_DEV_SRC_DIR}/skuwa/igt_12_71_hw_wa.c"
+    "${IGC_BUILD__GFX_DEV_SRC_DIR}/skuwa/igt_12_74_hw_wa.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/SamplerPerfOptPass.cpp"
     ${IGC_BUILD__SRC__Compiler_CISACodeGen}
     ${IGC_BUILD__SRC__Compiler_DebugInfo}

diff --git a/IGC/Compiler/igc_workaround_linux.cpp b/IGC/Compiler/igc_workaround_linux.cpp
@@ -181,6 +181,10 @@ namespace IGC
                 {
                     InitGt_12_71HwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
                 }
+                else if (GFX_GET_GMD_RELEASE_VERSION_RENDER(platform->getPlatformInfo()) == GFX_GMD_ARCH_12_RELEASE_XE_LPG_PLUS_1274)
+                {
+                    InitGt_12_74HwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
+                }
                 InitGt_12_70SwWaTable(&waTable, pSkuFeatureTable, &stWaInitParam);
             }
             break;

diff --git a/inc/common/igfxfmid.h b/inc/common/igfxfmid.h
@@ -148,6 +148,7 @@ typedef struct GFX_GMD_ID_DEF
 
 #define GFX_GMD_ARCH_12_RELEASE_XE_LP_MD                 (70)
 #define GFX_GMD_ARCH_12_RELEASE_XE_LP_LG                 (71)
+#define GFX_GMD_ARCH_12_RELEASE_XE_LPG_PLUS_1274         (74)
 
 #define GFX_GET_GMD_RELEASE_VERSION_RENDER(p)             ((p).sRenderBlockID.GmdID.GMDRelease)
 #define GFX_GET_GMD_RELEASE_VERSION_DISPLAY(p)            ((p).sDisplayBlockID.GmdID.GMDRelease)
@@ -719,6 +720,9 @@ typedef enum __NATIVEGTTYPE
 #define DEV_ID_56C1                             0x56C1
 #define DEV_ID_56CF                             0x56CF
 
+// ARL
+#define DEV_ID_7D67                             0x7D67
+
 #define GFX_IS_DG2_G11_CONFIG(d) ( ( d == DEV_ID_56A5 )             ||   \
                                  ( d == DEV_ID_56A6 )             ||   \
                                  ( d == DEV_ID_5693 )             ||   \
@@ -752,4 +756,6 @@ typedef enum __NATIVEGTTYPE
                                       ( d == DEV_ID_56B2 )                              ||   \
                                       ( d == DEV_ID_56B3 ))
 
+#define GFX_IS_ARL_S(d)  ( ( d == DEV_ID_7D67 ) )
+
 #endif
diff --git a/skuwa/igt_12_74_hw_wa.c b/skuwa/igt_12_74_hw_wa.c
@@ -0,0 +1,22 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2022-2023 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+// This is an auto-generated file. Please do not edit!
+// If changes are needed here please reach out to the codeowners, thanks.
+
+
+#include "wa_def.h"
+#include "igt_12_74_rev_id.h"
+
+
+void InitGt_12_74HwWaTable(PWA_TABLE pWaTable, PSKU_FEATURE_TABLE pSkuTable, PWA_INIT_PARAM pWaParam)
+{
+        int iStepId_GT_12_74 = (int)pWaParam->usRenderRevID;
+
+
+}
diff --git a/skuwa/igt_12_74_rev_id.h b/skuwa/igt_12_74_rev_id.h
@@ -0,0 +1,17 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2022-2023 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+// This is an auto-generated file. Please do not edit!
+// If changes are needed here please reach out to the codeowners, thanks.
+
+#include "wa_def.h"
+
+#define GT_12_74_REV_ID_A0   SI_REV_ID(0,0)
+
+#define GT_12_74_REV_ID_B0   SI_REV_ID(4,4)
+
diff --git a/skuwa/wa_def.h b/skuwa/wa_def.h
@@ -366,6 +366,10 @@ void InitGt_12_71HwWaTable(
        PWA_TABLE                       pWaTable,
        PSKU_FEATURE_TABLE              pSkuTable,
        PWA_INIT_PARAM                  pWaParam);
+void InitGt_12_74HwWaTable(
+       PWA_TABLE                       pWaTable,
+       PSKU_FEATURE_TABLE              pSkuTable,
+       PWA_INIT_PARAM                  pWaParam);
 void InitGt_12_70SwWaTable(
        PWA_TABLE                       pWaTable,
        PSKU_FEATURE_TABLE              pSkuTable,