@@ -1829,9 +1829,9 @@ HWTEST_F(KernelWorkDimTests, givenGroupCountsWhenPatchingWorkDimThenCrossThreadD
18291829 struct MockKernelWithMockCrossThreadData : public MockKernel {
18301830 public:
18311831 MockKernelWithMockCrossThreadData (MockModule *mockModule) : MockKernel(mockModule) {}
1832- void setCrossThreadData (uint32_t _crossThreadDataSize ) {
1833- crossThreadData.reset (new uint8_t [_crossThreadDataSize ]);
1834- crossThreadDataSize = _crossThreadDataSize ;
1832+ void setCrossThreadData (uint32_t dataSize ) {
1833+ crossThreadData.reset (new uint8_t [dataSize ]);
1834+ crossThreadDataSize = dataSize ;
18351835 memset (crossThreadData.get (), 0x00 , crossThreadDataSize);
18361836 }
18371837 };
@@ -1854,27 +1854,16 @@ HWTEST_F(KernelWorkDimTests, givenGroupCountsWhenPatchingWorkDimThenCrossThreadD
18541854 auto workDimInCrossThreadDataPtr = destinationBuffer.begin () + kernelDescriptor.payloadMappings .dispatchTraits .workDim ;
18551855 EXPECT_EQ (*workDimInCrossThreadDataPtr, 0u );
18561856
1857- std::array<std::array<uint32_t , 7 >, 8 > sizesCountsWorkDim{
1858- std::array<uint32_t , 7 >{2 , 1 , 1 , 1 , 1 , 1 , 1 },
1859- std::array<uint32_t , 7 >{1 , 1 , 1 , 1 , 1 , 1 , 1 },
1860- std::array<uint32_t , 7 >{1 , 2 , 1 , 2 , 1 , 1 , 2 },
1861- std::array<uint32_t , 7 >{1 , 2 , 1 , 1 , 1 , 1 , 2 },
1862- std::array<uint32_t , 7 >{1 , 1 , 1 , 1 , 2 , 1 , 2 },
1863- std::array<uint32_t , 7 >{1 , 1 , 1 , 2 , 2 , 2 , 3 },
1864- std::array<uint32_t , 7 >{1 , 1 , 2 , 1 , 1 , 1 , 3 },
1865- std::array<uint32_t , 7 >{1 , 1 , 1 , 1 , 1 , 2 , 3 }};
1866- for (auto parameters : sizesCountsWorkDim) {
1867-
1868- uint32_t groupSizeX = parameters[0 ];
1869- uint32_t groupSizeY = parameters[1 ];
1870- uint32_t groupSizeZ = parameters[2 ];
1871-
1872- uint32_t groupCountX = parameters[3 ];
1873- uint32_t groupCountY = parameters[4 ];
1874- uint32_t groupCountZ = parameters[5 ];
1875-
1876- uint32_t expectedWorkDim = parameters[6 ];
1857+ std::array<std::array<uint32_t , 7 >, 8 > sizesCountsWorkDim = {{{2 , 1 , 1 , 1 , 1 , 1 , 1 },
1858+ {1 , 1 , 1 , 1 , 1 , 1 , 1 },
1859+ {1 , 2 , 1 , 2 , 1 , 1 , 2 },
1860+ {1 , 2 , 1 , 1 , 1 , 1 , 2 },
1861+ {1 , 1 , 1 , 1 , 2 , 1 , 2 },
1862+ {1 , 1 , 1 , 2 , 2 , 2 , 3 },
1863+ {1 , 1 , 2 , 1 , 1 , 1 , 3 },
1864+ {1 , 1 , 1 , 1 , 1 , 2 , 3 }}};
18771865
1866+ for (auto &[groupSizeX, groupSizeY, groupSizeZ, groupCountX, groupCountY, groupCountZ, expectedWorkDim] : sizesCountsWorkDim) {
18781867 ze_result_t res = kernel->setGroupSize (groupSizeX, groupSizeY, groupSizeZ);
18791868 EXPECT_EQ (res, ZE_RESULT_SUCCESS);
18801869
0 commit comments