Skip to content

Commit d2358aa

Browse files
ssjiaSS-JIA
authored andcommitted
[ET-VK] Apply safe_idx to block indexing headers for Adreno 740 compatibility
Pull Request resolved: pytorch#18454 The Adreno 740 SPIR-V compiler crashes (SIGSEGV in libllvm-qgl.so during vkCreateComputePipelines) when a UBO-backed ivec4/uvec4 is dynamically indexed with a specialization constant that resolves to value 1 or 2. The block load/store/indexing headers contained `meta.sizes[block_outer_dim]` and similar patterns where the index is derived from the block_config specialization constant. Replace all UBO dynamic indexing with safe_idx() if/else chains in: - block_indexing.glslh: contiguous_block_idx_to_tensor* functions - block_load.glslh: block_load_* functions (size_at/stride_at with spec-const) - block_store.glslh: block_store_* functions (same pattern) - block_int8x4_load.glslh: block_int8x4_load_* functions - block_int8x4_store.glslh: block_int8x4_store_* functions Since the indices are specialization-constant-derived, the compiler eliminates all but one branch at pipeline creation time — zero runtime cost. This fixes the S23 (Adreno 740) crash when running uint8 quantized models that use q8ta_quantize/q8ta_dequantize shaders. ghstack-source-id: 357266951 @exported-using-ghexport Differential Revision: [D97959287](https://our.internmc.facebook.com/intern/diff/D97959287/)
1 parent 6f424e5 commit d2358aa

5 files changed

Lines changed: 61 additions & 34 deletions

File tree

‎backends/vulkan/runtime/graph/ops/glsl/block_indexing.glslh‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include "block_int8x4_utils.glslh"
1313
#include "common.glslh"
14+
#include "indexing.glslh"
1415

1516
//
1617
// Block Layout Int Utils
@@ -77,17 +78,17 @@ TensorIndex4D contiguous_block_idx_to_tensor4d_idx_with_block_config(
7778
const int packed_dim_1 = get_block_inner_dim(block_config);
7879
block_strides[packed_dim_1] = 1;
7980
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);
8182
// Outer block dim
8283
const int packed_dim_2 = get_block_outer_dim(block_config);
8384
block_strides[packed_dim_2] = stride;
8485
const uint block_size_2 =
8586
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);
8788
// First non-block dim
8889
const int outer_dim_1 = get_block_dim_order_2(block_config);
8990
block_strides[outer_dim_1] = stride;
90-
stride *= meta.sizes[0][outer_dim_1];
91+
stride *= safe_idx(meta.sizes[0], outer_dim_1);
9192
// Second non-block dim
9293
const int outer_dim_2 = get_block_dim_order_3(block_config);
9394
block_strides[outer_dim_2] = stride;
@@ -133,19 +134,21 @@ TensorIndex contiguous_block_idx_to_tensor_idx_with_block_config(
133134
uint stride = 1;
134135

135136
// 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);
137140

138141
// Outer block dim
139142
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);
141144

142145
// First non-block dim
143146
uint stride_nb1 = stride;
144-
stride *= size_at(meta, nonblock_dim_1);
147+
stride *= safe_idx(meta.sizes[0], nonblock_dim_1);
145148

146149
// Second non-block dim
147150
uint stride_nb2 = stride;
148-
stride *= size_at(meta, nonblock_dim_2);
151+
stride *= safe_idx(meta.sizes[0], nonblock_dim_2);
149152

150153
// Extra batch dims (4-7): always non-block, ascending order
151154
uint batch_strides[4];
@@ -198,17 +201,17 @@ TensorIndex4D contiguous_block_idx_to_tensor4d_idx_with_block_config(
198201
const int packed_dim_1 = get_block_inner_dim(block_config);
199202
block_strides[packed_dim_1] = 1;
200203
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);
202205
// Outer block dim
203206
const int packed_dim_2 = get_block_outer_dim(block_config);
204207
block_strides[packed_dim_2] = stride;
205208
const uint block_size_2 =
206209
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);
208211
// First non-block dim
209212
const int outer_dim_1 = get_block_dim_order_2(block_config);
210213
block_strides[outer_dim_1] = stride;
211-
stride *= meta.sizes[outer_dim_1];
214+
stride *= safe_idx(meta.sizes, outer_dim_1);
212215
// Second non-block dim
213216
const int outer_dim_2 = get_block_dim_order_3(block_config);
214217
block_strides[outer_dim_2] = stride;

‎backends/vulkan/runtime/graph/ops/glsl/block_int8x4_load.glslh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@
5757
\
5858
/* General path: use stride for non-contiguous access */ \
5959
const uint outer_stride = \
60-
stride_at(meta, block_outer_dim) * texels_per_block; \
61-
const uint outer_size = size_at(meta, block_outer_dim); \
60+
safe_idx(meta.strides[0], block_outer_dim) * texels_per_block; \
61+
const uint outer_size = \
62+
safe_idx(meta.sizes[0], block_outer_dim); \
6263
const int base_outer_idx = tidx_base.data[block_outer_dim]; \
6364
\
6465
ivec4 block = ivec4(0); \
@@ -108,8 +109,9 @@
108109
\
109110
/* General path: use stride for non-contiguous access */ \
110111
const uint outer_stride = \
111-
stride_at(meta, block_outer_dim) * texels_per_block; \
112-
const uint outer_size = size_at(meta, block_outer_dim); \
112+
safe_idx(meta.strides[0], block_outer_dim) * texels_per_block; \
113+
const uint outer_size = \
114+
safe_idx(meta.sizes[0], block_outer_dim); \
113115
const int base_outer_idx = int(tidx_base.data[0][block_outer_dim]); \
114116
\
115117
ivec4 block = ivec4(0); \

