From: Pan Xiuli <[email protected]> We should not include any llvm header in ir unit, and we need add missing headers for proliling after deleting llvm headers.
Signed-off-by: Pan Xiuli <[email protected]> --- backend/src/ir/profiling.cpp | 1 + backend/src/ir/unit.hpp | 4 +--- backend/src/llvm/llvm_gen_backend.cpp | 2 +- backend/src/llvm/llvm_printf_parser.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/src/ir/profiling.cpp b/backend/src/ir/profiling.cpp index ac61e9b..3289e76 100644 --- a/backend/src/ir/profiling.cpp +++ b/backend/src/ir/profiling.cpp @@ -24,6 +24,7 @@ #include <stdlib.h> #include "ir/profiling.hpp" #include "src/cl_device_data.h" +#include <inttypes.h> namespace gbe { diff --git a/backend/src/ir/unit.hpp b/backend/src/ir/unit.hpp index 46d7be7..d7a2a67 100644 --- a/backend/src/ir/unit.hpp +++ b/backend/src/ir/unit.hpp @@ -32,8 +32,6 @@ #include "sys/map.hpp" #include <string.h> -#include "llvm/IR/Instructions.h" - namespace gbe { namespace ir { @@ -46,7 +44,7 @@ namespace ir { public: typedef map<std::string, Function*> FunctionSet; /*! Moved from printf pass */ - map<llvm::CallInst*, PrintfSet::PrintfFmt*> printfs; + map<void *, PrintfSet::PrintfFmt*> printfs; vector<std::string> blockFuncs; /*! Create an empty unit */ Unit(PointerSize pointerSize = POINTER_32_BITS); diff --git a/backend/src/llvm/llvm_gen_backend.cpp b/backend/src/llvm/llvm_gen_backend.cpp index 6fa1ae0..8c04664 100644 --- a/backend/src/llvm/llvm_gen_backend.cpp +++ b/backend/src/llvm/llvm_gen_backend.cpp @@ -764,7 +764,7 @@ namespace gbe void emitUnalignedDQLoadStore(ir::Register ptr, Value *llvmValues, ir::AddressSpace addrSpace, ir::Register bti, bool isLoad, bool dwAligned, bool fixedBTI); void visitInstruction(Instruction &I) {NOT_SUPPORTED;} ir::PrintfSet::PrintfFmt* getPrintfInfo(CallInst* inst) { - if (unit.printfs.find(inst) == unit.printfs.end()) + if (unit.printfs.find((void *)inst) == unit.printfs.end()) return NULL; return unit.printfs[inst]; } diff --git a/backend/src/llvm/llvm_printf_parser.cpp b/backend/src/llvm/llvm_printf_parser.cpp index d64fc60..a1b1c2c 100644 --- a/backend/src/llvm/llvm_printf_parser.cpp +++ b/backend/src/llvm/llvm_printf_parser.cpp @@ -381,7 +381,7 @@ error: } GBE_ASSERT(unit.printfs.find(call) == unit.printfs.end()); - unit.printfs.insert(std::pair<llvm::CallInst*, PrintfSet::PrintfFmt*>(call, printf_fmt)); + unit.printfs.insert(std::pair<void *, PrintfSet::PrintfFmt*>((void *)call, printf_fmt)); return true; } -- 2.7.4 _______________________________________________ Beignet mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/beignet
