fix: remove spir support from xe2 and later

Related-To: NEO-15215

Signed-off-by: Grochowski, Stanislaw <stanislaw.grochowski@intel.com>

manifests/manifest.yml

@@ -41,7 +41,7 @@ components:
     dest_dir: kernels_bin
     type: git
     branch: kernels_bin
-    revision: 3648-5453
+    revision: 3648-5462
   level_zero:
     asset_name: level_zero
     dest_dir: level_zero

shared/offline_compiler/source/CMakeLists.txt

@@ -62,7 +62,9 @@ set(CLOC_LIB_SRCS_LIB
     ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper_base.inl
     ${NEO_SHARED_DIRECTORY}/helpers/compiler_aot_config_tgllp_and_later.inl
     ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper_before_xe_hpc.inl
+    ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper_before_xe2.inl
     ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper_xe_hpc_and_later.inl
+    ${NEO_SHARED_DIRECTORY}/helpers/compiler_product_helper_xe2_and_later.inl
     ${NEO_SHARED_DIRECTORY}/helpers/compiler_options_parser.cpp
     ${NEO_SHARED_DIRECTORY}/helpers/compiler_options_parser.h
     ${NEO_SHARED_DIRECTORY}/helpers/cache_policy.h

shared/source/gen12lp/enable_compiler_product_helper_adln.cpp

@@ -8,6 +8,7 @@
 #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"

shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp

@@ -8,6 +8,7 @@
 #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"

shared/source/gen12lp/enable_compiler_product_helper_adls.cpp

@@ -8,6 +8,7 @@
 #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"

shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp

@@ -8,6 +8,7 @@
 #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"

shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp

@@ -8,6 +8,7 @@
 #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"

shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp

@@ -8,6 +8,7 @@
 #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"

shared/source/helpers/CMakeLists.txt

@@ -44,12 +44,14 @@ 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

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 ReleaseHelper *releaseHelper) const = 0;
+    virtual bool isSpirSupported() 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 ReleaseHelper *releaseHelper) const override;
+    bool isSpirSupported() const override;
     bool oclocEnforceZebinFormat() const override;
     void setProductConfigForHwInfo(HardwareInfo &hwInfo, HardwareIpVersion config) const override;
     const char *getCachingPolicyOptions(bool isDebuggerActive) const override;

shared/source/helpers/compiler_product_helper_base.inl

