This reverts commit
7665383a33f9ce9256aa121cbe4d3bd948dff145 and is
squashed together with https://patchwork.freedesktop.org/patch/194610/
(spirv: avoid infinite loop / freeze in vtn_cfg_walk_blocks()) which
fixes https://bugs.freedesktop.org/show_bug.cgi?id=104359 properly.
Fixes: 9702fac68e (spirv: consider bitsize when handling OpSwitch cases)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104359
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
"Selector of OpSelect must have a type of OpTypeInt");
bool is_default = true;
"Selector of OpSelect must have a type of OpTypeInt");
bool is_default = true;
+ const uint bitsize = nir_alu_type_get_type_size(cond_type);
for (const uint32_t *w = block->branch + 2; w < branch_end;) {
uint64_t literal = 0;
if (!is_default) {
for (const uint32_t *w = block->branch + 2; w < branch_end;) {
uint64_t literal = 0;
if (!is_default) {
- if (nir_alu_type_get_type_size(cond_type) <= 32) {
literal = *(w++);
} else {
literal = *(w++);
} else {
- assert(nir_alu_type_get_type_size(cond_type) == 64);
literal = vtn_u64_literal(w);
w += 2;
}
literal = vtn_u64_literal(w);
w += 2;
}
/* Finally, we walk over all of the cases one more time and put
* them in fall-through order.
*/
/* Finally, we walk over all of the cases one more time and put
* them in fall-through order.
*/
- for (const uint32_t *w = block->branch + 2; w < branch_end; w += 2) {
+ for (const uint32_t *w = block->branch + 2; w < branch_end;) {
struct vtn_block *case_block =
vtn_value(b, *w, vtn_value_type_block)->block;
struct vtn_block *case_block =
vtn_value(b, *w, vtn_value_type_block)->block;
+ if (bitsize <= 32) {
+ w += 2;
+ } else {
+ assert(bitsize == 64);
+ w += 3;
+ }
+
if (case_block == break_block)
continue;
if (case_block == break_block)
continue;