Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Include dynamic SLM in clGetKernelWorkGroupInfo"

Browse Source 
This reverts commit 320b020dd6.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-10-12 22:18:39 +02:00
committed by Compute-Runtime-Automation
parent 0f2dc7c49d
commit c2ce19ff36
2 changed files with 4 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opencl/source/kernel/kernel.cpp
View File

@ -530,7 +530,7 @@ cl_int Kernel::getWorkGroupInfo(cl_kernel_work_group_info paramName,
struct size_t3 { struct size_t3 {
size_t val[3]; size_t val[3];
} requiredWorkGroupSize; } requiredWorkGroupSize;
size_t localMemorySize; cl_ulong localMemorySize;
const auto &kernelDescriptor = kernelInfo.kernelDescriptor; const auto &kernelDescriptor = kernelInfo.kernelDescriptor;
size_t preferredWorkGroupSizeMultiple = 0; size_t preferredWorkGroupSizeMultiple = 0;
cl_ulong scratchSize; cl_ulong scratchSize;
@ -561,7 +561,7 @@ cl_int Kernel::getWorkGroupInfo(cl_kernel_work_group_info paramName,
break; break;
case CL_KERNEL_LOCAL_MEM_SIZE: case CL_KERNEL_LOCAL_MEM_SIZE:
localMemorySize = static_cast<size_t>(this->getSlmTotalSize()); localMemorySize = kernelInfo.kernelDescriptor.kernelAttributes.slmInlineSize;
srcSize = sizeof(localMemorySize); srcSize = sizeof(localMemorySize);
pSrc = &localMemorySize; pSrc = &localMemorySize;
break; break;

41
opencl/test/unit_test/kernel/kernel_tests.cpp
View File

@ -312,7 +312,7 @@ TEST_F(KernelTests, GivenKernelCompileWorkGroupSizeWhenGettingWorkGroupInfoThenC
EXPECT_EQ(paramValueSize, paramValueSizeRet); EXPECT_EQ(paramValueSize, paramValueSizeRet);
} }
TEST_F(KernelTests, GivenRequiredDisabledEUFusionFlagWhenGettingPrefferedWorkGroupSizeMultipleThenCorrectValueIsReturned) { TEST_F(KernelTests, GivenRequiredDisabledEUFusionFlagWhenGettingPrefferedWorkGroupSizeMultipleThenCorectValueIsReturned) {
KernelInfo kernelInfo = {}; KernelInfo kernelInfo = {};
kernelInfo.kernelDescriptor.kernelAttributes.flags.requiresDisabledEUFusion = true; kernelInfo.kernelDescriptor.kernelAttributes.flags.requiresDisabledEUFusion = true;
MockKernel kernel(pProgram, kernelInfo, *pClDevice); MockKernel kernel(pProgram, kernelInfo, *pClDevice);
@ -337,44 +337,7 @@ TEST_F(KernelTests, GivenRequiredDisabledEUFusionFlagWhenGettingPrefferedWorkGro
EXPECT_EQ(expectedValue, paramValue); EXPECT_EQ(expectedValue, paramValue);
} }
TEST_F(KernelTests, GivenSlmInlineSizeAndSlmOffsetWhenGettingWorkGroupInfoThenCorrectValueIsReturned) { TEST_F(KernelTests, GivenCFEFusedEUDispatchEnabledAndRequiredDisabledUEFusionWhenGettingPrefferedWorkGroupSizeMultipleThenCorectValueIsReturned) {
MockKernelInfo kernelInfo = {};
kernelInfo.kernelDescriptor.kernelAttributes.slmInlineSize = 100u;
kernelInfo.addArgLocal(0, 0x10, 0x1);
kernelInfo.addArgBuffer(1, 0x20, sizeof(void *));
kernelInfo.addArgBuffer(2, 0x20, sizeof(void *));
kernelInfo.addArgLocal(3, 0x30, 0x10);
MockKernel kernel(pProgram, kernelInfo, *pClDevice);
kernel.kernelArguments.resize(4);
kernel.slmSizes.resize(4);
uint32_t crossThreadData[0x40]{};
crossThreadData[0x20 / sizeof(uint32_t)] = 0x12344321;
kernel.setCrossThreadData(crossThreadData, sizeof(crossThreadData));
kernel.setArgLocal(0, 4096, nullptr);
kernel.setArgLocal(3, 0, nullptr);
cl_kernel_info paramName = CL_KERNEL_LOCAL_MEM_SIZE;
size_t paramValue;
size_t paramValueSize = sizeof(paramValue);
size_t paramValueSizeRet = 0;
size_t expectedValue = 4096 + 0 + 100;
retVal = kernel.getWorkGroupInfo(
paramName,
paramValueSize,
&paramValue,
&paramValueSizeRet);
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_EQ(paramValueSize, paramValueSizeRet);
EXPECT_EQ(expectedValue, paramValue);
}
TEST_F(KernelTests, GivenCFEFusedEUDispatchEnabledAndRequiredDisabledUEFusionWhenGettingPrefferedWorkGroupSizeMultipleThenCorrectValueIsReturned) {
DebugManagerStateRestore dbgRestorer; DebugManagerStateRestore dbgRestorer;
DebugManager.flags.CFEFusedEUDispatch.set(0); DebugManager.flags.CFEFusedEUDispatch.set(0);