Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support ReturnSubDevicesAsApiDevices for zeFabricVertexGetExp 

Related-To: LOCI-3635

Signed-off-by: Joshua Santosh Ranjan <joshua.santosh.ranjan@intel.com>
This commit is contained in:
Joshua Santosh Ranjan 2022-11-18 14:21:34 +00:00 committed by Compute-Runtime-Automation
parent eacf42455d
commit 3a51656af5
2 changed files with 79 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -650,16 +650,37 @@ ze_result_t DriverHandleImp::fabricVertexGetExp(uint32_t *pCount, ze_fabric_vert
this->initializeVertexes();
}
uint32_t fabricVertexCount = static_cast<uint32_t>(this->fabricVertices.size());
bool exposeSubDevices = false;
if (NEO::DebugManager.flags.ReturnSubDevicesAsApiDevices.get() != -1) {
exposeSubDevices = NEO::DebugManager.flags.ReturnSubDevicesAsApiDevices.get();
}
if (*pCount == 0) {
*pCount = fabricVertexCount;
if (exposeSubDevices) {
for (auto &vertex : this->fabricVertices) {
*pCount += std::max(static_cast<uint32_t>(vertex->subVertices.size()), 1u);
}
} else {
*pCount = static_cast<uint32_t>(this->fabricVertices.size());
}
return ZE_RESULT_SUCCESS;
}
*pCount = std::min(fabricVertexCount, *pCount);
for (uint32_t index = 0; index < *pCount; index++) {
phVertices[index] = this->fabricVertices[index]->toHandle();
uint32_t i = 0;
for (auto vertex : this->fabricVertices) {
if (vertex->subVertices.size() > 0 && exposeSubDevices) {
for (auto subVertex : vertex->subVertices) {
phVertices[i++] = subVertex->toHandle();
if (i == *pCount) {
return ZE_RESULT_SUCCESS;
}
}
} else {
phVertices[i++] = vertex->toHandle();
if (i == *pCount) {
return ZE_RESULT_SUCCESS;
}
}
}
return ZE_RESULT_SUCCESS;

52
level_zero/core/test/unit_tests/sources/fabric/test_fabric.cpp
View File

@ -215,6 +215,58 @@ TEST_F(FabricVertexFixture, GivenDevicesAreCreatedWhenFabricVertexIsNotSetToDevi
EXPECT_EQ(hVertex, nullptr);
}
class FabricVertexSubdeviceAsDeviceTestFixture : public MultiDeviceFixture,
public ::testing::Test {
void SetUp() override {
NEO::DebugManager.flags.ZE_AFFINITY_MASK.set("0,1.1,2");
NEO::DebugManager.flags.ReturnSubDevicesAsApiDevices.set(1);
MultiDeviceFixture::setUp();
}
void TearDown() override {
MultiDeviceFixture::tearDown();
}
DebugManagerStateRestore restorer;
};
TEST_F(FabricVertexSubdeviceAsDeviceTestFixture, GivenReturnSubDevicesAsApiDevicesIsSetWhenFabricVerticesGetExpIsCalledCorrectVerticesAreReturned) {
uint32_t count = 0;
std::vector<ze_fabric_vertex_handle_t> phVertices;
EXPECT_EQ(driverHandle->fabricVertexGetExp(&count, nullptr), ZE_RESULT_SUCCESS);
EXPECT_EQ(count, 5u);
// Requesting for a reduced count
count -= 1;
phVertices.resize(count);
EXPECT_EQ(driverHandle->fabricVertexGetExp(&count, phVertices.data()), ZE_RESULT_SUCCESS);
ze_device_handle_t hDevice{};
// 0.0
EXPECT_EQ(L0::zeFabricVertexGetDeviceExp(phVertices[0], &hDevice), ZE_RESULT_SUCCESS);
DeviceImp *deviceImp = static_cast<DeviceImp *>(hDevice);
EXPECT_TRUE(deviceImp->isSubdevice);
EXPECT_EQ(deviceImp->getPhysicalSubDeviceId(), 0u);
// 0.1
EXPECT_EQ(L0::zeFabricVertexGetDeviceExp(phVertices[1], &hDevice), ZE_RESULT_SUCCESS);
deviceImp = static_cast<DeviceImp *>(hDevice);
EXPECT_TRUE(deviceImp->isSubdevice);
EXPECT_EQ(deviceImp->getPhysicalSubDeviceId(), 1u);
// 1.1
EXPECT_EQ(L0::zeFabricVertexGetDeviceExp(phVertices[2], &hDevice), ZE_RESULT_SUCCESS);
deviceImp = static_cast<DeviceImp *>(hDevice);
EXPECT_FALSE(deviceImp->isSubdevice);
EXPECT_EQ(deviceImp->getPhysicalSubDeviceId(), 1u);
// 2.0
EXPECT_EQ(L0::zeFabricVertexGetDeviceExp(phVertices[3], &hDevice), ZE_RESULT_SUCCESS);
deviceImp = static_cast<DeviceImp *>(hDevice);
EXPECT_TRUE(deviceImp->isSubdevice);
EXPECT_EQ(deviceImp->getPhysicalSubDeviceId(), 0u);
}
using FabricEdgeFixture = Test<MultiDeviceFixture>;
TEST_F(FabricEdgeFixture, GivenFabricVerticesAreCreatedWhenZeFabricEdgeGetExpIsCalledThenReturnSuccess) {