diff --git a/level_zero/api/driver_experimental/public/zex_event.cpp b/level_zero/api/driver_experimental/public/zex_event.cpp index 514dacb0b9..e7a66fe2f0 100644 --- a/level_zero/api/driver_experimental/public/zex_event.cpp +++ b/level_zero/api/driver_experimental/public/zex_event.cpp @@ -49,7 +49,7 @@ zexCounterBasedEventCreate2(ze_context_handle_t hContext, ze_device_handle_t hDe constexpr uint32_t supportedBasedFlags = (ZEX_COUNTER_BASED_EVENT_FLAG_IMMEDIATE | ZEX_COUNTER_BASED_EVENT_FLAG_NON_IMMEDIATE); auto device = Device::fromHandle(toInternalType(hDevice)); - auto counterBasedEventDesc = desc ? desc : &defaultCounterBasedEventDesc; + auto counterBasedEventDesc = desc ? desc : &defaultIntelCounterBasedEventDesc; if (!hDevice || !phEvent) { return ZE_RESULT_ERROR_INVALID_ARGUMENT; diff --git a/level_zero/core/source/context/context_imp.cpp b/level_zero/core/source/context/context_imp.cpp index 29ad74c5a4..bf999a7261 100644 --- a/level_zero/core/source/context/context_imp.cpp +++ b/level_zero/core/source/context/context_imp.cpp @@ -100,7 +100,7 @@ ze_result_t ContextImp::allocHostMem(const ze_host_mem_alloc_desc_t *hostDesc, size_t alignment, void **ptr) { - auto hostMemDesc = hostDesc ? hostDesc : &defaultHostMemDesc; + auto hostMemDesc = hostDesc ? hostDesc : &defaultIntelHostMemDesc; if (NEO::debugManager.flags.ForceExtendedUSMBufferSize.get() >= 1) { size += (MemoryConstants::pageSize * NEO::debugManager.flags.ForceExtendedUSMBufferSize.get()); @@ -251,7 +251,7 @@ ze_result_t ContextImp::allocDeviceMem(ze_device_handle_t hDevice, size_t size, size_t alignment, void **ptr) { - auto deviceMemDesc = deviceDesc ? deviceDesc : &defaultDeviceMemDesc; + auto deviceMemDesc = deviceDesc ? deviceDesc : &defaultIntelDeviceMemDesc; if (NEO::debugManager.flags.ForceExtendedUSMBufferSize.get() >= 1) { size += (MemoryConstants::pageSize * NEO::debugManager.flags.ForceExtendedUSMBufferSize.get()); @@ -380,8 +380,8 @@ ze_result_t ContextImp::allocSharedMem(ze_device_handle_t hDevice, size_t alignment, void **ptr) { - auto deviceMemDesc = deviceDesc ? deviceDesc : &defaultDeviceMemDesc; - auto hostMemDesc = hostDesc ? hostDesc : &defaultHostMemDesc; + auto deviceMemDesc = deviceDesc ? deviceDesc : &defaultIntelDeviceMemDesc; + auto hostMemDesc = hostDesc ? hostDesc : &defaultIntelHostMemDesc; if (NEO::debugManager.flags.ForceExtendedUSMBufferSize.get() >= 1) { size += (MemoryConstants::pageSize * NEO::debugManager.flags.ForceExtendedUSMBufferSize.get()); diff --git a/level_zero/core/source/device/device_imp.cpp b/level_zero/core/source/device/device_imp.cpp index 36162b608e..b5f3536616 100644 --- a/level_zero/core/source/device/device_imp.cpp +++ b/level_zero/core/source/device/device_imp.cpp @@ -300,7 +300,7 @@ ze_result_t DeviceImp::createInternalCommandList(const ze_command_list_desc_t *d ze_result_t DeviceImp::createCommandListImmediate(const ze_command_queue_desc_t *desc, ze_command_list_handle_t *phCommandList) { - ze_command_queue_desc_t commandQueueDesc = defaultCommandQueueDesc; + ze_command_queue_desc_t commandQueueDesc = defaultIntelCommandQueueDesc; if (desc) { commandQueueDesc = *desc; diff --git a/level_zero/core/test/black_box_tests/zello_arg_slm.cpp b/level_zero/core/test/black_box_tests/zello_arg_slm.cpp index 2bb5ef923b..aaffc82aeb 100644 --- a/level_zero/core/test/black_box_tests/zello_arg_slm.cpp +++ b/level_zero/core/test/black_box_tests/zello_arg_slm.cpp @@ -20,14 +20,14 @@ void executeKernelAndValidate(ze_context_handle_t context, uint32_t deviceIdentf } ze_command_list_handle_t cmdList; auto device = LevelZeroBlackBoxTests::zerTranslateIdentifierToDeviceHandleFunc(deviceIdentfier); - SUCCESS_OR_TERMINATE(zeCommandListCreateImmediate(context, device, &defaultCommandQueueDesc, &cmdList)); + SUCCESS_OR_TERMINATE(zeCommandListCreateImmediate(context, device, &defaultIntelCommandQueueDesc, &cmdList)); constexpr ze_group_count_t groupCounts{16, 1, 1}; // Create output buffer void *dstBuffer = nullptr; constexpr size_t allocSize = groupCounts.groupCountX * sizeof(uint32_t) * 2; - SUCCESS_OR_TERMINATE(zeMemAllocShared(context, &defaultDeviceMemDesc, &defaultHostMemDesc, allocSize, sizeof(uint32_t), device, &dstBuffer)); + SUCCESS_OR_TERMINATE(zeMemAllocShared(context, &defaultIntelDeviceMemDesc, &defaultIntelHostMemDesc, allocSize, sizeof(uint32_t), device, &dstBuffer)); std::string buildLog; auto spirV = LevelZeroBlackBoxTests::compileToSpirV(LevelZeroBlackBoxTests::slmArgKernelSrc, "", buildLog); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp index 5e90c78148..9715851792 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp @@ -122,7 +122,7 @@ TEST_F(DefaultDescriptorWithoutBlitterTest, givenDeviceWithoutBlitterSupportWhen TEST_F(DefaultDescriptorWithoutBlitterTest, givenDeviceWithoutBlitterSupportWhenCreatingCommandListImmediateWithDefaultDescriptorThenInOrderAsyncCmdListWithoutCopyOffloadIsCreated) { ze_command_list_handle_t hCommandList = {}; - ze_result_t result = context->createCommandListImmediate(device, &defaultCommandQueueDesc, &hCommandList); + ze_result_t result = context->createCommandListImmediate(device, &defaultIntelCommandQueueDesc, &hCommandList); EXPECT_EQ(ZE_RESULT_SUCCESS, result); auto commandList = CommandList::whiteboxCast(L0::CommandList::fromHandle(hCommandList)); diff --git a/level_zero/core/test/unit_tests/sources/event/test_event.cpp b/level_zero/core/test/unit_tests/sources/event/test_event.cpp index a468ac085b..63aa4d8131 100644 --- a/level_zero/core/test/unit_tests/sources/event/test_event.cpp +++ b/level_zero/core/test/unit_tests/sources/event/test_event.cpp @@ -5151,7 +5151,7 @@ HWTEST2_F(EventTimestampTest, givenAppendMemoryCopyIsCalledWhenCpuCopyIsUsedAndC TEST_F(EventTests, givenDefaultDescriptorWhenCreatingCbEvent2ThenEventWithNoProfilingAndSignalScopeHostAndDeviceScopeWaitIsCreated) { ze_event_handle_t handle = nullptr; - EXPECT_EQ(ZE_RESULT_SUCCESS, zexCounterBasedEventCreate2(context, device, &defaultCounterBasedEventDesc, &handle)); + EXPECT_EQ(ZE_RESULT_SUCCESS, zexCounterBasedEventCreate2(context, device, &defaultIntelCounterBasedEventDesc, &handle)); auto eventObj = Event::fromHandle(handle); EXPECT_TRUE(eventObj->isCounterBasedExplicitlyEnabled()); diff --git a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp index 2337781060..f16cb4e769 100644 --- a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp +++ b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp @@ -860,7 +860,7 @@ TEST_F(MemoryTest, whenAllocatingHostMemoryWithDefaultDescriptorThenCachedResour size_t alignment = 1u; void *ptr = nullptr; - ze_result_t result = context->allocHostMem(&defaultHostMemDesc, size, alignment, &ptr); + ze_result_t result = context->allocHostMem(&defaultIntelHostMemDesc, size, alignment, &ptr); EXPECT_EQ(ZE_RESULT_SUCCESS, result); EXPECT_NE(nullptr, ptr); @@ -878,7 +878,7 @@ TEST_F(MemoryTest, whenAllocatingDeviceMemoryWithDefaultDescriptorThenCachedReso void *ptr = nullptr; ze_result_t result = context->allocDeviceMem(device->toHandle(), - &defaultDeviceMemDesc, + &defaultIntelDeviceMemDesc, size, alignment, &ptr); EXPECT_EQ(ZE_RESULT_SUCCESS, result); EXPECT_NE(nullptr, ptr); @@ -897,8 +897,8 @@ TEST_F(MemoryTest, whenAllocatingSharedMemoryWithDefaultDescriptorsThenCachedRes void *ptr = nullptr; ze_result_t result = context->allocSharedMem(device->toHandle(), - &defaultDeviceMemDesc, - &defaultHostMemDesc, + &defaultIntelDeviceMemDesc, + &defaultIntelHostMemDesc, size, alignment, &ptr); EXPECT_EQ(ZE_RESULT_SUCCESS, result); EXPECT_NE(nullptr, ptr); diff --git a/level_zero/include/level_zero/driver_experimental/zex_common.h b/level_zero/include/level_zero/driver_experimental/zex_common.h index 77a10a82e3..3cb1fe3a39 100644 --- a/level_zero/include/level_zero/driver_experimental/zex_common.h +++ b/level_zero/include/level_zero/driver_experimental/zex_common.h @@ -201,7 +201,7 @@ typedef struct _zex_counter_based_event_desc_t { ///< additional cache hierarchies are invalidated. } zex_counter_based_event_desc_t; -static const zex_counter_based_event_desc_t defaultCounterBasedEventDesc = { +static const zex_counter_based_event_desc_t defaultIntelCounterBasedEventDesc = { ZEX_STRUCTURE_COUNTER_BASED_EVENT_DESC, // stype nullptr, // pNext ZEX_COUNTER_BASED_EVENT_FLAG_IMMEDIATE | diff --git a/level_zero/include/level_zero/ze_intel_gpu.h b/level_zero/include/level_zero/ze_intel_gpu.h index 420ca5d0b7..343f01aeaf 100644 --- a/level_zero/include/level_zero/ze_intel_gpu.h +++ b/level_zero/include/level_zero/ze_intel_gpu.h @@ -682,22 +682,20 @@ ZE_APIEXPORT ze_result_t ZE_APICALL zeCommandListAppendLaunchKernelWithParameter } // extern "C" #endif -#if ZE_API_VERSION_CURRENT_M <= ZE_MAKE_VERSION(1, 13) - -static const ze_device_mem_alloc_desc_t defaultDeviceMemDesc = { +static const ze_device_mem_alloc_desc_t defaultIntelDeviceMemDesc = { ZE_STRUCTURE_TYPE_DEVICE_MEM_ALLOC_DESC, // stype nullptr, // pNext ZE_DEVICE_MEM_ALLOC_FLAG_BIAS_CACHED, // flags 0 // ordinal }; -static const ze_host_mem_alloc_desc_t defaultHostMemDesc = { +static const ze_host_mem_alloc_desc_t defaultIntelHostMemDesc = { ZE_STRUCTURE_TYPE_HOST_MEM_ALLOC_DESC, // stype nullptr, // pNext ZE_HOST_MEM_ALLOC_FLAG_BIAS_CACHED | ZE_HOST_MEM_ALLOC_FLAG_BIAS_INITIAL_PLACEMENT // flags }; -static const ze_command_queue_desc_t defaultCommandQueueDesc = { +static const ze_command_queue_desc_t defaultIntelCommandQueueDesc = { ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC, // stype nullptr, // pNext 0, // ordinal @@ -707,6 +705,8 @@ static const ze_command_queue_desc_t defaultCommandQueueDesc = { ZE_COMMAND_QUEUE_PRIORITY_NORMAL // priority }; +#if ZE_API_VERSION_CURRENT_M <= ZE_MAKE_VERSION(1, 13) + /////////////////////////////////////////////////////////////////////////////// #ifndef ZE_EXTERNAL_MEMORY_MAPPING_EXT_NAME /// @brief External Memory Mapping Extension Name