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

zink: declare int/float size caps inline with type usage

Browse Source 
this is much more accurate than trying to use shader info

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13566>
This commit is contained in:
Mike Blumenkrantz
2021-10-25 11:06:19 -04:00
committed by Marge Bot
parent 17aa2be4c9
commit 854fd242fa
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
-12
View File
@@ -3646,18 +3646,6 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info, uint32_t
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityImageQuery); spirv_builder_emit_cap(&ctx.builder, SpvCapabilityImageQuery);
} }
if (s->info.bit_sizes_int & 8)
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityInt8);
if (s->info.bit_sizes_int & 16)
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityInt16);
if (s->info.bit_sizes_int & 64)
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityInt64);
if (s->info.bit_sizes_float & 16)
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityFloat16);
if (s->info.bit_sizes_float & 64)
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityFloat64);
ctx.stage = s->info.stage; ctx.stage = s->info.stage;
ctx.so_info = so_info; ctx.so_info = so_info;
ctx.GLSL_std_450 = spirv_builder_import(&ctx.builder, "GLSL.std.450"); ctx.GLSL_std_450 = spirv_builder_import(&ctx.builder, "GLSL.std.450");
src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
+22 -3
View File
@@ -1204,6 +1204,12 @@ SpvId
spirv_builder_type_uint(struct spirv_builder *b, unsigned width) spirv_builder_type_uint(struct spirv_builder *b, unsigned width)
{ {
uint32_t args[] = { width, 0 }; uint32_t args[] = { width, 0 };
if (width == 8)
spirv_builder_emit_cap(b, SpvCapabilityInt8);
else if (width == 16)
spirv_builder_emit_cap(b, SpvCapabilityInt16);
else if (width == 64)
spirv_builder_emit_cap(b, SpvCapabilityInt64);
return get_type_def(b, SpvOpTypeInt, args, ARRAY_SIZE(args)); return get_type_def(b, SpvOpTypeInt, args, ARRAY_SIZE(args));
} }
@@ -1211,6 +1217,10 @@ SpvId
spirv_builder_type_float(struct spirv_builder *b, unsigned width) spirv_builder_type_float(struct spirv_builder *b, unsigned width)
{ {
uint32_t args[] = { width }; uint32_t args[] = { width };
if (width == 16)
spirv_builder_emit_cap(b, SpvCapabilityFloat16);
else if (width == 64)
spirv_builder_emit_cap(b, SpvCapabilityFloat64);
return get_type_def(b, SpvOpTypeFloat, args, ARRAY_SIZE(args)); return get_type_def(b, SpvOpTypeFloat, args, ARRAY_SIZE(args));
} }
@@ -1430,6 +1440,12 @@ SpvId
spirv_builder_const_uint(struct spirv_builder *b, int width, uint64_t val) spirv_builder_const_uint(struct spirv_builder *b, int width, uint64_t val)
{ {
assert(width >= 8); assert(width >= 8);
if (width == 8)
spirv_builder_emit_cap(b, SpvCapabilityInt8);
else if (width == 16)
spirv_builder_emit_cap(b, SpvCapabilityInt16);
else if (width == 64)
spirv_builder_emit_cap(b, SpvCapabilityInt64);
SpvId type = spirv_builder_type_uint(b, width); SpvId type = spirv_builder_type_uint(b, width);
if (width <= 32) if (width <= 32)
return emit_constant_32(b, type, val); return emit_constant_32(b, type, val);
@@ -1449,12 +1465,15 @@ spirv_builder_const_float(struct spirv_builder *b, int width, double val)
{ {
assert(width >= 16); assert(width >= 16);
SpvId type = spirv_builder_type_float(b, width); SpvId type = spirv_builder_type_float(b, width);
if (width == 16) if (width == 16) {
spirv_builder_emit_cap(b, SpvCapabilityFloat16);
return emit_constant_32(b, type, _mesa_float_to_half(val)); return emit_constant_32(b, type, _mesa_float_to_half(val));
else if (width == 32) } else if (width == 32)
return emit_constant_32(b, type, u_bitcast_f2u(val)); return emit_constant_32(b, type, u_bitcast_f2u(val));
else if (width == 64) else if (width == 64) {
spirv_builder_emit_cap(b, SpvCapabilityFloat64);
return emit_constant_64(b, type, u_bitcast_d2u(val)); return emit_constant_64(b, type, u_bitcast_d2u(val));
}
unreachable("unhandled float-width"); unreachable("unhandled float-width");
} }