diff options
author | Lang Hames <lhames@gmail.com> | 2014-11-20 21:16:16 +0000 |
---|---|---|
committer | Lang Hames <lhames@gmail.com> | 2014-11-20 21:16:16 +0000 |
commit | 604171664c6967396b7113f28b8816d060ba9320 (patch) | |
tree | 10e9c20c58f2bf011232ed26223c08b252bab171 /lib | |
parent | 4e7b10b07f0ca2c8185e96bdc58ae4d9d540b3a4 (diff) |
[MCJIT] Remove JITEventListener::NotifyFunctionEmitted - this method is dead
now that the legacy JIT has been removed.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222453 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp | 82 | ||||
-rw-r--r-- | lib/ExecutionEngine/OProfileJIT/OProfileJITEventListener.cpp | 78 |
2 files changed, 0 insertions, 160 deletions
diff --git a/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp b/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp index 29be7c74902..ec9414750bd 100644 --- a/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp +++ b/lib/ExecutionEngine/IntelJITEvents/IntelJITEventListener.cpp @@ -57,10 +57,6 @@ public: ~IntelJITEventListener() { } - virtual void NotifyFunctionEmitted(const Function &F, - void *FnStart, size_t FnSize, - const EmittedFunctionDetails &Details); - virtual void NotifyFreeingMachineCode(void *OldPtr); virtual void NotifyObjectEmitted(const ObjectImage &Obj); @@ -68,18 +64,6 @@ public: virtual void NotifyFreeingObject(const ObjectImage &Obj); }; -static LineNumberInfo LineStartToIntelJITFormat( - uintptr_t StartAddress, - uintptr_t Address, - DebugLoc Loc) { - LineNumberInfo Result; - - Result.Offset = Address - StartAddress; - Result.LineNumber = Loc.getLine(); - - return Result; -} - static LineNumberInfo DILineInfoToIntelJITFormat(uintptr_t StartAddress, uintptr_t Address, DILineInfo Line) { @@ -113,72 +97,6 @@ static iJIT_Method_Load FunctionDescToIntelJITFormat( return Result; } -// Adds the just-emitted function to the symbol table. -void IntelJITEventListener::NotifyFunctionEmitted( - const Function &F, void *FnStart, size_t FnSize, - const EmittedFunctionDetails &Details) { - iJIT_Method_Load FunctionMessage = FunctionDescToIntelJITFormat(*Wrapper, - F.getName().data(), - reinterpret_cast<uint64_t>(FnStart), - FnSize); - - std::vector<LineNumberInfo> LineInfo; - - if (!Details.LineStarts.empty()) { - // Now convert the line number information from the address/DebugLoc - // format in Details to the offset/lineno in Intel JIT API format. - - LineInfo.reserve(Details.LineStarts.size() + 1); - - DebugLoc FirstLoc = Details.LineStarts[0].Loc; - assert(!FirstLoc.isUnknown() - && "LineStarts should not contain unknown DebugLocs"); - - MDNode *FirstLocScope = FirstLoc.getScope(F.getContext()); - DISubprogram FunctionDI = getDISubprogram(FirstLocScope); - if (FunctionDI.Verify()) { - FunctionMessage.source_file_name = const_cast<char*>( - Filenames.getFullPath(FirstLocScope)); - - LineNumberInfo FirstLine; - FirstLine.Offset = 0; - FirstLine.LineNumber = FunctionDI.getLineNumber(); - LineInfo.push_back(FirstLine); - } - - for (std::vector<EmittedFunctionDetails::LineStart>::const_iterator I = - Details.LineStarts.begin(), E = Details.LineStarts.end(); - I != E; ++I) { - // This implementation ignores the DebugLoc filename because the Intel - // JIT API does not support multiple source files associated with a single - // JIT function - LineInfo.push_back(LineStartToIntelJITFormat( - reinterpret_cast<uintptr_t>(FnStart), - I->Address, - I->Loc)); - - // If we have no file name yet for the function, use the filename from - // the first instruction that has one - if (FunctionMessage.source_file_name == 0) { - MDNode *scope = I->Loc.getScope( - Details.MF->getFunction()->getContext()); - FunctionMessage.source_file_name = const_cast<char*>( - Filenames.getFullPath(scope)); - } - } - - FunctionMessage.line_number_size = LineInfo.size(); - FunctionMessage.line_number_table = &*LineInfo.begin(); - } else { - FunctionMessage.line_number_size = 0; - FunctionMessage.line_number_table = 0; - } - - Wrapper->iJIT_NotifyEvent(iJVM_EVENT_TYPE_METHOD_LOAD_FINISHED, - &FunctionMessage); - MethodIDs[FnStart] = FunctionMessage.method_id; -} - void IntelJITEventListener::NotifyFreeingMachineCode(void *FnStart) { MethodIDMap::iterator I = MethodIDs.find(FnStart); if (I != MethodIDs.end()) { diff --git a/lib/ExecutionEngine/OProfileJIT/OProfileJITEventListener.cpp b/lib/ExecutionEngine/OProfileJIT/OProfileJITEventListener.cpp index fd37a13b112..1fd24f12f40 100644 --- a/lib/ExecutionEngine/OProfileJIT/OProfileJITEventListener.cpp +++ b/lib/ExecutionEngine/OProfileJIT/OProfileJITEventListener.cpp @@ -49,10 +49,6 @@ public: ~OProfileJITEventListener(); - virtual void NotifyFunctionEmitted(const Function &F, - void *FnStart, size_t FnSize, - const JITEvent_EmittedFunctionDetails &Details); - virtual void NotifyFreeingMachineCode(void *OldPtr); virtual void NotifyObjectEmitted(const ObjectImage &Obj); @@ -81,80 +77,6 @@ OProfileJITEventListener::~OProfileJITEventListener() { } } -static debug_line_info LineStartToOProfileFormat( - const MachineFunction &MF, FilenameCache &Filenames, - uintptr_t Address, DebugLoc Loc) { - debug_line_info Result; - Result.vma = Address; - Result.lineno = Loc.getLine(); - Result.filename = Filenames.getFilename( - Loc.getScope(MF.getFunction()->getContext())); - DEBUG(dbgs() << "Mapping " << reinterpret_cast<void*>(Result.vma) << " to " - << Result.filename << ":" << Result.lineno << "\n"); - return Result; -} - -// Adds the just-emitted function to the symbol table. -void OProfileJITEventListener::NotifyFunctionEmitted( - const Function &F, void *FnStart, size_t FnSize, - const JITEvent_EmittedFunctionDetails &Details) { - assert(F.hasName() && FnStart != 0 && "Bad symbol to add"); - if (Wrapper.op_write_native_code(F.getName().data(), - reinterpret_cast<uint64_t>(FnStart), - FnStart, FnSize) == -1) { - DEBUG(dbgs() << "Failed to tell OProfile about native function " - << F.getName() << " at [" - << FnStart << "-" << ((char*)FnStart + FnSize) << "]\n"); - return; - } - - if (!Details.LineStarts.empty()) { - // Now we convert the line number information from the address/DebugLoc - // format in Details to the address/filename/lineno format that OProfile - // expects. Note that OProfile 0.9.4 has a bug that causes it to ignore - // line numbers for addresses above 4G. - FilenameCache Filenames; - std::vector<debug_line_info> LineInfo; - LineInfo.reserve(1 + Details.LineStarts.size()); - - DebugLoc FirstLoc = Details.LineStarts[0].Loc; - assert(!FirstLoc.isUnknown() - && "LineStarts should not contain unknown DebugLocs"); - MDNode *FirstLocScope = FirstLoc.getScope(F.getContext()); - DISubprogram FunctionDI = getDISubprogram(FirstLocScope); - if (FunctionDI.Verify()) { - // If we have debug info for the function itself, use that as the line - // number of the first several instructions. Otherwise, after filling - // LineInfo, we'll adjust the address of the first line number to point at - // the start of the function. - debug_line_info line_info; - line_info.vma = reinterpret_cast<uintptr_t>(FnStart); - line_info.lineno = FunctionDI.getLineNumber(); - line_info.filename = Filenames.getFilename(FirstLocScope); - LineInfo.push_back(line_info); - } - - for (std::vector<EmittedFunctionDetails::LineStart>::const_iterator - I = Details.LineStarts.begin(), E = Details.LineStarts.end(); - I != E; ++I) { - LineInfo.push_back(LineStartToOProfileFormat( - *Details.MF, Filenames, I->Address, I->Loc)); - } - - // In case the function didn't have line info of its own, adjust the first - // line info's address to include the start of the function. - LineInfo[0].vma = reinterpret_cast<uintptr_t>(FnStart); - - if (Wrapper.op_write_debug_line_info(FnStart, LineInfo.size(), - &*LineInfo.begin()) == -1) { - DEBUG(dbgs() - << "Failed to tell OProfile about line numbers for native function " - << F.getName() << " at [" - << FnStart << "-" << ((char*)FnStart + FnSize) << "]\n"); - } - } -} - // Removes the being-deleted function from the symbol table. void OProfileJITEventListener::NotifyFreeingMachineCode(void *FnStart) { assert(FnStart && "Invalid function pointer"); |