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

[1/N] compiler interface refactor

Browse Source 
Decouple compiler interface from Program object

Change-Id: Ibd63c6eee01d85527318ccad52e52f5487d3402e
This commit is contained in:
Chodor, Jaroslaw
2019-08-29 15:10:51 +02:00
committed by sys_ocldev
parent 9066192dc3
commit 856e5c6aaf
63 changed files with 1444 additions and 1504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
runtime/program/link.cpp
View File

@@ -91,7 +91,7 @@ cl_int Program::link(
}
elfWriter.addSection(CLElfLib::SSectionNode(pInputProgObj->getIsSpirV() ? CLElfLib::E_SH_TYPE::SH_TYPE_SPIRV : CLElfLib::E_SH_TYPE::SH_TYPE_OPENCL_LLVM_BINARY,
CLElfLib::E_SH_FLAG::SH_FLAG_NONE, "", std::string(pInputProgObj->irBinary, pInputProgObj->irBinarySize), static_cast<uint32_t>(pInputProgObj->irBinarySize)));
CLElfLib::E_SH_FLAG::SH_FLAG_NONE, "", std::string(pInputProgObj->irBinary.get(), pInputProgObj->irBinarySize), static_cast<uint32_t>(pInputProgObj->irBinarySize)));
}
if (retVal != CL_SUCCESS) {
break;
@@ -107,23 +107,28 @@ cl_int Program::link(
break;
}
TranslationArgs inputArgs = {};
TranslationInput inputArgs = {IGC::CodeType::elf, IGC::CodeType::undefined};
inputArgs.pInput = data.data();
inputArgs.InputSize = (uint32_t)dataSize;
inputArgs.pOptions = options.c_str();
inputArgs.OptionsSize = (uint32_t)options.length();
inputArgs.pInternalOptions = internalOptions.c_str();
inputArgs.InternalOptionsSize = (uint32_t)internalOptions.length();
inputArgs.pTracingOptions = nullptr;
inputArgs.TracingOptionsCount = 0;
inputArgs.src = ArrayRef<const char>(data.data(), dataSize);
inputArgs.apiOptions = ArrayRef<const char>(options.c_str(), options.length());
inputArgs.internalOptions = ArrayRef<const char>(internalOptions.c_str(), internalOptions.length());
if (!isCreateLibrary) {
retVal = pCompilerInterface->link(*this, inputArgs);
inputArgs.outType = IGC::CodeType::oclGenBin;
NEO::TranslationOutput compilerOuput = {};
auto compilerErr = pCompilerInterface->link(*this->pDevice, inputArgs, compilerOuput);
this->updateBuildLog(this->pDevice, compilerOuput.frontendCompilerLog.c_str(), compilerOuput.frontendCompilerLog.size());
this->updateBuildLog(this->pDevice, compilerOuput.backendCompilerLog.c_str(), compilerOuput.backendCompilerLog.size());
retVal = asClError(compilerErr);
if (retVal != CL_SUCCESS) {
break;
}
this->genBinary = std::move(compilerOuput.deviceBinary.mem);
this->genBinarySize = compilerOuput.deviceBinary.size;
this->debugData = std::move(compilerOuput.debugData.mem);
this->debugDataSize = compilerOuput.debugData.size;
retVal = processGenBinary();
if (retVal != CL_SUCCESS) {
break;
@@ -137,10 +142,20 @@ cl_int Program::link(
}
}
} else {
retVal = pCompilerInterface->createLibrary(*this, inputArgs);
inputArgs.outType = IGC::CodeType::llvmBc;
NEO::TranslationOutput compilerOuput = {};
auto compilerErr = pCompilerInterface->createLibrary(*this->pDevice, inputArgs, compilerOuput);
this->updateBuildLog(this->pDevice, compilerOuput.frontendCompilerLog.c_str(), compilerOuput.frontendCompilerLog.size());
this->updateBuildLog(this->pDevice, compilerOuput.backendCompilerLog.c_str(), compilerOuput.backendCompilerLog.size());
retVal = asClError(compilerErr);
if (retVal != CL_SUCCESS) {
break;
}
this->irBinary = std::move(compilerOuput.intermediateRepresentation.mem);
this->irBinarySize = compilerOuput.intermediateRepresentation.size;
this->isSpirV = (compilerOuput.intermediateCodeType == IGC::CodeType::spirV);
this->debugData = std::move(compilerOuput.debugData.mem);
this->debugDataSize = compilerOuput.debugData.size;
programBinaryType = CL_PROGRAM_BINARY_TYPE_LIBRARY;
}
updateNonUniformFlag(&*inputProgramsInternal.begin(), inputProgramsInternal.size());