From c858234a3cb3a09fe322a759f312affa9d7ad49c Mon Sep 17 00:00:00 2001 From: Michal Mrozek Date: Fri, 20 Dec 2024 12:25:28 +0000 Subject: [PATCH] test: allow to utilize enqueue token for local size Signed-off-by: Michal Mrozek --- .../context/driver_diagnostics_enqueue_tests.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp index aacd398f8b..75f7387c0b 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp @@ -684,7 +684,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - auto localWorkSize = kernel->getLocalWorkSizeValues(); + auto localWorkSize = (kernel->getKernelInfo().kernelDescriptor.payloadMappings.dispatchTraits.localWorkSize[0] != undefined) ? kernel->getLocalWorkSizeValues() : kernel->getEnqueuedLocalWorkSizeValues(); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *localWorkSize[0], *localWorkSize[1], *localWorkSize[2]); @@ -698,7 +698,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - auto localWorkSize = kernel->getLocalWorkSizeValues(); + auto localWorkSize = (kernel->getKernelInfo().kernelDescriptor.payloadMappings.dispatchTraits.localWorkSize[0] != undefined) ? kernel->getLocalWorkSizeValues() : kernel->getEnqueuedLocalWorkSizeValues(); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *localWorkSize[0], *localWorkSize[1], *localWorkSize[2]); @@ -713,7 +713,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - auto localWorkSize = kernel->getLocalWorkSizeValues(); + auto localWorkSize = (kernel->getKernelInfo().kernelDescriptor.payloadMappings.dispatchTraits.localWorkSize[0] != undefined) ? kernel->getLocalWorkSizeValues() : kernel->getEnqueuedLocalWorkSizeValues(); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *localWorkSize[0], *localWorkSize[1], *localWorkSize[2]); @@ -727,7 +727,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - auto localWorkSize = kernel->getLocalWorkSizeValues(); + auto localWorkSize = (kernel->getKernelInfo().kernelDescriptor.payloadMappings.dispatchTraits.localWorkSize[0] != undefined) ? kernel->getLocalWorkSizeValues() : kernel->getEnqueuedLocalWorkSizeValues(); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *localWorkSize[0], *localWorkSize[1], *localWorkSize[2]); @@ -743,7 +743,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - auto localWorkSize = kernel->getLocalWorkSizeValues(); + auto localWorkSize = (kernel->getKernelInfo().kernelDescriptor.payloadMappings.dispatchTraits.localWorkSize[0] != undefined) ? kernel->getLocalWorkSizeValues() : kernel->getEnqueuedLocalWorkSizeValues(); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *localWorkSize[0], *localWorkSize[1], *localWorkSize[2]); @@ -759,7 +759,7 @@ TEST_F(PerformanceHintEnqueueKernelTest, GivenNullLocalSizeAndEnableComputeWorkS retVal = pCmdQ->enqueueKernel(kernel, 1, nullptr, globalWorkGroupSize, nullptr, 0, nullptr, nullptr); EXPECT_EQ(CL_SUCCESS, retVal); - auto localWorkSize = kernel->getLocalWorkSizeValues(); + auto localWorkSize = (kernel->getKernelInfo().kernelDescriptor.payloadMappings.dispatchTraits.localWorkSize[0] != undefined) ? kernel->getLocalWorkSizeValues() : kernel->getEnqueuedLocalWorkSizeValues(); snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[NULL_LOCAL_WORKGROUP_SIZE], kernel->getKernelInfo().kernelDescriptor.kernelMetadata.kernelName.c_str(), *localWorkSize[0], *localWorkSize[1], *localWorkSize[2]);