|
1 | 1 | # Indexing and dimensions
|
2 |
| -export workitemIdx, workgroupIdx, workgroupDim, gridDim, gridDimWG |
3 |
| -export threadIdx, blockIdx, blockDim |
4 | 2 |
|
5 | 3 | @generated function _index(::Val{fname}, ::Val{name}, ::Val{range}) where {fname, name, range}
|
6 | 4 | Context() do ctx
|
@@ -106,11 +104,11 @@ for (dim,off) in ((:x,1), (:y,2), (:z,3))
|
106 | 104 | @eval @inline $cufn() = $fn()
|
107 | 105 |
|
108 | 106 | # Grid dimension (in workitems)
|
109 |
| - fn = Symbol("gridDim_$dim") |
| 107 | + fn = Symbol("gridItemDim_$dim") |
110 | 108 | base = _packet_offsets[findfirst(x->x==:grid_size_x,_packet_names)]
|
111 | 109 | @eval @inline $fn() = Int(_dim($(Val(base)), $(Val(off)), $(Val(0:(_max_grid_size[dim]-1))), UInt32))
|
112 | 110 | # Grid dimension (in workgroups)
|
113 |
| - fn_wg = Symbol("gridDimWG_$dim") |
| 111 | + fn_wg = Symbol("gridGroupDim_$dim") |
114 | 112 | fn_wg_dim = Symbol("workgroupDim_$dim")
|
115 | 113 | @eval @inline $fn_wg() = div($fn(), $fn_wg_dim())
|
116 | 114 | end
|
@@ -140,20 +138,20 @@ See also: [`blockDim`](@ref)
|
140 | 138 | @inline workgroupDim() = (x=workgroupDim_x(), y=workgroupDim_y(), z=workgroupDim_z())
|
141 | 139 |
|
142 | 140 | """
|
143 |
| - gridDim()::ROCDim3 |
| 141 | + gridItemDim()::ROCDim3 |
144 | 142 |
|
145 | 143 | Returns the size of the grid in workitems.
|
146 | 144 | This behaviour is different from CUDA where `gridDim` gives the size of the grid in blocks.
|
147 | 145 | """
|
148 |
| -@inline gridDim() = (x=gridDim_x(), y=gridDim_y(), z=gridDim_z()) |
| 146 | +@inline gridItemDim() = (x=gridItemDim_x(), y=gridItemDim_y(), z=gridItemDim_z()) |
149 | 147 |
|
150 | 148 | """
|
151 |
| - gridDimWG()::ROCDim3 |
| 149 | + gridGroupDim()::ROCDim3 |
152 | 150 |
|
153 | 151 | Returns the size of the grid in workgroups.
|
154 | 152 | This is equivalent to CUDA's `gridDim`.
|
155 | 153 | """
|
156 |
| -@inline gridDimWG() = (x=gridDimWG_x(), y=gridDimWG_y(), z=gridDimWG_z()) |
| 154 | +@inline gridGroupDim() = (x=gridGroupDim_x(), y=gridGroupDim_y(), z=gridGroupDim_z()) |
157 | 155 |
|
158 | 156 | # For compat with CUDAnative et. al
|
159 | 157 |
|
|
0 commit comments