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

Return proper ze_device_image_properties_t when images are not supported 

Signed-off-by: Maciej Dziuban <maciej.dziuban@intel.com>
This commit is contained in:
Maciej Dziuban 2021-04-01 13:01:50 +00:00 committed by Compute-Runtime-Automation
parent 97505aebb6
commit 2258836b86
2 changed files with 77 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
level_zero/core/source/device/device_imp.cpp
View File

@ -516,14 +516,25 @@ ze_result_t DeviceImp::imageGetProperties(const ze_image_desc_t *desc,
ze_result_t DeviceImp::getDeviceImageProperties(ze_device_image_properties_t *pDeviceImageProperties) {
const auto &deviceInfo = this->neoDevice->getDeviceInfo();
pDeviceImageProperties->maxImageDims1D = static_cast<uint32_t>(deviceInfo.image2DMaxWidth);
pDeviceImageProperties->maxImageDims2D = static_cast<uint32_t>(deviceInfo.image2DMaxHeight);
pDeviceImageProperties->maxImageDims3D = static_cast<uint32_t>(deviceInfo.image3DMaxDepth);
pDeviceImageProperties->maxImageBufferSize = this->neoDevice->getDeviceInfo().imageMaxBufferSize;
pDeviceImageProperties->maxImageArraySlices = static_cast<uint32_t>(deviceInfo.imageMaxArraySize);
pDeviceImageProperties->maxSamplers = this->neoDevice->getDeviceInfo().maxSamplers;
pDeviceImageProperties->maxReadImageArgs = this->neoDevice->getDeviceInfo().maxReadImageArgs;
pDeviceImageProperties->maxWriteImageArgs = this->neoDevice->getDeviceInfo().maxWriteImageArgs;
if (deviceInfo.imageSupport) {
pDeviceImageProperties->maxImageDims1D = static_cast<uint32_t>(deviceInfo.image2DMaxWidth);
pDeviceImageProperties->maxImageDims2D = static_cast<uint32_t>(deviceInfo.image2DMaxHeight);
pDeviceImageProperties->maxImageDims3D = static_cast<uint32_t>(deviceInfo.image3DMaxDepth);
pDeviceImageProperties->maxImageBufferSize = deviceInfo.imageMaxBufferSize;
pDeviceImageProperties->maxImageArraySlices = static_cast<uint32_t>(deviceInfo.imageMaxArraySize);
pDeviceImageProperties->maxSamplers = deviceInfo.maxSamplers;
pDeviceImageProperties->maxReadImageArgs = deviceInfo.maxReadImageArgs;
pDeviceImageProperties->maxWriteImageArgs = deviceInfo.maxWriteImageArgs;
} else {
pDeviceImageProperties->maxImageDims1D = 0u;
pDeviceImageProperties->maxImageDims2D = 0u;
pDeviceImageProperties->maxImageDims3D = 0u;
pDeviceImageProperties->maxImageBufferSize = 0u;
pDeviceImageProperties->maxImageArraySlices = 0u;
pDeviceImageProperties->maxSamplers = 0u;
pDeviceImageProperties->maxReadImageArgs = 0u;
pDeviceImageProperties->maxWriteImageArgs = 0u;
}
return ZE_RESULT_SUCCESS;
}

58
level_zero/core/test/unit_tests/sources/device/test_device.cpp
View File

@ -1038,5 +1038,63 @@ TEST(zeDevice, givenValidImagePropertiesStructWhenGettingImagePropertiesThenSucc
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
}
TEST(zeDevice, givenImagesSupportedWhenGettingImagePropertiesThenValidValuesAreReturned) {
DriverHandleImp driverHandle{};
NEO::MockDevice *neoDevice = (NEO::MockDevice::createWithNewExecutionEnvironment<NEO::MockDevice>(NEO::defaultHwInfo.get(), 0));
auto device = std::unique_ptr<L0::Device>(Device::create(&driverHandle, neoDevice, 1, false));
DeviceInfo &deviceInfo = neoDevice->deviceInfo;
deviceInfo.imageSupport = true;
deviceInfo.image2DMaxWidth = 1;
deviceInfo.image2DMaxHeight = 2;
deviceInfo.image3DMaxDepth = 3;
deviceInfo.imageMaxBufferSize = 4;
deviceInfo.imageMaxArraySize = 5;
deviceInfo.maxSamplers = 6;
deviceInfo.maxReadImageArgs = 7;
deviceInfo.maxWriteImageArgs = 8;
ze_device_image_properties_t properties{};
ze_result_t result = zeDeviceGetImageProperties(device->toHandle(), &properties);
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
EXPECT_EQ(deviceInfo.image2DMaxWidth, static_cast<uint64_t>(properties.maxImageDims1D));
EXPECT_EQ(deviceInfo.image2DMaxHeight, static_cast<uint64_t>(properties.maxImageDims2D));
EXPECT_EQ(deviceInfo.image3DMaxDepth, static_cast<uint64_t>(properties.maxImageDims3D));
EXPECT_EQ(deviceInfo.imageMaxBufferSize, properties.maxImageBufferSize);
EXPECT_EQ(deviceInfo.imageMaxArraySize, static_cast<uint64_t>(properties.maxImageArraySlices));
EXPECT_EQ(deviceInfo.maxSamplers, properties.maxSamplers);
EXPECT_EQ(deviceInfo.maxReadImageArgs, properties.maxReadImageArgs);
EXPECT_EQ(deviceInfo.maxWriteImageArgs, properties.maxWriteImageArgs);
}
TEST(zeDevice, givenNoImagesSupportedWhenGettingImagePropertiesThenZeroValuesAreReturned) {
DriverHandleImp driverHandle{};
NEO::MockDevice *neoDevice = (NEO::MockDevice::createWithNewExecutionEnvironment<NEO::MockDevice>(NEO::defaultHwInfo.get(), 0));
auto device = std::unique_ptr<L0::Device>(Device::create(&driverHandle, neoDevice, 1, false));
DeviceInfo &deviceInfo = neoDevice->deviceInfo;
neoDevice->deviceInfo.imageSupport = false;
deviceInfo.image2DMaxWidth = 1;
deviceInfo.image2DMaxHeight = 2;
deviceInfo.image3DMaxDepth = 3;
deviceInfo.imageMaxBufferSize = 4;
deviceInfo.imageMaxArraySize = 5;
deviceInfo.maxSamplers = 6;
deviceInfo.maxReadImageArgs = 7;
deviceInfo.maxWriteImageArgs = 8;
ze_device_image_properties_t properties{};
ze_result_t result = zeDeviceGetImageProperties(device->toHandle(), &properties);
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
EXPECT_EQ(0u, properties.maxImageDims1D);
EXPECT_EQ(0u, properties.maxImageDims2D);
EXPECT_EQ(0u, properties.maxImageDims3D);
EXPECT_EQ(0u, properties.maxImageBufferSize);
EXPECT_EQ(0u, properties.maxImageArraySlices);
EXPECT_EQ(0u, properties.maxSamplers);
EXPECT_EQ(0u, properties.maxReadImageArgs);
EXPECT_EQ(0u, properties.maxWriteImageArgs);
}
} // namespace ult
} // namespace L0