From 3fdcf049bfd233318730db47649e741b6b3a67cd Mon Sep 17 00:00:00 2001
From: Mateusz Jablonski <mateusz.jablonski@intel.com>
Date: Wed, 11 Oct 2023 23:09:15 +0000
Subject: [PATCH] fix: set default device hierarchy to composite for all
 platforms except xe hpc

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
---
 shared/source/helpers/gfx_core_helper_base.inl          | 2 +-
 shared/test/unit_test/helpers/gfx_core_helper_tests.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/source/helpers/gfx_core_helper_base.inl b/shared/source/helpers/gfx_core_helper_base.inl
index 5f537f5edd..1309bdd19c 100644
--- a/shared/source/helpers/gfx_core_helper_base.inl
+++ b/shared/source/helpers/gfx_core_helper_base.inl
@@ -712,7 +712,7 @@ uint32_t GfxCoreHelperHw<GfxFamily>::calculateNumThreadsPerThreadGroup(uint32_t
 
 template <typename GfxFamily>
 char const *GfxCoreHelperHw<GfxFamily>::getDefaultDeviceHierarchy() const {
-    return deviceHierarchyFlat;
+    return deviceHierarchyComposite;
 }
 
 } // namespace NEO
diff --git a/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp b/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp
index 59bb1f0fdc..51eed27eee 100644
--- a/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp
+++ b/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp
@@ -1559,5 +1559,5 @@ HWTEST_F(GfxCoreHelperTest, givenFlagRemoveRestrictionsOnNumberOfThreadsInGpgpuT
 HWTEST2_F(GfxCoreHelperTest, whenGetDefaultDeviceHierarchyThenReturnFlatHierarchy, IsNotXeHpcCore) {
     const auto &gfxCoreHelper = getHelper<GfxCoreHelper>();
     auto defaultDeviceHierarchy = gfxCoreHelper.getDefaultDeviceHierarchy();
-    EXPECT_STREQ("FLAT", defaultDeviceHierarchy);
+    EXPECT_STREQ("COMPOSITE", defaultDeviceHierarchy);
 }