From 1f9f001599e4ed8e5884ba4ddf13f77524b4a470 Mon Sep 17 00:00:00 2001 From: Compute-Runtime-Validation Date: Tue, 28 Dec 2021 09:11:34 +0100 Subject: [PATCH] Revert "Disable device enqueue" This reverts commit 10357fbf22fc16a96b41f8e5e50b9ea1b1ead4c8. Signed-off-by: Compute-Runtime-Validation --- .../unit_test/device/device_caps_tests.cpp | 24 ------------------- shared/source/gen11/hw_info_icllp.cpp | 2 +- shared/source/gen9/hw_info_cfl.cpp | 2 +- shared/source/gen9/hw_info_kbl.cpp | 2 +- shared/source/gen9/hw_info_skl.cpp | 2 +- 5 files changed, 4 insertions(+), 28 deletions(-) diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index 62f279e977..2366218b51 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -1542,30 +1542,6 @@ TEST_F(DeviceGetCapsTest, givenDeviceEnqueueSupportForcedWhenCheckingDeviceEnque } } -TEST_F(DeviceGetCapsTest, givenDefaultFlagForceDeviceEnqueueSupportWhenCheckingDeviceEnqueueSupportThenFalseIsReported) { - DebugManagerStateRestore dbgRestorer; - auto hwInfo = *defaultHwInfo; - DebugManager.flags.ForceDeviceEnqueueSupport.set(-1); - - auto pClDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(&hwInfo)); - auto &caps = pClDevice->getDeviceInfo(); - - size_t deviceEnqueueFeaturesCount = 0; - for (auto &openclCFeature : caps.openclCFeatures) { - if (0 == strcmp(openclCFeature.name, "__opencl_c_device_enqueue")) { - deviceEnqueueFeaturesCount++; - } - } - - EXPECT_FALSE(pClDevice->isDeviceEnqueueSupported()); - EXPECT_EQ(0u, caps.maxOnDeviceEvents); - EXPECT_EQ(0u, caps.maxOnDeviceQueues); - EXPECT_EQ(0u, caps.queueOnDeviceMaxSize); - EXPECT_EQ(0u, caps.queueOnDevicePreferredSize); - EXPECT_EQ(static_cast(0), caps.queueOnDeviceProperties); - EXPECT_EQ(0u, deviceEnqueueFeaturesCount); -} - TEST_F(DeviceGetCapsTest, givenPipeSupportForcedWhenCheckingPipeSupportThenPipeIsCorrectlyReported) { DebugManagerStateRestore dbgRestorer; int32_t forcePipeSupportValues[] = {-1, 0, 1}; diff --git a/shared/source/gen11/hw_info_icllp.cpp b/shared/source/gen11/hw_info_icllp.cpp index 46a155cbb7..9a3d972e17 100644 --- a/shared/source/gen11/hw_info_icllp.cpp +++ b/shared/source/gen11/hw_info_icllp.cpp @@ -72,7 +72,7 @@ const RuntimeCapabilityTable ICLLP::capabilityTable{ true, // supportsVme false, // supportCacheFlushAfterWalker true, // supportsImages - false, // supportsDeviceEnqueue + true, // supportsDeviceEnqueue true, // supportsPipes true, // supportsOcl21Features false, // supportsOnDemandPageFaults diff --git a/shared/source/gen9/hw_info_cfl.cpp b/shared/source/gen9/hw_info_cfl.cpp index cf60b0db5b..ece52da1b1 100644 --- a/shared/source/gen9/hw_info_cfl.cpp +++ b/shared/source/gen9/hw_info_cfl.cpp @@ -68,7 +68,7 @@ const RuntimeCapabilityTable CFL::capabilityTable{ true, // supportsVme false, // supportCacheFlushAfterWalker true, // supportsImages - false, // supportsDeviceEnqueue + true, // supportsDeviceEnqueue true, // supportsPipes true, // supportsOcl21Features false, // supportsOnDemandPageFaults diff --git a/shared/source/gen9/hw_info_kbl.cpp b/shared/source/gen9/hw_info_kbl.cpp index 8e24e1f895..9cb0441bbe 100644 --- a/shared/source/gen9/hw_info_kbl.cpp +++ b/shared/source/gen9/hw_info_kbl.cpp @@ -68,7 +68,7 @@ const RuntimeCapabilityTable KBL::capabilityTable{ true, // supportsVme false, // supportCacheFlushAfterWalker true, // supportsImages - false, // supportsDeviceEnqueue + true, // supportsDeviceEnqueue true, // supportsPipes true, // supportsOcl21Features false, // supportsOnDemandPageFaults diff --git a/shared/source/gen9/hw_info_skl.cpp b/shared/source/gen9/hw_info_skl.cpp index 8c752916c2..a48247472a 100644 --- a/shared/source/gen9/hw_info_skl.cpp +++ b/shared/source/gen9/hw_info_skl.cpp @@ -76,7 +76,7 @@ const RuntimeCapabilityTable SKL::capabilityTable{ true, // supportsVme false, // supportCacheFlushAfterWalker true, // supportsImages - false, // supportsDeviceEnqueue + true, // supportsDeviceEnqueue true, // supportsPipes true, // supportsOcl21Features false, // supportsOnDemandPageFaults