From 058341349943a33b887fc4e62c68f0adb7e44afc Mon Sep 17 00:00:00 2001 From: "Neumann, Marta" Date: Wed, 15 Jun 2022 18:02:41 +0000 Subject: [PATCH] Remove error for unused parameter Remove error for unused parameter from clGetKernelMaxConcurrentWorkGroupCountINTEL Resolves: NEO-7044 Signed-off-by: Neumann, Marta --- opencl/source/api/api.cpp | 5 ----- ...el_max_concurrent_work_group_count_intel_tests.inl | 11 ++++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/opencl/source/api/api.cpp b/opencl/source/api/api.cpp index f5b0cfa3bd..f52a55c109 100644 --- a/opencl/source/api/api.cpp +++ b/opencl/source/api/api.cpp @@ -5946,11 +5946,6 @@ cl_int CL_API_CALL clGetKernelMaxConcurrentWorkGroupCountINTEL(cl_command_queue return retVal; } - if (globalWorkOffset == nullptr) { - retVal = CL_INVALID_GLOBAL_OFFSET; - return retVal; - } - if (localWorkSize == nullptr) { retVal = CL_INVALID_WORK_GROUP_SIZE; return retVal; diff --git a/opencl/test/unit_test/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl index 66bf77be96..1d788e00eb 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -49,10 +49,6 @@ TEST_F(clGetKernelMaxConcurrentWorkGroupCountTests, GivenInvalidInputWhenCalling globalWorkOffset, localWorkSize, &suggestedWorkGroupCount); EXPECT_EQ(CL_INVALID_WORK_DIMENSION, retVal); - retVal = clGetKernelMaxConcurrentWorkGroupCountINTEL(pCommandQueue, pMultiDeviceKernel, workDim, - nullptr, localWorkSize, &suggestedWorkGroupCount); - EXPECT_EQ(CL_INVALID_GLOBAL_OFFSET, retVal); - retVal = clGetKernelMaxConcurrentWorkGroupCountINTEL(pCommandQueue, pMultiDeviceKernel, workDim, globalWorkOffset, nullptr, &suggestedWorkGroupCount); EXPECT_EQ(CL_INVALID_WORK_GROUP_SIZE, retVal); @@ -71,6 +67,11 @@ TEST_F(clGetKernelMaxConcurrentWorkGroupCountTests, GivenVariousInputWhenGetting size_t expectedMaxConcurrentWorkGroupCount = pKernel->getMaxWorkGroupCount(workDim, localWorkSize, pCommandQueue); EXPECT_EQ(expectedMaxConcurrentWorkGroupCount, maxConcurrentWorkGroupCount); + retVal = clGetKernelMaxConcurrentWorkGroupCountINTEL(pCommandQueue, pMultiDeviceKernel, workDim, nullptr, localWorkSize, + &maxConcurrentWorkGroupCount); + EXPECT_EQ(CL_SUCCESS, retVal); + EXPECT_EQ(expectedMaxConcurrentWorkGroupCount, maxConcurrentWorkGroupCount); + auto pKernelWithExecutionEnvironmentPatch = MockKernel::create(pCommandQueue->getDevice(), pProgram); auto kernelInfos = MockKernel::toKernelInfoContainer(pKernelWithExecutionEnvironmentPatch->getKernelInfo(), testedRootDeviceIndex); MultiDeviceKernel multiDeviceKernelWithExecutionEnvironmentPatch(MockMultiDeviceKernel::toKernelVector(pKernelWithExecutionEnvironmentPatch), kernelInfos);