diff --git a/sycl/source/detail/cg.hpp b/sycl/source/detail/cg.hpp index 871f9baa0bcbd..7e4c39534f73a 100644 --- a/sycl/source/detail/cg.hpp +++ b/sycl/source/detail/cg.hpp @@ -252,7 +252,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; @@ -267,7 +266,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, @@ -278,8 +277,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/handler.cpp b/sycl/source/handler.cpp index 1eb05ee858568..ffd2846576e54 100644 --- a/sycl/source/handler.cpp +++ b/sycl/source/handler.cpp @@ -611,7 +611,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.data(), 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 55cc4f790353b..99a1bc3deeffe 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.data(), 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.data(), + 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 9d7b084cc38d3..52037e2920aa3 100644 --- a/sycl/unittests/scheduler/SchedulerTestUtils.hpp +++ b/sycl/unittests/scheduler/SchedulerTestUtils.hpp @@ -234,9 +234,6 @@ class MockHandler : public sycl::handler { std::vector> &getStreamStorage() { return MStreamStorage; } - std::unique_ptr &getHostKernel() { - return MHostKernel; - } std::vector> &getArgsStorage() { return impl->CGData.MArgsStorage; } @@ -299,10 +296,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()),