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

Add ClDevice::isOcl21Conformant function 

Do not report support of OpenCl C 2.0 if device is not OpenCL 2.1 conformant.

Related-To: NEO-4368

Change-Id: I076d539506760953cc28eed39ff5e7585630df51
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski 2020-06-23 18:59:36 +02:00 committed by sys_ocldev
parent 0c9c55cd17
commit c5f3fe5987
5 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opencl/source/cl_device/cl_device.cpp
View File

@ -88,6 +88,12 @@ unique_ptr_if_unused<ClDevice> ClDevice::decRefInternal() {
return pParentDevice->decRefInternal();
}
bool ClDevice::isOcl21Conformant() const {
auto &hwInfo = device.getHardwareInfo();
return (hwInfo.capabilityTable.supportsOcl21Features && hwInfo.capabilityTable.supportsDeviceEnqueue &&
hwInfo.capabilityTable.supportsPipes && hwInfo.capabilityTable.supportsIndependentForwardProgress);
}
void ClDevice::allocateSyncBufferHandler() {
TakeOwnershipWrapper<ClDevice> lock(*this);
if (syncBufferHandler.get() == nullptr) {

1
opencl/source/cl_device/cl_device.h
View File

@ -57,6 +57,7 @@ class ClDevice : public BaseObject<_cl_device_id> {
unsigned int getEnabledClVersion() const { return enabledClVersion; };
bool areOcl21FeaturesEnabled() const { return ocl21FeaturesEnabled; };
bool isOcl21Conformant() const;
void retainApi();
unique_ptr_if_unused<ClDevice> releaseApi();

2
opencl/source/cl_device/cl_device_caps.cpp
View File

@ -420,7 +420,7 @@ void ClDevice::initializeOpenclCAllVersions() {
openClCVersion.version = CL_MAKE_VERSION(1, 2, 0);
deviceInfo.openclCAllVersions.push_back(openClCVersion);
if (ocl21FeaturesEnabled) {
if (isOcl21Conformant()) {
openClCVersion.version = CL_MAKE_VERSION(2, 0, 0);
deviceInfo.openclCAllVersions.push_back(openClCVersion);
}

6
opencl/test/unit_test/device/device_caps_tests.cpp
View File

@ -55,7 +55,7 @@ struct DeviceGetCapsTest : public ::testing::Test {
EXPECT_EQ(CL_MAKE_VERSION(1u, 1u, 0u), (++openclCWithVersionIterator)->version);
EXPECT_EQ(CL_MAKE_VERSION(1u, 2u, 0u), (++openclCWithVersionIterator)->version);
if (clDevice.areOcl21FeaturesEnabled()) {
if (clDevice.isOcl21Conformant()) {
EXPECT_EQ(CL_MAKE_VERSION(2u, 0u, 0u), (++openclCWithVersionIterator)->version);
}
if (clDevice.getEnabledClVersion() == 30) {
@ -251,6 +251,10 @@ TEST_F(DeviceGetCapsTest, WhenCreatingDeviceThenCapsArePopulatedCorrectly) {
if (device->getHardwareInfo().capabilityTable.supportsOcl21Features == false && is64bit) {
EXPECT_TRUE(sharedCaps.force32BitAddressess);
}
if (caps.numericClVersion == 21) {
EXPECT_TRUE(device->isOcl21Conformant());
}
}
HWTEST_F(DeviceGetCapsTest, givenDeviceWhenAskingForSubGroupSizesThenReturnCorrectValues) {

21
opencl/test/unit_test/device/device_tests.cpp
View File

@ -47,6 +47,27 @@ TEST_F(DeviceTest, WhenDeviceIsCreatedThenEnabledClVersionMatchesHardwareInfo) {
EXPECT_EQ(version, version2);
}
TEST_F(DeviceTest, WhenDeviceIsCheckedForOcl21ConformanceThenCorrectValueIsReturned) {
auto hwInfo = pClDevice->getHardwareInfo();
for (auto supportsOcl21Features : ::testing::Bool()) {
hwInfo.capabilityTable.supportsOcl21Features = supportsOcl21Features;
for (auto supportsIfp : ::testing::Bool()) {
hwInfo.capabilityTable.supportsIndependentForwardProgress = supportsIfp;
for (auto supportsDeviceEnqueue : ::testing::Bool()) {
hwInfo.capabilityTable.supportsDeviceEnqueue = supportsDeviceEnqueue;
for (auto supportsPipes : ::testing::Bool()) {
hwInfo.capabilityTable.supportsPipes = supportsPipes;
auto pClDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo));
auto expectedOcl21Conformance = (supportsOcl21Features && supportsIfp && supportsDeviceEnqueue && supportsPipes);
EXPECT_EQ(expectedOcl21Conformance, pClDevice->isOcl21Conformant());
}
}
}
}
}
TEST_F(DeviceTest, givenDeviceWhenEngineIsCreatedThenSetInitialValueForTag) {
for (auto &engine : pDevice->engines) {
auto tagAddress = engine.commandStreamReceiver->getTagAddress();