refactor: add wrapper for max gfx core

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2025-12-18 22:08:53 +08:00 · 2025-11-24 12:37:08 +00:00
parent e0631437fc
commit a22817200f
83 changed files with 124 additions and 123 deletions
--- a/level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.cpp
+++ b/level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.cpp
@@ -15,7 +15,7 @@ L0::L0GfxCoreHelper &NEO::RootDeviceEnvironment::getHelper<L0::L0GfxCoreHelper>(

 namespace L0 {

-createL0GfxCoreHelperFunctionType l0GfxCoreHelperFactory[IGFX_MAX_CORE] = {};
+createL0GfxCoreHelperFunctionType l0GfxCoreHelperFactory[NEO::maxCoreEnumValue] = {};

 std::unique_ptr<L0GfxCoreHelper> L0GfxCoreHelper::create(GFXCORE_FAMILY gfxCore) {
    auto createL0GfxCoreHelperFunc = l0GfxCoreHelperFactory[gfxCore];
--- a/level_zero/core/source/helpers/l0_gfx_core_helper_factory_init.inl
+++ b/level_zero/core/source/helpers/l0_gfx_core_helper_factory_init.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,6 +7,6 @@

 template <>
 void populateFactoryTable<L0GfxCoreHelperHw<Family>>() {
-    extern createL0GfxCoreHelperFunctionType l0GfxCoreHelperFactory[IGFX_MAX_CORE];
+    extern createL0GfxCoreHelperFunctionType l0GfxCoreHelperFactory[NEO::maxCoreEnumValue];
    l0GfxCoreHelperFactory[gfxCore] = L0GfxCoreHelperHw<Family>::create;
 }
--- a/level_zero/core/test/unit_tests/fixtures/aub_csr_fixture.h
+++ b/level_zero/core/test/unit_tests/fixtures/aub_csr_fixture.h
@@ -15,7 +15,7 @@
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"

 namespace NEO {
-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];
 } // namespace NEO

 namespace L0 {
@@ -23,7 +23,7 @@ namespace ult {
 struct AubCsrFixture : public DeviceFixture {
    template <typename T>
    void setUpT() {
-        auto csrCreateFcn = &commandStreamReceiverFactory[IGFX_MAX_CORE + NEO::defaultHwInfo->platform.eRenderCoreFamily];
+        auto csrCreateFcn = &commandStreamReceiverFactory[NEO::maxCoreEnumValue + NEO::defaultHwInfo->platform.eRenderCoreFamily];
        variableBackup = std::make_unique<VariableBackup<CommandStreamReceiverCreateFunc>>(csrCreateFcn);
        *csrCreateFcn = UltAubCommandStreamReceiver<T>::create;
        DeviceFixture::setUp();
--- a/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp
+++ b/level_zero/core/test/unit_tests/sources/device/test_l0_device.cpp
@@ -67,7 +67,7 @@
 #include <memory>

 namespace NEO {
-extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[NEO::maxCoreEnumValue];
 } // namespace NEO

 namespace L0 {
--- a/opencl/source/command_queue/command_queue.cpp
+++ b/opencl/source/command_queue/command_queue.cpp
@@ -61,7 +61,7 @@
 namespace NEO {

 // Global table of create functions
-CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE] = {};
+CommandQueueCreateFunc commandQueueFactory[NEO::maxCoreEnumValue] = {};

 CommandQueue *CommandQueue::create(Context *context,
                                   ClDevice *device,
--- a/opencl/source/gen12lp/command_queue_gen12lp.cpp
+++ b/opencl/source/gen12lp/command_queue_gen12lp.cpp
@@ -32,7 +32,7 @@ bool CommandQueueHw<GfxFamily>::isCacheFlushCommand(uint32_t commandType) const

 template <>
 void populateFactoryTable<CommandQueueHw<Family>>() {
-    extern CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE];
+    extern CommandQueueCreateFunc commandQueueFactory[NEO::maxCoreEnumValue];
    commandQueueFactory[gfxCore] = CommandQueueHw<Family>::create;
 }

--- a/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp
+++ b/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp
@@ -27,7 +27,7 @@ bool GTPinGfxCoreHelperHw<GfxFamily>::canUseSharedAllocation(const HardwareInfo
    return canUseSharedAllocation;
 }

-extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[NEO::maxCoreEnumValue];

 typedef Gen12LpFamily Family;
 static const auto gfxFamily = IGFX_GEN12LP_CORE;
--- a/opencl/source/gtpin/gtpin_gfx_core_helper.cpp
+++ b/opencl/source/gtpin/gtpin_gfx_core_helper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,7 +8,7 @@
 #include "opencl/source/gtpin/gtpin_gfx_core_helper.h"

 namespace NEO {
-GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[IGFX_MAX_CORE] = {};
+GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[NEO::maxCoreEnumValue] = {};

 std::unique_ptr<GTPinGfxCoreHelper> GTPinGfxCoreHelper::create(GFXCORE_FAMILY gfxCore) {
    auto createFunction = gtpinGfxCoreHelperFactory[gfxCore];
--- a/opencl/source/helpers/cl_gfx_core_helper.cpp
+++ b/opencl/source/helpers/cl_gfx_core_helper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -12,7 +12,7 @@

 namespace NEO {

-createClGfxCoreHelperFunctionType clGfxCoreHelperFactory[IGFX_MAX_CORE] = {};
+createClGfxCoreHelperFunctionType clGfxCoreHelperFactory[NEO::maxCoreEnumValue] = {};

 std::unique_ptr<ClGfxCoreHelper> ClGfxCoreHelper::create(GFXCORE_FAMILY gfxCore) {
    auto createClGfxCoreHelperFunc = clGfxCoreHelperFactory[gfxCore];
--- a/opencl/source/helpers/cl_gfx_core_helper.h
+++ b/opencl/source/helpers/cl_gfx_core_helper.h
@@ -80,6 +80,6 @@ class ClGfxCoreHelperHw : public ClGfxCoreHelper {
    ClGfxCoreHelperHw() = default;
 };

-extern createClGfxCoreHelperFunctionType clGfxCoreHelperFactory[IGFX_MAX_CORE];
+extern createClGfxCoreHelperFunctionType clGfxCoreHelperFactory[NEO::maxCoreEnumValue];

 } // namespace NEO
--- a/opencl/source/helpers/cl_gfx_core_helper_factory_init.inl
+++ b/opencl/source/helpers/cl_gfx_core_helper_factory_init.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,6 +7,6 @@

 template <>
 void populateFactoryTable<ClGfxCoreHelperHw<Family>>() {
-    extern createClGfxCoreHelperFunctionType clGfxCoreHelperFactory[IGFX_MAX_CORE];
+    extern createClGfxCoreHelperFunctionType clGfxCoreHelperFactory[NEO::maxCoreEnumValue];
    clGfxCoreHelperFactory[gfxCore] = ClGfxCoreHelperHw<Family>::create;
 }
--- a/opencl/source/mem_obj/buffer.cpp
+++ b/opencl/source/mem_obj/buffer.cpp
@@ -35,7 +35,7 @@

 namespace NEO {

-BufferFactoryFuncs bufferFactory[IGFX_MAX_CORE] = {};
+BufferFactoryFuncs bufferFactory[NEO::maxCoreEnumValue] = {};

 namespace BufferFunctions {
 ValidateInputAndCreateBufferFunc validateInputAndCreateBuffer = Buffer::validateInputAndCreateBuffer;
--- a/opencl/source/mem_obj/buffer.h
+++ b/opencl/source/mem_obj/buffer.h
@@ -42,7 +42,7 @@ struct BufferFactoryFuncs {
    BufferCreateFunc createBufferFunction;
 };

-extern BufferFactoryFuncs bufferFactory[IGFX_MAX_CORE];
+extern BufferFactoryFuncs bufferFactory[NEO::maxCoreEnumValue];

 namespace BufferFunctions {
 using ValidateInputAndCreateBufferFunc = std::function<cl_mem(cl_context context,
--- a/opencl/source/mem_obj/buffer_factory_init.inl
+++ b/opencl/source/mem_obj/buffer_factory_init.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,6 +7,6 @@

 template <>
 void populateFactoryTable<BufferHw<Family>>() {
-    extern BufferFactoryFuncs bufferFactory[IGFX_MAX_CORE];
+    extern BufferFactoryFuncs bufferFactory[NEO::maxCoreEnumValue];
    bufferFactory[gfxCore].createBufferFunction = BufferHw<Family>::create;
 }
--- a/opencl/source/mem_obj/image.cpp
+++ b/opencl/source/mem_obj/image.cpp
@@ -45,7 +45,7 @@

 namespace NEO {

-ImageFactoryFuncs imageFactory[IGFX_MAX_CORE] = {};
+ImageFactoryFuncs imageFactory[NEO::maxCoreEnumValue] = {};

 namespace ImageFunctions {
 ValidateAndCreateImageFunc validateAndCreateImage = Image::validateAndCreateImage;
--- a/opencl/source/mem_obj/image_factory_init.inl
+++ b/opencl/source/mem_obj/image_factory_init.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -10,7 +10,7 @@ namespace NEO {
 template class ImageHw<Family>;
 template <>
 void populateFactoryTable<ImageHw<Family>>() {
-    extern ImageFactoryFuncs imageFactory[IGFX_MAX_CORE];
+    extern ImageFactoryFuncs imageFactory[NEO::maxCoreEnumValue];
    imageFactory[gfxCore].createImageFunction = ImageHw<Family>::create;
 }
 } // namespace NEO
--- a/opencl/source/sampler/sampler.cpp
+++ b/opencl/source/sampler/sampler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -20,7 +20,7 @@

 namespace NEO {

-SamplerCreateFunc samplerFactory[IGFX_MAX_CORE] = {};
+SamplerCreateFunc samplerFactory[NEO::maxCoreEnumValue] = {};

 Sampler::Sampler(Context *context, cl_bool normalizedCoordinates,
                 cl_addressing_mode addressingMode, cl_filter_mode filterMode,
--- a/opencl/source/sampler/sampler_factory_init.inl
+++ b/opencl/source/sampler/sampler_factory_init.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -12,6 +12,6 @@
 template struct SamplerHw<Family>;
 template <>
 void populateFactoryTable<SamplerHw<Family>>() {
-    extern SamplerCreateFunc samplerFactory[IGFX_MAX_CORE];
+    extern SamplerCreateFunc samplerFactory[NEO::maxCoreEnumValue];
    samplerFactory[gfxCore] = SamplerHw<Family>::create;
 }
--- a/opencl/source/xe2_hpg_core/command_queue_xe2_hpg_core.cpp
+++ b/opencl/source/xe2_hpg_core/command_queue_xe2_hpg_core.cpp
@@ -23,7 +23,7 @@ namespace NEO {

 template <>
 void populateFactoryTable<CommandQueueHw<Family>>() {
-    extern CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE];
+    extern CommandQueueCreateFunc commandQueueFactory[NEO::maxCoreEnumValue];
    commandQueueFactory[gfxCore] = CommandQueueHw<Family>::create;
 }

--- a/opencl/source/xe2_hpg_core/gtpin_setup_xe2_hpg_core.cpp
+++ b/opencl/source/xe2_hpg_core/gtpin_setup_xe2_hpg_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -17,7 +17,7 @@

 namespace NEO {

-extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[NEO::maxCoreEnumValue];

 using Family = Xe2HpgCoreFamily;
 static const auto gfxFamily = IGFX_XE2_HPG_CORE;
--- a/opencl/source/xe3_core/command_queue_xe3_core.cpp
+++ b/opencl/source/xe3_core/command_queue_xe3_core.cpp
@@ -23,7 +23,7 @@ namespace NEO {

 template <>
 void populateFactoryTable<CommandQueueHw<Family>>() {
-    extern CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE];
+    extern CommandQueueCreateFunc commandQueueFactory[NEO::maxCoreEnumValue];
    commandQueueFactory[gfxCore] = CommandQueueHw<Family>::create;
 }

--- a/opencl/source/xe3_core/gtpin_setup_xe3_core.cpp
+++ b/opencl/source/xe3_core/gtpin_setup_xe3_core.cpp
@@ -17,7 +17,7 @@

 namespace NEO {

-extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[NEO::maxCoreEnumValue];

 using Family = Xe3CoreFamily;
 static const auto gfxFamily = IGFX_XE3_CORE;
--- a/opencl/source/xe_hpc_core/command_queue_xe_hpc_core.cpp
+++ b/opencl/source/xe_hpc_core/command_queue_xe_hpc_core.cpp
@@ -23,7 +23,7 @@ static auto gfxCore = IGFX_XE_HPC_CORE;
 namespace NEO {
 template <>
 void populateFactoryTable<CommandQueueHw<Family>>() {
-    extern CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE];
+    extern CommandQueueCreateFunc commandQueueFactory[NEO::maxCoreEnumValue];
    commandQueueFactory[gfxCore] = CommandQueueHw<Family>::create;
 }

--- a/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp
+++ b/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -17,7 +17,7 @@

 namespace NEO {

-extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[NEO::maxCoreEnumValue];

 using Family = XeHpcCoreFamily;
 static const auto gfxFamily = IGFX_XE_HPC_CORE;
--- a/opencl/source/xe_hpg_core/command_queue_xe_hpg_core.cpp
+++ b/opencl/source/xe_hpg_core/command_queue_xe_hpg_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -23,7 +23,7 @@ static auto gfxCore = IGFX_XE_HPG_CORE;
 namespace NEO {
 template <>
 void populateFactoryTable<CommandQueueHw<Family>>() {
-    extern CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE];
+    extern CommandQueueCreateFunc commandQueueFactory[NEO::maxCoreEnumValue];
    commandQueueFactory[gfxCore] = CommandQueueHw<Family>::create;
 }

--- a/opencl/source/xe_hpg_core/gtpin_setup_xe_hpg_core.cpp
+++ b/opencl/source/xe_hpg_core/gtpin_setup_xe_hpg_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -17,7 +17,7 @@

 namespace NEO {

-extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[NEO::maxCoreEnumValue];

 typedef XeHpgCoreFamily Family;
 static const auto gfxFamily = IGFX_XE_HPG_CORE;
--- a/opencl/test/unit_test/command_queue/blit_enqueue_1_tests.cpp
+++ b/opencl/test/unit_test/command_queue/blit_enqueue_1_tests.cpp
@@ -29,7 +29,7 @@ struct BatchBuffer;
 template <typename GfxFamily>
 class MockCommandQueueHw;

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 using BlitAuxTranslationTests = BlitEnqueueTests<1>;

@@ -1128,7 +1128,7 @@ struct BlitEnqueueFlushTests : public BlitEnqueueTests<1> {

    template <typename T>
    void setUpT() {
-        auto csrCreateFcn = &commandStreamReceiverFactory[IGFX_MAX_CORE + defaultHwInfo->platform.eRenderCoreFamily];
+        auto csrCreateFcn = &commandStreamReceiverFactory[NEO::maxCoreEnumValue + defaultHwInfo->platform.eRenderCoreFamily];
        variableBackup = std::make_unique<VariableBackup<CommandStreamReceiverCreateFunc>>(csrCreateFcn);
        *csrCreateFcn = MyUltCsr<T>::create;

--- a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp
+++ b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp
@@ -21,7 +21,7 @@
 namespace NEO {

 // Global table of create functions
-extern CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE];
+extern CommandQueueCreateFunc commandQueueFactory[NEO::maxCoreEnumValue];

 CommandQueue *CommandQueueHwFixture::createCommandQueue(
    ClDevice *pDevice,
--- a/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp
+++ b/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp
@@ -17,7 +17,7 @@
 #include "opencl/test/unit_test/mocks/mock_context.h"

 namespace NEO {
-extern ImageFactoryFuncs imageFactory[IGFX_MAX_CORE];
+extern ImageFactoryFuncs imageFactory[NEO::maxCoreEnumValue];

 struct MultipleMapImageTest : public ClDeviceFixture, public ::testing::Test {
    template <typename T>
--- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp
+++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp
@@ -62,7 +62,7 @@ using namespace gtpin;

 namespace NEO {
 extern std::deque<gtpinkexec_t> kernelExecQueue;
-extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GTPinGfxCoreHelperCreateFunctionType gtpinGfxCoreHelperFactory[NEO::maxCoreEnumValue];
 } // namespace NEO

 namespace ULT {
--- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp
@@ -926,9 +926,9 @@ TEST_P(NoHostPtr, GivenValidFlagsWhenCreatingBufferThenBufferIsCreated) {
 }

 TEST_P(NoHostPtr, GivenNoHostPtrWhenHwBufferCreationFailsThenReturnNullptr) {
-    BufferFactoryFuncs bufferFuncsBackup[IGFX_MAX_CORE];
+    BufferFactoryFuncs bufferFuncsBackup[NEO::maxCoreEnumValue];

-    for (uint32_t i = 0; i < IGFX_MAX_CORE; i++) {
+    for (uint32_t i = 0; i < NEO::maxCoreEnumValue; i++) {
        bufferFuncsBackup[i] = bufferFactory[i];
        bufferFactory[i].createBufferFunction =
            [](Context *,
@@ -954,7 +954,7 @@ TEST_P(NoHostPtr, GivenNoHostPtrWhenHwBufferCreationFailsThenReturnNullptr) {

    EXPECT_EQ(nullptr, buffer);

-    for (uint32_t i = 0; i < IGFX_MAX_CORE; i++) {
+    for (uint32_t i = 0; i < NEO::maxCoreEnumValue; i++) {
        bufferFactory[i] = bufferFuncsBackup[i];
    }
 }
--- a/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp
@@ -24,7 +24,7 @@
 using namespace NEO;

 namespace NEO {
-extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[NEO::maxCoreEnumValue];
 }

 // Tests for cl_khr_image2d_from_buffer
--- a/opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp
+++ b/opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp
@@ -15,7 +15,7 @@
 #include "opencl/test/unit_test/mocks/mock_image.h"

 namespace NEO {
-extern ImageFactoryFuncs imageFactory[IGFX_MAX_CORE];
+extern ImageFactoryFuncs imageFactory[NEO::maxCoreEnumValue];
 }

 using namespace NEO;
--- a/opencl/test/unit_test/offline_compiler/decoder/iga_wrapper_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/decoder/iga_wrapper_tests.cpp
@@ -292,7 +292,7 @@ TEST_F(IgaWrapperTest, GivenIgcWrapperWhenLoadingLibraryTwiceWithPathChangeInThe

 TEST_F(IgaWrapperTest, GivenIgcWrapperWhenCallingSetGfxCoreMultipleTimesThenFirstValidGfxCoreFamilyIsPreserved) {
    ASSERT_FALSE(testedIgaWrapper.isKnownPlatform());
-    constexpr auto invalidGfxCoreFamily = IGFX_MAX_CORE;
+    constexpr auto invalidGfxCoreFamily = NEO::maxCoreEnumValue;

    testedIgaWrapper.setGfxCore(invalidGfxCoreFamily);
    EXPECT_FALSE(testedIgaWrapper.isKnownPlatform());
--- a/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -32,7 +32,7 @@ namespace SysCalls {
 extern const wchar_t *currentLibraryPath;
 }

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 CommandStreamReceiver *createMockCommandStreamReceiver(bool withAubDump,
                                                       ExecutionEnvironment &executionEnvironment,
--- a/opencl/test/unit_test/platform/platform_tests.cpp
+++ b/opencl/test/unit_test/platform/platform_tests.cpp
@@ -221,7 +221,7 @@ TEST(PlatformTestSimple, WhenConvertingOclCFeaturesToCompilerInternalOptionsThen
 }

 namespace NEO {
-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];
 }

 CommandStreamReceiver *createMockCommandStreamReceiver(bool withAubDump,
--- a/shared/source/command_stream/aub_command_stream_receiver.cpp
+++ b/shared/source/command_stream/aub_command_stream_receiver.cpp
@@ -26,7 +26,7 @@
 #include <sstream>

 namespace NEO {
-AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[IGFX_MAX_CORE] = {};
+AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[NEO::maxCoreEnumValue] = {};

 std::string AUBCommandStreamReceiver::createFullFilePath(const HardwareInfo &hwInfo, const std::string &filename, uint32_t rootDeviceIndex) {
    std::string hwPrefix = hardwarePrefix[hwInfo.platform.eProductFamily];
@@ -75,7 +75,7 @@ CommandStreamReceiver *AUBCommandStreamReceiver::create(const std::string &baseN
        filePath.assign(debugManager.flags.AUBDumpCaptureFileName.get());
    }

-    if (hwInfo->platform.eRenderCoreFamily >= IGFX_MAX_CORE) {
+    if (hwInfo->platform.eRenderCoreFamily >= NEO::maxCoreEnumValue) {
        DEBUG_BREAK_IF(!false);
        return nullptr;
    }
--- a/shared/source/command_stream/command_stream_receiver.cpp
+++ b/shared/source/command_stream/command_stream_receiver.cpp
@@ -51,7 +51,7 @@
 namespace NEO {

 // Global table of CommandStreamReceiver factories for HW and tests
-CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE] = {};
+CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue] = {};

 CommandStreamReceiver::CommandStreamReceiver(ExecutionEnvironment &executionEnvironment,
                                             uint32_t rootDeviceIndex,
--- a/shared/source/command_stream/command_stream_receiver_with_aub_dump.inl
+++ b/shared/source/command_stream/command_stream_receiver_with_aub_dump.inl
@@ -16,7 +16,7 @@

 namespace NEO {

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 template <typename BaseCSR>
 CommandStreamReceiverWithAUBDump<BaseCSR>::CommandStreamReceiverWithAUBDump(const std::string &baseName,
--- a/shared/source/command_stream/create_command_stream_impl.cpp
+++ b/shared/source/command_stream/create_command_stream_impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -17,7 +17,7 @@

 namespace NEO {

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 CommandStreamReceiver *createCommandStreamImpl(ExecutionEnvironment &executionEnvironment,
                                               uint32_t rootDeviceIndex,
--- a/shared/source/command_stream/tbx_command_stream_receiver.cpp
+++ b/shared/source/command_stream/tbx_command_stream_receiver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -15,7 +15,7 @@

 namespace NEO {

-TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[IGFX_MAX_CORE] = {};
+TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[NEO::maxCoreEnumValue] = {};

 CommandStreamReceiver *TbxCommandStreamReceiver::create(const std::string &baseName,
                                                        bool withAubDump,
@@ -24,7 +24,7 @@ CommandStreamReceiver *TbxCommandStreamReceiver::create(const std::string &baseN
                                                        const DeviceBitfield deviceBitfield) {
    auto hwInfo = executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo();

-    if (hwInfo->platform.eRenderCoreFamily >= IGFX_MAX_CORE) {
+    if (hwInfo->platform.eRenderCoreFamily >= NEO::maxCoreEnumValue) {
        DEBUG_BREAK_IF(!false);
        return nullptr;
    }
--- a/shared/source/debugger/debugger_l0.cpp
+++ b/shared/source/debugger/debugger_l0.cpp
@@ -21,7 +21,7 @@

 namespace NEO {

-DebugerL0CreateFn debuggerL0Factory[IGFX_MAX_CORE] = {};
+DebugerL0CreateFn debuggerL0Factory[NEO::maxCoreEnumValue] = {};

 DebuggerL0::DebuggerL0(NEO::Device *device) : device(device) {
    const auto deviceCount = std::max(1u, device->getNumSubDevices());
--- a/shared/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp
+++ b/shared/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp
@@ -25,7 +25,7 @@ constexpr uint32_t AUBCommandStreamReceiverHw<Family>::getMaskAndValueForPollFor

 template <>
 void populateFactoryTable<AUBCommandStreamReceiverHw<Family>>() {
-    extern AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[IGFX_MAX_CORE];
+    extern AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
    UNRECOVERABLE_IF(!isInRange(gfxCore, aubCommandStreamReceiverFactory));
    aubCommandStreamReceiverFactory[gfxCore] = AUBCommandStreamReceiverHw<Family>::create;
 }
--- a/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp
+++ b/shared/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp
@@ -234,7 +234,7 @@ size_t CommandStreamReceiverHw<Family>::getCmdSizeForL3Config() const {

 template <>
 void populateFactoryTable<CommandStreamReceiverHw<Family>>() {
-    extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+    extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];
    commandStreamReceiverFactory[gfxCore] = DeviceCommandStreamReceiver<Family>::create;
 }

--- a/shared/source/gen12lp/debugger_gen12lp.cpp
+++ b/shared/source/gen12lp/debugger_gen12lp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -18,7 +18,7 @@ static auto coreFamily = IGFX_GEN12LP_CORE;

 template <>
 void populateFactoryTable<DebuggerL0Hw<Family>>() {
-    extern DebugerL0CreateFn debuggerL0Factory[IGFX_MAX_CORE];
+    extern DebugerL0CreateFn debuggerL0Factory[NEO::maxCoreEnumValue];
    debuggerL0Factory[coreFamily] = DebuggerL0Hw<Family>::allocate;
 }
 template class DebuggerL0Hw<Family>;
--- a/shared/source/gen12lp/enable_family_full_core_gen12lp.cpp
+++ b/shared/source/gen12lp/enable_family_full_core_gen12lp.cpp
@@ -15,7 +15,7 @@

 namespace NEO {

-extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[NEO::maxCoreEnumValue];

 using Family = Gen12LpFamily;
 static auto gfxFamily = IGFX_GEN12LP_CORE;
--- a/shared/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp
+++ b/shared/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp
@@ -29,7 +29,7 @@ bool TbxCommandStreamReceiverHw<Family>::getpollNotEqualValueForPollForCompletio

 template <>
 void populateFactoryTable<TbxCommandStreamReceiverHw<Family>>() {
-    extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[IGFX_MAX_CORE];
+    extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
    UNRECOVERABLE_IF(!isInRange(gfxCore, tbxCommandStreamReceiverFactory));
    tbxCommandStreamReceiverFactory[gfxCore] = TbxCommandStreamReceiverHw<Family>::create;
 }
--- a/shared/source/gmm_helper/gmm_callbacks.cpp
+++ b/shared/source/gmm_helper/gmm_callbacks.cpp
@@ -8,6 +8,6 @@
 #include "shared/source/gmm_helper/gmm_callbacks.h"

 namespace NEO {
-NotifyAubCaptureFunc notifyAubCaptureFuncFactory[IGFX_MAX_CORE]{};
-WriteL3AddressFunc writeL3AddressFuncFactory[IGFX_MAX_CORE]{};
+NotifyAubCaptureFunc notifyAubCaptureFuncFactory[NEO::maxCoreEnumValue]{};
+WriteL3AddressFunc writeL3AddressFuncFactory[NEO::maxCoreEnumValue]{};
 } // namespace NEO
--- a/shared/source/gmm_helper/gmm_callbacks.h
+++ b/shared/source/gmm_helper/gmm_callbacks.h
@@ -19,8 +19,8 @@ namespace NEO {
 using NotifyAubCaptureFunc = long(__stdcall *)(void *csrHandle, uint64_t gfxAddress, size_t gfxSize, bool allocate);
 using WriteL3AddressFunc = int(__stdcall *)(void *queueHandle, uint64_t l3GfxAddress, uint64_t regOffset);

-extern NotifyAubCaptureFunc notifyAubCaptureFuncFactory[IGFX_MAX_CORE];
-extern WriteL3AddressFunc writeL3AddressFuncFactory[IGFX_MAX_CORE];
+extern NotifyAubCaptureFunc notifyAubCaptureFuncFactory[NEO::maxCoreEnumValue];
+extern WriteL3AddressFunc writeL3AddressFuncFactory[NEO::maxCoreEnumValue];

 template <typename GfxFamily>
 struct GmmCallbacks {
--- a/shared/source/gmm_helper/igfxfmid_wrapper/neo_igfxfmid.h
+++ b/shared/source/gmm_helper/igfxfmid_wrapper/neo_igfxfmid.h
@@ -10,6 +10,7 @@
 #include "igfxfmid.h"

 namespace NEO {
-constexpr GFXCORE_FAMILY xe3pCoreEnumValue = static_cast<GFXCORE_FAMILY>(0x2300); // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange), NEO-16649
+constexpr GFXCORE_FAMILY xe3pCoreEnumValue = static_cast<GFXCORE_FAMILY>(0x2300);               // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange), NEO-16649
+constexpr GFXCORE_FAMILY maxCoreEnumValue = static_cast<GFXCORE_FAMILY>(xe3pCoreEnumValue + 1); // NOLINT(clang-analyzer-optin.core.EnumCastOutOfRange), NEO-16649
 constexpr PRODUCT_FAMILY maxProductEnumValue = IGFX_MAX_PRODUCT;
 } // namespace NEO
--- a/shared/source/helpers/gfx_core_helper.cpp
+++ b/shared/source/helpers/gfx_core_helper.cpp
@@ -17,7 +17,7 @@

 namespace NEO {

-GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[IGFX_MAX_CORE] = {};
+GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[NEO::maxCoreEnumValue] = {};

 std::unique_ptr<GfxCoreHelper> GfxCoreHelper::create(const GFXCORE_FAMILY gfxCoreFamily) {

--- a/shared/source/helpers/hw_info.cpp
+++ b/shared/source/helpers/hw_info.cpp
@@ -27,7 +27,7 @@ const char *hardwarePrefix[NEO::maxProductEnumValue] = {
 };

 // Global table of family names
-bool familyEnabled[IGFX_MAX_CORE] = {
+bool familyEnabled[NEO::maxCoreEnumValue] = {
    false,
 };

--- a/shared/source/helpers/hw_info.h
+++ b/shared/source/helpers/hw_info.h
@@ -70,7 +70,7 @@ struct HardwareInfo { // NOLINT(clang-analyzer-optin.performance.Padding)
 };

 // Global table of hardware prefixes
-extern bool familyEnabled[IGFX_MAX_CORE];
+extern bool familyEnabled[NEO::maxCoreEnumValue];
 extern const char *hardwarePrefix[NEO::maxProductEnumValue];
 extern const HardwareInfo *hardwareInfoTable[NEO::maxProductEnumValue];
 extern void (*hardwareInfoSetup[NEO::maxProductEnumValue])(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const ReleaseHelper *releaseHelper);
--- a/shared/source/xe2_hpg_core/aub_command_stream_receiver_xe2_hpg_core.cpp
+++ b/shared/source/xe2_hpg_core/aub_command_stream_receiver_xe2_hpg_core.cpp
@@ -18,7 +18,7 @@ static auto gfxCore = IGFX_XE2_HPG_CORE;

 template <>
 void populateFactoryTable<AUBCommandStreamReceiverHw<Family>>() {
-    extern AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[IGFX_MAX_CORE];
+    extern AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
    UNRECOVERABLE_IF(!isInRange(gfxCore, aubCommandStreamReceiverFactory));
    aubCommandStreamReceiverFactory[gfxCore] = AUBCommandStreamReceiverHw<Family>::create;
 }
--- a/shared/source/xe2_hpg_core/command_stream_receiver_hw_xe2_hpg_core.cpp
+++ b/shared/source/xe2_hpg_core/command_stream_receiver_hw_xe2_hpg_core.cpp
@@ -35,7 +35,7 @@ template class ImplicitFlushSettings<Family>;

 template <>
 void populateFactoryTable<CommandStreamReceiverHw<Family>>() {
-    extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+    extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];
    commandStreamReceiverFactory[gfxCore] = DeviceCommandStreamReceiver<Family>::create;
 }

--- a/shared/source/xe2_hpg_core/debugger_xe2_hpg_core.cpp
+++ b/shared/source/xe2_hpg_core/debugger_xe2_hpg_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -17,7 +17,7 @@ static auto coreFamily = IGFX_XE2_HPG_CORE;

 template <>
 void populateFactoryTable<DebuggerL0Hw<GfxFamily>>() {
-    extern DebugerL0CreateFn debuggerL0Factory[IGFX_MAX_CORE];
+    extern DebugerL0CreateFn debuggerL0Factory[NEO::maxCoreEnumValue];
    debuggerL0Factory[coreFamily] = DebuggerL0Hw<GfxFamily>::allocate;
 }
 template class DebuggerL0Hw<GfxFamily>;
--- a/shared/source/xe2_hpg_core/enable_family_full_core_xe2_hpg_core.cpp
+++ b/shared/source/xe2_hpg_core/enable_family_full_core_xe2_hpg_core.cpp
@@ -15,7 +15,7 @@

 namespace NEO {

-extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[NEO::maxCoreEnumValue];

 using Family = Xe2HpgCoreFamily;
 static auto gfxFamily = IGFX_XE2_HPG_CORE;
--- a/shared/source/xe2_hpg_core/tbx_command_stream_receiver_xe2_hpg_core.cpp
+++ b/shared/source/xe2_hpg_core/tbx_command_stream_receiver_xe2_hpg_core.cpp
@@ -20,7 +20,7 @@ static auto gfxCore = IGFX_XE2_HPG_CORE;

 template <>
 void populateFactoryTable<TbxCommandStreamReceiverHw<Family>>() {
-    extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[IGFX_MAX_CORE];
+    extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
    UNRECOVERABLE_IF(!isInRange(gfxCore, tbxCommandStreamReceiverFactory));
    tbxCommandStreamReceiverFactory[gfxCore] = TbxCommandStreamReceiverHw<Family>::create;
 }
--- a/shared/source/xe3_core/aub_command_stream_receiver_xe3_core.cpp
+++ b/shared/source/xe3_core/aub_command_stream_receiver_xe3_core.cpp
@@ -18,7 +18,7 @@ static auto gfxCore = IGFX_XE3_CORE;

 template <>
 void populateFactoryTable<AUBCommandStreamReceiverHw<Family>>() {
-    extern AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[IGFX_MAX_CORE];
+    extern AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
    UNRECOVERABLE_IF(!isInRange(gfxCore, aubCommandStreamReceiverFactory));
    aubCommandStreamReceiverFactory[gfxCore] = AUBCommandStreamReceiverHw<Family>::create;
 }
--- a/shared/source/xe3_core/command_stream_receiver_hw_xe3_core.cpp
+++ b/shared/source/xe3_core/command_stream_receiver_hw_xe3_core.cpp
@@ -34,7 +34,7 @@ template class ImplicitFlushSettings<Family>;

 template <>
 void populateFactoryTable<CommandStreamReceiverHw<Family>>() {
-    extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+    extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];
    commandStreamReceiverFactory[gfxCore] = DeviceCommandStreamReceiver<Family>::create;
 }

--- a/shared/source/xe3_core/debugger_xe3_core.cpp
+++ b/shared/source/xe3_core/debugger_xe3_core.cpp
@@ -16,7 +16,7 @@ static auto coreFamily = IGFX_XE3_CORE;

 template <>
 void populateFactoryTable<DebuggerL0Hw<GfxFamily>>() {
-    extern DebugerL0CreateFn debuggerL0Factory[IGFX_MAX_CORE];
+    extern DebugerL0CreateFn debuggerL0Factory[NEO::maxCoreEnumValue];
    debuggerL0Factory[coreFamily] = DebuggerL0Hw<GfxFamily>::allocate;
 }
 template class DebuggerL0Hw<GfxFamily>;
--- a/shared/source/xe3_core/enable_family_full_core_xe3_core.cpp
+++ b/shared/source/xe3_core/enable_family_full_core_xe3_core.cpp
@@ -15,7 +15,7 @@

 namespace NEO {

-extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[NEO::maxCoreEnumValue];

 using Family = Xe3CoreFamily;
 static auto gfxFamily = IGFX_XE3_CORE;
--- a/shared/source/xe3_core/tbx_command_stream_receiver_xe3_core.cpp
+++ b/shared/source/xe3_core/tbx_command_stream_receiver_xe3_core.cpp
@@ -18,7 +18,7 @@ static auto gfxCore = IGFX_XE3_CORE;

 template <>
 void populateFactoryTable<TbxCommandStreamReceiverHw<Family>>() {
-    extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[IGFX_MAX_CORE];
+    extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
    UNRECOVERABLE_IF(!isInRange(gfxCore, tbxCommandStreamReceiverFactory));
    tbxCommandStreamReceiverFactory[gfxCore] = TbxCommandStreamReceiverHw<Family>::create;
 }
--- a/shared/source/xe_hpc_core/aub_command_stream_receiver_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/aub_command_stream_receiver_xe_hpc_core.cpp
@@ -19,7 +19,7 @@ static auto gfxCore = IGFX_XE_HPC_CORE;

 template <>
 void populateFactoryTable<AUBCommandStreamReceiverHw<Family>>() {
-    extern AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[IGFX_MAX_CORE];
+    extern AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
    UNRECOVERABLE_IF(!isInRange(gfxCore, aubCommandStreamReceiverFactory));
    aubCommandStreamReceiverFactory[gfxCore] = AUBCommandStreamReceiverHw<Family>::create;
 }
--- a/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp
@@ -34,7 +34,7 @@ template class ImplicitFlushSettings<Family>;

 template <>
 void populateFactoryTable<CommandStreamReceiverHw<Family>>() {
-    extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+    extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];
    commandStreamReceiverFactory[gfxCore] = DeviceCommandStreamReceiver<Family>::create;
 }

--- a/shared/source/xe_hpc_core/debugger_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/debugger_xe_hpc_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -18,7 +18,7 @@ static auto coreFamily = IGFX_XE_HPC_CORE;

 template <>
 void populateFactoryTable<DebuggerL0Hw<Family>>() {
-    extern DebugerL0CreateFn debuggerL0Factory[IGFX_MAX_CORE];
+    extern DebugerL0CreateFn debuggerL0Factory[NEO::maxCoreEnumValue];
    debuggerL0Factory[coreFamily] = DebuggerL0Hw<Family>::allocate;
 }
 template class DebuggerL0Hw<Family>;
--- a/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp
@@ -15,7 +15,7 @@

 namespace NEO {

-extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[NEO::maxCoreEnumValue];

 using Family = XeHpcCoreFamily;
 static auto gfxFamily = IGFX_XE_HPC_CORE;
--- a/shared/source/xe_hpc_core/tbx_command_stream_receiver_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/tbx_command_stream_receiver_xe_hpc_core.cpp
@@ -20,7 +20,7 @@ static auto gfxCore = IGFX_XE_HPC_CORE;

 template <>
 void populateFactoryTable<TbxCommandStreamReceiverHw<Family>>() {
-    extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[IGFX_MAX_CORE];
+    extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
    UNRECOVERABLE_IF(!isInRange(gfxCore, tbxCommandStreamReceiverFactory));
    tbxCommandStreamReceiverFactory[gfxCore] = TbxCommandStreamReceiverHw<Family>::create;
 }
--- a/shared/source/xe_hpg_core/aub_command_stream_receiver_xe_hpg_core.cpp
+++ b/shared/source/xe_hpg_core/aub_command_stream_receiver_xe_hpg_core.cpp
@@ -19,7 +19,7 @@ static auto gfxCore = IGFX_XE_HPG_CORE;

 template <>
 void populateFactoryTable<AUBCommandStreamReceiverHw<Family>>() {
-    extern AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[IGFX_MAX_CORE];
+    extern AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
    UNRECOVERABLE_IF(!isInRange(gfxCore, aubCommandStreamReceiverFactory));
    aubCommandStreamReceiverFactory[gfxCore] = AUBCommandStreamReceiverHw<Family>::create;
 }
--- a/shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp
+++ b/shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp
@@ -31,7 +31,7 @@ template class ImplicitFlushSettings<Family>;

 template <>
 void populateFactoryTable<CommandStreamReceiverHw<Family>>() {
-    extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+    extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];
    commandStreamReceiverFactory[gfxCore] = DeviceCommandStreamReceiver<Family>::create;
 }

--- a/shared/source/xe_hpg_core/debugger_xe_hpg_core.cpp
+++ b/shared/source/xe_hpg_core/debugger_xe_hpg_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -18,7 +18,7 @@ static auto coreFamily = IGFX_XE_HPG_CORE;

 template <>
 void populateFactoryTable<DebuggerL0Hw<GfxFamily>>() {
-    extern DebugerL0CreateFn debuggerL0Factory[IGFX_MAX_CORE];
+    extern DebugerL0CreateFn debuggerL0Factory[NEO::maxCoreEnumValue];
    debuggerL0Factory[coreFamily] = DebuggerL0Hw<GfxFamily>::allocate;
 }
 template class DebuggerL0Hw<GfxFamily>;
--- a/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp
+++ b/shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp
@@ -15,7 +15,7 @@

 namespace NEO {

-extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[NEO::maxCoreEnumValue];

 using Family = XeHpgCoreFamily;
 static auto gfxFamily = IGFX_XE_HPG_CORE;
--- a/shared/source/xe_hpg_core/tbx_command_stream_receiver_xe_hpg_core.cpp
+++ b/shared/source/xe_hpg_core/tbx_command_stream_receiver_xe_hpg_core.cpp
@@ -20,7 +20,7 @@ static auto gfxCore = IGFX_XE_HPG_CORE;

 template <>
 void populateFactoryTable<TbxCommandStreamReceiverHw<Family>>() {
-    extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[IGFX_MAX_CORE];
+    extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
    UNRECOVERABLE_IF(!isInRange(gfxCore, tbxCommandStreamReceiverFactory));
    tbxCommandStreamReceiverFactory[gfxCore] = TbxCommandStreamReceiverHw<Family>::create;
 }
--- a/shared/test/common/helpers/raii_gfx_core_helper.h
+++ b/shared/test/common/helpers/raii_gfx_core_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -12,7 +12,7 @@
 #include "shared/source/helpers/hw_info.h"

 namespace NEO {
-extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[IGFX_MAX_CORE];
+extern GfxCoreHelperCreateFunctionType gfxCoreHelperFactory[NEO::maxCoreEnumValue];

 template <class MockHelper>
 class RAIIGfxCoreHelperFactory {
--- a/shared/test/common/libult/create_command_stream.cpp
+++ b/shared/test/common/libult/create_command_stream.cpp
@@ -22,7 +22,7 @@

 namespace NEO {

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnvironment,
                                           uint32_t rootDeviceIndex,
@@ -41,7 +41,7 @@ CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnviro
        }
    }

-    auto funcCreate = commandStreamReceiverFactory[IGFX_MAX_CORE + hwInfo->platform.eRenderCoreFamily];
+    auto funcCreate = commandStreamReceiverFactory[NEO::maxCoreEnumValue + hwInfo->platform.eRenderCoreFamily];
    if (funcCreate) {
        return funcCreate(false, executionEnvironment, rootDeviceIndex, deviceBitfield);
    }
--- a/shared/test/common/libult/gen12lp.cpp
+++ b/shared/test/common/libult/gen12lp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -16,11 +16,11 @@ typedef Gen12LpFamily Family;

 constexpr auto gfxCore = IGFX_GEN12LP_CORE;

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 template <>
 void populateFactoryTable<UltCommandStreamReceiver<Family>>() {
-    commandStreamReceiverFactory[IGFX_MAX_CORE + gfxCore] = UltCommandStreamReceiver<Family>::create;
+    commandStreamReceiverFactory[NEO::maxCoreEnumValue + gfxCore] = UltCommandStreamReceiver<Family>::create;
 }

 struct EnableGen12LP {
--- a/shared/test/common/libult/xe2_hpg_core.cpp
+++ b/shared/test/common/libult/xe2_hpg_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -15,11 +15,11 @@ namespace NEO {
 using Family = Xe2HpgCoreFamily;
 constexpr auto gfxCore = IGFX_XE2_HPG_CORE;

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 template <>
 void populateFactoryTable<UltCommandStreamReceiver<Family>>() {
-    commandStreamReceiverFactory[IGFX_MAX_CORE + gfxCore] = UltCommandStreamReceiver<Family>::create;
+    commandStreamReceiverFactory[NEO::maxCoreEnumValue + gfxCore] = UltCommandStreamReceiver<Family>::create;
 }

 struct EnableXe2HpgCore {
--- a/shared/test/common/libult/xe3_core.cpp
+++ b/shared/test/common/libult/xe3_core.cpp
@@ -15,11 +15,11 @@ namespace NEO {
 using Family = Xe3CoreFamily;
 constexpr auto gfxCore = IGFX_XE3_CORE;

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 template <>
 void populateFactoryTable<UltCommandStreamReceiver<Family>>() {
-    commandStreamReceiverFactory[IGFX_MAX_CORE + gfxCore] = UltCommandStreamReceiver<Family>::create;
+    commandStreamReceiverFactory[NEO::maxCoreEnumValue + gfxCore] = UltCommandStreamReceiver<Family>::create;
 }

 struct EnableXe3Core {
--- a/shared/test/common/libult/xe_hp_core.cpp
+++ b/shared/test/common/libult/xe_hp_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -16,11 +16,11 @@ typedef XeHpFamily Family;

 constexpr auto gfxCore = IGFX_XE_HP_CORE;

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 template <>
 void populateFactoryTable<UltCommandStreamReceiver<Family>>() {
-    commandStreamReceiverFactory[IGFX_MAX_CORE + gfxCore] = UltCommandStreamReceiver<Family>::create;
+    commandStreamReceiverFactory[NEO::maxCoreEnumValue + gfxCore] = UltCommandStreamReceiver<Family>::create;
 }

 struct enableXeHpCore {
--- a/shared/test/common/libult/xe_hpc_core.cpp
+++ b/shared/test/common/libult/xe_hpc_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -16,11 +16,11 @@ typedef XeHpcCoreFamily Family;

 constexpr auto gfxCore = IGFX_XE_HPC_CORE;

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 template <>
 void populateFactoryTable<UltCommandStreamReceiver<Family>>() {
-    commandStreamReceiverFactory[IGFX_MAX_CORE + gfxCore] = UltCommandStreamReceiver<Family>::create;
+    commandStreamReceiverFactory[NEO::maxCoreEnumValue + gfxCore] = UltCommandStreamReceiver<Family>::create;
 }

 struct EnableXeHpcCore {
--- a/shared/test/common/libult/xe_hpg_core.cpp
+++ b/shared/test/common/libult/xe_hpg_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -16,11 +16,11 @@ typedef XeHpgCoreFamily Family;

 constexpr auto gfxCore = IGFX_XE_HPG_CORE;

-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * NEO::maxCoreEnumValue];

 template <>
 void populateFactoryTable<UltCommandStreamReceiver<Family>>() {
-    commandStreamReceiverFactory[IGFX_MAX_CORE + gfxCore] = UltCommandStreamReceiver<Family>::create;
+    commandStreamReceiverFactory[NEO::maxCoreEnumValue + gfxCore] = UltCommandStreamReceiver<Family>::create;
 }

 struct EnableXeHpgCore {
--- a/shared/test/common/mocks/debugger_l0_create.cpp
+++ b/shared/test/common/mocks/debugger_l0_create.cpp
@@ -10,7 +10,7 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/mocks/mock_l0_debugger.h"

-NEO::DebugerL0CreateFn mockDebuggerL0HwFactory[IGFX_MAX_CORE];
+NEO::DebugerL0CreateFn mockDebuggerL0HwFactory[NEO::maxCoreEnumValue];
 bool forceCreateNullptrDebugger = false;
 size_t createDebuggerCallCount = 0;

--- a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp
+++ b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp
@@ -43,7 +43,7 @@
 using namespace NEO;

 namespace NEO {
-extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[IGFX_MAX_CORE];
+extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[NEO::maxCoreEnumValue];
 } // namespace NEO

 struct TbxFixture : public TbxCommandStreamFixture,