test: update ults to respect minimal simd
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
parent
62b30fa72c
commit
b8723458e4
|
@ -23,7 +23,9 @@ struct ClCreateKernelsInProgramTests : public ApiTests {
|
|||
ApiTests::SetUp();
|
||||
|
||||
constexpr auto numBits = is32bit ? Elf::EI_CLASS_32 : Elf::EI_CLASS_64;
|
||||
auto zebinData = std::make_unique<ZebinTestData::ZebinCopyBufferSimdModule<numBits>>(pDevice->getHardwareInfo(), 16);
|
||||
auto simd = std::max(16u, pDevice->getGfxCoreHelper().getMinimalSIMDSize());
|
||||
|
||||
auto zebinData = std::make_unique<ZebinTestData::ZebinCopyBufferSimdModule<numBits>>(pDevice->getHardwareInfo(), static_cast<uint8_t>(simd));
|
||||
const auto &src = zebinData->storage;
|
||||
const auto &binarySize = src.size();
|
||||
|
||||
|
|
|
@ -1688,7 +1688,8 @@ HWTEST2_F(DeviceGetCapsTest, givenSysInfoWhenDeviceCreatedThenMaxWorkGroupSizeIs
|
|||
auto &gfxCoreHelper = device->getGfxCoreHelper();
|
||||
auto minSimd = gfxCoreHelper.getMinimalSIMDSize();
|
||||
|
||||
size_t expectedWGSize = (mySysInfo.ThreadCount / mySysInfo.DualSubSliceCount) * minSimd;
|
||||
uint32_t expectedWGSize = (mySysInfo.ThreadCount / mySysInfo.DualSubSliceCount) * minSimd;
|
||||
expectedWGSize = gfxCoreHelper.overrideMaxWorkGroupSize(expectedWGSize);
|
||||
EXPECT_EQ(expectedWGSize, device->sharedDeviceInfo.maxWorkGroupSize);
|
||||
}
|
||||
|
||||
|
|
|
@ -2861,8 +2861,8 @@ TEST_F(KernelCrossThreadTests, WhenKernelIsInitializedThenEnqueuedMaxWorkGroupSi
|
|||
}
|
||||
|
||||
TEST_F(KernelCrossThreadTests, WhenKernelIsInitializedThenDataParameterSimdSizeIsCorrect) {
|
||||
pKernelInfo->kernelDescriptor.payloadMappings.implicitArgs.simdSize = 16;
|
||||
pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 16;
|
||||
pKernelInfo->kernelDescriptor.payloadMappings.implicitArgs.simdSize = pClDevice->getGfxCoreHelper().getMinimalSIMDSize();
|
||||
pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = pClDevice->getGfxCoreHelper().getMinimalSIMDSize();
|
||||
MockKernel kernel(program.get(), *pKernelInfo, *pClDevice);
|
||||
ASSERT_EQ(CL_SUCCESS, kernel.initialize());
|
||||
|
||||
|
@ -3821,7 +3821,7 @@ struct KernelLargeGrfTests : Test<ClDeviceFixture> {
|
|||
};
|
||||
|
||||
HWTEST2_F(KernelLargeGrfTests, GivenLargeGrfAndSimdSizeWhenGettingMaxWorkGroupSizeThenCorrectValueReturned, IsAtLeastXeHpCore) {
|
||||
pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 16;
|
||||
pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = pClDevice->getGfxCoreHelper().getMinimalSIMDSize();
|
||||
pKernelInfo->kernelDescriptor.kernelAttributes.crossThreadDataSize = 4;
|
||||
pKernelInfo->kernelDescriptor.payloadMappings.implicitArgs.maxWorkGroupSize = 0;
|
||||
{
|
||||
|
@ -3838,9 +3838,12 @@ HWTEST2_F(KernelLargeGrfTests, GivenLargeGrfAndSimdSizeWhenGettingMaxWorkGroupSi
|
|||
|
||||
pKernelInfo->kernelDescriptor.kernelAttributes.numGrfRequired = GrfConfig::largeGrfNumber;
|
||||
EXPECT_EQ(CL_SUCCESS, kernel.initialize());
|
||||
if (pKernelInfo->kernelDescriptor.kernelAttributes.simdSize != 32) {
|
||||
|
||||
EXPECT_EQ(pDevice->getDeviceInfo().maxWorkGroupSize >> 1, *kernel.maxWorkGroupSizeForCrossThreadData);
|
||||
EXPECT_EQ(pDevice->getDeviceInfo().maxWorkGroupSize >> 1, kernel.maxKernelWorkGroupSize);
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
MockKernel kernel(program.get(), *pKernelInfo, *pClDevice);
|
||||
|
|
|
@ -92,7 +92,7 @@ TEST_F(PrintfHandlerTests, givenKernelWithImplicitArgsWhenPreparingPrintfHandler
|
|||
|
||||
auto pKernelInfo = std::make_unique<MockKernelInfo>();
|
||||
pKernelInfo->setPrintfSurface(sizeof(uintptr_t), 0);
|
||||
pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 16;
|
||||
pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = device->getGfxCoreHelper().getMinimalSIMDSize();
|
||||
pKernelInfo->kernelDescriptor.kernelAttributes.flags.requiresImplicitArgs = true;
|
||||
|
||||
MockProgram program{&context, false, toClDeviceVector(*device)};
|
||||
|
|
Loading…
Reference in New Issue