intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-11 00:10:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for spirv regression - preserve IR type

Browse Source 
Preserve IR type during Program::compile when program
is created from IR

Change-Id: I9ee12b27e52fa72a1abbfa070895caf0ac3e32fb
This commit is contained in:
Chodor, Jaroslaw
2018-07-20 15:34:01 +02:00
committed by sys_ocldev
parent 2561ff6cb4
commit 44589b79b4
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/compiler_interface/compiler_interface.cpp
View File

@@ -222,7 +222,7 @@ cl_int CompilerInterface::compile(
char *pOutput; char *pOutput;
uint32_t OutputSize; uint32_t OutputSize;
program.getSource(pOutput, OutputSize); program.getSource(pOutput, OutputSize);
program.storeIrBinary(pOutput, OutputSize, outType == IGC::CodeType::spirV); program.storeIrBinary(pOutput, OutputSize, program.getIsSpirV());
} }
} }

20
unit_tests/compiler_interface/compiler_interface_tests.cpp
View File

@@ -288,6 +288,26 @@ TEST_F(CompilerInterfaceTest, CompileClToIr) {
gEnvironment->fclPopDebugVars(); gEnvironment->fclPopDebugVars();
} }
TEST_F(CompilerInterfaceTest, GivenProgramCreatedFromIrWhenCompileIsCalledThenIrFormatIsPreserved) {
struct MockProgram : Program {
using Program::isSpirV;
using Program::pDevice;
using Program::programBinaryType;
};
MockProgram prog;
prog.programBinaryType = CL_PROGRAM_BINARY_TYPE_INTERMEDIATE;
prog.pDevice = pContext->getDevice(0);
prog.isSpirV = true;
retVal = pCompilerInterface->compile(prog, inputArgs);
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_TRUE(prog.isSpirV);
prog.isSpirV = false;
retVal = pCompilerInterface->compile(prog, inputArgs);
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_FALSE(prog.isSpirV);
}
TEST_F(CompilerInterfaceTest, WhenCompileIsInvokedThenFclReceivesListOfExtensionsInInternalOptions) { TEST_F(CompilerInterfaceTest, WhenCompileIsInvokedThenFclReceivesListOfExtensionsInInternalOptions) {
std::string receivedInternalOptions; std::string receivedInternalOptions;