From f2c94a00a62ae7f6f5daf3cc8ab4b77fb1708f50 Mon Sep 17 00:00:00 2001 From: Filip Hazubski Date: Tue, 23 Jun 2020 15:26:04 +0200 Subject: [PATCH] Correct LKF and EHL device info Report supportsDeviceEnqueue equal false when device does not support OCL 2.1 features. Change-Id: I64e157a70d4a24c3c6256ad204d988dc4b033932 Signed-off-by: Filip Hazubski --- opencl/source/gen11/hw_info_ehl.inl | 2 +- opencl/source/gen11/hw_info_lkf.inl | 2 +- opencl/test/unit_test/device/device_caps_tests.cpp | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/opencl/source/gen11/hw_info_ehl.inl b/opencl/source/gen11/hw_info_ehl.inl index d00a904b38..46fcf04c12 100644 --- a/opencl/source/gen11/hw_info_ehl.inl +++ b/opencl/source/gen11/hw_info_ehl.inl @@ -69,7 +69,7 @@ const RuntimeCapabilityTable EHL::capabilityTable{ false, // supportsVme false, // supportCacheFlushAfterWalker true, // supportsImages - true, // supportsDeviceEnqueue + false, // supportsDeviceEnqueue false, // supportsPipes false, // supportsOcl21Features false, // supportsOnDemandPageFaults diff --git a/opencl/source/gen11/hw_info_lkf.inl b/opencl/source/gen11/hw_info_lkf.inl index 6bd75925d9..a447169828 100644 --- a/opencl/source/gen11/hw_info_lkf.inl +++ b/opencl/source/gen11/hw_info_lkf.inl @@ -69,7 +69,7 @@ const RuntimeCapabilityTable LKF::capabilityTable{ false, // supportsVme false, // supportCacheFlushAfterWalker true, // supportsImages - true, // supportsDeviceEnqueue + false, // supportsDeviceEnqueue false, // supportsPipes false, // supportsOcl21Features false, // supportsOnDemandPageFaults diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index 7aca2e0150..506adcab4d 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -813,6 +813,14 @@ TEST_F(DeviceGetCapsTest, WhenDeviceIsCreatedThenVmeIsEnabled) { EXPECT_TRUE(freshDebugSettingsManager.flags.EnableIntelVme.get()); } +TEST_F(DeviceGetCapsTest, WhenDeviceDoesNotSupportOcl21FeaturesThenDeviceEnqueueAndPipeAreNotSupported) { + UltClDeviceFactory deviceFactory{1, 0}; + if (deviceFactory.rootDevices[0]->areOcl21FeaturesEnabled() == false) { + EXPECT_FALSE(deviceFactory.rootDevices[0]->getDeviceInfo().deviceEnqueueSupport); + EXPECT_FALSE(deviceFactory.rootDevices[0]->getDeviceInfo().pipeSupport); + } +} + TEST_F(DeviceGetCapsTest, givenVmeRelatedFlagsSetWhenCapsAreCreatedThenDeviceReportCorrectBuiltins) { DebugManagerStateRestore dbgRestorer;