diff --git a/sycl/source/detail/config.hpp b/sycl/source/detail/config.hpp index 3e0a591e27d14..df50ba01adbcc 100644 --- a/sycl/source/detail/config.hpp +++ b/sycl/source/detail/config.hpp @@ -647,7 +647,7 @@ template <> class SYCLConfig { public: static std::string get() { - const std::string DefaultValue{""}; + std::string DefaultValue{""}; const char *ValStr = getCachedValue(); @@ -675,7 +675,7 @@ template <> class SYCLConfig { public: static std::string get() { - const std::string DefaultValue{""}; + std::string DefaultValue{""}; const char *ValStr = getCachedValue(); diff --git a/sycl/source/detail/jit_compiler.cpp b/sycl/source/detail/jit_compiler.cpp index 3ccd0b6a1c067..e24e49cf68463 100644 --- a/sycl/source/detail/jit_compiler.cpp +++ b/sycl/source/detail/jit_compiler.cpp @@ -137,7 +137,7 @@ translateBinaryImageFormat(ur::DeviceBinaryType Type) { } } -::jit_compiler::BinaryFormat getTargetFormat(QueueImplPtr &Queue) { +::jit_compiler::BinaryFormat getTargetFormat(const QueueImplPtr &Queue) { auto Backend = Queue->getDeviceImplPtr()->getBackend(); switch (Backend) { case backend::ext_oneapi_level_zero: @@ -154,7 +154,7 @@ ::jit_compiler::BinaryFormat getTargetFormat(QueueImplPtr &Queue) { } } -::jit_compiler::TargetInfo getTargetInfo(QueueImplPtr &Queue) { +::jit_compiler::TargetInfo getTargetInfo(const QueueImplPtr &Queue) { ::jit_compiler::BinaryFormat Format = getTargetFormat(Queue); return ::jit_compiler::TargetInfo::get( Format, static_cast<::jit_compiler::DeviceArchitecture>( @@ -659,7 +659,7 @@ updatePromotedArgs(const ::jit_compiler::SYCLKernelInfo &FusedKernelInfo, } ur_kernel_handle_t jit_compiler::materializeSpecConstants( - QueueImplPtr Queue, const RTDeviceBinaryImage *BinImage, + const QueueImplPtr &Queue, const RTDeviceBinaryImage *BinImage, const std::string &KernelName, const std::vector &SpecConstBlob) { #ifndef _WIN32 @@ -1042,16 +1042,13 @@ jit_compiler::fuseKernels(QueueImplPtr Queue, FusedOrCachedKernelName); std::shared_ptr KernelBundleImplPtr; - if (TargetFormat == ::jit_compiler::BinaryFormat::SPIRV) { - detail::getSyclObjImpl(get_kernel_bundle( - Queue->get_context(), {Queue->get_device()}, {FusedKernelId})); - } std::unique_ptr FusedCG; FusedCG.reset(new detail::CGExecKernel( NDRDesc, nullptr, nullptr, std::move(KernelBundleImplPtr), - std::move(CGData), std::move(FusedArgs), FusedOrCachedKernelName, {}, {}, - CGType::Kernel, KernelCacheConfig, false /* KernelIsCooperative */, + std::move(CGData), std::move(FusedArgs), + std::move(FusedOrCachedKernelName), {}, {}, CGType::Kernel, + KernelCacheConfig, false /* KernelIsCooperative */, false /* KernelUsesClusterLaunch*/, 0 /* KernelWorkGroupMemorySize */)); return FusedCG; } diff --git a/sycl/source/detail/jit_compiler.hpp b/sycl/source/detail/jit_compiler.hpp index 1b85afc1d4cda..ba5911820bc78 100644 --- a/sycl/source/detail/jit_compiler.hpp +++ b/sycl/source/detail/jit_compiler.hpp @@ -44,7 +44,7 @@ class jit_compiler { fuseKernels(QueueImplPtr Queue, std::vector &InputKernels, const property_list &); ur_kernel_handle_t - materializeSpecConstants(QueueImplPtr Queue, + materializeSpecConstants(const QueueImplPtr &Queue, const RTDeviceBinaryImage *BinImage, const std::string &KernelName, const std::vector &SpecConstBlob); diff --git a/sycl/source/detail/scheduler/scheduler.cpp b/sycl/source/detail/scheduler/scheduler.cpp index 856cbdc3cca14..c36ff2acbb21a 100644 --- a/sycl/source/detail/scheduler/scheduler.cpp +++ b/sycl/source/detail/scheduler/scheduler.cpp @@ -587,7 +587,7 @@ void Scheduler::cleanupAuxiliaryResources(BlockingT Blocking) { } ur_kernel_handle_t Scheduler::completeSpecConstMaterialization( - [[maybe_unused]] QueueImplPtr Queue, + [[maybe_unused]] const QueueImplPtr &Queue, [[maybe_unused]] const RTDeviceBinaryImage *BinImage, [[maybe_unused]] const std::string &KernelName, [[maybe_unused]] std::vector &SpecConstBlob) { diff --git a/sycl/source/detail/scheduler/scheduler.hpp b/sycl/source/detail/scheduler/scheduler.hpp index f3ce947b32e5d..43c70ea55e2fd 100644 --- a/sycl/source/detail/scheduler/scheduler.hpp +++ b/sycl/source/detail/scheduler/scheduler.hpp @@ -453,7 +453,7 @@ class Scheduler { void deferMemObjRelease(const std::shared_ptr &MemObj); ur_kernel_handle_t completeSpecConstMaterialization( - QueueImplPtr Queue, const RTDeviceBinaryImage *BinImage, + const QueueImplPtr &Queue, const RTDeviceBinaryImage *BinImage, const std::string &KernelName, std::vector &SpecConstBlob); void releaseResources(BlockingT Blocking = BlockingT::BLOCKING);