Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for zeContextCreateEx

Browse Source 
Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>
This commit is contained in:
Jaime Arteaga
2021-03-14 22:49:27 +00:00
committed by Compute-Runtime-Automation
parent 9ed68131c3
commit 521cc56096
12 changed files with 92 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
level_zero/api/core/ze_context.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2020 Intel Corporation
* Copyright (C) 2019-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -14,7 +14,17 @@ zeContextCreate(
ze_driver_handle_t hDriver,
const ze_context_desc_t *desc,
ze_context_handle_t *phContext) {
return L0::DriverHandle::fromHandle(hDriver)->createContext(desc, phContext);
return L0::DriverHandle::fromHandle(hDriver)->createContext(desc, 0u, nullptr, phContext);
}
ZE_APIEXPORT ze_result_t ZE_APICALL
zeContextCreateEx(
ze_driver_handle_t hDriver,
const ze_context_desc_t *desc,
uint32_t numDevices,
ze_device_handle_t *phDevices,
ze_context_handle_t *phContext) {
return L0::DriverHandle::fromHandle(hDriver)->createContext(desc, numDevices, phDevices, phContext);
}
ZE_APIEXPORT ze_result_t ZE_APICALL

1
level_zero/api/core/ze_core_loader.cpp
View File

@ -94,6 +94,7 @@ zeGetContextProcAddrTable(
ze_result_t result = ZE_RESULT_SUCCESS;
pDdiTable->pfnCreate = zeContextCreate;
pDdiTable->pfnCreateEx = zeContextCreateEx;
pDdiTable->pfnDestroy = zeContextDestroy;
pDdiTable->pfnGetStatus = zeContextGetStatus;
pDdiTable->pfnSystemBarrier = zeContextSystemBarrier;

7
level_zero/core/source/context/context_imp.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2020-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -109,7 +109,12 @@ struct ContextImp : Context {
const ze_image_desc_t *desc,
ze_image_handle_t *phImage) override;
std::vector<Device *> &getDevices() {
return devices;
}
protected:
std::vector<Device *> devices;
DriverHandle *driverHandle = nullptr;
};

2
level_zero/core/source/driver/driver_handle.h
View File

