Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
fabiomestre committed Jan 14, 2025
1 parent 075eb00 commit 28d0d3a
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 24 deletions.
10 changes: 5 additions & 5 deletions sycl/include/sycl/ext/oneapi/experimental/graph.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -449,12 +449,13 @@ class __SYCL_EXPORT dynamic_parameter_base {
public:
dynamic_parameter_base(
sycl::ext::oneapi::experimental::command_graph<graph_state::modifiable>
Graph);
Graph,
const property_list &PropList);

dynamic_parameter_base(
sycl::ext::oneapi::experimental::command_graph<graph_state::modifiable>
Graph,
size_t ParamSize, const void *Data);
size_t ParamSize, const void *Data, const property_list &PropList);

protected:
void updateValue(const void *NewValue, size_t Size);
Expand Down Expand Up @@ -518,9 +519,8 @@ class dynamic_local_accessor : public detail::dynamic_parameter_base {
dynamic_local_accessor(command_graph<graph_state::modifiable> Graph,
range<Dimensions> AllocationSize,
const property_list &PropList = {})
: detail::dynamic_parameter_base(Graph), AllocationSize(AllocationSize) {
(void)PropList;
}
: detail::dynamic_parameter_base(Graph, PropList),
AllocationSize(AllocationSize) {}

void update(range<Dimensions> NewAllocationSize) {
detail::dynamic_parameter_base::updateLocalAccessor(
Expand Down
14 changes: 7 additions & 7 deletions sycl/include/sycl/handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1850,21 +1850,21 @@ class __SYCL_EXPORT handler {

// set_arg for graph dynamic_parameters
template <typename T>
void set_arg(int argIndex,
ext::oneapi::experimental::dynamic_parameter<T> &dynamicParam) {
setArgHelper(argIndex, dynamicParam);
void set_arg(int ArgIndex,
ext::oneapi::experimental::dynamic_parameter<T> &DynamicParam) {
setArgHelper(ArgIndex, DynamicParam);
}

template <typename DataT, int Dims>
void set_arg(int argIndex,
void set_arg(int ArgIndex,
ext::oneapi::experimental::dynamic_local_accessor<DataT, Dims>
&DynamicLocalAccessor) {
setArgHelper(argIndex, DynamicLocalAccessor);
setArgHelper(ArgIndex, DynamicLocalAccessor);
}

// set_arg for the raw_kernel_arg extension type.
void set_arg(int argIndex, ext::oneapi::experimental::raw_kernel_arg &&Arg) {
setArgHelper(argIndex, std::move(Arg));
void set_arg(int ArgIndex, ext::oneapi::experimental::raw_kernel_arg &&Arg) {
setArgHelper(ArgIndex, std::move(Arg));
}

/// Sets arguments for OpenCL interoperability kernels.
Expand Down
18 changes: 11 additions & 7 deletions sycl/source/detail/graph_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1894,15 +1894,19 @@ void executable_command_graph::update(const std::vector<node> &Nodes) {
}

dynamic_parameter_base::dynamic_parameter_base(
command_graph<graph_state::modifiable> Graph, size_t ParamSize,
const void *Data)
command_graph<graph_state::modifiable> Graph, const property_list &PropList)
: impl(std::make_shared<dynamic_parameter_impl>(
sycl::detail::getSyclObjImpl(Graph), ParamSize, Data)) {}
sycl::detail::getSyclObjImpl(Graph))) {
checkGraphPropertiesAndThrow(PropList);
}

dynamic_parameter_base::dynamic_parameter_base(
command_graph<graph_state::modifiable> Graph)
command_graph<graph_state::modifiable> Graph, size_t ParamSize,
const void *Data, const property_list &PropList)
: impl(std::make_shared<dynamic_parameter_impl>(
sycl::detail::getSyclObjImpl(Graph))) {}
sycl::detail::getSyclObjImpl(Graph), ParamSize, Data)) {
checkGraphPropertiesAndThrow(PropList);
}

void dynamic_parameter_base::updateValue(const void *NewValue, size_t Size) {
impl->updateValue(NewValue, Size);
Expand All @@ -1919,7 +1923,7 @@ void dynamic_parameter_base::updateAccessor(
}

sycl::detail::LocalAccessorImplPtr
dynamic_parameter_base::getLocalAccessor(handler *Handler) {
dynamic_parameter_base::getLocalAccessor(handler *Handler) const {
return impl->getLocalAccessor(Handler);
}

Expand Down Expand Up @@ -1988,7 +1992,7 @@ void dynamic_parameter_impl::updateAccessor(
}

sycl::detail::LocalAccessorImplPtr
dynamic_parameter_impl::getLocalAccessor(handler *Handler) {
dynamic_parameter_impl::getLocalAccessor(handler *Handler) const {
auto HandlerImpl = sycl::detail::getSyclObjImpl(*Handler);
auto FindLocalAcc = MHandlerToLocalAccMap.find(HandlerImpl);

Expand Down
13 changes: 8 additions & 5 deletions sycl/test/abi/sycl_symbols_linux.dump
Original file line number Diff line number Diff line change
Expand Up @@ -3072,13 +3072,12 @@ _ZN4sycl3_V13ext6oneapi12experimental6detail17build_from_sourceERNS0_13kernel_bu
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base11updateValueEPKNS3_14raw_kernel_argEm
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base11updateValueEPKvm
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base14updateAccessorEPKNS0_6detail16AccessorBaseHostE
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base16getLocalAccessorEPNS0_7handlerE
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base19updateLocalAccessorENS0_5rangeILi3EEE
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base21registerLocalAccessorEPNS0_6detail21LocalAccessorBaseHostEPNS0_7handlerE
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEE
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEEmPKv
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEE
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEEmPKv
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEERKNS0_13property_listE
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEEmPKvRKNS0_13property_listE
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEERKNS0_13property_listE
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEEmPKvRKNS0_13property_listE
_ZN4sycl3_V13ext6oneapi12experimental6detail24executable_command_graph12finalizeImplEv
_ZN4sycl3_V13ext6oneapi12experimental6detail24executable_command_graph6updateERKNS3_13command_graphILNS3_11graph_stateE0EEE
_ZN4sycl3_V13ext6oneapi12experimental6detail24executable_command_graph6updateERKNS3_4nodeE
Expand All @@ -3091,6 +3090,7 @@ _ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph13end_reco
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph15begin_recordingERKSt6vectorINS0_5queueESaIS7_EERKNS0_13property_listE
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph15begin_recordingERNS0_5queueERKNS0_13property_listE
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph24addGraphLeafDependenciesENS3_4nodeE
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph27checkNodePropertiesAndThrowERKNS0_13property_listE
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph7addImplERKSt6vectorINS3_4nodeESaIS7_EE
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph7addImplERNS3_21dynamic_command_groupERKSt6vectorINS3_4nodeESaIS9_EE
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph7addImplESt8functionIFvRNS0_7handlerEEERKSt6vectorINS3_4nodeESaISC_EE
Expand Down Expand Up @@ -3252,6 +3252,7 @@ _ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEE
_ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEERKNS0_7contextE
_ZN4sycl3_V16detail14SubmissionInfo14SecondaryQueueEv
_ZN4sycl3_V16detail14SubmissionInfo17PostProcessorFuncEv
_ZN4sycl3_V16detail14SubmissionInfo9EventModeEv
_ZN4sycl3_V16detail14SubmissionInfoC1Ev
_ZN4sycl3_V16detail14SubmissionInfoC2Ev
_ZN4sycl3_V16detail14addCounterInitERNS0_7handlerERSt10shared_ptrINS1_10queue_implEERS4_IiE
Expand Down Expand Up @@ -3622,6 +3623,7 @@ _ZNK4sycl3_V13ext6oneapi12experimental21dynamic_command_group16get_active_indexE
_ZNK4sycl3_V13ext6oneapi12experimental4node14get_successorsEv
_ZNK4sycl3_V13ext6oneapi12experimental4node16get_predecessorsEv
_ZNK4sycl3_V13ext6oneapi12experimental4node8get_typeEv
_ZNK4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base16getLocalAccessorEPNS0_7handlerE
_ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph11print_graphENS0_6detail11string_viewEb
_ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph11print_graphENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb
_ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph14get_root_nodesEv
Expand Down Expand Up @@ -3728,6 +3730,7 @@ _ZNK4sycl3_V16detail12buffer_plain22get_allocator_internalEv
_ZNK4sycl3_V16detail12buffer_plain7getSizeEv
_ZNK4sycl3_V16detail14SubmissionInfo14SecondaryQueueEv
_ZNK4sycl3_V16detail14SubmissionInfo17PostProcessorFuncEv
_ZNK4sycl3_V16detail14SubmissionInfo9EventModeEv
_ZNK4sycl3_V16detail16AccessorBaseHost11getElemSizeEv
_ZNK4sycl3_V16detail16AccessorBaseHost11getPropListEv
_ZNK4sycl3_V16detail16AccessorBaseHost13isPlaceholderEv
Expand Down

0 comments on commit 28d0d3a

Please sign in to comment.