Skip to content

Commit 5ed6f20

Browse files
committed
Merge branch 'main' into error-code-consistency
2 parents 999a1e0 + fcd82d9 commit 5ed6f20

6 files changed

Lines changed: 384 additions & 175 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
python3 makeSpec -clean -spec khr+ext OUTDIR=out.release -j 5 api c env ext cxx4opencl
4747
4848
- name: Release Specs
49-
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
49+
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
5050
with:
5151
draft: true
5252
files: |

api/opencl_architecture.asciidoc

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -578,12 +578,12 @@ Consider the following three domains of synchronization in OpenCL:
578578
for execution
579579

580580

581-
Synchronization across all work-items within a single work-group is carried
582-
out using a _work-group function_.
583-
These functions carry out collective operations across all the work-items in
584-
a work-group.
585-
Available collective operations are: barrier, reduction, broadcast, prefix
586-
sum, and evaluation of a predicate.
581+
Synchronization across work-items within a work-group is done by using a
582+
_work-group function_.
583+
These functions perform collective operations across the work-items in a
584+
work-group.
585+
Available collective operations include barriers, reductions, broadcast, prefix
586+
sums, and evaluation of a predicate.
587587
A work-group function must occur within a converged control flow; i.e. all
588588
work-items in the work-group must encounter precisely the same work-group
589589
function.
@@ -592,27 +592,18 @@ must encounter the same work-group function in the same loop iterations.
592592
All the work-items of a work-group must execute the work-group function and
593593
complete reads and writes to memory before any are allowed to continue
594594
execution beyond the work-group function.
595-
Work-group functions that apply between work-groups are not provided in
595+
Work-group functions that apply across work-groups are not provided in
596596
OpenCL since OpenCL does not define forward-progress or ordering relations
597597
between work-groups, hence collective synchronization operations are not
598598
well defined.
599599

600-
Synchronization across all work-items within a single sub-group is carried
601-
out using a _sub-group function_.
602-
These functions carry out collective operations across all the work-items in
603-
a sub-group.
604-
Available collective operations are: barrier, reduction, broadcast, prefix
605-
sum, and evaluation of a predicate.
606-
A sub-group function must occur within a converged control flow; i.e. all
607-
work-items in the sub-group must encounter precisely the same sub-group
608-
function.
609-
For example, if a work-group function occurs within a loop, the work-items
610-
must encounter the same sub-group function in the same loop iterations.
611-
All the work-items of a sub-group must execute the sub-group function and
612-
complete reads and writes to memory before any are allowed to continue
613-
execution beyond the sub-group function.
614-
Synchronization between sub-groups must either be performed using work-group
615-
functions, or through memory operations.
600+
Synchronization across work-items within a sub-group is done by using a
601+
_sub-group function_.
602+
These functions perform collective operations across the work-items in a
603+
sub-group.
604+
Like work-group functions, sub-group functions must also occur within a
605+
converged control flow; i.e. all work-items in the sub-group must encounter
606+
precisely the same sub-group function.
616607
Using memory operations for sub-group synchronization should be used
617608
carefully as forward progress of sub-groups relative to each other is only
618609
supported optionally by OpenCL implementations.

api/opencl_platform_layer.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ errors footnote:[{fn-error-precedence}].
367367
** if _platform_ is not a valid platform
368368
* {CL_INVALID_VALUE}
369369
** if _param_name_ is not one of the supported values
370-
** if the size in bytes specified by _param_value_size_ is less than size of
370+
** if the size in bytes specified by _param_value_size_ is less than the size of
371371
the return type specified in the <<platform-queries-table, Platform
372372
Queries>> table and _param_value_ is not `NULL`
373373
* {CL_OUT_OF_HOST_MEMORY}
@@ -2274,7 +2274,7 @@ Otherwise, it returns one of the following errors:
22742274
** if _device_ is not a valid device
22752275
* {CL_INVALID_VALUE}
22762276
** if _param_name_ is not one of the supported values
2277-
** if the size in bytes specified by _param_value_size_ is less than size of
2277+
** if the size in bytes specified by _param_value_size_ is less than the size of
22782278
the return type specified in the <<device-queries-table, Device Queries>>
22792279
table and _param_value_ is not `NULL`
22802280
* {CL_OUT_OF_RESOURCES}
@@ -3776,7 +3776,7 @@ Otherwise, it returns one of the following errors:
37763776
** if _context_ is not a valid context
37773777
* {CL_INVALID_VALUE}
37783778
** if _param_name_ is not one of the supported values
3779-
** if the size in bytes specified by _param_value_size_ is less than size of
3779+
** if the size in bytes specified by _param_value_size_ is less than the size of
37803780
the return type specified in the <<context-info-table, Context Queries>>
37813781
table and _param_value_ is not `NULL`
37823782
* {CL_OUT_OF_RESOURCES}

0 commit comments

Comments
 (0)