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

Remove device enqueue part 13 

- update isOcl21Conformant, supportsOcl21, REQUIRE_OCL_21_OR_SKIP
(remove deviceEnqueueSupport check)

Related-To: NEO-6559
Signed-off-by: Katarzyna Cencelewska <katarzyna.cencelewska@intel.com>
This commit is contained in:
Katarzyna Cencelewska 2022-01-28 14:29:12 +00:00 committed by Compute-Runtime-Automation
parent c374073a4f
commit 0ec6deddf1
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,8 +93,8 @@ unique_ptr_if_unused<ClDevice> ClDevice::decRefInternal() {
bool ClDevice::isOcl21Conformant() const {
auto &hwInfo = device.getHardwareInfo();
return (hwInfo.capabilityTable.supportsOcl21Features && hwInfo.capabilityTable.supportsDeviceEnqueue &&
hwInfo.capabilityTable.supportsPipes && hwInfo.capabilityTable.supportsIndependentForwardProgress);
return (hwInfo.capabilityTable.supportsOcl21Features && hwInfo.capabilityTable.supportsPipes &&
hwInfo.capabilityTable.supportsIndependentForwardProgress);
}
void ClDevice::retainApi() {

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

@ -54,6 +54,24 @@ 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 supportsPipes : ::testing::Bool()) {
hwInfo.capabilityTable.supportsPipes = supportsPipes;
auto pClDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo));
auto expectedOcl21Conformance = (supportsOcl21Features && supportsIfp && supportsPipes);
EXPECT_EQ(expectedOcl21Conformance, pClDevice->isOcl21Conformant());
}
}
}
}
TEST_F(DeviceTest, givenDeviceWhenEngineIsCreatedThenSetInitialValueForTag) {
for (auto &engine : pDevice->allEngines) {
auto tagAddress = engine.commandStreamReceiver->getTagAddress();

4
opencl/test/unit_test/test_macros/test_checks_ocl.cpp
View File

@ -31,8 +31,8 @@ bool TestChecks::supportsOcl21(const Context *pContext) {
}
bool TestChecks::supportsOcl21(const std::unique_ptr<HardwareInfo> &pHardwareInfo) {
return (pHardwareInfo->capabilityTable.supportsOcl21Features && pHardwareInfo->capabilityTable.supportsDeviceEnqueue &&
pHardwareInfo->capabilityTable.supportsPipes && pHardwareInfo->capabilityTable.supportsIndependentForwardProgress);
return (pHardwareInfo->capabilityTable.supportsOcl21Features && pHardwareInfo->capabilityTable.supportsPipes &&
pHardwareInfo->capabilityTable.supportsIndependentForwardProgress);
}
bool TestChecks::supportsAuxResolves() {