From 5d3b665ea0db97eb27bfebe13e7b11c44a0c56df Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 31 Oct 2022 12:11:16 +0000 Subject: [PATCH] ULT: Move Xe product specific tests shared Signed-off-by: Mateusz Jablonski --- .../unit_test/memory_manager/CMakeLists.txt | 2 +- ...nager_allocate_in_preferred_pool_tests.cpp | 52 ++++++ .../xe_hpc_core/excludes_ocl_xe_hpc_core.cpp | 3 - .../unit_test/xe_hpc_core/pvc/CMakeLists.txt | 2 - .../pvc/test_hw_info_config_pvc.cpp | 170 ------------------ .../test_device_caps_xe_hpc_core.cpp | 2 - .../unit_test/xe_hpg_core/dg2/CMakeLists.txt | 1 - .../unit_test/memory_manager/CMakeLists.txt | 1 + ...nager_allocate_in_preferred_pool_tests.cpp | 38 ---- .../xe_hpc_core/excludes_xe_hpc_core.cpp | 3 + .../unit_test/xe_hpc_core/pvc/CMakeLists.txt | 1 + .../xe_hpc_core/pvc/sampler_tests_pvc.cpp | 7 +- .../pvc/test_hw_info_config_pvc.cpp | 168 +++++++++++++++-- .../unit_test/xe_hpg_core/dg2/CMakeLists.txt | 1 + .../dg2/memory_manager_tests_dg2.cpp | 0 15 files changed, 219 insertions(+), 232 deletions(-) create mode 100644 opencl/test/unit_test/memory_manager/cl_memory_manager_allocate_in_preferred_pool_tests.cpp delete mode 100644 opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp rename {opencl => shared}/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp (96%) rename {opencl => shared}/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp (90%) rename {opencl => shared}/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp (100%) diff --git a/opencl/test/unit_test/memory_manager/CMakeLists.txt b/opencl/test/unit_test/memory_manager/CMakeLists.txt index 4bcbc29693..35f346fb34 100644 --- a/opencl/test/unit_test/memory_manager/CMakeLists.txt +++ b/opencl/test/unit_test/memory_manager/CMakeLists.txt @@ -6,9 +6,9 @@ set(IGDRCL_SRCS_tests_memory_manager ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/cl_memory_manager_allocate_in_preferred_pool_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_memory_sync_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_allocate_in_preferred_pool_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/migraton_controller_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_manager_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj_surface_tests.cpp diff --git a/opencl/test/unit_test/memory_manager/cl_memory_manager_allocate_in_preferred_pool_tests.cpp b/opencl/test/unit_test/memory_manager/cl_memory_manager_allocate_in_preferred_pool_tests.cpp new file mode 100644 index 0000000000..d6226c89e9 --- /dev/null +++ b/opencl/test/unit_test/memory_manager/cl_memory_manager_allocate_in_preferred_pool_tests.cpp @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2018-2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/gmm_helper/gmm_helper.h" +#include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/mocks/ult_device_factory.h" + +#include "opencl/source/helpers/cl_memory_properties_helpers.h" +#include "opencl/source/mem_obj/mem_obj_helper.h" + +using namespace NEO; + +TEST(MemoryManagerTest, givenEnabledLocalMemoryWhenAllocatingSharedResourceCopyThenLocalMemoryAllocationIsReturnedAndGpuAddresIsInStandard64kHeap) { + UltDeviceFactory deviceFactory{1, 0}; + HardwareInfo localPlatformDevice = {}; + + localPlatformDevice = *defaultHwInfo; + localPlatformDevice.featureTable.flags.ftrLocalMemory = true; + + auto executionEnvironment = std::unique_ptr(MockDevice::prepareExecutionEnvironment(&localPlatformDevice, 0u)); + executionEnvironment->rootDeviceEnvironments[0]->initGmm(); + + MockMemoryManager memoryManager(false, true, *executionEnvironment); + + ImageDescriptor imgDesc = {}; + imgDesc.imageWidth = 512; + imgDesc.imageHeight = 1; + imgDesc.imageType = ImageType::Image2D; + auto imgInfo = MockGmm::initImgInfo(imgDesc, 0, nullptr); + + auto memoryProperties = ClMemoryPropertiesHelper::createMemoryProperties(0, 0, 0, deviceFactory.rootDevices[0]); + AllocationProperties allocProperties = MemObjHelper::getAllocationPropertiesWithImageInfo(mockRootDeviceIndex, imgInfo, true, memoryProperties, localPlatformDevice, mockDeviceBitfield, true); + allocProperties.allocationType = AllocationType::SHARED_RESOURCE_COPY; + + auto allocation = memoryManager.allocateGraphicsMemoryInPreferredPool(allocProperties, nullptr); + ASSERT_NE(nullptr, allocation); + EXPECT_EQ(MemoryPool::LocalMemory, allocation->getMemoryPool()); + EXPECT_EQ(0u, allocation->getDefaultGmm()->resourceParams.Flags.Info.NonLocalOnly); + + auto gmmHelper = memoryManager.getGmmHelper(allocation->getRootDeviceIndex()); + EXPECT_LT(gmmHelper->canonize(memoryManager.getGfxPartition(allocation->getRootDeviceIndex())->getHeapBase(HeapIndex::HEAP_STANDARD64KB)), allocation->getGpuAddress()); + EXPECT_GT(gmmHelper->canonize(memoryManager.getGfxPartition(allocation->getRootDeviceIndex())->getHeapLimit(HeapIndex::HEAP_STANDARD64KB)), allocation->getGpuAddress()); + EXPECT_EQ(0llu, allocation->getGpuBaseAddress()); + + memoryManager.freeGraphicsMemory(allocation); +} diff --git a/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp index 4871c2b594..b425566f03 100644 --- a/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp @@ -34,7 +34,6 @@ HWTEST_EXCLUDE_PRODUCT(HwHelperTestXeHPAndLater, givenCcsDisabledAndNumberOfCcsE HWTEST_EXCLUDE_PRODUCT(HwHelperTest, givenDefaultHwHelperHwWhenMinimalSIMDSizeIsQueriedThen8IsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(PipeControlHelperTestsXeHPAndLater, WhenGettingSizeForAdditionalSynchronizationThenCorrectValueIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwHelperTest, whenQueryingMaxNumSamplersThenReturnSixteen, IGFX_XE_HPC_CORE); -HWTEST_EXCLUDE_PRODUCT(MemoryManagerGetAlloctionDataTests, givenCommandBufferAllocationTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsRequested, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(MultiDeviceStorageInfoTest, givenSingleTileCsrWhenAllocatingCsrSpecificAllocationsThenStoreThemInSystemMemory, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwHelperTest, givenKernelInfoWhenCheckingRequiresAuxResolvesThenCorrectValuesAreReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwHelperTest, givenHwHelperWhenGettingIfRevisionSpecificBinaryBuiltinIsRequiredThenFalseIsReturned, IGFX_XE_HPC_CORE); @@ -50,5 +49,3 @@ HWTEST_EXCLUDE_PRODUCT(EnqueueReadBufferStatefulTest, WhenReadingBufferStatefulT HWTEST_EXCLUDE_PRODUCT(EnqueueWriteBufferRectStatefulTest, WhenWritingBufferRectStatefulThenSuccessIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(CommandStreamReceiverFlushTaskTests, givenOverrideThreadArbitrationPolicyDebugVariableSetWhenFlushingThenRequestRequiredMode, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterAubCommandStreamReceiverWithoutFixtureTests, GivenCopyHostPtrAndHostNoAccessAndReadOnlyFlagsWhenAllocatingBufferThenAllocationIsCopiedToEveryTile, IGFX_XE_HPC_CORE); -HWTEST_EXCLUDE_PRODUCT(GetAllocationDataTestHw, givenRingBufferAllocationWhenGetAllocationDataIsCalledThenItHasProperFieldsSet, IGFX_XE_HPC_CORE); -HWTEST_EXCLUDE_PRODUCT(GetAllocationDataTestHw, givenSemaphoreBufferAllocationWhenGetAllocationDataIsCalledThenItHasProperFieldsSet, IGFX_XE_HPC_CORE); diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt b/opencl/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt index 2249a546ad..9826492f28 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt +++ b/opencl/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt @@ -10,9 +10,7 @@ if(TESTS_PVC) ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_pvc.cpp ${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper_tests_pvc.cpp ${CMAKE_CURRENT_SOURCE_DIR}/get_device_info_pvc.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_pvc.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_pvc.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_pvc.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_pvc.cpp ) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_xe_hpc_core_pvc}) diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp deleted file mode 100644 index b3b226f201..0000000000 --- a/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (C) 2021-2022 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/source/command_stream/stream_properties.h" -#include "shared/source/helpers/constants.h" -#include "shared/source/os_interface/hw_info_config.h" -#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" -#include "shared/source/xe_hpc_core/pvc/device_ids_configs_pvc.h" -#include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/helpers/gtest_helpers.h" -#include "shared/test/common/test_macros/header/per_product_test_definitions.h" -#include "shared/test/common/test_macros/test.h" - -#include "gtest/gtest.h" - -using namespace NEO; - -using PvcHwInfoConfig = ::testing::Test; - -PVCTEST_F(PvcHwInfoConfig, givenPvcWhenCallingGetDeviceMemoryNameThenHbmIsReturned) { - auto hwInfoConfig = HwInfoConfig::get(defaultHwInfo->platform.eProductFamily); - auto deviceMemoryName = hwInfoConfig->getDeviceMemoryName(); - EXPECT_TRUE(hasSubstr(deviceMemoryName, std::string("HBM"))); -} - -PVCTEST_F(PvcHwInfoConfig, givenHwInfoConfigWhenAdditionalKernelExecInfoSupportCheckedThenCorrectValueIsReturned) { - auto &hwInfoConfig = *HwInfoConfig::get(productFamily); - auto hwInfo = *defaultHwInfo; - EXPECT_FALSE(hwInfoConfig.isDisableOverdispatchAvailable(hwInfo)); - - FrontEndPropertiesSupport fePropertiesSupport{}; - hwInfoConfig.fillFrontEndPropertiesSupportStructure(fePropertiesSupport, hwInfo); - EXPECT_FALSE(fePropertiesSupport.disableOverdispatch); - - hwInfo.platform.usRevId = hwInfoConfig.getHwRevIdFromStepping(REVISION_B, hwInfo); - EXPECT_TRUE(hwInfoConfig.isDisableOverdispatchAvailable(hwInfo)); - - hwInfoConfig.fillFrontEndPropertiesSupportStructure(fePropertiesSupport, hwInfo); - EXPECT_TRUE(fePropertiesSupport.disableOverdispatch); -} - -PVCTEST_F(PvcHwInfoConfig, givenHwInfoConfigWhenAskedIfPipeControlPriorToNonPipelinedStateCommandsWARequiredThenTrueIsReturned) { - const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); - auto hwInfo = *defaultHwInfo; - auto isRcs = false; - - const auto &[isBasicWARequired, isExtendedWARequired] = hwInfoConfig.isPipeControlPriorToNonPipelinedStateCommandsWARequired(hwInfo, isRcs); - - EXPECT_FALSE(isBasicWARequired); - EXPECT_FALSE(isExtendedWARequired); -} - -PVCTEST_F(PvcHwInfoConfig, givenPvcHwInfoConfigWhenCheckDirectSubmissionSupportedThenTrueIsReturned) { - const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); - auto hwInfo = *defaultHwInfo; - EXPECT_TRUE(hwInfoConfig.isDirectSubmissionSupported(hwInfo)); -} - -PVCTEST_F(PvcHwInfoConfig, givenPvcHwInfoConfigWhenCheckCopyEngineSelectorEnabledThenFalseIsReturned) { - const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); - auto hwInfo = *defaultHwInfo; - EXPECT_FALSE(hwInfoConfig.isCopyEngineSelectorEnabled(hwInfo)); -} - -PVCTEST_F(PvcHwInfoConfig, givenHwInfoConfigAndProgramExtendedPipeControlPriorToNonPipelinedStateCommandDisabledWhenAskedIfPipeControlPriorToNonPipelinedStateCommandsWARequiredThenFalseIsReturned) { - DebugManagerStateRestore restore; - DebugManager.flags.ProgramExtendedPipeControlPriorToNonPipelinedStateCommand.set(0); - - const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); - auto hwInfo = *defaultHwInfo; - auto isRcs = false; - - const auto &[isBasicWARequired, isExtendedWARequired] = hwInfoConfig.isPipeControlPriorToNonPipelinedStateCommandsWARequired(hwInfo, isRcs); - - EXPECT_FALSE(isExtendedWARequired); - EXPECT_FALSE(isBasicWARequired); -} - -using PvcHwInfo = ::testing::Test; - -PVCTEST_F(PvcHwInfo, givenPvcWhenConfiguringThenDisableCccs) { - auto hwInfoConfig = HwInfoConfig::get(productFamily); - HardwareInfo hwInfo = *defaultHwInfo; - - hwInfoConfig->configureHardwareCustom(&hwInfo, nullptr); - EXPECT_FALSE(hwInfo.featureTable.flags.ftrRcsNode); -} - -PVCTEST_F(PvcHwInfo, givenDebugVariableSetWhenConfiguringThenEnableCccs) { - DebugManagerStateRestore restore; - DebugManager.flags.NodeOrdinal.set(static_cast(aub_stream::EngineType::ENGINE_CCCS)); - - auto hwInfoConfig = HwInfoConfig::get(productFamily); - HardwareInfo hwInfo = *defaultHwInfo; - - hwInfoConfig->configureHardwareCustom(&hwInfo, nullptr); - EXPECT_TRUE(hwInfo.featureTable.flags.ftrRcsNode); -} - -PVCTEST_F(PvcHwInfo, givenDeviceIdThenProperMaxThreadsForWorkgroupIsReturned) { - HardwareInfo hwInfo = *defaultHwInfo; - auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); - - for (const auto &deviceId : pvcXlDeviceIds) { - hwInfo.platform.usDeviceID = deviceId; - EXPECT_EQ(64u, hwInfoConfig.getMaxThreadsForWorkgroupInDSSOrSS(hwInfo, 64u, 64u)); - } - - for (const auto &deviceId : pvcXtDeviceIds) { - hwInfo.platform.usDeviceID = deviceId; - uint32_t numThreadsPerEU = hwInfo.gtSystemInfo.ThreadCount / hwInfo.gtSystemInfo.EUCount; - EXPECT_EQ(64u * numThreadsPerEU, hwInfoConfig.getMaxThreadsForWorkgroupInDSSOrSS(hwInfo, 64u, 64u)); - } -} - -PVCTEST_F(PvcHwInfo, givenVariousValuesWhenConvertingHwRevIdAndSteppingThenConversionIsCorrect) { - auto hwInfo = *defaultHwInfo; - const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); - - for (uint32_t testValue = 0; testValue < 0xFF; testValue++) { - for (const auto *pvc : {&pvcXlDeviceIds, &pvcXtDeviceIds}) { - for (const auto &deviceId : *pvc) { - hwInfo.platform.usDeviceID = deviceId; - auto hwRevIdFromStepping = hwInfoConfig.getHwRevIdFromStepping(testValue, hwInfo); - if (hwRevIdFromStepping != CommonConstants::invalidStepping) { - hwInfo.platform.usRevId = hwRevIdFromStepping; - EXPECT_EQ(testValue, hwInfoConfig.getSteppingFromHwRevId(hwInfo)); - } - } - } - hwInfo.platform.usRevId = testValue; - auto steppingFromHwRevId = hwInfoConfig.getSteppingFromHwRevId(hwInfo); - if (steppingFromHwRevId != CommonConstants::invalidStepping) { - bool anyMatchAfterConversionFromStepping = false; - for (const auto *pvc : {&pvcXlDeviceIds, &pvcXtDeviceIds}) { - for (const auto &deviceId : *pvc) { - hwInfo.platform.usDeviceID = deviceId; - auto hwRevId = hwInfoConfig.getHwRevIdFromStepping(steppingFromHwRevId, hwInfo); - EXPECT_NE(CommonConstants::invalidStepping, hwRevId); - // expect values to match. 0x1 and 0x0 translate to the same stepping so they are interpreted as a match too. - if (((testValue & PVC::pvcSteppingBits) == (hwRevId & PVC::pvcSteppingBits)) || - (((testValue & PVC::pvcSteppingBits) == 0x1) && ((hwRevId & PVC::pvcSteppingBits) == 0x0))) { - anyMatchAfterConversionFromStepping = true; - } - } - } - EXPECT_TRUE(anyMatchAfterConversionFromStepping); - } - } -} - -PVCTEST_F(PvcHwInfo, givenPvcHwInfoConfigWhenIsIpSamplingSupportedThenCorrectResultIsReturned) { - const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); - auto hwInfo = *defaultHwInfo; - - for (const auto &deviceId : pvcXlDeviceIds) { - hwInfo.platform.usDeviceID = deviceId; - EXPECT_FALSE(hwInfoConfig.isIpSamplingSupported(hwInfo)); - } - - for (const auto &deviceId : pvcXtDeviceIds) { - hwInfo.platform.usDeviceID = deviceId; - EXPECT_TRUE(hwInfoConfig.isIpSamplingSupported(hwInfo)); - } -} diff --git a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp index 8deb48d600..1e055ee42f 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp @@ -10,10 +10,8 @@ #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" -#include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/device_info_fixture.h" -#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "hw_cmds_xe_hpc_core_base.h" diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt b/opencl/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt index b61713d129..feb67f297d 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt +++ b/opencl/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt @@ -14,7 +14,6 @@ if(TESTS_DG2) ${IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/get_device_info_dg2.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_tests_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmds_programming_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_dg2.cpp diff --git a/shared/test/unit_test/memory_manager/CMakeLists.txt b/shared/test/unit_test/memory_manager/CMakeLists.txt index 5f2218424a..0d7437a2cd 100644 --- a/shared/test/unit_test/memory_manager/CMakeLists.txt +++ b/shared/test/unit_test/memory_manager/CMakeLists.txt @@ -16,6 +16,7 @@ target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/internal_allocation_storage_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_allocate_in_device_pool_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_allocate_in_preferred_pool_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_multi_device_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/memory_pool_tests.cpp diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp b/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp similarity index 96% rename from opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp rename to shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp index 732fa6f273..9ecef19f6d 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp +++ b/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp @@ -21,9 +21,6 @@ #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/hw_test.h" -#include "opencl/source/helpers/cl_memory_properties_helpers.h" -#include "opencl/source/mem_obj/mem_obj_helper.h" - using namespace NEO; using MemoryManagerGetAlloctionData32BitAnd64kbPagesAllowedTest = testing::TestWithParam; @@ -1045,41 +1042,6 @@ TEST(MemoryManagerTest, givenEnableLocalMemoryAndMemoryManagerWhenBufferTypeIsPa memoryManager.freeGraphicsMemory(allocation); } -TEST(MemoryManagerTest, givenEnabledLocalMemoryWhenAllocatingSharedResourceCopyThenLocalMemoryAllocationIsReturnedAndGpuAddresIsInStandard64kHeap) { - UltDeviceFactory deviceFactory{1, 0}; - HardwareInfo localPlatformDevice = {}; - - localPlatformDevice = *defaultHwInfo; - localPlatformDevice.featureTable.flags.ftrLocalMemory = true; - - auto executionEnvironment = std::unique_ptr(MockDevice::prepareExecutionEnvironment(&localPlatformDevice, 0u)); - executionEnvironment->rootDeviceEnvironments[0]->initGmm(); - - MockMemoryManager memoryManager(false, true, *executionEnvironment); - - ImageDescriptor imgDesc = {}; - imgDesc.imageWidth = 512; - imgDesc.imageHeight = 1; - imgDesc.imageType = ImageType::Image2D; - auto imgInfo = MockGmm::initImgInfo(imgDesc, 0, nullptr); - - auto memoryProperties = ClMemoryPropertiesHelper::createMemoryProperties(0, 0, 0, deviceFactory.rootDevices[0]); - AllocationProperties allocProperties = MemObjHelper::getAllocationPropertiesWithImageInfo(mockRootDeviceIndex, imgInfo, true, memoryProperties, localPlatformDevice, mockDeviceBitfield, true); - allocProperties.allocationType = AllocationType::SHARED_RESOURCE_COPY; - - auto allocation = memoryManager.allocateGraphicsMemoryInPreferredPool(allocProperties, nullptr); - ASSERT_NE(nullptr, allocation); - EXPECT_EQ(MemoryPool::LocalMemory, allocation->getMemoryPool()); - EXPECT_EQ(0u, allocation->getDefaultGmm()->resourceParams.Flags.Info.NonLocalOnly); - - auto gmmHelper = memoryManager.getGmmHelper(allocation->getRootDeviceIndex()); - EXPECT_LT(gmmHelper->canonize(memoryManager.getGfxPartition(allocation->getRootDeviceIndex())->getHeapBase(HeapIndex::HEAP_STANDARD64KB)), allocation->getGpuAddress()); - EXPECT_GT(gmmHelper->canonize(memoryManager.getGfxPartition(allocation->getRootDeviceIndex())->getHeapLimit(HeapIndex::HEAP_STANDARD64KB)), allocation->getGpuAddress()); - EXPECT_EQ(0llu, allocation->getGpuBaseAddress()); - - memoryManager.freeGraphicsMemory(allocation); -} - using MemoryManagerGetAlloctionDataHaveToBeForcedTo48BitTest = testing::TestWithParam>; TEST_P(MemoryManagerGetAlloctionDataHaveToBeForcedTo48BitTest, givenAllocationTypesHaveToBeForcedTo48BitThenAllocationDataResource48BitIsSet) { diff --git a/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp index 507345ea51..a8c6678362 100644 --- a/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp @@ -38,3 +38,6 @@ HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControl HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsPrefetcherDisablingInDirectSubmissionRequiredThenTrueIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(DirectSubmissionTest, givenDebugFlagSetWhenDispatchingPrefetcherThenSetCorrectValue, IGFX_XE_HPC_CORE); +HWTEST_EXCLUDE_PRODUCT(GetAllocationDataTestHw, givenRingBufferAllocationWhenGetAllocationDataIsCalledThenItHasProperFieldsSet, IGFX_XE_HPC_CORE); +HWTEST_EXCLUDE_PRODUCT(GetAllocationDataTestHw, givenSemaphoreBufferAllocationWhenGetAllocationDataIsCalledThenItHasProperFieldsSet, IGFX_XE_HPC_CORE); +HWTEST_EXCLUDE_PRODUCT(MemoryManagerGetAlloctionDataTests, givenCommandBufferAllocationTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsRequested, IGFX_XE_HPC_CORE); \ No newline at end of file diff --git a/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt b/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt index 9712af2065..1181686cfa 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt +++ b/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt @@ -14,6 +14,7 @@ if(TESTS_PVC) ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_pvc.cpp ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_pvc.cpp ${CMAKE_CURRENT_SOURCE_DIR}/product_config_tests_pvc.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_pvc.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_pvc.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_pvc.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_pvc.cpp diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp similarity index 90% rename from opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp rename to shared/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp index 150029e6f2..d49f38bb04 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp @@ -5,20 +5,17 @@ * */ -#include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/xe_hpc_core/hw_cmds_pvc.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" -#include "opencl/test/unit_test/fixtures/cl_device_fixture.h" - #include using namespace NEO; - -typedef Test PvcSamplerTest; +using PvcSamplerTest = ::testing::Test; PVCTEST_F(PvcSamplerTest, givenPvcSamplerWhenUsingDefaultFilteringAndAppendSamplerStateParamsThenDisableLowQualityFilter) { EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp index 18df93468f..9502eafe1d 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp @@ -5,19 +5,22 @@ * */ +#include "shared/source/command_stream/stream_properties.h" #include "shared/source/helpers/constants.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/xe_hpc_core/hw_cmds_pvc.h" +#include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/common/xe_hpc_core/pvc/product_configs_pvc.h" using namespace NEO; -using PVCHwInfoConfig = ::testing::Test; +using PvcHwInfoConfig = ::testing::Test; -PVCTEST_F(PVCHwInfoConfig, givenPVCRevId3AndAboveWhenGettingThreadEuRatioForScratchThen16IsReturned) { +PVCTEST_F(PvcHwInfoConfig, givenPVCRevId3AndAboveWhenGettingThreadEuRatioForScratchThen16IsReturned) { const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); auto hwInfo = *defaultHwInfo; hwInfo.platform.usRevId = 3; @@ -27,14 +30,14 @@ PVCTEST_F(PVCHwInfoConfig, givenPVCRevId3AndAboveWhenGettingThreadEuRatioForScra EXPECT_EQ(16u, hwInfoConfig.getThreadEuRatioForScratch(hwInfo)); } -PVCTEST_F(PVCHwInfoConfig, givenPVCRevId0WhenGettingThreadEuRatioForScratchThen8IsReturned) { +PVCTEST_F(PvcHwInfoConfig, givenPVCRevId0WhenGettingThreadEuRatioForScratchThen8IsReturned) { const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); auto hwInfo = *defaultHwInfo; hwInfo.platform.usRevId = 0; EXPECT_EQ(8u, hwInfoConfig.getThreadEuRatioForScratch(hwInfo)); } -PVCTEST_F(PVCHwInfoConfig, givenPVCWithDifferentSteppingsThenImplicitScalingIsEnabledForBAndHigher) { +PVCTEST_F(PvcHwInfoConfig, givenPVCWithDifferentSteppingsThenImplicitScalingIsEnabledForBAndHigher) { const auto &hwInfoConfig = *HwInfoConfig::get(defaultHwInfo->platform.eProductFamily); auto hwInfo = *defaultHwInfo; @@ -49,7 +52,7 @@ PVCTEST_F(PVCHwInfoConfig, givenPVCWithDifferentSteppingsThenImplicitScalingIsEn } } -PVCTEST_F(PVCHwInfoConfig, givenPvcHwInfoWhenIsIpSamplingSupportedThenCorrectResultIsReturned) { +PVCTEST_F(PvcHwInfoConfig, givenPvcHwInfoWhenIsIpSamplingSupportedThenCorrectResultIsReturned) { const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); auto hwInfo = *defaultHwInfo; @@ -64,23 +67,23 @@ PVCTEST_F(PVCHwInfoConfig, givenPvcHwInfoWhenIsIpSamplingSupportedThenCorrectRes } } -PVCTEST_F(PVCHwInfoConfig, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) { +PVCTEST_F(PvcHwInfoConfig, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) { HardwareInfo hwInfo = *defaultHwInfo; const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported()); } -PVCTEST_F(PVCHwInfoConfig, givenPvcHwInfoConfigWhenIsPrefetcherDisablingInDirectSubmissionRequiredThenFalseIsReturned) { +PVCTEST_F(PvcHwInfoConfig, givenPvcHwInfoConfigWhenIsPrefetcherDisablingInDirectSubmissionRequiredThenFalseIsReturned) { const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); EXPECT_FALSE(hwInfoConfig.isPrefetcherDisablingInDirectSubmissionRequired()); } -PVCTEST_F(PVCHwInfoConfig, givenPvcHwInfoConfigWhenIsStatefulAddressingModeSupportedThenReturnFalse) { +PVCTEST_F(PvcHwInfoConfig, givenPvcHwInfoConfigWhenIsStatefulAddressingModeSupportedThenReturnFalse) { const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); EXPECT_FALSE(hwInfoConfig.isStatefulAddressingModeSupported()); } -PVCTEST_F(PVCHwInfoConfig, givenPvcSteppingWhenQueryIsComputeDispatchAllWalkerEnableInCfeStateRequiredThenAppropriateValueIsReturned) { +PVCTEST_F(PvcHwInfoConfig, givenPvcSteppingWhenQueryIsComputeDispatchAllWalkerEnableInCfeStateRequiredThenAppropriateValueIsReturned) { const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); auto hwInfo = *defaultHwInfo; @@ -91,7 +94,7 @@ PVCTEST_F(PVCHwInfoConfig, givenPvcSteppingWhenQueryIsComputeDispatchAllWalkerEn EXPECT_TRUE(hwInfoConfig.isComputeDispatchAllWalkerEnableInCfeStateRequired(hwInfo)); } -PVCTEST_F(PVCHwInfoConfig, givenHwInfoConfigWhenGetCommandsStreamPropertiesSupportThenExpectCorrectValues) { +PVCTEST_F(PvcHwInfoConfig, givenHwInfoConfigWhenGetCommandsStreamPropertiesSupportThenExpectCorrectValues) { HardwareInfo hwInfo = *defaultHwInfo; const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); @@ -121,3 +124,148 @@ PVCTEST_F(PVCHwInfoConfig, givenHwInfoConfigWhenGetCommandsStreamPropertiesSuppo EXPECT_FALSE(hwInfoConfig.getPipelineSelectPropertyMediaSamplerDopClockGateSupport()); EXPECT_TRUE(hwInfoConfig.getPipelineSelectPropertySystolicModeSupport()); } + +PVCTEST_F(PvcHwInfoConfig, givenPvcWhenCallingGetDeviceMemoryNameThenHbmIsReturned) { + auto hwInfoConfig = HwInfoConfig::get(defaultHwInfo->platform.eProductFamily); + auto deviceMemoryName = hwInfoConfig->getDeviceMemoryName(); + EXPECT_TRUE(hasSubstr(deviceMemoryName, std::string("HBM"))); +} + +PVCTEST_F(PvcHwInfoConfig, givenHwInfoConfigWhenAdditionalKernelExecInfoSupportCheckedThenCorrectValueIsReturned) { + auto &hwInfoConfig = *HwInfoConfig::get(productFamily); + auto hwInfo = *defaultHwInfo; + EXPECT_FALSE(hwInfoConfig.isDisableOverdispatchAvailable(hwInfo)); + + FrontEndPropertiesSupport fePropertiesSupport{}; + hwInfoConfig.fillFrontEndPropertiesSupportStructure(fePropertiesSupport, hwInfo); + EXPECT_FALSE(fePropertiesSupport.disableOverdispatch); + + hwInfo.platform.usRevId = hwInfoConfig.getHwRevIdFromStepping(REVISION_B, hwInfo); + EXPECT_TRUE(hwInfoConfig.isDisableOverdispatchAvailable(hwInfo)); + + hwInfoConfig.fillFrontEndPropertiesSupportStructure(fePropertiesSupport, hwInfo); + EXPECT_TRUE(fePropertiesSupport.disableOverdispatch); +} + +PVCTEST_F(PvcHwInfoConfig, givenHwInfoConfigWhenAskedIfPipeControlPriorToNonPipelinedStateCommandsWARequiredThenTrueIsReturned) { + const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); + auto hwInfo = *defaultHwInfo; + auto isRcs = false; + + const auto &[isBasicWARequired, isExtendedWARequired] = hwInfoConfig.isPipeControlPriorToNonPipelinedStateCommandsWARequired(hwInfo, isRcs); + + EXPECT_FALSE(isBasicWARequired); + EXPECT_FALSE(isExtendedWARequired); +} + +PVCTEST_F(PvcHwInfoConfig, givenPvcHwInfoConfigWhenCheckDirectSubmissionSupportedThenTrueIsReturned) { + const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); + auto hwInfo = *defaultHwInfo; + EXPECT_TRUE(hwInfoConfig.isDirectSubmissionSupported(hwInfo)); +} + +PVCTEST_F(PvcHwInfoConfig, givenPvcHwInfoConfigWhenCheckCopyEngineSelectorEnabledThenFalseIsReturned) { + const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); + auto hwInfo = *defaultHwInfo; + EXPECT_FALSE(hwInfoConfig.isCopyEngineSelectorEnabled(hwInfo)); +} + +PVCTEST_F(PvcHwInfoConfig, givenHwInfoConfigAndProgramExtendedPipeControlPriorToNonPipelinedStateCommandDisabledWhenAskedIfPipeControlPriorToNonPipelinedStateCommandsWARequiredThenFalseIsReturned) { + DebugManagerStateRestore restore; + DebugManager.flags.ProgramExtendedPipeControlPriorToNonPipelinedStateCommand.set(0); + + const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); + auto hwInfo = *defaultHwInfo; + auto isRcs = false; + + const auto &[isBasicWARequired, isExtendedWARequired] = hwInfoConfig.isPipeControlPriorToNonPipelinedStateCommandsWARequired(hwInfo, isRcs); + + EXPECT_FALSE(isExtendedWARequired); + EXPECT_FALSE(isBasicWARequired); +} + +PVCTEST_F(PvcHwInfoConfig, givenPvcWhenConfiguringThenDisableCccs) { + auto hwInfoConfig = HwInfoConfig::get(productFamily); + HardwareInfo hwInfo = *defaultHwInfo; + + hwInfoConfig->configureHardwareCustom(&hwInfo, nullptr); + EXPECT_FALSE(hwInfo.featureTable.flags.ftrRcsNode); +} + +PVCTEST_F(PvcHwInfoConfig, givenDebugVariableSetWhenConfiguringThenEnableCccs) { + DebugManagerStateRestore restore; + DebugManager.flags.NodeOrdinal.set(static_cast(aub_stream::EngineType::ENGINE_CCCS)); + + auto hwInfoConfig = HwInfoConfig::get(productFamily); + HardwareInfo hwInfo = *defaultHwInfo; + + hwInfoConfig->configureHardwareCustom(&hwInfo, nullptr); + EXPECT_TRUE(hwInfo.featureTable.flags.ftrRcsNode); +} + +PVCTEST_F(PvcHwInfoConfig, givenDeviceIdThenProperMaxThreadsForWorkgroupIsReturned) { + HardwareInfo hwInfo = *defaultHwInfo; + auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); + + for (const auto &deviceId : pvcXlDeviceIds) { + hwInfo.platform.usDeviceID = deviceId; + EXPECT_EQ(64u, hwInfoConfig.getMaxThreadsForWorkgroupInDSSOrSS(hwInfo, 64u, 64u)); + } + + for (const auto &deviceId : pvcXtDeviceIds) { + hwInfo.platform.usDeviceID = deviceId; + uint32_t numThreadsPerEU = hwInfo.gtSystemInfo.ThreadCount / hwInfo.gtSystemInfo.EUCount; + EXPECT_EQ(64u * numThreadsPerEU, hwInfoConfig.getMaxThreadsForWorkgroupInDSSOrSS(hwInfo, 64u, 64u)); + } +} + +PVCTEST_F(PvcHwInfoConfig, givenVariousValuesWhenConvertingHwRevIdAndSteppingThenConversionIsCorrect) { + auto hwInfo = *defaultHwInfo; + const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); + + for (uint32_t testValue = 0; testValue < 0xFF; testValue++) { + for (const auto *pvc : {&pvcXlDeviceIds, &pvcXtDeviceIds}) { + for (const auto &deviceId : *pvc) { + hwInfo.platform.usDeviceID = deviceId; + auto hwRevIdFromStepping = hwInfoConfig.getHwRevIdFromStepping(testValue, hwInfo); + if (hwRevIdFromStepping != CommonConstants::invalidStepping) { + hwInfo.platform.usRevId = hwRevIdFromStepping; + EXPECT_EQ(testValue, hwInfoConfig.getSteppingFromHwRevId(hwInfo)); + } + } + } + hwInfo.platform.usRevId = testValue; + auto steppingFromHwRevId = hwInfoConfig.getSteppingFromHwRevId(hwInfo); + if (steppingFromHwRevId != CommonConstants::invalidStepping) { + bool anyMatchAfterConversionFromStepping = false; + for (const auto *pvc : {&pvcXlDeviceIds, &pvcXtDeviceIds}) { + for (const auto &deviceId : *pvc) { + hwInfo.platform.usDeviceID = deviceId; + auto hwRevId = hwInfoConfig.getHwRevIdFromStepping(steppingFromHwRevId, hwInfo); + EXPECT_NE(CommonConstants::invalidStepping, hwRevId); + // expect values to match. 0x1 and 0x0 translate to the same stepping so they are interpreted as a match too. + if (((testValue & PVC::pvcSteppingBits) == (hwRevId & PVC::pvcSteppingBits)) || + (((testValue & PVC::pvcSteppingBits) == 0x1) && ((hwRevId & PVC::pvcSteppingBits) == 0x0))) { + anyMatchAfterConversionFromStepping = true; + } + } + } + EXPECT_TRUE(anyMatchAfterConversionFromStepping); + } + } +} + +PVCTEST_F(PvcHwInfoConfig, givenPvcHwInfoConfigWhenIsIpSamplingSupportedThenCorrectResultIsReturned) { + const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); + auto hwInfo = *defaultHwInfo; + + for (const auto &deviceId : pvcXlDeviceIds) { + hwInfo.platform.usDeviceID = deviceId; + EXPECT_FALSE(hwInfoConfig.isIpSamplingSupported(hwInfo)); + } + + for (const auto &deviceId : pvcXtDeviceIds) { + hwInfo.platform.usDeviceID = deviceId; + EXPECT_TRUE(hwInfoConfig.isIpSamplingSupported(hwInfo)); + } +} diff --git a/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt index b6b3b764b7..8399dbf3bc 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt +++ b/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt @@ -17,6 +17,7 @@ if(TESTS_DG2) ${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_dg2.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_tests_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_dg2.cpp diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp similarity index 100% rename from opencl/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp rename to shared/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp