Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-10 12:53:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(zebin): code improvements

Browse Source 
- Set initial value for ArgIndexT index in
KernelArgMiscInfoT struct
- Add check for arg index in extended metadata in order to avoid OOB
accesses
- Fix missing: populating ArgTypeTraits + refactor ULTs in order to
check it
- Add missing ULTs for Program::callPopulateZebinExtendedArgsMetadataOnce

Signed-off-by: Kacper Nowak <kacper.nowak@intel.com>
This commit is contained in:
Kacper Nowak
2022-11-03 14:07:05 +00:00
committed by Compute-Runtime-Automation
parent 2d229f3fea
commit a12251d464
5 changed files with 175 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp
View File

@ -129,4 +129,4 @@ TEST_F(KernelArgInfoTest, GivenParamWhenGettingKernelArgNameThenCorrectValueIsRe
nullptr);
ASSERT_EQ(CL_SUCCESS, retVal);
EXPECT_EQ(0, strcmp(paramValue.get(), expectedArgName));
}
}

97
opencl/test/unit_test/program/program_tests.cpp
View File

@ -3426,3 +3426,100 @@ TEST(ProgramInternalOptionsTests, givenProgramWhenForceDefaultGrfCompilationMode
CompilerOptions::applyAdditionalOptions(internalOptions);
EXPECT_EQ(internalOptionsSize, internalOptions.size());
}
TEST(ProgramPopulateZebinExtendedArgsMetadataTests, givenNonZebinaryFormatWhenCallingPopulateZebinExtendedArgsMetadataThenMetadataIsNotPopulated) {
MockClDevice device{new MockDevice()};
MockProgram program(toClDeviceVector(device));
program.callBasePopulateZebinExtendedArgsMetadataOnce = true;
constexpr auto mockBinarySize = 0x10;
const auto &rootDeviceIndex = device.getRootDeviceIndex();
auto &buildInfo = program.buildInfos[rootDeviceIndex];
buildInfo.unpackedDeviceBinary.reset(new char[mockBinarySize]{0});
buildInfo.unpackedDeviceBinarySize = mockBinarySize;
KernelInfo kernelInfo;
kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "some_kernel";
buildInfo.kernelInfoArray.push_back(&kernelInfo);
ASSERT_TRUE(kernelInfo.kernelDescriptor.explicitArgsExtendedMetadata.empty());
program.callPopulateZebinExtendedArgsMetadataOnce(rootDeviceIndex);
EXPECT_TRUE(kernelInfo.kernelDescriptor.explicitArgsExtendedMetadata.empty());
buildInfo.kernelInfoArray.clear();
}
TEST(ProgramPopulateZebinExtendedArgsMetadataTests, givenZebinaryFormatAndDecodeErrorOnDecodingArgsMetadataWhenCallingPopulateZebinExtendedArgsMetadataThenMetadataIsNotPopulated) {
MockClDevice device{new MockDevice()};
MockProgram program(toClDeviceVector(device));
program.callBasePopulateZebinExtendedArgsMetadataOnce = true;
const auto &rootDeviceIndex = device.getRootDeviceIndex();
auto &buildInfo = program.buildInfos[rootDeviceIndex];
KernelInfo kernelInfo;
kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "some_kernel";
buildInfo.kernelInfoArray.push_back(&kernelInfo);
NEO::ConstStringRef invalidZeInfo = R"===(
kernels:
- name: some_kernel
simd_size: 32
...
)===";
constexpr auto numBits = is32bit ? Elf::EI_CLASS_32 : Elf::EI_CLASS_64;
MockElfEncoder<numBits> elfEncoder;
elfEncoder.getElfFileHeader().type = NEO::Elf::ET_REL;
elfEncoder.appendSection(Elf::SHT_ZEBIN::SHT_ZEBIN_ZEINFO, Elf::SectionsNamesZebin::zeInfo, ArrayRef<const uint8_t>::fromAny(invalidZeInfo.data(), invalidZeInfo.size()));
auto storage = elfEncoder.encode();
buildInfo.unpackedDeviceBinary.reset(reinterpret_cast<char *>(storage.data()));
buildInfo.unpackedDeviceBinarySize = storage.size();
ASSERT_TRUE(kernelInfo.kernelDescriptor.explicitArgsExtendedMetadata.empty());
ASSERT_EQ(std::string::npos, buildInfo.kernelMiscInfoPos);
program.callPopulateZebinExtendedArgsMetadataOnce(rootDeviceIndex);
EXPECT_TRUE(kernelInfo.kernelDescriptor.explicitArgsExtendedMetadata.empty());
buildInfo.kernelInfoArray.clear();
buildInfo.unpackedDeviceBinary.release();
}
TEST(ProgramPopulateZebinExtendedArgsMetadataTests, givenZebinaryFormatWithValidZeInfoWhenCallingPopulateExtendedArgsMetadataThenMetadataIsPopulated) {
MockClDevice device{new MockDevice()};
MockProgram program(toClDeviceVector(device));
program.callBasePopulateZebinExtendedArgsMetadataOnce = true;
const auto &rootDeviceIndex = device.getRootDeviceIndex();
auto &buildInfo = program.buildInfos[rootDeviceIndex];
KernelInfo kernelInfo;
kernelInfo.kernelDescriptor.kernelMetadata.kernelName = "some_kernel";
buildInfo.kernelInfoArray.push_back(&kernelInfo);
NEO::ConstStringRef zeInfo = R"===(
kernels:
- name: some_kernel
simd_size: 32
kernels_misc_info:
- name: some_kernel
args_info:
- name: a
index: 0
address_qualifier: __global
...
)===";
constexpr auto numBits = is32bit ? Elf::EI_CLASS_32 : Elf::EI_CLASS_64;
MockElfEncoder<numBits> elfEncoder;
elfEncoder.getElfFileHeader().type = NEO::Elf::ET_REL;
elfEncoder.appendSection(Elf::SHT_ZEBIN::SHT_ZEBIN_ZEINFO, Elf::SectionsNamesZebin::zeInfo, ArrayRef<const uint8_t>::fromAny(zeInfo.data(), zeInfo.size()));
auto storage = elfEncoder.encode();
buildInfo.unpackedDeviceBinary.reset(reinterpret_cast<char *>(storage.data()));
buildInfo.unpackedDeviceBinarySize = storage.size();
buildInfo.kernelMiscInfoPos = zeInfo.str().find(Elf::ZebinKernelMetadata::Tags::kernelMiscInfo.str());
ASSERT_NE(std::string::npos, buildInfo.kernelMiscInfoPos);
ASSERT_TRUE(kernelInfo.kernelDescriptor.explicitArgsExtendedMetadata.empty());
program.callPopulateZebinExtendedArgsMetadataOnce(rootDeviceIndex);
EXPECT_EQ(1u, kernelInfo.kernelDescriptor.explicitArgsExtendedMetadata.size());
buildInfo.kernelInfoArray.clear();
buildInfo.unpackedDeviceBinary.release();
}