From dca67ad8145d0bef9216e18ae5f3f23c00ffa20b Mon Sep 17 00:00:00 2001 From: Artem Gindinson Date: Mon, 23 Mar 2020 10:12:59 +0300 Subject: [PATCH] [SYCL][NFC] Make the RT::PiPlugin object private Signed-off-by: Artem Gindinson --- sycl/source/detail/plugin.hpp | 6 +++--- sycl/source/detail/program_manager/program_manager.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sycl/source/detail/plugin.hpp b/sycl/source/detail/plugin.hpp index dd67409eb3480..14ddf8f9560e2 100644 --- a/sycl/source/detail/plugin.hpp +++ b/sycl/source/detail/plugin.hpp @@ -29,6 +29,8 @@ class plugin { ~plugin() = default; + const RT::PiPlugin &getPiPlugin() const { return MPlugin; } + /// Checks return value from PI calls. /// /// \throw Exception if pi_result is not a PI_SUCCESS. @@ -71,11 +73,9 @@ class plugin { RT::PiResult Err = call_nocheck(Args...); checkPiResult(Err); } - // TODO: Make this private. Currently used in program_manager to create a - // pointer to PiProgram. - RT::PiPlugin MPlugin; private: + RT::PiPlugin MPlugin; bool MPiEnableTrace; }; // class plugin diff --git a/sycl/source/detail/program_manager/program_manager.cpp b/sycl/source/detail/program_manager/program_manager.cpp index 0d95d886b5061..32e21d5365e1c 100644 --- a/sycl/source/detail/program_manager/program_manager.cpp +++ b/sycl/source/detail/program_manager/program_manager.cpp @@ -367,8 +367,8 @@ ProgramManager::getBuiltPIProgram(OSModuleHandle M, const context &Context, ContextImplPtr ContextImpl = getSyclObjImpl(Context); const detail::plugin &Plugin = ContextImpl->getPlugin(); RT::PiProgram Prg = createPIProgram(Img, Context); - ProgramPtr ProgramManaged(Prg, - Plugin.MPlugin.PiFunctionTable.piProgramRelease); + ProgramPtr ProgramManaged( + Prg, Plugin.getPiPlugin().PiFunctionTable.piProgramRelease); // Link a fallback implementation of device libraries if they are not // supported by a device compiler.