KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: don't lower pack/unpack intrinsics 

this just ends up propagating the bitsize that we don't want, making it
harder to remove them later

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16669>
This commit is contained in:
Mike Blumenkrantz 2022-05-18 12:34:57 -04:00 committed by Marge Bot
parent 3d8131341b
commit 7c75ce6204
2 changed files with 67 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View File

@ -2112,6 +2112,73 @@ emit_alu(struct ntv_context *ctx, nir_alu_instr *alu)
result = spirv_builder_emit_quadop(&ctx->builder, SpvOpBitFieldInsert, dest_type, src[0], src[1], src[2], src[3]);
break;
case nir_op_pack_32_2x16_split:
case nir_op_pack_64_2x32_split: {
nir_alu_type type = nir_alu_type_get_base_type(nir_op_infos[alu->op].input_types[0]);
if (num_components <= 2) {
SpvId components[] = {src[0], src[1]};
SpvId vec_type = get_alu_type(ctx, type, num_components * 2, nir_src_bit_size(alu->src[0].src));
result = spirv_builder_emit_composite_construct(&ctx->builder, vec_type, components, 2);
result = emit_bitcast(ctx, dest_type, result);
} else {
SpvId components[NIR_MAX_VEC_COMPONENTS];
SpvId conv_type = get_alu_type(ctx, type, 1, nir_src_bit_size(alu->src[0].src));
SpvId vec_type = get_alu_type(ctx, type, 2, nir_src_bit_size(alu->src[0].src));
SpvId dest_scalar_type = get_alu_type(ctx, nir_op_infos[alu->op].output_type, 1, bit_size);
for (unsigned i = 0; i < nir_src_num_components(alu->src[0].src); i++) {
SpvId conv[2];
conv[0] = spirv_builder_emit_composite_extract(&ctx->builder, conv_type, src[0], &i, 1);
conv[1] = spirv_builder_emit_composite_extract(&ctx->builder, conv_type, src[1], &i, 1);
SpvId vec = spirv_builder_emit_composite_construct(&ctx->builder, vec_type, conv, 2);
components[i] = emit_bitcast(ctx, dest_scalar_type, vec);
}
result = spirv_builder_emit_composite_construct(&ctx->builder, dest_type, components, num_components);
}
break;
}
case nir_op_unpack_32_2x16_split_x:
case nir_op_unpack_64_2x32_split_x: {
nir_alu_type type = nir_alu_type_get_base_type(nir_op_infos[alu->op].input_types[0]);
SpvId vec_type = get_alu_type(ctx, type, 2, bit_size);
unsigned idx = 0;
if (num_components == 1) {
SpvId vec = emit_bitcast(ctx, vec_type, src[0]);
result = spirv_builder_emit_composite_extract(&ctx->builder, dest_type, vec, &idx, 1);
} else {
SpvId components[NIR_MAX_VEC_COMPONENTS];
for (unsigned i = 0; i < nir_src_num_components(alu->src[0].src); i++) {
SpvId conv = spirv_builder_emit_composite_extract(&ctx->builder, get_alu_type(ctx, type, 1, nir_src_bit_size(alu->src[0].src)), src[0], &i, 1);
conv = emit_bitcast(ctx, vec_type, conv);
SpvId conv_type = get_alu_type(ctx, type, 1, bit_size);
components[i] = spirv_builder_emit_composite_extract(&ctx->builder, conv_type, conv, &idx, 1);
}
result = spirv_builder_emit_composite_construct(&ctx->builder, dest_type, components, num_components);
}
break;
}
case nir_op_unpack_32_2x16_split_y:
case nir_op_unpack_64_2x32_split_y: {
nir_alu_type type = nir_alu_type_get_base_type(nir_op_infos[alu->op].input_types[0]);
SpvId vec_type = get_alu_type(ctx, type, 2, bit_size);
unsigned idx = 1;
if (num_components == 1) {
SpvId vec = emit_bitcast(ctx, vec_type, src[0]);
result = spirv_builder_emit_composite_extract(&ctx->builder, dest_type, vec, &idx, 1);
} else {
SpvId components[NIR_MAX_VEC_COMPONENTS];
for (unsigned i = 0; i < nir_src_num_components(alu->src[0].src); i++) {
SpvId conv = spirv_builder_emit_composite_extract(&ctx->builder, get_alu_type(ctx, type, 1, nir_src_bit_size(alu->src[0].src)), src[0], &i, 1);
conv = emit_bitcast(ctx, vec_type, conv);
SpvId conv_type = get_alu_type(ctx, type, 1, bit_size);
components[i] = spirv_builder_emit_composite_extract(&ctx->builder, conv_type, conv, &idx, 1);
}
result = spirv_builder_emit_composite_construct(&ctx->builder, dest_type, components, num_components);
}
break;
}
default:
fprintf(stderr, "emit_alu: not implemented (%s)\n",
nir_op_infos[alu->op].name);

4
src/gallium/drivers/zink/zink_compiler.c
View File

@ -348,10 +348,6 @@ zink_screen_init_compiler(struct zink_screen *screen)
.lower_mul_high = true,
.lower_rotate = true,
.lower_uadd_carry = true,
.lower_pack_64_2x32_split = true,
.lower_unpack_64_2x32_split = true,
.lower_pack_32_2x16_split = true,
.lower_unpack_32_2x16_split = true,
.lower_vector_cmp = true,
.lower_int64_options = 0,
.lower_doubles_options = 0,