diff --git a/sycl/source/detail/cg.hpp b/sycl/source/detail/cg.hpp index 8d3a5e56ac71a..a4597453071a5 100644 --- a/sycl/source/detail/cg.hpp +++ b/sycl/source/detail/cg.hpp @@ -251,7 +251,6 @@ class CGExecKernel : public CG { public: /// Stores ND-range description. NDRDescT MNDRDesc; - std::shared_ptr MHostKernel; std::shared_ptr MSyclKernel; std::shared_ptr MKernelBundle; std::vector MArgs; @@ -266,7 +265,7 @@ class CGExecKernel : public CG { bool MKernelUsesClusterLaunch = false; size_t MKernelWorkGroupMemorySize = 0; - CGExecKernel(NDRDescT NDRDesc, std::shared_ptr HKernel, + CGExecKernel(NDRDescT NDRDesc, std::shared_ptr SyclKernel, std::shared_ptr KernelBundle, CG::StorageInitHelper CGData, std::vector Args, @@ -277,8 +276,7 @@ class CGExecKernel : public CG { bool KernelIsCooperative, bool MKernelUsesClusterLaunch, size_t KernelWorkGroupMemorySize, detail::code_location loc = {}) : CG(Type, std::move(CGData), std::move(loc)), - MNDRDesc(std::move(NDRDesc)), MHostKernel(std::move(HKernel)), - MSyclKernel(std::move(SyclKernel)), + MNDRDesc(std::move(NDRDesc)), MSyclKernel(std::move(SyclKernel)), MKernelBundle(std::move(KernelBundle)), MArgs(std::move(Args)), MKernelName(std::move(KernelName)), MStreams(std::move(Streams)), MAuxiliaryResources(std::move(AuxiliaryResources)), diff --git a/sycl/source/detail/jit_compiler.cpp b/sycl/source/detail/jit_compiler.cpp index 3ccd0b6a1c067..d14e3816438e0 100644 --- a/sycl/source/detail/jit_compiler.cpp +++ b/sycl/source/detail/jit_compiler.cpp @@ -1049,9 +1049,9 @@ jit_compiler::fuseKernels(QueueImplPtr Queue, 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 */, + NDRDesc, nullptr, std::move(KernelBundleImplPtr), std::move(CGData), + std::move(FusedArgs), FusedOrCachedKernelName, {}, {}, CGType::Kernel, + KernelCacheConfig, false /* KernelIsCooperative */, false /* KernelUsesClusterLaunch*/, 0 /* KernelWorkGroupMemorySize */)); return FusedCG; } diff --git a/sycl/source/handler.cpp b/sycl/source/handler.cpp index 9eee74d397cbe..226bbc10d98c5 100644 --- a/sycl/source/handler.cpp +++ b/sycl/source/handler.cpp @@ -561,7 +561,7 @@ event handler::finalize() { // running of this method by reductions implementation. This allows for // assert feature to check if kernel uses assertions CommandGroup.reset(new detail::CGExecKernel( - std::move(impl->MNDRDesc), std::move(MHostKernel), std::move(MKernel), + std::move(impl->MNDRDesc), std::move(MKernel), std::move(impl->MKernelBundle), std::move(impl->CGData), std::move(impl->MArgs), MKernelName.c_str(), std::move(MStreamStorage), std::move(impl->MAuxiliaryResources), getType(), diff --git a/sycl/unittests/program_manager/arg_mask/EliminatedArgMask.cpp b/sycl/unittests/program_manager/arg_mask/EliminatedArgMask.cpp index 80c7ddf07c1b2..7f33e39043f93 100644 --- a/sycl/unittests/program_manager/arg_mask/EliminatedArgMask.cpp +++ b/sycl/unittests/program_manager/arg_mask/EliminatedArgMask.cpp @@ -126,13 +126,13 @@ class MockHandler : public sycl::handler { switch (getType()) { case sycl::detail::CGType::Kernel: { CommandGroup.reset(new sycl::detail::CGExecKernel( - std::move(impl->MNDRDesc), std::move(CGH->MHostKernel), - std::move(CGH->MKernel), std::move(impl->MKernelBundle), - std::move(impl->CGData), std::move(impl->MArgs), - CGH->MKernelName.c_str(), std::move(CGH->MStreamStorage), - std::move(impl->MAuxiliaryResources), impl->MCGType, {}, - impl->MKernelIsCooperative, impl->MKernelUsesClusterLaunch, - impl->MKernelWorkGroupMemorySize, CGH->MCodeLoc)); + std::move(impl->MNDRDesc), std::move(CGH->MKernel), + std::move(impl->MKernelBundle), std::move(impl->CGData), + std::move(impl->MArgs), CGH->MKernelName.c_str(), + std::move(CGH->MStreamStorage), std::move(impl->MAuxiliaryResources), + impl->MCGType, {}, impl->MKernelIsCooperative, + impl->MKernelUsesClusterLaunch, impl->MKernelWorkGroupMemorySize, + CGH->MCodeLoc)); break; } default: diff --git a/sycl/unittests/scheduler/SchedulerTestUtils.hpp b/sycl/unittests/scheduler/SchedulerTestUtils.hpp index ffc0567ba7daa..e115d41ebabde 100644 --- a/sycl/unittests/scheduler/SchedulerTestUtils.hpp +++ b/sycl/unittests/scheduler/SchedulerTestUtils.hpp @@ -298,10 +298,9 @@ class MockHandlerCustomFinalize : public MockHandler { switch (getType()) { case sycl::detail::CGType::Kernel: { CommandGroup.reset(new sycl::detail::CGExecKernel( - getNDRDesc(), std::move(getHostKernel()), getKernel(), - std::move(impl->MKernelBundle), std::move(CGData), getArgs(), - getKernelName(), getStreamStorage(), impl->MAuxiliaryResources, - getType(), {}, impl->MKernelIsCooperative, + getNDRDesc(), getKernel(), std::move(impl->MKernelBundle), + std::move(CGData), getArgs(), getKernelName(), getStreamStorage(), + impl->MAuxiliaryResources, getType(), {}, impl->MKernelIsCooperative, impl->MKernelUsesClusterLaunch, impl->MKernelWorkGroupMemorySize, getCodeLoc())); break; diff --git a/sycl/unittests/scheduler/StreamInitDependencyOnHost.cpp b/sycl/unittests/scheduler/StreamInitDependencyOnHost.cpp index 132baecad5448..3f51698e0fcdf 100644 --- a/sycl/unittests/scheduler/StreamInitDependencyOnHost.cpp +++ b/sycl/unittests/scheduler/StreamInitDependencyOnHost.cpp @@ -29,8 +29,7 @@ class MockHandlerStreamInit : public MockHandler { switch (getType()) { case detail::CGType::Kernel: { CommandGroup.reset(new detail::CGExecKernel( - getNDRDesc(), std::move(getHostKernel()), getKernel(), - std::move(impl->MKernelBundle), + getNDRDesc(), getKernel(), std::move(impl->MKernelBundle), detail::CG::StorageInitHelper(getArgsStorage(), getAccStorage(), getSharedPtrStorage(), getRequirements(), getEvents()),