Respect EnableMultiRootDeviceContexts when creating context from type

Related-To: NEO-3691
Change-Id: Ib61ddfe1e5df5ed7611ed785fadd305a49ef204a
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

opencl/source/api/api.cpp

@@ -427,10 +427,14 @@ cl_context CL_API_CALL clCreateContextFromType(const cl_context_properties *prop
         retVal = clGetDeviceIDs(nullptr, deviceType, numDevices, supportedDevs.begin(), nullptr);
         DEBUG_BREAK_IF(retVal != CL_SUCCESS);
 
-        ClDeviceVector allDevs(supportedDevs.begin(), std::min(numDevices, 1u));
-        pContext = Context::create<Context>(properties, allDevs, funcNotify, userData, retVal);
+        if (!DebugManager.flags.EnableMultiRootDeviceContexts.get()) {
+            numDevices = 1u;
+        }
+
+        ClDeviceVector deviceVector(supportedDevs.begin(), numDevices);
+        pContext = Context::create<Context>(properties, deviceVector, funcNotify, userData, retVal);
         if (pContext != nullptr) {
-            gtpinNotifyContextCreate((cl_context)pContext);
+            gtpinNotifyContextCreate(pContext);
         }
     } while (false);
 

opencl/test/unit_test/api/cl_create_context_from_type_tests.inl

@@ -100,4 +100,51 @@ TEST_F(clCreateContextFromTypeTests, GivenNonDefaultPlatformWithInvalidIcdDispat
     EXPECT_EQ(nullptr, clContext);
 }
 
+TEST(clCreateContextFromTypeTest, GivenPlatformWithMultipleDevicesAndMultiRootDeviceContextsAreEnabledWhenCreatingContextFromTypeThenContextContainsAllDevices) {
+    DebugManagerStateRestore restorer;
+    DebugManager.flags.CreateMultipleRootDevices.set(2);
+    DebugManager.flags.EnableMultiRootDeviceContexts.set(true);
+
+    initPlatform();
+
+    cl_int retVal = CL_INVALID_CONTEXT;
+
+    auto context =
+        clCreateContextFromType(nullptr, CL_DEVICE_TYPE_GPU, nullptr, nullptr, &retVal);
+
+    ASSERT_EQ(CL_SUCCESS, retVal);
+    ASSERT_NE(nullptr, context);
+
+    auto pContext = castToObject<Context>(context);
+    EXPECT_EQ(2u, pContext->getNumDevices());
+    EXPECT_EQ(platform()->getClDevice(0), pContext->getDevice(0));
+    EXPECT_EQ(platform()->getClDevice(1), pContext->getDevice(1));
+
+    retVal = clReleaseContext(context);
+    ASSERT_EQ(CL_SUCCESS, retVal);
+}
+
+TEST(clCreateContextFromTypeTest, GivenPlatformWithMultipleDevicesAndMultiRootDeviceContextsAreDisabledWhenCreatingContextFromTypeThenContextContainsOnlyOneDevice) {
+    DebugManagerStateRestore restorer;
+    DebugManager.flags.CreateMultipleRootDevices.set(2);
+    DebugManager.flags.EnableMultiRootDeviceContexts.set(false);
+
+    initPlatform();
+
+    cl_int retVal = CL_INVALID_CONTEXT;
+
+    auto context =
+        clCreateContextFromType(nullptr, CL_DEVICE_TYPE_GPU, nullptr, nullptr, &retVal);
+
+    ASSERT_EQ(CL_SUCCESS, retVal);
+    ASSERT_NE(nullptr, context);
+
+    auto pContext = castToObject<Context>(context);
+    EXPECT_EQ(1u, pContext->getNumDevices());
+    EXPECT_EQ(platform()->getClDevice(0), pContext->getDevice(0));
+
+    retVal = clReleaseContext(context);
+    ASSERT_EQ(CL_SUCCESS, retVal);
+}
+
 } // namespace ULT