Revert "fix: remove spir support from xe2 and later"

This reverts commit bcfcd02a03. Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
2026-01-04 15:53:45 +08:00 · 2025-09-23 01:39:46 +02:00
parent e7e3c4126d
commit 39a3ea0e0e
37 changed files with 59 additions and 76 deletions
--- a/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/helpers/compiler_aot_config_tgllp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/compiler_product_helper_base.inl"
-#include "shared/source/helpers/compiler_product_helper_before_xe2.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hp.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
--- a/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/helpers/compiler_aot_config_tgllp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/compiler_product_helper_base.inl"
-#include "shared/source/helpers/compiler_product_helper_before_xe2.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hp.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
--- a/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/helpers/compiler_aot_config_tgllp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/compiler_product_helper_base.inl"
-#include "shared/source/helpers/compiler_product_helper_before_xe2.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hp.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
--- a/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/helpers/compiler_aot_config_tgllp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/compiler_product_helper_base.inl"
-#include "shared/source/helpers/compiler_product_helper_before_xe2.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hp.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
--- a/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/helpers/compiler_aot_config_tgllp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/compiler_product_helper_base.inl"
-#include "shared/source/helpers/compiler_product_helper_before_xe2.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hp.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
--- a/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp
+++ b/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/helpers/compiler_aot_config_tgllp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/compiler_product_helper_base.inl"
-#include "shared/source/helpers/compiler_product_helper_before_xe2.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hp.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
--- a/shared/source/helpers/CMakeLists.txt
+++ b/shared/source/helpers/CMakeLists.txt
@@ -44,14 +44,12 @@ set(NEO_CORE_HELPERS
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_aot_config_tgllp_and_later.inl
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_before_xe_hp.inl
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_before_xe_hpc.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_before_xe2.inl
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_disable_subgroup_local_block_io.inl
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_enable_subgroup_local_block_io.inl
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_product_config_default.inl
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_tgllp_and_later.inl
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_xe_hp_and_later.inl
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_xe_hpc_and_later.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_xe2_and_later.inl
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options_parser.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options_parser.h
    ${CMAKE_CURRENT_SOURCE_DIR}/completion_stamp.h
--- a/shared/source/helpers/compiler_product_helper.h
+++ b/shared/source/helpers/compiler_product_helper.h
@@ -70,7 +70,7 @@ class CompilerProductHelper {
    virtual bool isForceToStatelessRequired() const = 0;
    virtual bool failBuildProgramWithStatefulAccessPreference() const = 0;
    virtual bool isDotIntegerProductExtensionSupported() const = 0;
-    virtual bool isSpirSupported() const = 0;
+    virtual bool isSpirSupported(const ReleaseHelper *releaseHelper) const = 0;
    virtual bool oclocEnforceZebinFormat() const = 0;
    virtual void setProductConfigForHwInfo(HardwareInfo &hwInfo, HardwareIpVersion config) const = 0;
    virtual const char *getCachingPolicyOptions(bool isDebuggerActive) const = 0;
@@ -126,7 +126,7 @@ class CompilerProductHelperHw : public CompilerProductHelper {
    bool isForceToStatelessRequired() const override;
    bool failBuildProgramWithStatefulAccessPreference() const override;
    bool isDotIntegerProductExtensionSupported() const override;
-    bool isSpirSupported() const override;
+    bool isSpirSupported(const ReleaseHelper *releaseHelper) const override;
    bool oclocEnforceZebinFormat() const override;
    void setProductConfigForHwInfo(HardwareInfo &hwInfo, HardwareIpVersion config) const override;
    const char *getCachingPolicyOptions(bool isDebuggerActive) const override;
--- a/shared/source/helpers/compiler_product_helper_base.inl
+++ b/shared/source/helpers/compiler_product_helper_base.inl
@@ -194,7 +194,7 @@ std::string CompilerProductHelperHw<gfxProduct>::getDeviceExtensions(const Hardw
    if (isDotIntegerProductExtensionSupported()) {
        extensions += "cl_khr_integer_dot_product ";
    }
-    if (isSpirSupported()) {
+    if (isSpirSupported(releaseHelper)) {
        extensions += "cl_khr_spir ";
    }

@@ -260,6 +260,15 @@ bool CompilerProductHelperHw<gfxProduct>::isDotProductAccumulateSystolicSupporte
    return false;
 }

+template <PRODUCT_FAMILY gfxProduct>
+bool CompilerProductHelperHw<gfxProduct>::isSpirSupported(const ReleaseHelper *releaseHelper) const {
+    if (releaseHelper) {
+        return releaseHelper->isSpirSupported();
+    }
+
+    return true;
+}
+
 template <PRODUCT_FAMILY gfxProduct>
 bool CompilerProductHelperHw<gfxProduct>::isSplitMatrixMultiplyAccumulateSupported(const ReleaseHelper *releaseHelper) const {
    if (releaseHelper) {
--- a/shared/source/helpers/compiler_product_helper_before_xe2.inl
+++ b/shared/source/helpers/compiler_product_helper_before_xe2.inl
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2025 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/source/helpers/compiler_product_helper.h"
-
-namespace NEO {
-template <PRODUCT_FAMILY gfxProduct>
-bool CompilerProductHelperHw<gfxProduct>::isSpirSupported() const {
-    return true;
-}
-
-} // namespace NEO
--- a/shared/source/helpers/compiler_product_helper_xe2_and_later.inl
+++ b/shared/source/helpers/compiler_product_helper_xe2_and_later.inl
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2025 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/source/helpers/compiler_product_helper.h"
-
-namespace NEO {
-template <PRODUCT_FAMILY gfxProduct>
-bool CompilerProductHelperHw<gfxProduct>::isSpirSupported() const {
-    return false;
-}
-
-} // namespace NEO
--- a/shared/source/release_helper/release_helper.h
+++ b/shared/source/release_helper/release_helper.h
@@ -69,6 +69,7 @@ class ReleaseHelper {
    virtual bool isPostImageWriteFlushRequired() const = 0;
    virtual uint32_t adjustMaxThreadsPerEuCount(uint32_t maxThreadsPerEuCount, uint32_t grfCount) const = 0;
    virtual bool shouldQueryPeerAccess() const = 0;
+    virtual bool isSpirSupported() const = 0;

  protected:
    ReleaseHelper(HardwareIpVersion hardwareIpVersion) : hardwareIpVersion(hardwareIpVersion) {}
@@ -117,6 +118,7 @@ class ReleaseHelperHw : public ReleaseHelper {
    bool isPostImageWriteFlushRequired() const override;
    uint32_t adjustMaxThreadsPerEuCount(uint32_t maxThreadsPerEuCount, uint32_t grfCount) const override;
    bool shouldQueryPeerAccess() const override;
+    bool isSpirSupported() const override;

  protected:
    ReleaseHelperHw(HardwareIpVersion hardwareIpVersion) : ReleaseHelper(hardwareIpVersion) {}
--- a/shared/source/release_helper/release_helper_base.inl
+++ b/shared/source/release_helper/release_helper_base.inl
@@ -191,4 +191,9 @@ bool ReleaseHelperHw<releaseType>::shouldQueryPeerAccess() const {
    return false;
 }

+template <ReleaseType releaseType>
+bool ReleaseHelperHw<releaseType>::isSpirSupported() const {
+    return true;
+}
+
 } // namespace NEO
--- a/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp
+++ b/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp
@@ -10,7 +10,6 @@
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 #include "shared/source/helpers/compiler_product_helper_mtl_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
-#include "shared/source/helpers/compiler_product_helper_xe2_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl"

--- a/shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp
+++ b/shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp
@@ -10,7 +10,6 @@
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 #include "shared/source/helpers/compiler_product_helper_mtl_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
-#include "shared/source/helpers/compiler_product_helper_xe2_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl"

--- a/shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp
+++ b/shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp
@@ -10,7 +10,6 @@
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 #include "shared/source/helpers/compiler_product_helper_mtl_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
-#include "shared/source/helpers/compiler_product_helper_xe2_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl"

--- a/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp
+++ b/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/helpers/compiler_aot_config_tgllp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/compiler_product_helper_base.inl"
-#include "shared/source/helpers/compiler_product_helper_before_xe2.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
--- a/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp
+++ b/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp
@@ -8,7 +8,6 @@
 #include "shared/source/helpers/compiler_aot_config_tgllp_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/compiler_product_helper_base.inl"
-#include "shared/source/helpers/compiler_product_helper_before_xe2.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 #include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl"
--- a/shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl
+++ b/shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl
@@ -7,7 +7,6 @@

 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/compiler_product_helper_base.inl"
-#include "shared/source/helpers/compiler_product_helper_before_xe2.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 #include "shared/source/helpers/compiler_product_helper_mtl_and_later.inl"