Skip to content

Commit 55bac6c

Browse files
committed
Rename property shortcut
Signed-off-by: Lukas Sommer <lukas.sommer@codeplay.com>
1 parent 4932e7f commit 55bac6c

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

sycl/doc/extensions/proposed/sycl_ext_oneapi_graph_fusion.asciidoc

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ namespace sycl::ext::oneapi::experimental::property{
208208
template<sycl::memory_scope Scope>
209209
struct access_scope {};
210210

211-
inline constexpr auto access_scope_local =
211+
inline constexpr auto access_scope_work_group =
212212
access_scope<memory_scope_work_group>;
213213

214-
inline constexpr auto access_scope_private =
214+
inline constexpr auto access_scope_work_item =
215215
access_scope<memory_scope_work_item>;
216216

217217
} // namespace sycl::ext::oneapi::experimental::property
@@ -227,11 +227,11 @@ the property is specified on an accessor) or in any kernel in the graph (in case
227227
the property is specified on a buffer or an USM pointer).
228228

229229
More concretely, the two shortcuts express the following semantics:
230-
* `access_scope_local`: Applying this specialization asserts that each element
231-
in the buffer or allocated device memory is accessed by no more than one
230+
* `access_scope_work_group`: Applying this specialization asserts that each
231+
element in the buffer or allocated device memory is accessed by no more than one
232232
work-group.
233-
* `access_scope_private`: Applying this specialization asserts that each element
234-
in the buffer or allocated device memory is accessed by no more than one
233+
* `access_scope_work_item`: Applying this specialization asserts that each
234+
element in the buffer or allocated device memory is accessed by no more than one
235235
work-item.
236236

237237
Implementations may treat specializations of the access scope property as a
@@ -478,31 +478,31 @@ properties must be combined as follows:
478478
|None
479479
|None
480480

481-
|Local
482-
|Local
481+
|Work Group
482+
|Work Group
483483

484-
|Private
485-
|Private
484+
|Work Item
485+
|Work Item
486486

487-
.3+.^|Local
487+
.3+.^|Work Group
488488
|None
489-
|Local
489+
|Work Group
490490

491-
|Local
492-
|Local
491+
|Work Group
492+
|Work Group
493493

494-
|Private
494+
|Work Item
495495
|*Error*
496496

497-
.3+.^|Private
497+
.3+.^|Work Item
498498
|None
499-
|Private
499+
|Work Item
500500

501-
|Local
501+
|Work Group
502502
|*Error*
503503

504-
|Private
505-
|Private
504+
|Work Item
505+
|Work Item
506506
|===
507507

508508
In case different internalization targets are used for accessors to the same
@@ -516,16 +516,16 @@ buffer, the following (commutative and associative) rules are followed:
516516
|_Any_
517517
|None
518518

519-
.2+.^|Local
520-
|Local
521-
|Local
519+
.2+.^|Work Group
520+
|Work Group
521+
|Work Group
522522

523-
|Private
523+
|Work Item
524524
|None
525525

526-
|Private
527-
|Private
528-
|Private
526+
|Work Item
527+
|Work Item
528+
|Work Item
529529
|===
530530

531531
If no work-group size is specified or two accessors specify different
@@ -569,13 +569,13 @@ int main() {
569569
// Internalization specified on the buffer
570570
buffer<int> bTmp2{
571571
range{dataSize},
572-
{sycl::ext::oneapi::experimental::property::access_scope_private{},
572+
{sycl::ext::oneapi::experimental::property::access_scope_work_item{},
573573
sycl::ext::oneapi::experimental::property::fusion_internal_memory{},
574574
no_init}};
575575
// Internalization specified on the buffer
576576
buffer<int> bTmp3{
577577
range{dataSize},
578-
{sycl::ext::oneapi::experimental::property::access_scope_private{},
578+
{sycl::ext::oneapi::experimental::property::access_scope_work_item{},
579579
sycl::ext::oneapi::experimental::property::fusion_internal_memory{},
580580
no_init}};
581581
buffer<int> bOut{out, range{dataSize}};
@@ -592,17 +592,17 @@ int main() {
592592
auto accIn1 = bIn1.get_access(cgh);
593593
auto accIn2 = bIn2.get_access(cgh);
594594
// Internalization specified on each accessor.
595-
auto accTmp1 = bTmp1.get_access(
596-
cgh, sycl::ext::oneapi::experimental::property::access_scope_private{}
595+
auto accTmp1 = bTmp1.get_access(cgh,
596+
sycl::ext::oneapi::experimental::property::access_scope_work_item{}
597597
sycl::ext::oneapi::experimental::property::fusion_internal_memory{},
598598
no_init);
599599
cgh.parallel_for<AddKernel>(dataSize, AddKernel{accIn1, accIn2, accTmp1});
600600
});
601601

602602
q.submit([&](handler &cgh) {
603603
// Internalization specified on each accessor.
604-
auto accTmp1 = bTmp1.get_access(
605-
cgh, sycl::ext::oneapi::experimental::property::access_scope_private{}
604+
auto accTmp1 = bTmp1.get_access(cgh,
605+
sycl::ext::oneapi::experimental::property::access_scope_work_item{}
606606
sycl::ext::oneapi::experimental::property::fusion_internal_memory{},
607607
no_init);
608608
auto accIn3 = bIn3.get_access(cgh);
@@ -613,8 +613,8 @@ int main() {
613613

614614
q.submit([&](handler &cgh) {
615615
// Internalization specified on each accessor.
616-
auto accTmp1 = bTmp1.get_access(
617-
cgh, sycl::ext::oneapi::experimental::property::access_scope_private{}
616+
auto accTmp1 = bTmp1.get_access(cgh,
617+
sycl::ext::oneapi::experimental::property::access_scope_work_item{}
618618
sycl::ext::oneapi::experimental::property::fusion_internal_memory{},
619619
no_init);
620620
auto accTmp3 = bTmp3.get_access(cgh);
@@ -674,7 +674,7 @@ int main() {
674674
// Specify internalization for an USM pointer
675675
dTmp = malloc_device<int>(
676676
q, dataSize,
677-
{sycl_ext::property::access_scope_private{},
677+
{sycl_ext::property::access_scope_work_item{},
678678
sycl_ext::property::fusion_internal_memory{}, no_init});
679679

680680
// This explicit memory operation is compatible with fusion, as it can be

0 commit comments

Comments
 (0)