<div dir="ltr">Thanks!<div><br></div><div>-eric</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Sep 4, 2014 at 1:37 PM, Yaron Keren <span dir="ltr"><<a href="mailto:yaron.keren@gmail.com" target="_blank">yaron.keren@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: yrnkrn<br>
Date: Thu Sep 4 15:37:02 2014<br>
New Revision: 217193<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=217193&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=217193&view=rev</a><br>
Log:<br>
Post-JIT light cleanup of ExecutionEngine.h: edited comments about the JIT,<br>
removed runJITOnFunction and isLazyCompilationDisabled.<br>
<br>
Deleted CodeGen\MachineCodeInfo.h which was used by runJITOnFunction() only.<br>
<br>
<br>
<br>
Removed:<br>
llvm/trunk/include/llvm/CodeGen/MachineCodeInfo.h<br>
Modified:<br>
llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h<br>
<br>
Removed: llvm/trunk/include/llvm/CodeGen/MachineCodeInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineCodeInfo.h?rev=217192&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineCodeInfo.h?rev=217192&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/CodeGen/MachineCodeInfo.h (original)<br>
+++ llvm/trunk/include/llvm/CodeGen/MachineCodeInfo.h (removed)<br>
@@ -1,53 +0,0 @@<br>
-//===-- MachineCodeInfo.h - Class used to report JIT info -------*- C++ -*-===//<br>
-//<br>
-// The LLVM Compiler Infrastructure<br>
-//<br>
-// This file is distributed under the University of Illinois Open Source<br>
-// License. See LICENSE.TXT for details.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-//<br>
-// This file defines MachineCodeInfo, a class used by the JIT ExecutionEngine<br>
-// to report information about the generated machine code.<br>
-//<br>
-// See JIT::runJITOnFunction for usage.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-#ifndef LLVM_CODEGEN_MACHINECODEINFO_H<br>
-#define LLVM_CODEGEN_MACHINECODEINFO_H<br>
-<br>
-#include "llvm/Support/DataTypes.h"<br>
-<br>
-namespace llvm {<br>
-<br>
-class MachineCodeInfo {<br>
-private:<br>
- size_t Size; // Number of bytes in memory used<br>
- void *Address; // The address of the function in memory<br>
-<br>
-public:<br>
- MachineCodeInfo() : Size(0), Address(nullptr) {}<br>
-<br>
- void setSize(size_t s) {<br>
- Size = s;<br>
- }<br>
-<br>
- void setAddress(void *a) {<br>
- Address = a;<br>
- }<br>
-<br>
- size_t size() const {<br>
- return Size;<br>
- }<br>
-<br>
- void *address() const {<br>
- return Address;<br>
- }<br>
-<br>
-};<br>
-<br>
-}<br>
-<br>
-#endif<br>
-<br>
<br>
Modified: llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h?rev=217193&r1=217192&r2=217193&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h?rev=217193&r1=217192&r2=217193&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h (original)<br>
+++ llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h Thu Sep 4 15:37:02 2014<br>
@@ -152,9 +152,8 @@ protected:<br>
void *(*LazyFunctionCreator)(const std::string &);<br>
<br>
public:<br>
- /// lock - This lock protects the ExecutionEngine, MCJIT, JIT, JITResolver and<br>
- /// JITEmitter classes. It must be held while changing the internal state of<br>
- /// any of those classes.<br>
+ /// lock - This lock protects the ExecutionEngine and MCJIT classes. It must<br>
+ /// be held while changing the internal state of any of those classes.<br>
sys::Mutex lock;<br>
<br>
//===--------------------------------------------------------------------===//<br>
@@ -216,10 +215,6 @@ public:<br>
/// it prints a message to stderr and aborts.<br>
///<br>
/// This function is deprecated for the MCJIT execution engine.<br>
- ///<br>
- /// FIXME: the JIT and MCJIT interfaces should be disentangled or united<br>
- /// again, if possible.<br>
- ///<br>
virtual void *getPointerToNamedFunction(const std::string &Name,<br>
bool AbortOnFailure = true) = 0;<br>
<br>
@@ -232,7 +227,7 @@ public:<br>
"EE!");<br>
}<br>
<br>
- /// generateCodeForModule - Run code generationen for the specified module and<br>
+ /// generateCodeForModule - Run code generation for the specified module and<br>
/// load it into memory.<br>
///<br>
/// When this function has completed, all code and data for the specified<br>
@@ -246,7 +241,7 @@ public:<br>
/// locally can use the getFunctionAddress call, which will generate code<br>
/// and apply final preparations all in one step.<br>
///<br>
- /// This method has no effect for the legacy JIT engine or the interpeter.<br>
+ /// This method has no effect for the interpeter.<br>
virtual void generateCodeForModule(Module *M) {}<br>
<br>
/// finalizeObject - ensure the module is fully processed and is usable.<br>
@@ -255,8 +250,7 @@ public:<br>
/// object usable for execution. It should be called after sections within an<br>
/// object have been relocated using mapSectionAddress. When this method is<br>
/// called the MCJIT execution engine will reapply relocations for a loaded<br>
- /// object. This method has no effect for the legacy JIT engine or the<br>
- /// interpeter.<br>
+ /// object. This method has no effect for the interpeter.<br>
virtual void finalizeObject() {}<br>
<br>
/// runStaticConstructorsDestructors - This method is used to execute all of<br>
@@ -341,9 +335,9 @@ public:<br>
/// getGlobalValueAddress - Return the address of the specified global<br>
/// value. This may involve code generation.<br>
///<br>
- /// This function should not be called with the JIT or interpreter engines.<br>
+ /// This function should not be called with the interpreter engine.<br>
virtual uint64_t getGlobalValueAddress(const std::string &Name) {<br>
- // Default implementation for JIT and interpreter. MCJIT will override this.<br>
+ // Default implementation for the interpreter. MCJIT will override this.<br>
// JIT and interpreter clients should use getPointerToGlobal instead.<br>
return 0;<br>
}<br>
@@ -351,14 +345,11 @@ public:<br>
/// getFunctionAddress - Return the address of the specified function.<br>
/// This may involve code generation.<br>
virtual uint64_t getFunctionAddress(const std::string &Name) {<br>
- // Default implementation for JIT and interpreter. MCJIT will override this.<br>
- // JIT and interpreter clients should use getPointerToFunction instead.<br>
+ // Default implementation for the interpreter. MCJIT will override this.<br>
+ // Interpreter clients should use getPointerToFunction instead.<br>
return 0;<br>
}<br>
<br>
- // The JIT overrides a version that actually does this.<br>
- virtual void runJITOnFunction(Function *, MachineCodeInfo * = nullptr) { }<br>
-<br>
/// getGlobalValueAtAddress - Return the LLVM global value object that starts<br>
/// at the specified address.<br>
///<br>
@@ -391,7 +382,7 @@ public:<br>
virtual void UnregisterJITEventListener(JITEventListener *) {}<br>
<br>
/// Sets the pre-compiled object cache. The ownership of the ObjectCache is<br>
- /// not changed. Supported by MCJIT but not JIT.<br>
+ /// not changed. Supported by MCJIT but not the interpreter.<br>
virtual void setObjectCache(ObjectCache *) {<br>
llvm_unreachable("No support for an object cache");<br>
}<br>
@@ -433,11 +424,6 @@ public:<br>
bool isCompilingLazily() const {<br>
return CompilingLazily;<br>
}<br>
- // Deprecated in favor of isCompilingLazily (to reduce double-negatives).<br>
- // Remove this in LLVM 2.8.<br>
- bool isLazyCompilationDisabled() const {<br>
- return !CompilingLazily;<br>
- }<br>
<br>
/// DisableGVCompilation - If called, the JIT will abort if it's asked to<br>
/// allocate space and populate a GlobalVariable that is not internal to<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>