[Beignet] [PATCH 1/4] enable cl_khr_spir extension to build and run from SPIR binary.
xionghu.luo at intel.com
xionghu.luo at intel.com
Sun Mar 8 20:24:25 PDT 2015
From: Luo Xionghu <xionghu.luo at intel.com>
the SPIR are built by clang generating a standard llvm Module file,
beignet need insert one byte before the module repesents binary type
then parse the module to link.
enable cl_khr_spir extension output string;
enable the SPIR calling conversion of CallingConv::SPIR_KERNEL;
get_global_id shoud be OVERLOADABLE; fix some bugs in prinf parse
and backend.
v2: move OVERLOADABLE change to another patch to keep clean;
rename FROM_INTERMEDIATE to FROM_LLVM_SPIR.
Signed-off-by: Luo Xionghu <xionghu.luo at intel.com>
---
backend/src/backend/gen_program.cpp | 5 +++++
backend/src/libocl/tmpl/ocl_defines.tmpl.h | 1 +
backend/src/llvm/llvm_gen_backend.cpp | 5 ++++-
backend/src/llvm/llvm_printf_parser.cpp | 3 ++-
backend/src/llvm/llvm_scalarize.cpp | 1 +
src/cl_api.c | 1 +
src/cl_extensions.c | 4 ++++
src/cl_program.c | 21 +++++++++++++++++++--
src/cl_program.h | 3 ++-
9 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/backend/src/backend/gen_program.cpp b/backend/src/backend/gen_program.cpp
index 755c60e..f4c74f8 100644
--- a/backend/src/backend/gen_program.cpp
+++ b/backend/src/backend/gen_program.cpp
@@ -261,6 +261,11 @@ namespace gbe {
acquireLLVMContextLock();
llvm::Module* module = llvm::ParseIR(memory_buffer, Err, c);
#endif
+ // if load 32 bit spir binary, the triple should be spir-unknown-unknown.
+ llvm::Triple triple(module->getTargetTriple());
+ if(triple.getArchName() == "spir" && triple.getVendorName() == "unknown" && triple.getOSName() == "unknown"){
+ module->setTargetTriple("spir");
+ }
releaseLLVMContextLock();
if(module == NULL){
GBE_ASSERT(0);
diff --git a/backend/src/libocl/tmpl/ocl_defines.tmpl.h b/backend/src/libocl/tmpl/ocl_defines.tmpl.h
index 4e210be..fe999b2 100644
--- a/backend/src/libocl/tmpl/ocl_defines.tmpl.h
+++ b/backend/src/libocl/tmpl/ocl_defines.tmpl.h
@@ -34,5 +34,6 @@
#define cl_khr_byte_addressable_store
#define cl_khr_icd
#define cl_khr_gl_sharing
+#define cl_khr_spir
#endif /* end of __OCL_COMMON_DEF_H__ */
diff --git a/backend/src/llvm/llvm_gen_backend.cpp b/backend/src/llvm/llvm_gen_backend.cpp
index 6390551..2e03120 100644
--- a/backend/src/llvm/llvm_gen_backend.cpp
+++ b/backend/src/llvm/llvm_gen_backend.cpp
@@ -1375,7 +1375,9 @@ namespace gbe
llvmInfo.typeName = (cast<MDString>(typeNameNode->getOperand(1 + argID)))->getString();
llvmInfo.accessQual = (cast<MDString>(accessQualNode->getOperand(1 + argID)))->getString();
llvmInfo.typeQual = (cast<MDString>(typeQualNode->getOperand(1 + argID)))->getString();
- llvmInfo.argName = (cast<MDString>(argNameNode->getOperand(1 + argID)))->getString();
+ if(argNameNode){
+ llvmInfo.argName = (cast<MDString>(argNameNode->getOperand(1 + argID)))->getString();
+ }
// function arguments are uniform values.
this->newRegister(I, NULL, true);
@@ -2022,6 +2024,7 @@ namespace gbe
#else
case CallingConv::C:
case CallingConv::Fast:
+ case CallingConv::SPIR_KERNEL:
#endif
break;
default:
diff --git a/backend/src/llvm/llvm_printf_parser.cpp b/backend/src/llvm/llvm_printf_parser.cpp
index 8e662b3..9632011 100644
--- a/backend/src/llvm/llvm_printf_parser.cpp
+++ b/backend/src/llvm/llvm_printf_parser.cpp
@@ -565,6 +565,7 @@ error:
#else
case CallingConv::C:
case CallingConv::Fast:
+ case CallingConv::SPIR_KERNEL:
#endif
break;
default:
@@ -595,7 +596,7 @@ error:
continue;
}
- if (call->getCalledFunction()->getIntrinsicID() != 0)
+ if (call->getCalledFunction() && call->getCalledFunction()->getIntrinsicID() != 0)
continue;
Value *Callee = call->getCalledValue();
diff --git a/backend/src/llvm/llvm_scalarize.cpp b/backend/src/llvm/llvm_scalarize.cpp
index 97a7615..15309de 100644
--- a/backend/src/llvm/llvm_scalarize.cpp
+++ b/backend/src/llvm/llvm_scalarize.cpp
@@ -789,6 +789,7 @@ namespace gbe {
#else
case CallingConv::C:
case CallingConv::Fast:
+ case CallingConv::SPIR_KERNEL:
#endif
break;
default:
diff --git a/src/cl_api.c b/src/cl_api.c
index 972c687..3e72deb 100644
--- a/src/cl_api.c
+++ b/src/cl_api.c
@@ -941,6 +941,7 @@ clBuildProgram(cl_program program,
/* TODO support create program from binary */
assert(program->source_type == FROM_LLVM ||
program->source_type == FROM_SOURCE ||
+ program->source_type == FROM_LLVM_SPIR ||
program->source_type == FROM_BINARY);
if((err = cl_program_build(program, options)) != CL_SUCCESS) {
goto error;
diff --git a/src/cl_extensions.c b/src/cl_extensions.c
index d07a525..cea2dd8 100644
--- a/src/cl_extensions.c
+++ b/src/cl_extensions.c
@@ -34,8 +34,12 @@ void check_opt1_extension(cl_extensions_t *extensions)
{
int id;
for(id = OPT1_EXT_START_ID; id <= OPT1_EXT_END_ID; id++)
+ {
if (id == EXT_ID(khr_icd))
extensions->extensions[id].base.ext_enabled = 1;
+ if (id == EXT_ID(khr_spir))
+ extensions->extensions[id].base.ext_enabled = 1;
+ }
}
void
diff --git a/src/cl_program.c b/src/cl_program.c
index c30f85e..db53757 100644
--- a/src/cl_program.c
+++ b/src/cl_program.c
@@ -231,7 +231,21 @@ cl_program_create_from_binary(cl_context ctx,
program->binary_sz = lengths[0];
program->source_type = FROM_BINARY;
- if(isBitcode((unsigned char*)program->binary+1, (unsigned char*)program->binary+program->binary_sz)) {
+ if(isBitcode((unsigned char*)program->binary, (unsigned char*)program->binary+program->binary_sz)) {
+
+ char* typed_binary;
+ TRY_ALLOC(typed_binary, cl_calloc(lengths[0]+1, sizeof(char)));
+ memcpy(typed_binary+1, binaries[0], lengths[0]);
+ *typed_binary = 1;
+ program->opaque = compiler_program_new_from_llvm_binary(program->ctx->device->vendor_id, typed_binary, program->binary_sz+1);
+ cl_free(typed_binary);
+ if (UNLIKELY(program->opaque == NULL)) {
+ err = CL_INVALID_PROGRAM;
+ goto error;
+ }
+
+ program->source_type = FROM_LLVM_SPIR;
+ }else if(isBitcode((unsigned char*)program->binary+1, (unsigned char*)program->binary+program->binary_sz)) {
if(*program->binary == 1){
program->binary_type = CL_PROGRAM_BINARY_TYPE_COMPILED_OBJECT;
}else if(*program->binary == 2){
@@ -499,6 +513,9 @@ cl_program_build(cl_program p, const char *options)
memcpy(p->build_opts, options, strlen(options));
p->source_type = p->source ? FROM_SOURCE : p->binary ? FROM_BINARY : FROM_LLVM;
+ if (strstr(options, "-x spir")) {
+ p->source_type = FROM_LLVM_SPIR;
+ }
}
}
@@ -526,7 +543,7 @@ cl_program_build(cl_program p, const char *options)
/* Create all the kernels */
TRY (cl_program_load_gen_program, p);
- } else if (p->source_type == FROM_LLVM) {
+ } else if (p->source_type == FROM_LLVM || p->source_type == FROM_LLVM_SPIR) {
if (!CompilerSupported()) {
err = CL_COMPILER_NOT_AVAILABLE;
goto error;
diff --git a/src/cl_program.h b/src/cl_program.h
index 3ab7acd..7af0206 100644
--- a/src/cl_program.h
+++ b/src/cl_program.h
@@ -33,7 +33,8 @@ struct _gbe_program;
enum {
FROM_SOURCE = 0,
FROM_LLVM = 1,
- FROM_BINARY = 2
+ FROM_BINARY = 2,
+ FROM_LLVM_SPIR = 3
};
/* This maps an OCL file containing some kernels */
--
1.9.1
More information about the Beignet
mailing list