nir: add options to lower nir_op_pack_[64/32]_* via nir_lower_alu_to_scalar()
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6527>
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 3ed7991..f782253 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -3215,6 +3215,9 @@
bool lower_pack_snorm_2x16;
bool lower_pack_unorm_4x8;
bool lower_pack_snorm_4x8;
+ bool lower_pack_64_2x32;
+ bool lower_pack_64_4x16;
+ bool lower_pack_32_2x16;
bool lower_pack_64_2x32_split;
bool lower_pack_32_2x16_split;
bool lower_unpack_half_2x16;
diff --git a/src/compiler/nir/nir_lower_alu_to_scalar.c b/src/compiler/nir/nir_lower_alu_to_scalar.c
index f56eb76..5df2501 100644
--- a/src/compiler/nir/nir_lower_alu_to_scalar.c
+++ b/src/compiler/nir/nir_lower_alu_to_scalar.c
@@ -209,6 +209,34 @@
nir_fadd(b, sum[2], sum[3]));
}
+ case nir_op_pack_64_2x32: {
+ if (!b->shader->options->lower_pack_64_2x32)
+ return NULL;
+
+ nir_ssa_def *src_vec2 = nir_ssa_for_alu_src(b, alu, 0);
+ return nir_pack_64_2x32_split(b, nir_channel(b, src_vec2, 0),
+ nir_channel(b, src_vec2, 1));
+ }
+ case nir_op_pack_64_4x16: {
+ if (!b->shader->options->lower_pack_64_4x16)
+ return NULL;
+
+ nir_ssa_def *src_vec4 = nir_ssa_for_alu_src(b, alu, 0);
+ nir_ssa_def *xy = nir_pack_32_2x16_split(b, nir_channel(b, src_vec4, 0),
+ nir_channel(b, src_vec4, 1));
+ nir_ssa_def *zw = nir_pack_32_2x16_split(b, nir_channel(b, src_vec4, 2),
+ nir_channel(b, src_vec4, 3));
+
+ return nir_pack_64_2x32_split(b, xy, zw);
+ }
+ case nir_op_pack_32_2x16: {
+ if (!b->shader->options->lower_pack_32_2x16)
+ return NULL;
+
+ nir_ssa_def *src_vec2 = nir_ssa_for_alu_src(b, alu, 0);
+ return nir_pack_32_2x16_split(b, nir_channel(b, src_vec2, 0),
+ nir_channel(b, src_vec2, 1));
+ }
case nir_op_unpack_64_2x32:
case nir_op_unpack_64_4x16:
case nir_op_unpack_32_2x16: