|
11 | 11 |
|
12 | 12 | #include "block_int8x4_utils.glslh" |
13 | 13 | #include "common.glslh" |
| 14 | +#include "indexing.glslh" |
14 | 15 |
|
15 | 16 | // |
16 | 17 | // Block Layout Int Utils |
@@ -77,17 +78,17 @@ TensorIndex4D contiguous_block_idx_to_tensor4d_idx_with_block_config( |
77 | 78 | const int packed_dim_1 = get_block_inner_dim(block_config); |
78 | 79 | block_strides[packed_dim_1] = 1; |
79 | 80 | const uint block_size_1 = uint(get_block_inner_dim_block_size(block_config)); |
80 | | - stride = div_up(meta.sizes[0][packed_dim_1], block_size_1); |
| 81 | + stride = div_up(safe_idx(meta.sizes[0], packed_dim_1), block_size_1); |
81 | 82 | // Outer block dim |
82 | 83 | const int packed_dim_2 = get_block_outer_dim(block_config); |
83 | 84 | block_strides[packed_dim_2] = stride; |
84 | 85 | const uint block_size_2 = |
85 | 86 | uint(get_block_outer_dim_block_size(block_config)); |
86 | | - stride *= div_up(meta.sizes[0][packed_dim_2], block_size_2); |
| 87 | + stride *= div_up(safe_idx(meta.sizes[0], packed_dim_2), block_size_2); |
87 | 88 | // First non-block dim |
88 | 89 | const int outer_dim_1 = get_block_dim_order_2(block_config); |
89 | 90 | block_strides[outer_dim_1] = stride; |
90 | | - stride *= meta.sizes[0][outer_dim_1]; |
| 91 | + stride *= safe_idx(meta.sizes[0], outer_dim_1); |
91 | 92 | // Second non-block dim |
92 | 93 | const int outer_dim_2 = get_block_dim_order_3(block_config); |
93 | 94 | block_strides[outer_dim_2] = stride; |
@@ -133,19 +134,21 @@ TensorIndex contiguous_block_idx_to_tensor_idx_with_block_config( |
133 | 134 | uint stride = 1; |
134 | 135 |
|
135 | 136 | // Inner block dim |
136 | | - stride = div_up(size_at(meta, inner_dim), inner_bs); |
| 137 | + // Use safe_idx for UBO-backed meta.sizes to avoid Adreno dynamic indexing |
| 138 | + // crash. All block dims are < 4, so they index into meta.sizes[0]. |
| 139 | + stride = div_up(safe_idx(meta.sizes[0], inner_dim), inner_bs); |
137 | 140 |
|
138 | 141 | // Outer block dim |
139 | 142 | uint stride_outer = stride; |
140 | | - stride *= div_up(size_at(meta, outer_dim), outer_bs); |
| 143 | + stride *= div_up(safe_idx(meta.sizes[0], outer_dim), outer_bs); |
141 | 144 |
|
142 | 145 | // First non-block dim |
143 | 146 | uint stride_nb1 = stride; |
144 | | - stride *= size_at(meta, nonblock_dim_1); |
| 147 | + stride *= safe_idx(meta.sizes[0], nonblock_dim_1); |
145 | 148 |
|
146 | 149 | // Second non-block dim |
147 | 150 | uint stride_nb2 = stride; |
148 | | - stride *= size_at(meta, nonblock_dim_2); |
| 151 | + stride *= safe_idx(meta.sizes[0], nonblock_dim_2); |
149 | 152 |
|
150 | 153 | // Extra batch dims (4-7): always non-block, ascending order |
151 | 154 | uint batch_strides[4]; |
@@ -198,17 +201,17 @@ TensorIndex4D contiguous_block_idx_to_tensor4d_idx_with_block_config( |
198 | 201 | const int packed_dim_1 = get_block_inner_dim(block_config); |
199 | 202 | block_strides[packed_dim_1] = 1; |
200 | 203 | const uint block_size_1 = uint(get_block_inner_dim_block_size(block_config)); |
201 | | - stride = div_up(meta.sizes[packed_dim_1], block_size_1); |
| 204 | + stride = div_up(safe_idx(meta.sizes, packed_dim_1), block_size_1); |
202 | 205 | // Outer block dim |
203 | 206 | const int packed_dim_2 = get_block_outer_dim(block_config); |
204 | 207 | block_strides[packed_dim_2] = stride; |
205 | 208 | const uint block_size_2 = |
206 | 209 | uint(get_block_outer_dim_block_size(block_config)); |
207 | | - stride *= div_up(meta.sizes[packed_dim_2], block_size_2); |
| 210 | + stride *= div_up(safe_idx(meta.sizes, packed_dim_2), block_size_2); |
208 | 211 | // First non-block dim |
209 | 212 | const int outer_dim_1 = get_block_dim_order_2(block_config); |
210 | 213 | block_strides[outer_dim_1] = stride; |
211 | | - stride *= meta.sizes[outer_dim_1]; |
| 214 | + stride *= safe_idx(meta.sizes, outer_dim_1); |
212 | 215 | // Second non-block dim |
213 | 216 | const int outer_dim_2 = get_block_dim_order_3(block_config); |
214 | 217 | block_strides[outer_dim_2] = stride; |
|
0 commit comments