Skip to content

[SYCL][NFC] Remove unused host kernel member in CGExecKernel #18466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[SYCL][NFC] Remove unused host kernel member in CGExecKernel #18466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dde6a29
[SYCL][NFC] Remove unused host kernel member in CGExecKernel
steffenlarsen May 14, 2025
b28e840
Merge remote-tracking branch 'intel/sycl' into steffen/remove_host_ke…
steffenlarsen May 16, 2025
b22eabe
Merge remote-tracking branch 'intel/sycl' into steffen/remove_host_ke…
steffenlarsen May 19, 2025
3338e53
Merge remote-tracking branch 'intel/sycl' into steffen/remove_host_ke…
steffenlarsen May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions sycl/source/detail/cg.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ class CGExecKernel : public CG {
public:
/// Stores ND-range description.
NDRDescT MNDRDesc;
std::shared_ptr<HostKernelBase> MHostKernel;
std::shared_ptr<detail::kernel_impl> MSyclKernel;
std::shared_ptr<detail::kernel_bundle_impl> MKernelBundle;
std::vector<ArgDesc> MArgs;
Expand All @@ -268,7 +267,7 @@ class CGExecKernel : public CG {
bool MKernelUsesClusterLaunch = false;
size_t MKernelWorkGroupMemorySize = 0;

CGExecKernel(NDRDescT NDRDesc, std::shared_ptr<HostKernelBase> HKernel,
CGExecKernel(NDRDescT NDRDesc,
std::shared_ptr<detail::kernel_impl> SyclKernel,
std::shared_ptr<detail::kernel_bundle_impl> KernelBundle,
CG::StorageInitHelper CGData, std::vector<ArgDesc> Args,
Expand All @@ -280,8 +279,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)),
MKernelNameBasedCachePtr(KernelNameBasedCachePtr),
Expand Down
2 changes: 1 addition & 1 deletion sycl/source/handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,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(),
impl->MKernelNameBasedCachePtr, std::move(MStreamStorage),
Expand Down
15 changes: 7 additions & 8 deletions sycl/unittests/program_manager/arg_mask/EliminatedArgMask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,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(), impl->MKernelNameBasedCachePtr,
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(),
impl->MKernelNameBasedCachePtr, std::move(CGH->MStreamStorage),
std::move(impl->MAuxiliaryResources), impl->MCGType, {},
impl->MKernelIsCooperative, impl->MKernelUsesClusterLaunch,
impl->MKernelWorkGroupMemorySize, CGH->MCodeLoc));
break;
}
default:
Expand Down
9 changes: 3 additions & 6 deletions sycl/unittests/scheduler/SchedulerTestUtils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,6 @@ class MockHandler : public sycl::handler {
std::vector<std::shared_ptr<sycl::detail::stream_impl>> &getStreamStorage() {
return MStreamStorage;
}
std::unique_ptr<sycl::detail::HostKernelBase> &getHostKernel() {
return MHostKernel;
}
std::vector<std::vector<char>> &getArgsStorage() {
return impl->CGData.MArgsStorage;
}
Expand Down Expand Up @@ -299,9 +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(), impl->MKernelNameBasedCachePtr, getStreamStorage(),
getNDRDesc(), getKernel(), std::move(impl->MKernelBundle),
std::move(CGData), getArgs(), getKernelName(),
impl->MKernelNameBasedCachePtr, getStreamStorage(),
impl->MAuxiliaryResources, getType(), {}, impl->MKernelIsCooperative,
impl->MKernelUsesClusterLaunch, impl->MKernelWorkGroupMemorySize,
getCodeLoc()));
Expand Down
3 changes: 1 addition & 2 deletions sycl/unittests/scheduler/StreamInitDependencyOnHost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
Loading