refactor: add separate helper for extension support

cl_intel_subgroup_split_matrix_multiply_accumulate

Related-To: NEO-7800
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

shared/source/gen11/enable_compiler_product_helper_ehl.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen11/enable_compiler_product_helper_icllp.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen11/enable_compiler_product_helper_lkf.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen12lp/enable_compiler_product_helper_adln.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 
 #include "compiler_product_helper_adln.inl"

shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 
 #include "compiler_product_helper_adlp.inl"

shared/source/gen12lp/enable_compiler_product_helper_adls.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen8/enable_compiler_product_helper_bdw.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_disable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen9/enable_compiler_product_helper_bxt.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_disable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen9/enable_compiler_product_helper_cfl.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_disable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen9/enable_compiler_product_helper_glk.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_disable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen9/enable_compiler_product_helper_kbl.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_disable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/gen9/enable_compiler_product_helper_skl.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.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_disable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_disable_subgroup_local_block_io.inl"
 
 namespace NEO {

shared/source/helpers/CMakeLists.txt

@@ -45,7 +45,9 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_bdw_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_disable_split_matrix_multiply_accumulate.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_disable_subgroup_local_block_io.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_enable_split_matrix_multiply_accumulate.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_enable_subgroup_local_block_io.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

shared/source/helpers/compiler_product_helper.h

@@ -37,6 +37,7 @@ class CompilerProductHelper {
     virtual bool isForceEmuInt32DivRemSPRequired() const = 0;
     virtual bool isStatelessToStatefulBufferOffsetSupported() const = 0;
     virtual bool isMatrixMultiplyAccumulateSupported(const HardwareInfo &hwInfo) const = 0;
+    virtual bool isSplitMatrixMultiplyAccumulateSupported(const HardwareInfo &hwInfo) const = 0;
     virtual bool isBFloat16ConversionSupported(const HardwareInfo &hwInfo) const = 0;
     virtual bool isSubgroupLocalBlockIoSupported() const = 0;
     virtual bool isDotAccumulateSupported() const = 0;
@@ -69,6 +70,7 @@ class CompilerProductHelperHw : public CompilerProductHelper {
     bool isForceEmuInt32DivRemSPRequired() const override;
     bool isStatelessToStatefulBufferOffsetSupported() const override;
     bool isMatrixMultiplyAccumulateSupported(const HardwareInfo &hwInfo) const override;
+    bool isSplitMatrixMultiplyAccumulateSupported(const HardwareInfo &hwInfo) const override;
     bool isBFloat16ConversionSupported(const HardwareInfo &hwInfo) const override;
     bool isSubgroupLocalBlockIoSupported() const override;
     bool isDotAccumulateSupported() const override;

shared/source/helpers/compiler_product_helper_base.inl

@@ -50,6 +50,9 @@ std::string CompilerProductHelperHw<gfxProduct>::getExtensions(const HardwareInf
 
     if (isMatrixMultiplyAccumulateSupported(hwInfo)) {
         extensions += "cl_intel_subgroup_matrix_multiply_accumulate ";
+    }
+
+    if (isSplitMatrixMultiplyAccumulateSupported(hwInfo)) {
         extensions += "cl_intel_subgroup_split_matrix_multiply_accumulate ";
     }
 

shared/source/helpers/compiler_product_helper_disable_split_matrix_multiply_accumulate.inl

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/helpers/compiler_product_helper.h"
+
+namespace NEO {
+template <PRODUCT_FAMILY gfxProduct>
+bool CompilerProductHelperHw<gfxProduct>::isSplitMatrixMultiplyAccumulateSupported(const HardwareInfo &hwInfo) const {
+    return false;
+}
+
+} // namespace NEO

shared/source/helpers/compiler_product_helper_enable_split_matrix_multiply_accumulate.inl

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/helpers/compiler_product_helper.h"
+
+namespace NEO {
+template <PRODUCT_FAMILY gfxProduct>
+bool CompilerProductHelperHw<gfxProduct>::isSplitMatrixMultiplyAccumulateSupported(const HardwareInfo &hwInfo) const {
+    return true;
+}
+
+} // namespace NEO

shared/source/helpers/gfx_core_helper_base.inl

@@ -12,7 +12,6 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/basic_math.h"
-#include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/hw_info.h"

shared/source/xe_hp_core/enable_compiler_product_helper_xe_hp_sdv.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/helpers/compiler_product_helper_base.inl"
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl"
+#include "shared/source/helpers/compiler_product_helper_enable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 

shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp

@@ -9,6 +9,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_bdw_and_later.inl"
+#include "shared/source/helpers/compiler_product_helper_enable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.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_hpg_core/enable_compiler_product_helper_dg2.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/helpers/compiler_product_helper_base.inl"
 #include "shared/source/helpers/compiler_product_helper_bdw_and_later.inl"
 #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl"
+#include "shared/source/helpers/compiler_product_helper_enable_split_matrix_multiply_accumulate.inl"
 #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl"
 #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl"
 

shared/source/xe_hpg_core/enable_compiler_product_helper_mtl.cpp

@@ -25,6 +25,11 @@ bool CompilerProductHelperHw<gfxProduct>::isMatrixMultiplyAccumulateSupported(co
     return (MTL::isLpg(hwInfo) == false);
 }
 
+template <>
+bool CompilerProductHelperHw<gfxProduct>::isSplitMatrixMultiplyAccumulateSupported(const HardwareInfo &hwInfo) const {
+    return (MTL::isLpg(hwInfo) == false);
+}
+
 template <>
 bool CompilerProductHelperHw<gfxProduct>::isBFloat16ConversionSupported(const HardwareInfo &hwInfo) const {
     return (MTL::isLpg(hwInfo) == false);

shared/test/common/test_macros/header/common_matchers.h

@@ -29,6 +29,7 @@ using IsAtMostGen12lp = IsAtMostGfxCore<IGFX_GEN12LP_CORE>;
 using IsAtLeastGen12lp = IsAtLeastGfxCore<IGFX_GEN12LP_CORE>;
 
 using IsWithinXeGfxFamily = IsWithinGfxCore<IGFX_XE_HP_CORE, IGFX_XE_HPC_CORE>;
+using IsNotWithinXeGfxFamily = IsNotAnyGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE, IGFX_XE_HPC_CORE>;
 
 using IsAtLeastXeHpCore = IsAtLeastGfxCore<IGFX_XE_HP_CORE>;
 using IsAtMostXeHpCore = IsAtMostGfxCore<IGFX_XE_HP_CORE>;

shared/test/unit_test/helpers/compiler_product_helper_tests.cpp

@@ -122,6 +122,18 @@ HWTEST2_F(CompilerProductHelperFixture, GivenXeHpAndLaterThenMatrixMultiplyAccum
     EXPECT_TRUE(compilerProductHelper.isMatrixMultiplyAccumulateSupported(pDevice->getHardwareInfo()));
 }
 
+HWTEST2_F(CompilerProductHelperFixture, GivenXeFamilyThenSplitMatrixMultiplyAccumulateIsSupported, IsWithinXeGfxFamily) {
+    auto &compilerProductHelper = pDevice->getCompilerProductHelper();
+
+    EXPECT_TRUE(compilerProductHelper.isSplitMatrixMultiplyAccumulateSupported(pDevice->getHardwareInfo()));
+}
+
+HWTEST2_F(CompilerProductHelperFixture, GivenNotXeFamilyThenSplitMatrixMultiplyAccumulateIsNotSupported, IsNotWithinXeGfxFamily) {
+    auto &compilerProductHelper = pDevice->getCompilerProductHelper();
+
+    EXPECT_FALSE(compilerProductHelper.isSplitMatrixMultiplyAccumulateSupported(pDevice->getHardwareInfo()));
+}
+
 HWTEST2_F(CompilerProductHelperFixture, GivenPreXeHpThenBFloat16ConversionIsNotSupported, IsAtMostGen12lp) {
     auto &compilerProductHelper = pDevice->getCompilerProductHelper();
 

shared/test/unit_test/xe_hpg_core/mtl/excludes_xe_hpg_core_mtl.cpp

@@ -23,3 +23,4 @@ HWTEST_EXCLUDE_PRODUCT(ProductHelperTest, givenProductHelperWhenIsAdjustWalkOrde
 HWTEST_EXCLUDE_PRODUCT(ProductHelperCommonTest, givenPatIndexAndAllocationTypeWhenCallOverridePatIndexThenSameIndexIsReturned, IGFX_METEORLAKE);
 HWTEST_EXCLUDE_PRODUCT(CompilerProductHelperFixture, GivenXeHpAndLaterThenBFloat16ConversionIsSupported_IsAtLeastXeHpCore, IGFX_METEORLAKE);
 HWTEST_EXCLUDE_PRODUCT(CompilerProductHelperFixture, GivenXeHpAndLaterThenMatrixMultiplyAccumulateIsSupported_IsAtLeastXeHpCore, IGFX_METEORLAKE);
+HWTEST_EXCLUDE_PRODUCT(CompilerProductHelperFixture, GivenXeFamilyThenSplitMatrixMultiplyAccumulateIsSupported_IsWithinXeGfxFamily, IGFX_METEORLAKE);

shared/test/unit_test/xe_hpg_core/mtl/gfx_core_helper_tests_mtl.cpp

@@ -38,6 +38,7 @@ MTLTEST_F(GfxCoreHelperTestMtl, givenVariousMtlReleasesWhenGetExtensionsIsCalled
         EXPECT_EQ(!MTL::isLpg(hwInfo), hasSubstr(extensions, std::string("cl_intel_subgroup_matrix_multiply_accumulate")));
         EXPECT_EQ(!MTL::isLpg(hwInfo), hasSubstr(extensions, std::string("cl_intel_subgroup_split_matrix_multiply_accumulate")));
         EXPECT_EQ(!MTL::isLpg(hwInfo), compilerProductHelper.isMatrixMultiplyAccumulateSupported(hwInfo));
+        EXPECT_EQ(!MTL::isLpg(hwInfo), compilerProductHelper.isSplitMatrixMultiplyAccumulateSupported(hwInfo));
     }
 }