intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-24 20:39:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[2/N] compiler interface refactor (spir/spirV fix)

Browse Source 
Fixing regression in spir/spirV scenarios

Resolves: NEO-3854, NEO-3852, NEO-3845, NEO-3851, NEO-3844

Change-Id: Ifee7f1847c7f6598428f96ae2241b3d85e58ad11
This commit is contained in:
Jaroslaw Chodor
2019-10-20 14:22:34 +02:00
parent 55486a2f32
commit 8ec7e45bff
8 changed files with 58 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -1,5 +1,5 @@
#!groovy
dependenciesRevision='3fca422c0e381f607f9c8c02dca161010c30dac8-1319'
strategy='EQUAL'
allowedCD=260
allowedCD=259
allowedF=7

19
runtime/program/build.cpp
View File

@@ -69,13 +69,15 @@ cl_int Program::build(
break;
}
auto inType = IGC::CodeType::oclC;
TranslationInput inputArgs = {IGC::CodeType::oclC, IGC::CodeType::oclGenBin};
if ((createdFrom == CreatedFrom::IL) || (this->programBinaryType == CL_PROGRAM_BINARY_TYPE_INTERMEDIATE)) {
inType = isSpirV ? IGC::CodeType::spirV : IGC::CodeType::llvmBc;
inputArgs.srcType = isSpirV ? IGC::CodeType::spirV : IGC::CodeType::llvmBc;
inputArgs.src = ArrayRef<const char>(irBinary.get(), irBinarySize);
} else {
inputArgs.src = ArrayRef<const char>(sourceCode.c_str(), sourceCode.size());
}
TranslationInput inputArgs = {inType, IGC::CodeType::oclGenBin};
if (strcmp(sourceCode.c_str(), "") == 0) {
if (inputArgs.src.size() == 0) {
retVal = CL_INVALID_PROGRAM;
break;
}
@@ -95,7 +97,6 @@ cl_int Program::build(
internalOptions.append(compilerExtensionsOptions);
}
inputArgs.src = ArrayRef<const char>(sourceCode.c_str(), sourceCode.size());
inputArgs.apiOptions = ArrayRef<const char>(options.c_str(), options.length());
inputArgs.internalOptions = ArrayRef<const char>(internalOptions.c_str(), internalOptions.length());
inputArgs.GTPinInput = gtpinGetIgcInit();
@@ -114,9 +115,11 @@ cl_int Program::build(
if (retVal != CL_SUCCESS) {
break;
}
this->irBinary = std::move(compilerOuput.intermediateRepresentation.mem);
this->irBinarySize = compilerOuput.intermediateRepresentation.size;
this->isSpirV = compilerOuput.intermediateCodeType == IGC::CodeType::spirV;
if (inputArgs.srcType == IGC::CodeType::oclC) {
this->irBinary = std::move(compilerOuput.intermediateRepresentation.mem);
this->irBinarySize = compilerOuput.intermediateRepresentation.size;
this->isSpirV = compilerOuput.intermediateCodeType == IGC::CodeType::spirV;
}
this->genBinary = std::move(compilerOuput.deviceBinary.mem);
this->genBinarySize = compilerOuput.deviceBinary.size;
this->debugData = std::move(compilerOuput.debugData.mem);

5
runtime/program/compile.cpp
View File

@@ -70,6 +70,11 @@ cl_int Program::compile(
break;
}
if ((createdFrom == CreatedFrom::IL) || (this->programBinaryType == CL_PROGRAM_BINARY_TYPE_INTERMEDIATE)) {
retVal = CL_SUCCESS;
break;
}
buildStatus = CL_BUILD_IN_PROGRESS;
options = (buildOptions != nullptr) ? buildOptions : "";

1
runtime/program/create.inl
View File

@@ -158,7 +158,6 @@ T *Program::createFromIL(Context *ctx,
T *program = new T(*ctx->getDevice(0)->getExecutionEnvironment(), ctx, false);
errcodeRet = program->createProgramFromBinary(il, length);
program->createdFrom = CreatedFrom::IL;
if (errcodeRet != CL_SUCCESS) {

6
runtime/program/get_info.cpp
View File

@@ -104,14 +104,14 @@ cl_int Program::getInfo(cl_program_info paramName, size_t paramValueSize,
break;
case CL_PROGRAM_IL:
pSrc = sourceCode.data();
retSize = srcSize = sourceCode.size();
if (!Program::isValidSpirvBinary(pSrc, srcSize)) {
if (createdFrom != CreatedFrom::IL) {
if (paramValueSizeRet) {
*paramValueSizeRet = 0;
}
return CL_SUCCESS;
}
pSrc = irBinary.get();
retSize = srcSize = irBinarySize;
break;
case CL_PROGRAM_DEBUG_INFO_SIZES_INTEL:

4
runtime/program/process_spir_binary.cpp
View File

@@ -31,8 +31,8 @@ cl_int Program::processSpirBinary(
bool isSpirV) {
programBinaryType = CL_PROGRAM_BINARY_TYPE_INTERMEDIATE;
std::string binaryString(static_cast<const char *>(pBinary), binarySize);
sourceCode.swap(binaryString);
this->irBinary = makeCopy(pBinary, binarySize);
this->irBinarySize = binarySize;
buildStatus = CL_BUILD_NONE;
this->isSpirV = isSpirV;

6
unit_tests/program/process_spir_binary_tests.cpp
View File

@@ -37,7 +37,7 @@ TEST_F(ProcessSpirBinaryTests, InvalidSizeBinary) {
auto retVal = program->processSpirBinary(pBinary, binarySize, false);
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_EQ(binarySize, program->sourceCode.size());
EXPECT_EQ(binarySize, program->irBinarySize);
}
TEST_F(ProcessSpirBinaryTests, SomeBinary) {
@@ -46,8 +46,8 @@ TEST_F(ProcessSpirBinaryTests, SomeBinary) {
auto retVal = program->processSpirBinary(pBinary, binarySize, false);
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_EQ(0, strcmp(pBinary, program->sourceCode.c_str()));
EXPECT_EQ(binarySize, program->sourceCode.size());
EXPECT_EQ(0, memcmp(pBinary, program->irBinary.get(), program->irBinarySize));
EXPECT_EQ(binarySize, program->irBinarySize);
// Verify no built log is available
auto pBuildLog = program->getBuildLog(program->getDevicePtr());

33
unit_tests/program/program_tests.cpp
View File

@@ -2642,6 +2642,39 @@ TEST_F(ProgramTests, createFromILWhenCreateProgramFromBinaryIsSuccessfulThenRetu
prog->release();
}
TEST_F(ProgramTests, givenProgramCreatedFromILWhenCompileIsCalledThenReuseTheILInsteadOfCallingCompilerInterface) {
const uint32_t spirv[16] = {0x03022307};
cl_int errCode = 0;
auto prog = Program::createFromIL<MockProgram>(pContext, reinterpret_cast<const void *>(spirv), sizeof(spirv), errCode);
ASSERT_NE(nullptr, prog);
cl_device_id deviceId = pDevice;
auto debugVars = NEO::getIgcDebugVars();
debugVars.forceBuildFailure = true;
gEnvironment->fclPushDebugVars(debugVars);
auto compilerErr = prog->compile(1, &deviceId, nullptr, 0, nullptr, nullptr, nullptr, nullptr);
EXPECT_EQ(CL_SUCCESS, compilerErr);
gEnvironment->fclPopDebugVars();
prog->release();
}
TEST_F(ProgramTests, givenProgramCreatedFromIntermediateBinaryRepresentationWhenCompileIsCalledThenReuseTheILInsteadOfCallingCompilerInterface) {
const uint32_t spirv[16] = {0x03022307};
cl_int errCode = 0;
cl_device_id deviceId = pDevice;
cl_context ctx = pContext;
size_t lengths = sizeof(spirv);
const unsigned char *binaries[1] = {reinterpret_cast<const unsigned char *>(spirv)};
auto prog = Program::create<MockProgram>(ctx, 1U, &deviceId, &lengths, binaries, nullptr, errCode);
ASSERT_NE(nullptr, prog);
auto debugVars = NEO::getIgcDebugVars();
debugVars.forceBuildFailure = true;
gEnvironment->fclPushDebugVars(debugVars);
auto compilerErr = prog->compile(1, &deviceId, nullptr, 0, nullptr, nullptr, nullptr, nullptr);
EXPECT_EQ(CL_SUCCESS, compilerErr);
gEnvironment->fclPopDebugVars();
prog->release();
}
TEST_F(ProgramTests, createFromILWhenIlIsNullptrThenReturnsInvalidBinaryError) {
cl_int errCode = CL_SUCCESS;
constexpr cl_int expectedErrCode = CL_INVALID_BINARY;