Revert "Remove device enqueue part 13"

This reverts commit 0ec6deddf1.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation 2022-01-30 15:11:38 +01:00 committed by Compute-Runtime-Automation
parent 68ce1ee989
commit 26d10eb985
3 changed files with 4 additions and 22 deletions

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.supportsPipes &&
hwInfo.capabilityTable.supportsIndependentForwardProgress);
return (hwInfo.capabilityTable.supportsOcl21Features && hwInfo.capabilityTable.supportsDeviceEnqueue &&
hwInfo.capabilityTable.supportsPipes && hwInfo.capabilityTable.supportsIndependentForwardProgress);
}
void ClDevice::retainApi() {

View File

@ -54,24 +54,6 @@ 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();

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.supportsPipes &&
pHardwareInfo->capabilityTable.supportsIndependentForwardProgress);
return (pHardwareInfo->capabilityTable.supportsOcl21Features && pHardwareInfo->capabilityTable.supportsDeviceEnqueue &&
pHardwareInfo->capabilityTable.supportsPipes && pHardwareInfo->capabilityTable.supportsIndependentForwardProgress);
}
bool TestChecks::supportsAuxResolves() {