diff --git 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 index f4a4454d06..f71a94f070 100644 --- 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 @@ -4199,10 +4199,10 @@ TEST_F(MultiSubDeviceEnabledImplicitScalingTest, GivenEnabledImplicitScalingWhen using DeviceSimpleTests = Test; -static_assert(ZE_MEMORY_ACCESS_CAP_FLAG_RW == UNIFIED_SHARED_MEMORY_ACCESS, "Flags value difference"); -static_assert(ZE_MEMORY_ACCESS_CAP_FLAG_ATOMIC == UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS, "Flags value difference"); -static_assert(ZE_MEMORY_ACCESS_CAP_FLAG_CONCURRENT == UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS, "Flags value difference"); -static_assert(ZE_MEMORY_ACCESS_CAP_FLAG_CONCURRENT_ATOMIC == UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS, "Flags value difference"); +static_assert(ZE_MEMORY_ACCESS_CAP_FLAG_RW == UnifiedSharedMemoryFlags::access, "Flags value difference"); +static_assert(ZE_MEMORY_ACCESS_CAP_FLAG_ATOMIC == UnifiedSharedMemoryFlags::atomicAccess, "Flags value difference"); +static_assert(ZE_MEMORY_ACCESS_CAP_FLAG_CONCURRENT == UnifiedSharedMemoryFlags::concurrentAccess, "Flags value difference"); +static_assert(ZE_MEMORY_ACCESS_CAP_FLAG_CONCURRENT_ATOMIC == UnifiedSharedMemoryFlags::concurrentAtomicAccess, "Flags value difference"); TEST_F(DeviceSimpleTests, returnsGPUType) { ze_device_properties_t properties = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES}; diff --git a/opencl/test/unit_test/memory_manager/unified_memory_token_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_token_tests.cpp index 32f16869bf..9c497703a7 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_token_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_token_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,8 @@ #include "gtest/gtest.h" TEST(UnifiedMemoryTests, givenCLUSMMemorySupportFlagsWhenUsingUnifiedMemorySupportFlagsThenEverythingMatch) { - static_assert(CL_UNIFIED_SHARED_MEMORY_ACCESS_INTEL == UNIFIED_SHARED_MEMORY_ACCESS, "Flags value difference"); - static_assert(CL_UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS_INTEL == UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS, "Flags value difference"); - static_assert(CL_UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS_INTEL == UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS, "Flags value difference"); - static_assert(CL_UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS_INTEL == UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS, "Flags value difference"); + static_assert(CL_UNIFIED_SHARED_MEMORY_ACCESS_INTEL == UnifiedSharedMemoryFlags::access, "Flags value difference"); + static_assert(CL_UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS_INTEL == UnifiedSharedMemoryFlags::atomicAccess, "Flags value difference"); + static_assert(CL_UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS_INTEL == UnifiedSharedMemoryFlags::concurrentAccess, "Flags value difference"); + static_assert(CL_UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS_INTEL == UnifiedSharedMemoryFlags::concurrentAtomicAccess, "Flags value difference"); } diff --git a/shared/source/gen12lp/dg1/os_agnostic_product_helper_dg1.inl b/shared/source/gen12lp/dg1/os_agnostic_product_helper_dg1.inl index fd57a62ee4..0c83ff5d73 100644 --- a/shared/source/gen12lp/dg1/os_agnostic_product_helper_dg1.inl +++ b/shared/source/gen12lp/dg1/os_agnostic_product_helper_dg1.inl @@ -39,7 +39,7 @@ bool ProductHelperHw::pipeControlWARequired(const HardwareInfo &hwIn template <> uint64_t ProductHelperHw::getHostMemCapabilitiesValue() const { - return UNIFIED_SHARED_MEMORY_ACCESS; + return UnifiedSharedMemoryFlags::access; } template <> diff --git a/shared/source/os_interface/product_helper.inl b/shared/source/os_interface/product_helper.inl index b62d94f6b5..7d72b15b5b 100644 --- a/shared/source/os_interface/product_helper.inl +++ b/shared/source/os_interface/product_helper.inl @@ -86,10 +86,10 @@ void ProductHelperHw::enableBlitterOperationsSupport(HardwareInfo *h template uint64_t ProductHelperHw::getDeviceMemCapabilities() const { - uint64_t capabilities = UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS; + uint64_t capabilities = UnifiedSharedMemoryFlags::access | UnifiedSharedMemoryFlags::atomicAccess; if (getConcurrentAccessMemCapabilitiesSupported(UsmAccessCapabilities::Device)) { - capabilities |= UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS; + capabilities |= UnifiedSharedMemoryFlags::concurrentAccess | UnifiedSharedMemoryFlags::concurrentAtomicAccess; } return capabilities; @@ -97,10 +97,10 @@ uint64_t ProductHelperHw::getDeviceMemCapabilities() const { template uint64_t ProductHelperHw::getSingleDeviceSharedMemCapabilities() const { - uint64_t capabilities = UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS; + uint64_t capabilities = UnifiedSharedMemoryFlags::access | UnifiedSharedMemoryFlags::atomicAccess; if (isKmdMigrationSupported() || getConcurrentAccessMemCapabilitiesSupported(UsmAccessCapabilities::SharedSingleDevice)) { - capabilities |= UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS; + capabilities |= UnifiedSharedMemoryFlags::concurrentAccess | UnifiedSharedMemoryFlags::concurrentAtomicAccess; } return capabilities; @@ -122,7 +122,7 @@ uint64_t ProductHelperHw::getHostMemCapabilities(const HardwareInfo uint64_t capabilities = getHostMemCapabilitiesValue(); if (getConcurrentAccessMemCapabilitiesSupported(UsmAccessCapabilities::Host)) { - capabilities |= UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS; + capabilities |= UnifiedSharedMemoryFlags::concurrentAccess | UnifiedSharedMemoryFlags::concurrentAtomicAccess; } return (supported ? capabilities : 0); @@ -136,7 +136,7 @@ uint64_t ProductHelperHw::getSharedSystemMemCapabilities(const Hardw supported = !!debugManager.flags.EnableSharedSystemUsmSupport.get(); } - return (supported ? (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS) : 0); + return (supported ? (UnifiedSharedMemoryFlags::access | UnifiedSharedMemoryFlags::atomicAccess | UnifiedSharedMemoryFlags::concurrentAccess | UnifiedSharedMemoryFlags::concurrentAtomicAccess) : 0); } template diff --git a/shared/source/os_interface/product_helper_bdw_and_later.inl b/shared/source/os_interface/product_helper_bdw_and_later.inl index 609e5b3963..98b155e903 100644 --- a/shared/source/os_interface/product_helper_bdw_and_later.inl +++ b/shared/source/os_interface/product_helper_bdw_and_later.inl @@ -11,7 +11,7 @@ namespace NEO { template uint64_t ProductHelperHw::getHostMemCapabilitiesValue() const { - return (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS); + return (UnifiedSharedMemoryFlags::access | UnifiedSharedMemoryFlags::atomicAccess); } template diff --git a/shared/source/os_interface/product_helper_xehp_and_later.inl b/shared/source/os_interface/product_helper_xehp_and_later.inl index 19c506abab..9d2363107d 100644 --- a/shared/source/os_interface/product_helper_xehp_and_later.inl +++ b/shared/source/os_interface/product_helper_xehp_and_later.inl @@ -11,15 +11,15 @@ namespace NEO { template uint64_t ProductHelperHw::getHostMemCapabilitiesValue() const { - return (UNIFIED_SHARED_MEMORY_ACCESS); + return (UnifiedSharedMemoryFlags::access); } template uint64_t ProductHelperHw::getCrossDeviceSharedMemCapabilities() const { - uint64_t capabilities = UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS; + uint64_t capabilities = UnifiedSharedMemoryFlags::access | UnifiedSharedMemoryFlags::atomicAccess; if (getConcurrentAccessMemCapabilitiesSupported(UsmAccessCapabilities::SharedCrossDevice)) { - capabilities |= UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS; + capabilities |= UnifiedSharedMemoryFlags::concurrentAccess | UnifiedSharedMemoryFlags::concurrentAtomicAccess; } return capabilities; diff --git a/shared/source/unified_memory/usm_memory_support.h b/shared/source/unified_memory/usm_memory_support.h index 15488da3d5..cd8c5fa264 100644 --- a/shared/source/unified_memory/usm_memory_support.h +++ b/shared/source/unified_memory/usm_memory_support.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,11 @@ #include -inline constexpr uint64_t UNIFIED_SHARED_MEMORY_ACCESS = 1 << 0; -inline constexpr uint64_t UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS = 1 << 1; -inline constexpr uint64_t UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS = 1 << 2; -inline constexpr uint64_t UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS = 1 << 3; +namespace UnifiedSharedMemoryFlags { + +inline constexpr uint64_t access = 1 << 0; +inline constexpr uint64_t atomicAccess = 1 << 1; +inline constexpr uint64_t concurrentAccess = 1 << 2; +inline constexpr uint64_t concurrentAtomicAccess = 1 << 3; + +} // namespace UnifiedSharedMemoryFlags diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp index 94c9e96e10..b80c9af841 100644 --- a/shared/source/xe_hpc_core/hw_info_pvc.cpp +++ b/shared/source/xe_hpc_core/hw_info_pvc.cpp @@ -130,7 +130,7 @@ void PVC::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) { } void PVC::adjustHardwareInfo(HardwareInfo *hwInfo) { - hwInfo->capabilityTable.sharedSystemMemCapabilities = (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS); + hwInfo->capabilityTable.sharedSystemMemCapabilities = (UnifiedSharedMemoryFlags::access | UnifiedSharedMemoryFlags::concurrentAccess | UnifiedSharedMemoryFlags::concurrentAtomicAccess); } void PVC::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const ReleaseHelper *releaseHelper) { diff --git a/shared/source/xe_hpg_core/xe_lpg/os_agnostic_product_helper_xe_lpg.inl b/shared/source/xe_hpg_core/xe_lpg/os_agnostic_product_helper_xe_lpg.inl index e02141eadf..9ae3fa21e5 100644 --- a/shared/source/xe_hpg_core/xe_lpg/os_agnostic_product_helper_xe_lpg.inl +++ b/shared/source/xe_hpg_core/xe_lpg/os_agnostic_product_helper_xe_lpg.inl @@ -21,7 +21,7 @@ namespace NEO { template <> uint64_t ProductHelperHw::getHostMemCapabilitiesValue() const { - return (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS); + return (UnifiedSharedMemoryFlags::access | UnifiedSharedMemoryFlags::atomicAccess); } template <> diff --git a/shared/test/unit_test/os_interface/product_helper_tests.cpp b/shared/test/unit_test/os_interface/product_helper_tests.cpp index 269608be26..be78294695 100644 --- a/shared/test/unit_test/os_interface/product_helper_tests.cpp +++ b/shared/test/unit_test/os_interface/product_helper_tests.cpp @@ -73,7 +73,7 @@ HWTEST_F(ProductHelperTest, givenProductHelperWhenGettingSharedSystemMemCapabili debugManager.flags.EnableSharedSystemUsmSupport.set(enable); if (enable > 0) { - auto caps = UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS; + auto caps = UnifiedSharedMemoryFlags::access | UnifiedSharedMemoryFlags::atomicAccess | UnifiedSharedMemoryFlags::concurrentAccess | UnifiedSharedMemoryFlags::concurrentAtomicAccess; EXPECT_EQ(caps, productHelper->getSharedSystemMemCapabilities(&pInHwInfo)); } else { EXPECT_EQ(0u, productHelper->getSharedSystemMemCapabilities(&pInHwInfo)); @@ -96,40 +96,40 @@ HWTEST_F(ProductHelperTest, givenProductHelperWhenGettingMemoryCapabilitiesThenC auto hostMemCapabilities = productHelper->getHostMemCapabilities(&pInHwInfo); if (hostMemCapabilities > 0) { if (capabilityBitset.test(static_cast(UsmAccessCapabilities::Host))) { - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS & hostMemCapabilities); - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS & hostMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAccess & hostMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAtomicAccess & hostMemCapabilities); } } auto deviceMemCapabilities = productHelper->getDeviceMemCapabilities(); if (deviceMemCapabilities > 0) { if (capabilityBitset.test(static_cast(UsmAccessCapabilities::Device))) { - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS & deviceMemCapabilities); - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS & deviceMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAccess & deviceMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAtomicAccess & deviceMemCapabilities); } } auto singleDeviceSharedMemCapabilities = productHelper->getSingleDeviceSharedMemCapabilities(); if (singleDeviceSharedMemCapabilities > 0) { if (capabilityBitset.test(static_cast(UsmAccessCapabilities::SharedSingleDevice))) { - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS & singleDeviceSharedMemCapabilities); - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS & singleDeviceSharedMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAccess & singleDeviceSharedMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAtomicAccess & singleDeviceSharedMemCapabilities); } } auto crossDeviceSharedMemCapabilities = productHelper->getCrossDeviceSharedMemCapabilities(); if (crossDeviceSharedMemCapabilities > 0) { if (capabilityBitset.test(static_cast(UsmAccessCapabilities::SharedCrossDevice))) { - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS & crossDeviceSharedMemCapabilities); - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS & crossDeviceSharedMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAccess & crossDeviceSharedMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAtomicAccess & crossDeviceSharedMemCapabilities); } } auto sharedSystemMemCapabilities = productHelper->getSharedSystemMemCapabilities(&pInHwInfo); if (sharedSystemMemCapabilities > 0) { if (capabilityBitset.test(static_cast(UsmAccessCapabilities::SharedSystemCrossDevice))) { - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS & sharedSystemMemCapabilities); - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS & sharedSystemMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAccess & sharedSystemMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAtomicAccess & sharedSystemMemCapabilities); } } } @@ -139,8 +139,8 @@ HWTEST_F(ProductHelperTest, givenProductHelperAndSingleDeviceSharedMemAccessConc auto singleDeviceSharedMemCapabilities = productHelper->getSingleDeviceSharedMemCapabilities(); if ((singleDeviceSharedMemCapabilities > 0) && (productHelper->isKmdMigrationSupported())) { - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS & singleDeviceSharedMemCapabilities); - EXPECT_TRUE(UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS & singleDeviceSharedMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAccess & singleDeviceSharedMemCapabilities); + EXPECT_TRUE(UnifiedSharedMemoryFlags::concurrentAtomicAccess & singleDeviceSharedMemCapabilities); } } diff --git a/shared/test/unit_test/xe_hpc_core/pvc/hw_info_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/hw_info_tests_pvc.cpp index 3c7b72c345..5a4e613c07 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/hw_info_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/hw_info_tests_pvc.cpp @@ -101,6 +101,6 @@ PVCTEST_F(PvcConfigHwInfoTests, givenPvcHwConfigWhenSetupHardwareInfoThenSharedS auto releaseHelper = ReleaseHelper::create(hwInfo.ipVersion); auto &capabilityTable = hwInfo.capabilityTable; PvcHwConfig::setupHardwareInfo(&hwInfo, false, releaseHelper.get()); - uint64_t expectedSharedSystemMemCapabilities = (UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ACCESS | UNIFIED_SHARED_MEMORY_CONCURRENT_ATOMIC_ACCESS); + uint64_t expectedSharedSystemMemCapabilities = (UnifiedSharedMemoryFlags::access | UnifiedSharedMemoryFlags::concurrentAccess | UnifiedSharedMemoryFlags::concurrentAtomicAccess); EXPECT_EQ(expectedSharedSystemMemCapabilities, capabilityTable.sharedSystemMemCapabilities); }