@@ -189,7 +189,7 @@ std::string CompilerProductHelperHw<gfxProduct>::getDeviceExtensions(const Hardw
     if (isDotIntegerProductExtensionSupported()) {
         extensions += "cl_khr_integer_dot_product ";
     }
-    if (isSpirSupported(releaseHelper)) {
+    if (isSpirSupported()) {
         extensions += "cl_khr_spir ";
     }
 
@@ -255,15 +255,6 @@ 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) {

shared/source/helpers/compiler_product_helper_before_xe2.inl

@@ -0,0 +1,16 @@
+/*
+ * 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

shared/source/helpers/compiler_product_helper_xe2_and_later.inl

@@ -0,0 +1,16 @@
+/*
+ * 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

shared/source/release_helper/release_helper.h

@@ -68,7 +68,6 @@ 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;
     virtual bool isSingleDispatchRequiredForMultiCCS() const = 0;
 
   protected:
@@ -117,7 +116,6 @@ 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;
     bool isSingleDispatchRequiredForMultiCCS() const override;
 
   protected:

shared/source/release_helper/release_helper_base.inl

@@ -186,11 +186,6 @@ bool ReleaseHelperHw<releaseType>::shouldQueryPeerAccess() const {
     return false;
 }
 
-template <ReleaseType releaseType>
-bool ReleaseHelperHw<releaseType>::isSpirSupported() const {
-    return true;
-}
-
 template <ReleaseType releaseType>
 bool ReleaseHelperHw<releaseType>::isSingleDispatchRequiredForMultiCCS() const {
     return false;

shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp

@@ -10,6 +10,7 @@
 #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"
 

shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp

@@ -10,6 +10,7 @@
 #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"
 

shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp

@@ -10,6 +10,7 @@
 #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"
 

shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp

@@ -8,6 +8,7 @@
 #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"

shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp

@@ -8,6 +8,7 @@
 #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"

shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl

@@ -7,6 +7,7 @@
 
 #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"

shared/test/common/mocks/mock_compiler_product_helper.h

@@ -55,7 +55,7 @@ class MockCompilerProductHelper : public CompilerProductHelper {
     ADDMETHOD_CONST_NOBASE(getFinalizerLibraryName, const char *, nullptr, ());
     ADDMETHOD_CONST_NOBASE(useIgcAsFcl, bool, false, ());
     ADDMETHOD_CONST_NOBASE(getPreferredIntermediateRepresentation, IGC::CodeType::CodeType_t, IGC::CodeType::undefined, ());
-    ADDMETHOD_CONST_NOBASE(isSpirSupported, bool, true, (const ReleaseHelper *releaseHelper));
+    ADDMETHOD_CONST_NOBASE(isSpirSupported, bool, true, ());
 };
 
 class MockCompilerProductHelperHeapless : public MockCompilerProductHelper {

shared/test/common/mocks/mock_release_helper.h

@@ -46,7 +46,6 @@ class MockReleaseHelper : public ReleaseHelper {
     ADDMETHOD_CONST_NOBASE(adjustMaxThreadsPerEuCount, uint32_t, 8u, (uint32_t maxThreadsPerEuCount, uint32_t grfCount));
     ADDMETHOD_CONST_NOBASE_VOIDRETURN(adjustRTDispatchGlobals, (void *rtDispatchGlobals, uint32_t rtStacksPerDss, bool heaplessEnabled, uint32_t maxBvhLevels));
     ADDMETHOD_CONST_NOBASE(shouldQueryPeerAccess, bool, false, ());
-    ADDMETHOD_CONST_NOBASE(isSpirSupported, bool, true, ());
     ADDMETHOD_CONST_NOBASE(isSingleDispatchRequiredForMultiCCS, bool, false, ());
 
     const SizeToPreferredSlmValueArray &getSizeToPreferredSlmValue(bool isHeapless) const override {

shared/test/unit_test/helpers/compiler_product_helper_tests.cpp

@@ -78,6 +78,18 @@ HWTEST2_F(CompilerProductHelperFixture, GivenPreXeHpThenCreateBufferWithProperti
     EXPECT_FALSE(compilerProductHelper.isCreateBufferWithPropertiesSupported());
 }
 
+HWTEST2_F(CompilerProductHelperFixture, GivenXe2AndLaterThenSpirIsNotSupported, IsAtLeastXe2HpgCore) {
+    auto &compilerProductHelper = pDevice->getCompilerProductHelper();
+
+    EXPECT_FALSE(compilerProductHelper.isSpirSupported());
+}
+
+HWTEST2_F(CompilerProductHelperFixture, GivenPreXe2ThenSpirIsSupported, IsAtMostXeCore) {
+    auto &compilerProductHelper = pDevice->getCompilerProductHelper();
+
+    EXPECT_TRUE(compilerProductHelper.isSpirSupported());
+}
+
 HWTEST2_F(CompilerProductHelperFixture, GivenXeHpcAndLaterThenSubgroupNamedBarrierIsSupported, IsAtLeastXeHpcCore) {
     auto &compilerProductHelper = pDevice->getCompilerProductHelper();
 
@@ -208,42 +220,30 @@ HWTEST2_F(CompilerProductHelperFixture, GivenReleaseHelperThenSplitMatrixMultipl
     }
 }
 
-TEST_F(CompilerProductHelperFixture, GivenReleaseHelperThenSpirIsSupportedBasedOnReleaseHelper) {
+HWTEST2_F(CompilerProductHelperFixture, givenAtLeastXe2HpgCoreWhenQueryingExtensionsThenSpirIsNotReported, IsAtLeastXe2HpgCore) {
     auto &compilerProductHelper = pDevice->getCompilerProductHelper();
-    auto releaseHelper = pDevice->getReleaseHelper();
+    auto *releaseHelper = getReleaseHelper();
-    if (releaseHelper) {
+    auto hwInfo = *defaultHwInfo;
-        EXPECT_EQ(releaseHelper->isSpirSupported(), compilerProductHelper.isSpirSupported(releaseHelper));
+    auto extensionString = compilerProductHelper.getDeviceExtensions(hwInfo, releaseHelper);
-    } else {
+    std::set<std::string> extensions;
-        EXPECT_TRUE(compilerProductHelper.isSpirSupported(releaseHelper));
+    std::istringstream iss(extensionString);
+    for (std::string extension; iss >> extension;) {
+        extensions.insert(extension);
     }
-
+    EXPECT_FALSE(extensions.contains("cl_khr_spir"));
-    EXPECT_TRUE(compilerProductHelper.isSpirSupported(nullptr));
 }
 
-TEST_F(CompilerProductHelperFixture, GivenReleaseHelperThenSpirSupportIsReportedBasedOnReleaseHelper) {
+HWTEST2_F(CompilerProductHelperFixture, givenAtMostXeHpgCoreWhenQueryingExtensionsThenSpirIsReported, IsAtMostXeHpgCore) {
     auto &compilerProductHelper = pDevice->getCompilerProductHelper();
+    auto *releaseHelper = getReleaseHelper();
     auto hwInfo = *defaultHwInfo;
-
+    auto extensionString = compilerProductHelper.getDeviceExtensions(hwInfo, releaseHelper);
-    auto releaseHelper = std::unique_ptr<MockReleaseHelper>(new MockReleaseHelper());
-    releaseHelper->isSpirSupportedResult = true;
-
-    auto extensionString = compilerProductHelper.getDeviceExtensions(hwInfo, releaseHelper.get());
     std::set<std::string> extensions;
     std::istringstream iss(extensionString);
     for (std::string extension; iss >> extension;) {
         extensions.insert(extension);
     }
     EXPECT_TRUE(extensions.contains("cl_khr_spir"));
-
-    releaseHelper->isSpirSupportedResult = false;
-    extensions.clear();
-    extensionString = compilerProductHelper.getDeviceExtensions(hwInfo, releaseHelper.get());
-    iss.clear();
-    iss.str(extensionString);
-    for (std::string extension; iss >> extension;) {
-        extensions.insert(extension);
-    }
-    EXPECT_FALSE(extensions.contains("cl_khr_spir"));
 }
 
 HWTEST2_F(CompilerProductHelperFixture, GivenReleaseHelperThenSplitMatrixMultiplyAccumulateIsNotSupported, IsXeHpcCore) {

shared/test/unit_test/release_helper/release_helper_12_55_tests.cpp

@@ -40,7 +40,6 @@ TEST_F(ReleaseHelper1255Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_TRUE(releaseHelper->isRayTracingSupported());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_12_56_tests.cpp

@@ -40,7 +40,6 @@ TEST_F(ReleaseHelper1256Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_TRUE(releaseHelper->isRayTracingSupported());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_12_57_tests.cpp

@@ -40,7 +40,6 @@ TEST_F(ReleaseHelper1257Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_TRUE(releaseHelper->isRayTracingSupported());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_12_60_tests.cpp

@@ -38,7 +38,6 @@ TEST_F(ReleaseHelper1260Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_TRUE(releaseHelper->isRayTracingSupported());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_12_61_tests.cpp

@@ -37,7 +37,6 @@ TEST_F(ReleaseHelper1261Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_TRUE(releaseHelper->isRayTracingSupported());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_12_70_tests.cpp

@@ -42,7 +42,6 @@ TEST_F(ReleaseHelper1270Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
         EXPECT_TRUE(releaseHelper->isDirectSubmissionLightSupported());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_12_71_tests.cpp

@@ -42,7 +42,6 @@ TEST_F(ReleaseHelper1271Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
         EXPECT_TRUE(releaseHelper->isDirectSubmissionLightSupported());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_12_74_tests.cpp

@@ -41,7 +41,6 @@ TEST_F(ReleaseHelper1274Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
         EXPECT_TRUE(releaseHelper->isDirectSubmissionLightSupported());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_20_01_tests.cpp

@@ -39,7 +39,6 @@ TEST_F(ReleaseHelper2001Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_TRUE(releaseHelper->isRayTracingSupported());
         EXPECT_TRUE(releaseHelper->isGlobalBindlessAllocatorEnabled());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_20_02_tests.cpp

@@ -39,7 +39,6 @@ TEST_F(ReleaseHelper2002Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
         EXPECT_TRUE(releaseHelper->isRayTracingSupported());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_20_04_tests.cpp

@@ -41,7 +41,6 @@ TEST_F(ReleaseHelper2004Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_TRUE(releaseHelper->isGlobalBindlessAllocatorEnabled());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_FALSE(releaseHelper->getFtrXe2Compression());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_30_00_tests.cpp

@@ -39,7 +39,6 @@ TEST_F(ReleaseHelper3000Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_EQ(64u, releaseHelper->getStackSizePerRay());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_EQ(revision != 0, releaseHelper->getFtrXe2Compression());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_30_01_tests.cpp

@@ -39,7 +39,6 @@ TEST_F(ReleaseHelper3001Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_EQ(64u, releaseHelper->getStackSizePerRay());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_TRUE(releaseHelper->getFtrXe2Compression());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }
 

shared/test/unit_test/release_helper/release_helper_30_03_tests.cpp

@@ -39,7 +39,6 @@ TEST_F(ReleaseHelper3003Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe
         EXPECT_EQ(0u, releaseHelper->getStackSizePerRay());
         EXPECT_TRUE(releaseHelper->isNumRtStacksPerDssFixedValue());
         EXPECT_TRUE(releaseHelper->getFtrXe2Compression());
-        EXPECT_TRUE(releaseHelper->isSpirSupported());
     }
 }