‎backends/vulkan/runtime/graph/ops/glsl/block_int8x4_store.glslh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@
5959
\
6060
/* General path: use stride for non-contiguous access */ \
6161
const uint outer_stride = \
62-
stride_at(meta, block_outer_dim) * texels_per_block; \
63-
const uint outer_size = size_at(meta, block_outer_dim); \
62+
safe_idx(meta.strides[0], block_outer_dim) * texels_per_block; \
63+
const uint outer_size = \
64+
safe_idx(meta.sizes[0], block_outer_dim); \
6465
const int base_outer_idx = tidx_base.data[block_outer_dim]; \
6566
\
6667
[[unroll]] for (int block_y = 0; block_y < 4; ++block_y) { \
@@ -109,8 +110,9 @@
109110
\
110111
/* General path: use stride for non-contiguous access */ \
111112
const uint outer_stride = \
112-
stride_at(meta, block_outer_dim) * texels_per_block; \
113-
const uint outer_size = size_at(meta, block_outer_dim); \
113+
safe_idx(meta.strides[0], block_outer_dim) * texels_per_block; \
114+
const uint outer_size = \
115+
safe_idx(meta.sizes[0], block_outer_dim); \
114116
const int base_outer_idx = int(tidx_base.data[0][block_outer_dim]); \
115117
\
116118
[[unroll]] for (int block_y = 0; block_y < 4; ++block_y) { \

‎backends/vulkan/runtime/graph/ops/glsl/block_load.glslh‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,17 @@
4545
/* Compute base buffer index once and use strides for iteration */ \
4646
const uint base_idx = \
4747
tensor4d_idx_to_buf_idx(meta, tidx_base, hashed_layout); \
48-
const uint outer_stride = stride_at(meta, block_outer_dim); \
48+
/* Use safe_idx for UBO-backed meta fields to avoid Adreno dynamic */ \
49+
/* indexing crash */ \
50+
const uint outer_stride = \
51+
safe_idx(meta.strides[0], block_outer_dim); \
4952
/* Inner stride is 1 since packed_dim == block_inner_dim */ \
5053
\
5154
/* Pre-compute bounds for efficient checking */ \
52-
const uint outer_size = size_at(meta, block_outer_dim); \
53-
const uint inner_size = size_at(meta, block_inner_dim); \
55+
const uint outer_size = \
56+
safe_idx(meta.sizes[0], block_outer_dim); \
57+
const uint inner_size = \
58+
safe_idx(meta.sizes[0], block_inner_dim); \
5459
const int base_outer_idx = tidx_base.data[block_outer_dim]; \
5560
const int base_inner_idx = tidx_base.data[block_inner_dim]; \
5661
\
@@ -88,7 +93,7 @@
8893
ivec3 tex_pos = \
8994
tensor4d_idx_to_texel_pos_simple(meta, tidx_base, hashed_layout); \
9095
const int tex_outer_dim = mod_4(block_outer_dim); \
91-
const int outer_size = meta.sizes[block_outer_dim]; \
96+
const int outer_size = safe_idx(meta.sizes, block_outer_dim); \
9297
const int base_outer_idx = tidx_base.data[block_outer_dim]; \
9398
\
9499
mat4 block; \
@@ -119,12 +124,17 @@
119124
/* Compute base buffer index using 8D strides */ \
120125
const uint base_idx = \
121126
tensor_idx_to_buf_idx(meta, tidx_base, hashed_layout); \
122-
const uint outer_stride = stride_at(meta, block_outer_dim); \
127+
/* Use safe_idx for UBO-backed meta fields to avoid Adreno dynamic */ \
128+
/* indexing crash */ \
129+
const uint outer_stride = \
130+
safe_idx(meta.strides[0], block_outer_dim); \
123131
/* Inner stride is 1 since packed_dim == block_inner_dim */ \
124132
\
125133
/* Pre-compute bounds (block dims always < 4, so use data[0]) */ \
126-
const uint outer_size = size_at(meta, block_outer_dim); \
127-
const uint inner_size = size_at(meta, block_inner_dim); \
134+
const uint outer_size = \
135+
safe_idx(meta.sizes[0], block_outer_dim); \
136+
const uint inner_size = \
137+
safe_idx(meta.sizes[0], block_inner_dim); \
128138
const int base_outer_idx = int(tidx_base.data[0][block_outer_dim]); \
129139
const int base_inner_idx = int(tidx_base.data[0][block_inner_dim]); \
130140
\
@@ -164,7 +174,7 @@
164174
ivec3 tex_pos = \
165175
tensor4d_idx_to_texel_pos_simple(meta, tidx4d, hashed_layout); \
166176
const int tex_outer_dim = mod_4(block_outer_dim); \
167-
const int outer_size = meta.sizes[block_outer_dim]; \
177+
const int outer_size = safe_idx(meta.sizes, block_outer_dim); \
168178
const int base_outer_idx = tidx4d.data[block_outer_dim]; \
169179
\
170180
mat4 block; \

‎backends/vulkan/runtime/graph/ops/glsl/block_store.glslh‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,17 @@
4545
/* Compute base buffer index once and use strides for iteration */ \
4646
const uint base_idx = \
4747
tensor4d_idx_to_buf_idx(meta, tidx_base, hashed_layout); \
48-
const uint outer_stride = stride_at(meta, block_outer_dim); \
48+
/* Use safe_idx for UBO-backed meta fields to avoid Adreno dynamic */ \
49+
/* indexing crash */ \
50+
const uint outer_stride = \
51+
safe_idx(meta.strides[0], block_outer_dim); \
4952
/* Inner stride is 1 since packed_dim == block_inner_dim */ \
5053
\
5154
/* Pre-compute bounds for efficient checking */ \
52-
const uint outer_size = size_at(meta, block_outer_dim); \
53-
const uint inner_size = size_at(meta, block_inner_dim); \
55+
const uint outer_size = \
56+
safe_idx(meta.sizes[0], block_outer_dim); \
57+
const uint inner_size = \
58+
safe_idx(meta.sizes[0], block_inner_dim); \
5459
const int base_outer_idx = tidx_base.data[block_outer_dim]; \
5560
const int base_inner_idx = tidx_base.data[block_inner_dim]; \
5661
\
@@ -84,7 +89,7 @@
8489
ivec3 tex_pos = \
8590
tensor4d_idx_to_texel_pos_simple(meta, tidx_base, hashed_layout); \
8691
const int tex_outer_dim = mod_4(block_outer_dim); \
87-
const int outer_size = meta.sizes[block_outer_dim]; \
92+
const int outer_size = safe_idx(meta.sizes, block_outer_dim); \
8893
const int base_outer_idx = tidx_base.data[block_outer_dim]; \
8994
\
9095
[[unroll]] for (int block_y = 0; block_y < 4; ++block_y) { \
@@ -112,12 +117,17 @@
112117
/* Compute base buffer index using 8D strides */ \
113118
const uint base_idx = \
114119
tensor_idx_to_buf_idx(meta, tidx_base, hashed_layout); \
115-
const uint outer_stride = stride_at(meta, block_outer_dim); \
120+
/* Use safe_idx for UBO-backed meta fields to avoid Adreno dynamic */ \
121+
/* indexing crash */ \
122+
const uint outer_stride = \
123+
safe_idx(meta.strides[0], block_outer_dim); \
116124
/* Inner stride is 1 since packed_dim == block_inner_dim */ \
117125
\
118126
/* Pre-compute bounds (block dims always < 4, so use data[0]) */ \
119-
const uint outer_size = size_at(meta, block_outer_dim); \
120-
const uint inner_size = size_at(meta, block_inner_dim); \
127+
const uint outer_size = \
128+
safe_idx(meta.sizes[0], block_outer_dim); \
129+
const uint inner_size = \
130+
safe_idx(meta.sizes[0], block_inner_dim); \
121131
const int base_outer_idx = int(tidx_base.data[0][block_outer_dim]);\
122132
const int base_inner_idx = int(tidx_base.data[0][block_inner_dim]);\
123133
\
@@ -153,7 +163,7 @@
153163
ivec3 tex_pos = \
154164
tensor4d_idx_to_texel_pos_simple(meta, tidx4d, hashed_layout); \
155165
const int tex_outer_dim = mod_4(block_outer_dim); \
156-
const int outer_size = meta.sizes[block_outer_dim]; \
166+
const int outer_size = safe_idx(meta.sizes, block_outer_dim); \
157167
const int base_outer_idx = tidx4d.data[block_outer_dim]; \
158168
\
159169
[[unroll]] for (int block_y = 0; block_y < 4; ++block_y) { \

0 commit comments

Comments
 (0)