Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Skip rebuild binary forced by flag when lack of ir 

when flag RebuildPrecompiledKernels set and call clCreateProgramWithBinary
skip rebuild if ir binary not available

Resolves: HSD-18035219734
Signed-off-by: Katarzyna Cencelewska <katarzyna.cencelewska@intel.com>
This commit is contained in:
Katarzyna Cencelewska 2023-12-06 10:55:29 +00:00 committed by Compute-Runtime-Automation
parent fc1d93af8e
commit 39ccf0297f
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
opencl/source/program/program.cpp
View File

@ -203,11 +203,20 @@ cl_int Program::createProgramFromBinary(
auto isVmeUsed = containsVmeUsage(this->buildInfos[rootDeviceIndex].kernelInfoArray);
bool rebuild = isRebuiltToPatchtokensRequired(&clDevice.getDevice(), archive, this->options, this->isBuiltIn, isVmeUsed);
rebuild |= debugManager.flags.RebuildPrecompiledKernels.get();
bool flagRebuild = debugManager.flags.RebuildPrecompiledKernels.get();
if (rebuild && 0u == this->irBinarySize) {
return CL_INVALID_BINARY;
if (0u == this->irBinarySize) {
if (flagRebuild) {
PRINT_DEBUG_STRING(debugManager.flags.PrintDebugMessages.get(), stderr, "Skip rebuild binary. Lack of IR, rebuild impossible.\n");
}
if (rebuild) {
return CL_INVALID_BINARY;
}
rebuild = 0;
} else {
rebuild |= flagRebuild;
}
if ((false == singleDeviceBinary.deviceBinary.empty()) && (false == rebuild)) {
this->buildInfos[rootDeviceIndex].unpackedDeviceBinary = makeCopy<char>(reinterpret_cast<const char *>(singleDeviceBinary.deviceBinary.begin()), singleDeviceBinary.deviceBinary.size());
this->buildInfos[rootDeviceIndex].unpackedDeviceBinarySize = singleDeviceBinary.deviceBinary.size();

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

@ -2766,9 +2766,10 @@ TEST_F(ProgramTests, GivenInjectInternalBuildOptionsWhenCompilingBuiltInProgramT
EXPECT_FALSE(CompilerOptions::contains(cip->buildInternalOptions, "-abc")) << cip->buildInternalOptions;
}
TEST(CreateProgramFromBinaryTests, givenBinaryProgramBuiltInWhenKernelRebulildIsForcedAndIrBinaryIsNotPresentThenErrorIsReturned) {
TEST(CreateProgramFromBinaryTests, givenBinaryProgramBuiltInWhenKernelRebulildIsForcedAndIrBinaryIsNotPresentThenSkipRebuildPrintDebugMssageAndReturnSuccess) {
DebugManagerStateRestore dbgRestorer;
debugManager.flags.RebuildPrecompiledKernels.set(true);
debugManager.flags.PrintDebugMessages.set(true);
cl_int retVal = CL_INVALID_BINARY;
PatchTokensTestData::ValidEmptyProgram programTokens;
@ -2779,8 +2780,38 @@ TEST(CreateProgramFromBinaryTests, givenBinaryProgramBuiltInWhenKernelRebulildIs
EXPECT_EQ(CL_SUCCESS, retVal);
pProgram->irBinarySize = 0x10;
::testing::internal::CaptureStderr();
retVal = pProgram->createProgramFromBinary(programTokens.storage.data(), programTokens.storage.size(), *clDevice);
std::string output = testing::internal::GetCapturedStderr();
EXPECT_FALSE(pProgram->requiresRebuild);
EXPECT_EQ(CL_SUCCESS, retVal);
std::string expectedOutput = "Skip rebuild binary. Lack of IR, rebuild impossible.\n";
EXPECT_EQ(expectedOutput, output);
}
TEST(CreateProgramFromBinaryTests, givenCreateProgramFromBinaryWhenIrBinaryIsNotPresentAndIsRebuiltToPatchtokensRequiredThenReturnClInvalidBinary) {
DebugManagerStateRestore dbgRestorer;
debugManager.flags.RebuildPrecompiledKernels.set(false);
cl_int retVal = CL_INVALID_BINARY;
ZebinTestData::ValidEmptyProgram zebin;
auto clDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr));
auto rootDeviceIndex = clDevice->getRootDeviceIndex();
std::unique_ptr<MockProgram> pProgram(Program::createBuiltInFromGenBinary<MockProgram>(nullptr, toClDeviceVector(*clDevice), zebin.storage.data(), zebin.storage.size(), &retVal));
ASSERT_NE(nullptr, pProgram.get());
EXPECT_EQ(CL_SUCCESS, retVal);
pProgram->irBinarySize = 0x10;
pProgram->isBuiltIn = false;
KernelInfo kernelInfo;
kernelInfo.kernelDescriptor.kernelAttributes.flags.usesVme = true;
pProgram->buildInfos[rootDeviceIndex].kernelInfoArray.push_back(&kernelInfo);
retVal = pProgram->createProgramFromBinary(zebin.storage.data(), zebin.storage.size(), *clDevice);
EXPECT_FALSE(pProgram->requiresRebuild);
EXPECT_EQ(CL_INVALID_BINARY, retVal);
pProgram->buildInfos[rootDeviceIndex].kernelInfoArray.clear();
}
TEST(CreateProgramFromBinaryTests, givenBinaryProgramBuiltInWhenKernelRebulildIsForcedAndIrBinaryIsPresentThenDeviceBinaryIsNotUsed) {