[llvm] r254693 - [Orc] Rename JITCompileCallbackManagerBase to JITCompileCallbackManager.

NAKAMURA Takumi via llvm-commits llvm-commits at lists.llvm.org
Thu Dec 3 18:23:51 PST 2015


Could you update examples?

On Fri, Dec 4, 2015 at 11:18 AM Lang Hames via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: lhames
> Date: Thu Dec  3 20:15:39 2015
> New Revision: 254693
>
> URL: http://llvm.org/viewvc/llvm-project?rev=254693&view=rev
> Log:
> [Orc] Rename JITCompileCallbackManagerBase to JITCompileCallbackManager.
>
> This class is turning into a useful interface, rather than an
> implementation
> detail, so I'm dropping the 'Base' suffix.
>
> No functional change.
>
>
> Modified:
>     llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
>     llvm/trunk/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
>     llvm/trunk/lib/ExecutionEngine/Orc/IndirectionUtils.cpp
>     llvm/trunk/lib/ExecutionEngine/Orc/OrcCBindingsStack.cpp
>     llvm/trunk/lib/ExecutionEngine/Orc/OrcCBindingsStack.h
>     llvm/trunk/tools/lli/OrcLazyJIT.cpp
>     llvm/trunk/tools/lli/OrcLazyJIT.h
>     llvm/trunk/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp
>
> Modified:
> llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h?rev=254693&r1=254692&r2=254693&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
> (original)
> +++ llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h Thu
> Dec  3 20:15:39 2015
> @@ -38,7 +38,7 @@ namespace orc {
>  /// of the function body from the original module. The extracted body is
> then
>  /// compiled and executed.
>  template <typename BaseLayerT,
> -          typename CompileCallbackMgrT = JITCompileCallbackManagerBase,
> +          typename CompileCallbackMgrT = JITCompileCallbackManager,
>            typename IndirectStubsMgrT = IndirectStubsManagerBase>
>  class CompileOnDemandLayer {
>  private:
>
> Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h?rev=254693&r1=254692&r2=254693&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
> (original)
> +++ llvm/trunk/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h Thu
> Dec  3 20:15:39 2015
> @@ -27,8 +27,8 @@
>  namespace llvm {
>  namespace orc {
>
> -/// @brief Target-independent base class JITCompileCallbackManager.
> -class JITCompileCallbackManagerBase {
> +/// @brief Target-independent base class for compile callback management.
> +class JITCompileCallbackManager {
>  public:
>
>    typedef std::function<TargetAddress()> CompileFtor;
> @@ -50,13 +50,13 @@ public:
>      CompileFtor &Compile;
>    };
>
> -  /// @brief Construct a JITCompileCallbackManagerBase.
> +  /// @brief Construct a JITCompileCallbackManager.
>    /// @param ErrorHandlerAddress The address of an error handler in the
> target
>    ///                            process to be used if a compile callback
> fails.
> -  JITCompileCallbackManagerBase(TargetAddress ErrorHandlerAddress)
> +  JITCompileCallbackManager(TargetAddress ErrorHandlerAddress)
>      : ErrorHandlerAddress(ErrorHandlerAddress) {}
>
> -  virtual ~JITCompileCallbackManagerBase() {}
> +  virtual ~JITCompileCallbackManager() {}
>
>    /// @brief Execute the callback for the given trampoline id. Called by
> the JIT
>    ///        to compile functions on demand.
> @@ -116,16 +116,16 @@ private:
>    virtual void anchor();
>  };
>
> -/// @brief Manage compile callbacks.
> +/// @brief Manage compile callbacks for in-process JITs.
>  template <typename TargetT>
> -class JITCompileCallbackManager : public JITCompileCallbackManagerBase {
> +class LocalJITCompileCallbackManager : public JITCompileCallbackManager {
>  public:
>
> -  /// @brief Construct a JITCompileCallbackManager.
> +  /// @brief Construct a InProcessJITCompileCallbackManager.
>    /// @param ErrorHandlerAddress The address of an error handler in the
> target
>    ///                            process to be used if a compile callback
> fails.
> -  JITCompileCallbackManager(TargetAddress ErrorHandlerAddress)
> -    : JITCompileCallbackManagerBase(ErrorHandlerAddress) {
> +  LocalJITCompileCallbackManager(TargetAddress ErrorHandlerAddress)
> +    : JITCompileCallbackManager(ErrorHandlerAddress) {
>
>      /// Set up the resolver block.
>      std::error_code EC;
>
> Modified: llvm/trunk/lib/ExecutionEngine/Orc/IndirectionUtils.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/IndirectionUtils.cpp?rev=254693&r1=254692&r2=254693&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/ExecutionEngine/Orc/IndirectionUtils.cpp (original)
> +++ llvm/trunk/lib/ExecutionEngine/Orc/IndirectionUtils.cpp Thu Dec  3
> 20:15:39 2015
> @@ -19,7 +19,7 @@
>  namespace llvm {
>  namespace orc {
>
> -void JITCompileCallbackManagerBase::anchor() {}
> +void JITCompileCallbackManager::anchor() {}
>  void IndirectStubsManagerBase::anchor() {}
>
>  Constant* createIRTypedAddress(FunctionType &FT, TargetAddress Addr) {
>
> Modified: llvm/trunk/lib/ExecutionEngine/Orc/OrcCBindingsStack.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/OrcCBindingsStack.cpp?rev=254693&r1=254692&r2=254693&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/ExecutionEngine/Orc/OrcCBindingsStack.cpp (original)
> +++ llvm/trunk/lib/ExecutionEngine/Orc/OrcCBindingsStack.cpp Thu Dec  3
> 20:15:39 2015
> @@ -23,7 +23,7 @@ OrcCBindingsStack::createCompileCallback
>      default: return nullptr;
>
>      case Triple::x86_64: {
> -      typedef orc::JITCompileCallbackManager<orc::OrcX86_64> CCMgrT;
> +      typedef orc::LocalJITCompileCallbackManager<orc::OrcX86_64> CCMgrT;
>        return llvm::make_unique<CCMgrT>(0);
>      }
>    }
>
> Modified: llvm/trunk/lib/ExecutionEngine/Orc/OrcCBindingsStack.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/OrcCBindingsStack.h?rev=254693&r1=254692&r2=254693&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/ExecutionEngine/Orc/OrcCBindingsStack.h (original)
> +++ llvm/trunk/lib/ExecutionEngine/Orc/OrcCBindingsStack.h Thu Dec  3
> 20:15:39 2015
> @@ -29,7 +29,7 @@ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Targe
>  class OrcCBindingsStack {
>  public:
>
> -  typedef orc::JITCompileCallbackManagerBase CompileCallbackMgr;
> +  typedef orc::JITCompileCallbackManager CompileCallbackMgr;
>    typedef orc::ObjectLinkingLayer<> ObjLayerT;
>    typedef orc::IRCompileLayer<ObjLayerT> CompileLayerT;
>    typedef orc::CompileOnDemandLayer<CompileLayerT, CompileCallbackMgr>
> CODLayerT;
>
> Modified: llvm/trunk/tools/lli/OrcLazyJIT.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/OrcLazyJIT.cpp?rev=254693&r1=254692&r2=254693&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/lli/OrcLazyJIT.cpp (original)
> +++ llvm/trunk/tools/lli/OrcLazyJIT.cpp Thu Dec  3 20:15:39 2015
> @@ -52,7 +52,7 @@ OrcLazyJIT::createCompileCallbackMgr(Tri
>      default: return nullptr;
>
>      case Triple::x86_64: {
> -      typedef orc::JITCompileCallbackManager<orc::OrcX86_64> CCMgrT;
> +      typedef orc::LocalJITCompileCallbackManager<orc::OrcX86_64> CCMgrT;
>        return llvm::make_unique<CCMgrT>(0);
>      }
>    }
>
> Modified: llvm/trunk/tools/lli/OrcLazyJIT.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/OrcLazyJIT.h?rev=254693&r1=254692&r2=254693&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/lli/OrcLazyJIT.h (original)
> +++ llvm/trunk/tools/lli/OrcLazyJIT.h Thu Dec  3 20:15:39 2015
> @@ -29,7 +29,7 @@ namespace llvm {
>  class OrcLazyJIT {
>  public:
>
> -  typedef orc::JITCompileCallbackManagerBase CompileCallbackMgr;
> +  typedef orc::JITCompileCallbackManager CompileCallbackMgr;
>    typedef orc::ObjectLinkingLayer<> ObjLayerT;
>    typedef orc::IRCompileLayer<ObjLayerT> CompileLayerT;
>    typedef std::function<std::unique_ptr<Module>(std::unique_ptr<Module>)>
>
> Modified:
> llvm/trunk/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp?rev=254693&r1=254692&r2=254693&view=diff
>
> ==============================================================================
> --- llvm/trunk/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp
> (original)
> +++ llvm/trunk/unittests/ExecutionEngine/Orc/CompileOnDemandLayerTest.cpp
> Thu Dec  3 20:15:39 2015
> @@ -16,10 +16,10 @@ using namespace llvm::orc;
>
>  namespace {
>
> -class DummyCallbackManager : public orc::JITCompileCallbackManagerBase {
> +class DummyCallbackManager : public orc::JITCompileCallbackManager {
>  public:
>    DummyCallbackManager()
> -      : JITCompileCallbackManagerBase(0), NextStubAddress(0),
> +      : JITCompileCallbackManager(0), NextStubAddress(0),
>          UniversalCompile([]() { return 0; }) {
>    }
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151204/1b8b87c1/attachment.html>


More information about the llvm-commits mailing list