Skip to content

Commit 5b1a33e

Browse files
committed
Address review comments
1 parent 097261f commit 5b1a33e

File tree

4 files changed

+31
-24
lines changed

4 files changed

+31
-24
lines changed

sycl/include/sycl/ext/oneapi/experimental/graph.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,13 @@ class __SYCL_EXPORT dynamic_parameter_base {
449449
public:
450450
dynamic_parameter_base(
451451
sycl::ext::oneapi::experimental::command_graph<graph_state::modifiable>
452-
Graph);
452+
Graph,
453+
const property_list &PropList);
453454

454455
dynamic_parameter_base(
455456
sycl::ext::oneapi::experimental::command_graph<graph_state::modifiable>
456457
Graph,
457-
size_t ParamSize, const void *Data);
458+
size_t ParamSize, const void *Data, const property_list &PropList);
458459

459460
protected:
460461
void updateValue(const void *NewValue, size_t Size);
@@ -518,9 +519,8 @@ class dynamic_local_accessor : public detail::dynamic_parameter_base {
518519
dynamic_local_accessor(command_graph<graph_state::modifiable> Graph,
519520
range<Dimensions> AllocationSize,
520521
const property_list &PropList = {})
521-
: detail::dynamic_parameter_base(Graph), AllocationSize(AllocationSize) {
522-
(void)PropList;
523-
}
522+
: detail::dynamic_parameter_base(Graph, PropList),
523+
AllocationSize(AllocationSize) {}
524524

525525
void update(range<Dimensions> NewAllocationSize) {
526526
detail::dynamic_parameter_base::updateLocalAccessor(

sycl/include/sycl/handler.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1850,21 +1850,21 @@ class __SYCL_EXPORT handler {
18501850

18511851
// set_arg for graph dynamic_parameters
18521852
template <typename T>
1853-
void set_arg(int argIndex,
1854-
ext::oneapi::experimental::dynamic_parameter<T> &dynamicParam) {
1855-
setArgHelper(argIndex, dynamicParam);
1853+
void set_arg(int ArgIndex,
1854+
ext::oneapi::experimental::dynamic_parameter<T> &DynamicParam) {
1855+
setArgHelper(ArgIndex, DynamicParam);
18561856
}
18571857

18581858
template <typename DataT, int Dims>
1859-
void set_arg(int argIndex,
1859+
void set_arg(int ArgIndex,
18601860
ext::oneapi::experimental::dynamic_local_accessor<DataT, Dims>
18611861
&DynamicLocalAccessor) {
1862-
setArgHelper(argIndex, DynamicLocalAccessor);
1862+
setArgHelper(ArgIndex, DynamicLocalAccessor);
18631863
}
18641864

18651865
// set_arg for the raw_kernel_arg extension type.
1866-
void set_arg(int argIndex, ext::oneapi::experimental::raw_kernel_arg &&Arg) {
1867-
setArgHelper(argIndex, std::move(Arg));
1866+
void set_arg(int ArgIndex, ext::oneapi::experimental::raw_kernel_arg &&Arg) {
1867+
setArgHelper(ArgIndex, std::move(Arg));
18681868
}
18691869

18701870
/// Sets arguments for OpenCL interoperability kernels.

sycl/source/detail/graph_impl.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,15 +1894,19 @@ void executable_command_graph::update(const std::vector<node> &Nodes) {
18941894
}
18951895

18961896
dynamic_parameter_base::dynamic_parameter_base(
1897-
command_graph<graph_state::modifiable> Graph, size_t ParamSize,
1898-
const void *Data)
1897+
command_graph<graph_state::modifiable> Graph, const property_list &PropList)
18991898
: impl(std::make_shared<dynamic_parameter_impl>(
1900-
sycl::detail::getSyclObjImpl(Graph), ParamSize, Data)) {}
1899+
sycl::detail::getSyclObjImpl(Graph))) {
1900+
checkGraphPropertiesAndThrow(PropList);
1901+
}
19011902

19021903
dynamic_parameter_base::dynamic_parameter_base(
1903-
command_graph<graph_state::modifiable> Graph)
1904+
command_graph<graph_state::modifiable> Graph, size_t ParamSize,
1905+
const void *Data, const property_list &PropList)
19041906
: impl(std::make_shared<dynamic_parameter_impl>(
1905-
sycl::detail::getSyclObjImpl(Graph))) {}
1907+
sycl::detail::getSyclObjImpl(Graph), ParamSize, Data)) {
1908+
checkGraphPropertiesAndThrow(PropList);
1909+
}
19061910

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

19211925
sycl::detail::LocalAccessorImplPtr
1922-
dynamic_parameter_base::getLocalAccessor(handler *Handler) {
1926+
dynamic_parameter_base::getLocalAccessor(handler *Handler) const {
19231927
return impl->getLocalAccessor(Handler);
19241928
}
19251929

@@ -1988,7 +1992,7 @@ void dynamic_parameter_impl::updateAccessor(
19881992
}
19891993

19901994
sycl::detail::LocalAccessorImplPtr
1991-
dynamic_parameter_impl::getLocalAccessor(handler *Handler) {
1995+
dynamic_parameter_impl::getLocalAccessor(handler *Handler) const {
19921996
auto HandlerImpl = sycl::detail::getSyclObjImpl(*Handler);
19931997
auto FindLocalAcc = MHandlerToLocalAccMap.find(HandlerImpl);
19941998

sycl/test/abi/sycl_symbols_linux.dump

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3072,13 +3072,12 @@ _ZN4sycl3_V13ext6oneapi12experimental6detail17build_from_sourceERNS0_13kernel_bu
30723072
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base11updateValueEPKNS3_14raw_kernel_argEm
30733073
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base11updateValueEPKvm
30743074
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base14updateAccessorEPKNS0_6detail16AccessorBaseHostE
3075-
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base16getLocalAccessorEPNS0_7handlerE
30763075
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base19updateLocalAccessorENS0_5rangeILi3EEE
30773076
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base21registerLocalAccessorEPNS0_6detail21LocalAccessorBaseHostEPNS0_7handlerE
3078-
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEE
3079-
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEEmPKv
3080-
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEE
3081-
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEEmPKv
3077+
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEERKNS0_13property_listE
3078+
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC1ENS3_13command_graphILNS3_11graph_stateE0EEEmPKvRKNS0_13property_listE
3079+
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEERKNS0_13property_listE
3080+
_ZN4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_baseC2ENS3_13command_graphILNS3_11graph_stateE0EEEmPKvRKNS0_13property_listE
30823081
_ZN4sycl3_V13ext6oneapi12experimental6detail24executable_command_graph12finalizeImplEv
30833082
_ZN4sycl3_V13ext6oneapi12experimental6detail24executable_command_graph6updateERKNS3_13command_graphILNS3_11graph_stateE0EEE
30843083
_ZN4sycl3_V13ext6oneapi12experimental6detail24executable_command_graph6updateERKNS3_4nodeE
@@ -3091,6 +3090,7 @@ _ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph13end_reco
30913090
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph15begin_recordingERKSt6vectorINS0_5queueESaIS7_EERKNS0_13property_listE
30923091
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph15begin_recordingERNS0_5queueERKNS0_13property_listE
30933092
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph24addGraphLeafDependenciesENS3_4nodeE
3093+
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph27checkNodePropertiesAndThrowERKNS0_13property_listE
30943094
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph7addImplERKSt6vectorINS3_4nodeESaIS7_EE
30953095
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph7addImplERNS3_21dynamic_command_groupERKSt6vectorINS3_4nodeESaIS9_EE
30963096
_ZN4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph7addImplESt8functionIFvRNS0_7handlerEEERKSt6vectorINS3_4nodeESaISC_EE
@@ -3252,6 +3252,7 @@ _ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEE
32523252
_ZN4sycl3_V16detail13select_deviceERKSt8functionIFiRKNS0_6deviceEEERKNS0_7contextE
32533253
_ZN4sycl3_V16detail14SubmissionInfo14SecondaryQueueEv
32543254
_ZN4sycl3_V16detail14SubmissionInfo17PostProcessorFuncEv
3255+
_ZN4sycl3_V16detail14SubmissionInfo9EventModeEv
32553256
_ZN4sycl3_V16detail14SubmissionInfoC1Ev
32563257
_ZN4sycl3_V16detail14SubmissionInfoC2Ev
32573258
_ZN4sycl3_V16detail14addCounterInitERNS0_7handlerERSt10shared_ptrINS1_10queue_implEERS4_IiE
@@ -3622,6 +3623,7 @@ _ZNK4sycl3_V13ext6oneapi12experimental21dynamic_command_group16get_active_indexE
36223623
_ZNK4sycl3_V13ext6oneapi12experimental4node14get_successorsEv
36233624
_ZNK4sycl3_V13ext6oneapi12experimental4node16get_predecessorsEv
36243625
_ZNK4sycl3_V13ext6oneapi12experimental4node8get_typeEv
3626+
_ZNK4sycl3_V13ext6oneapi12experimental6detail22dynamic_parameter_base16getLocalAccessorEPNS0_7handlerE
36253627
_ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph11print_graphENS0_6detail11string_viewEb
36263628
_ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph11print_graphENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb
36273629
_ZNK4sycl3_V13ext6oneapi12experimental6detail24modifiable_command_graph14get_root_nodesEv
@@ -3728,6 +3730,7 @@ _ZNK4sycl3_V16detail12buffer_plain22get_allocator_internalEv
37283730
_ZNK4sycl3_V16detail12buffer_plain7getSizeEv
37293731
_ZNK4sycl3_V16detail14SubmissionInfo14SecondaryQueueEv
37303732
_ZNK4sycl3_V16detail14SubmissionInfo17PostProcessorFuncEv
3733+
_ZNK4sycl3_V16detail14SubmissionInfo9EventModeEv
37313734
_ZNK4sycl3_V16detail16AccessorBaseHost11getElemSizeEv
37323735
_ZNK4sycl3_V16detail16AccessorBaseHost11getPropListEv
37333736
_ZNK4sycl3_V16detail16AccessorBaseHost13isPlaceholderEv

0 commit comments

Comments
 (0)