From d3ede5cdf20f8fcc576d73651445cdb91e263bf0 Mon Sep 17 00:00:00 2001
From: Filip Hazubski <filip.hazubski@intel.com>
Date: Mon, 7 Sep 2020 20:51:15 +0200
Subject: [PATCH] Correct reporting subgroups feature macro

Change-Id: Icd8967eee07cd57b9e85830098b251fdd3393ebb
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
---
 opencl/source/platform/extensions.cpp              | 6 ++----
 opencl/test/unit_test/device/device_caps_tests.cpp | 5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/opencl/source/platform/extensions.cpp b/opencl/source/platform/extensions.cpp
index 7bd1c9f9bb..13bb798ab3 100644
--- a/opencl/source/platform/extensions.cpp
+++ b/opencl/source/platform/extensions.cpp
@@ -113,10 +113,8 @@ void getOpenclCFeaturesList(const HardwareInfo &hwInfo, StackVec<cl_name_version
         strcpy_s(openClCFeature.name, CL_NAME_VERSION_MAX_NAME_SIZE, "__opencl_c_work_group_collective_functions");
         openclCFeatures.push_back(openClCFeature);
 
-        if (hwInfo.capabilityTable.supportsIndependentForwardProgress) {
-            strcpy_s(openClCFeature.name, CL_NAME_VERSION_MAX_NAME_SIZE, "__opencl_c_subgroups");
-            openclCFeatures.push_back(openClCFeature);
-        }
+        strcpy_s(openClCFeature.name, CL_NAME_VERSION_MAX_NAME_SIZE, "__opencl_c_subgroups");
+        openclCFeatures.push_back(openClCFeature);
     }
 
     auto forceDeviceEnqueueSupport = DebugManager.flags.ForceDeviceEnqueueSupport.get();
diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp
index 26bf8703b6..2e6329ce2f 100644
--- a/opencl/test/unit_test/device/device_caps_tests.cpp
+++ b/opencl/test/unit_test/device/device_caps_tests.cpp
@@ -88,10 +88,7 @@ struct DeviceGetCapsTest : public ::testing::Test {
             EXPECT_STREQ("__opencl_c_program_scope_global_variables", (++openclCFeatureIterator)->name);
             EXPECT_STREQ("__opencl_c_read_write_images", (++openclCFeatureIterator)->name);
             EXPECT_STREQ("__opencl_c_work_group_collective_functions", (++openclCFeatureIterator)->name);
-
-            if (hwInfo.capabilityTable.supportsIndependentForwardProgress) {
-                EXPECT_STREQ("__opencl_c_subgroups", (++openclCFeatureIterator)->name);
-            }
+            EXPECT_STREQ("__opencl_c_subgroups", (++openclCFeatureIterator)->name);
         }
         if (hwInfo.capabilityTable.supportsDeviceEnqueue) {
             EXPECT_STREQ("__opencl_c_device_enqueue", (++openclCFeatureIterator)->name);