Skip to content

Add workspace to base argument #275

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

Merged
merged 1 commit into from
Jun 17, 2022
+31 −32
Merged

Add workspace to base argument #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion include/ck/tensor_operation/gpu/device/device_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ struct BaseArgument
BaseArgument& operator=(const BaseArgument&) = default;

virtual ~BaseArgument() {}

void* p_workspace_ = nullptr;
};

struct BaseInvoker
Expand Down Expand Up @@ -42,7 +44,11 @@ struct BaseOperator

virtual size_t GetWorkSpaceSize(const BaseArgument*) const { return 0; }

virtual void SetWorkSpacePointer(BaseArgument*, void*) const {}
virtual void SetWorkSpacePointer(BaseArgument* p_arg, void* p_workspace) const final
{
assert(p_arg);
p_arg->p_workspace_ = p_workspace;
}

virtual ~BaseOperator() {}
};
Expand Down
55 changes: 24 additions & 31 deletions include/ck/tensor_operation/gpu/device/device_grouped_gemm_xdl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ struct DeviceGroupedGemmXdl
{
grid_size_ = 0;

gemm_descs_args_workspace_ = nullptr;
p_workspace_ = nullptr;

group_count_ = ck::type_convert<ck::index_t>(gemm_shapes.size());

Expand Down Expand Up @@ -437,8 +437,6 @@ struct DeviceGroupedGemmXdl

std::vector<GemmDescKernelArg> gemm_desc_kernel_arg_;

void* gemm_descs_args_workspace_;

index_t grid_size_;
};

Expand Down Expand Up @@ -488,7 +486,7 @@ struct DeviceGroupedGemmXdl
}

hipGetErrorString(
hipMemcpy(arg.gemm_descs_args_workspace_,
hipMemcpy(arg.p_workspace_,
arg.gemm_desc_kernel_arg_.data(),
arg.gemm_desc_kernel_arg_.size() * sizeof(GemmDescKernelArg),
hipMemcpyHostToDevice));
Expand All @@ -507,17 +505,17 @@ struct DeviceGroupedGemmXdl
CElementwiseOperation,
true>;

ave_time = launch_and_time_kernel(
stream_config,
kernel,
dim3(arg.grid_size_),
dim3(BlockSize),
0,
cast_pointer_to_constant_address_space(arg.gemm_descs_args_workspace_),
arg.gemm_desc_kernel_arg_.size(),
arg.a_element_op_,
arg.b_element_op_,
arg.c_element_op_);
ave_time =
launch_and_time_kernel(stream_config,
kernel,
dim3(arg.grid_size_),
dim3(BlockSize),
0,
cast_pointer_to_constant_address_space(arg.p_workspace_),
arg.gemm_desc_kernel_arg_.size(),
arg.a_element_op_,
arg.b_element_op_,
arg.c_element_op_);
}
else
{
Expand All @@ -531,17 +529,17 @@ struct DeviceGroupedGemmXdl
CElementwiseOperation,
false>;

ave_time = launch_and_time_kernel(
stream_config,
kernel,
dim3(arg.grid_size_),
dim3(BlockSize),
0,
cast_pointer_to_constant_address_space(arg.gemm_descs_args_workspace_),
arg.gemm_desc_kernel_arg_.size(),
arg.a_element_op_,
arg.b_element_op_,
arg.c_element_op_);
ave_time =
launch_and_time_kernel(stream_config,
kernel,
dim3(arg.grid_size_),
dim3(BlockSize),
0,
cast_pointer_to_constant_address_space(arg.p_workspace_),
arg.gemm_desc_kernel_arg_.size(),
arg.a_element_op_,
arg.b_element_op_,
arg.c_element_op_);
}

return ave_time;
Expand Down Expand Up @@ -635,11 +633,6 @@ struct DeviceGroupedGemmXdl
{
return dynamic_cast<const Argument*>(p_arg)->group_count_ * sizeof(GemmDescKernelArg);
}

void SetWorkSpacePointer(BaseArgument* p_arg, void* workspace_ptr) const override
{
dynamic_cast<Argument*>(p_arg)->gemm_descs_args_workspace_ = workspace_ptr;
}
};

} // namespace device
Expand Down