@ -24,6 +24,8 @@ struct L0EnvVariables;
struct DriverHandle : _ze_driver_handle_t {
virtual ze_result_t createContext(const ze_context_desc_t *desc,
uint32_t numDevices,
ze_device_handle_t *phDevices,
ze_context_handle_t *phContext) = 0;
virtual ze_result_t getDevice(uint32_t *pCount, ze_device_handle_t *phDevices) = 0;
virtual ze_result_t getProperties(ze_driver_properties_t *properties) = 0;

11
level_zero/core/source/driver/driver_handle_imp.cpp
View File

@ -33,6 +33,8 @@ struct DriverHandleImp *GlobalDriver;
DriverHandleImp::DriverHandleImp() = default;
ze_result_t DriverHandleImp::createContext(const ze_context_desc_t *desc,
uint32_t numDevices,
ze_device_handle_t *phDevices,
ze_context_handle_t *phContext) {
ContextImp *context = new ContextImp(this);
if (nullptr == context) {
@ -41,6 +43,15 @@ ze_result_t DriverHandleImp::createContext(const ze_context_desc_t *desc,
*phContext = context->toHandle();
if (numDevices == 0) {
context->getDevices().resize(numDevices);
context->getDevices() = this->devices;
} else {
for (uint32_t i = 0; i < numDevices; i++) {
context->getDevices().push_back(Device::fromHandle(phDevices[i]));
}
}
return ZE_RESULT_SUCCESS;
}

5
level_zero/core/source/driver/driver_handle_imp.h
View File

@ -20,7 +20,10 @@ struct DriverHandleImp : public DriverHandle {
~DriverHandleImp() override;
DriverHandleImp();
ze_result_t createContext(const ze_context_desc_t *desc, ze_context_handle_t *phContext) override;
ze_result_t createContext(const ze_context_desc_t *desc,
uint32_t numDevices,
ze_device_handle_t *phDevices,
ze_context_handle_t *phContext) override;
ze_result_t getDevice(uint32_t *pCount, ze_device_handle_t *phDevices) override;
ze_result_t getProperties(ze_driver_properties_t *properties) override;
ze_result_t getApiVersion(ze_api_version_t *version) override;

2
level_zero/core/test/unit_tests/fixtures/device_fixture.cpp
View File

@ -46,7 +46,7 @@ void ContextFixture::SetUp() {
ze_context_handle_t hContext = {};
ze_context_desc_t desc;
ze_result_t res = driverHandle->createContext(&desc, &hContext);
ze_result_t res = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
EXPECT_NE(nullptr, hContext);
context = L0::Context::fromHandle(hContext);

2
level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h
View File

@ -46,7 +46,7 @@ struct HostPointerManagerFixure {
ASSERT_NE(nullptr, heapPointer);
ze_context_desc_t desc;
ze_result_t ret = hostDriverHandle->createContext(&desc, &hContext);
ze_result_t ret = hostDriverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, ret);
context = L0::Context::fromHandle(hContext);
}

2
level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp
View File

@ -255,7 +255,7 @@ HWTEST2_F(DeviceQueueGroupTest,
ze_context_handle_t hContext;
ze_context_desc_t desc;
res = driverHandle->createContext(&desc, &hContext);
res = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
L0::Context *context = Context::fromHandle(hContext);

4
level_zero/core/test/unit_tests/gen9/test_device_gen9.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2020-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -76,7 +76,7 @@ HWTEST2_F(DeviceQueueGroupTest, givenQueueGroupsReturnedThenCommandListIsCreated
ze_context_handle_t hContext;
ze_context_desc_t contextDesc;
res = driverHandle->createContext(&contextDesc, &hContext);
res = driverHandle->createContext(&contextDesc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
L0::Context *context = Context::fromHandle(hContext);

57
level_zero/core/test/unit_tests/sources/context/test_context.cpp
View File

@ -12,6 +12,7 @@
#include "test.h"
#include "level_zero/core/source/context/context_imp.h"
#include "level_zero/core/source/driver/driver_handle_imp.h"
#include "level_zero/core/source/image/image.h"
#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
#include "level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h"
@ -22,11 +23,51 @@
namespace L0 {
namespace ult {
using MultiDeviceContextTests = Test<MultiDeviceFixture>;
TEST_F(MultiDeviceContextTests,
whenCreatingContextWithZeroNumDevicesThenAllDevicesAreAssociatedWithTheContext) {
ze_context_handle_t hContext;
ze_context_desc_t desc;
ze_result_t res = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
ContextImp *contextImp = static_cast<ContextImp *>(Context::fromHandle(hContext));
for (size_t i = 0; i < driverHandle->devices.size(); i++) {
EXPECT_EQ(driverHandle->devices[i], contextImp->getDevices()[i]);
}
res = L0::Context::fromHandle(hContext)->destroy();
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
}
TEST_F(MultiDeviceContextTests,
whenCreatingContextWithNonZeroNumDevicesThenOnlySpecifiedDeviceIsAssociatedWithTheContext) {
ze_context_handle_t hContext;
ze_context_desc_t desc;
uint32_t count = 1;
ze_device_handle_t device = driverHandle->devices[1]->toHandle();
ze_result_t res = driverHandle->createContext(&desc, 1u, &device, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
ContextImp *contextImp = static_cast<ContextImp *>(Context::fromHandle(hContext));
EXPECT_EQ(contextImp->getDevices().size(), count);
EXPECT_EQ(contextImp->getDevices()[0], driverHandle->devices[1]);
res = L0::Context::fromHandle(hContext)->destroy();
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
}
using ContextGetStatusTest = Test<DeviceFixture>;
TEST_F(ContextGetStatusTest, givenCallToContextGetStatusThenCorrectErrorCodeIsReturnedWhenResourcesHaveBeenReleased) {
ze_context_handle_t hContext;
ze_context_desc_t desc;
ze_result_t res = driverHandle->createContext(&desc, &hContext);
ze_result_t res = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
L0::Context *context = L0::Context::fromHandle(hContext);
@ -51,7 +92,7 @@ TEST_F(ContextTest, whenCreatingAndDestroyingContextThenSuccessIsReturned) {
ze_context_handle_t hContext;
ze_context_desc_t desc;
ze_result_t res = driverHandle->createContext(&desc, &hContext);
ze_result_t res = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
res = L0::Context::fromHandle(hContext)->destroy();
@ -338,7 +379,7 @@ TEST_F(ContextTest, whenGettingDriverThenDriverIsRetrievedSuccessfully) {
ze_context_handle_t hContext;
ze_context_desc_t desc;
ze_result_t res = driverHandle->createContext(&desc, &hContext);
ze_result_t res = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
ContextImp *contextImp = static_cast<ContextImp *>(L0::Context::fromHandle(hContext));
@ -353,7 +394,7 @@ TEST_F(ContextTest, whenCallingVirtualMemInterfacesThenUnsupportedIsReturned) {
ze_context_handle_t hContext;
ze_context_desc_t desc;
ze_result_t res = driverHandle->createContext(&desc, &hContext);
ze_result_t res = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
ContextImp *contextImp = static_cast<ContextImp *>(L0::Context::fromHandle(hContext));
@ -379,7 +420,7 @@ TEST_F(ContextTest, whenCallingPhysicalMemInterfacesThenUnsupportedIsReturned) {
ze_context_handle_t hContext;
ze_context_desc_t desc;
ze_result_t res = driverHandle->createContext(&desc, &hContext);
ze_result_t res = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
ContextImp *contextImp = static_cast<ContextImp *>(L0::Context::fromHandle(hContext));
@ -400,7 +441,7 @@ TEST_F(ContextTest, whenCallingMappingVirtualInterfacesThenUnsupportedIsReturned
ze_context_handle_t hContext;
ze_context_desc_t desc;
ze_result_t res = driverHandle->createContext(&desc, &hContext);
ze_result_t res = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
ContextImp *contextImp = static_cast<ContextImp *>(L0::Context::fromHandle(hContext));
@ -440,7 +481,7 @@ using IsAtMostProductDG1 = IsAtMostProduct<IGFX_DG1>;
HWTEST2_F(ContextTest, WhenCreatingImageThenSuccessIsReturned, IsAtMostProductDG1) {
ze_context_handle_t hContext;
ze_context_desc_t desc;
ze_result_t res = driverHandle->createContext(&desc, &hContext);
ze_result_t res = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
ContextImp *contextImp = static_cast<ContextImp *>(L0::Context::fromHandle(hContext));
@ -459,4 +500,4 @@ HWTEST2_F(ContextTest, WhenCreatingImageThenSuccessIsReturned, IsAtMostProductDG
}
} // namespace ult
} // namespace L0
} // namespace L0

4
level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
View File

@ -641,7 +641,7 @@ TEST_F(MemoryIPCTests,
ze_context_handle_t hContext;
ze_context_desc_t desc;
ze_result_t result = driverHandle->createContext(&desc, &hContext);
ze_result_t result = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
ContextImp *contextImp = static_cast<ContextImp *>(L0::Context::fromHandle(hContext));
@ -682,7 +682,7 @@ TEST_F(MemoryIPCTests,
ze_context_handle_t hContext;
ze_context_desc_t desc;
ze_result_t result = driverHandle->createContext(&desc, &hContext);
ze_result_t result = driverHandle->createContext(&desc, 0u, nullptr, &hContext);
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
ContextImp *contextImp = static_cast<ContextImp *>(L0::Context::fromHandle(hContext));