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

nir: add pack_32_2x16_split/unpack_32_2x16_split lowering

Browse Source 
The new option replaces the two other _split lowering options, since
there's no need for separate options.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4738>
This commit is contained in:
Jonathan Marek
2020-04-24 14:27:33 -04:00
committed by Marge Bot
parent cbeda7f78e
commit 42093bb694
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir.h
+2 -2
View File
@@ -2863,18 +2863,18 @@ typedef struct nir_shader_compiler_options {
bool lower_ldexp;
bool lower_pack_half_2x16;
bool lower_pack_half_2x16_split;
bool lower_pack_unorm_2x16;
bool lower_pack_snorm_2x16;
bool lower_pack_unorm_4x8;
bool lower_pack_snorm_4x8;
bool lower_unpack_half_2x16;
bool lower_unpack_half_2x16_split;
bool lower_unpack_unorm_2x16;
bool lower_unpack_snorm_2x16;
bool lower_unpack_unorm_4x8;
bool lower_unpack_snorm_4x8;
bool lower_pack_split;
bool lower_extract_byte;
bool lower_extract_word;
src/compiler/nir/nir_opt_algebraic.py
+15 -3
View File
@@ -1295,15 +1295,27 @@ optimizations.extend([
(('pack_half_2x16_split', 'a@32', 'b@32'),
('ior', ('ishl', ('u2u32', ('f2f16', b)), 16), ('u2u32', ('f2f16', a))),
'options->lower_pack_half_2x16_split'),
'options->lower_pack_split'),
(('unpack_half_2x16_split_x', 'a@32'),
('f2f32', ('u2u16', a)),
'options->lower_unpack_half_2x16_split'),
'options->lower_pack_split'),
(('unpack_half_2x16_split_y', 'a@32'),
('f2f32', ('u2u16', ('ushr', a, 16))),
'options->lower_unpack_half_2x16_split'),
'options->lower_pack_split'),
(('pack_32_2x16_split', 'a@16', 'b@16'),
('ior', ('ishl', ('u2u32', b), 16), ('u2u32', a)),
'options->lower_pack_split'),
(('unpack_32_2x16_split_x', 'a@32'),
('u2u16', a),
'options->lower_pack_split'),
(('unpack_32_2x16_split_y', 'a@32'),
('u2u16', ('ushr', 'a', 16)),
'options->lower_pack_split'),
(('isign', a), ('imin', ('imax', a, -1), 1), 'options->lower_isign'),
(('fsign', a), ('fsub', ('b2f', ('flt', 0.0, a)), ('b2f', ('flt', a, 0.0))), 'options->lower_fsign'),
src/freedreno/ir3/ir3_nir.c
+2 -4
View File
@@ -58,17 +58,16 @@ static const nir_shader_compiler_options options = {
.lower_bitfield_insert_to_shifts = true,
.lower_bitfield_extract_to_shifts = true,
.lower_pack_half_2x16 = true,
.lower_pack_half_2x16_split = true,
.lower_pack_snorm_4x8 = true,
.lower_pack_snorm_2x16 = true,
.lower_pack_unorm_4x8 = true,
.lower_pack_unorm_2x16 = true,
.lower_unpack_half_2x16 = true,
.lower_unpack_half_2x16_split = true,
.lower_unpack_snorm_4x8 = true,
.lower_unpack_snorm_2x16 = true,
.lower_unpack_unorm_4x8 = true,
.lower_unpack_unorm_2x16 = true,
.lower_pack_split = true,
.use_interpolated_input_intrinsics = true,
.lower_rotate = true,
.lower_to_scalar = true,
@@ -100,17 +99,16 @@ static const nir_shader_compiler_options options_a6xx = {
.lower_bitfield_insert_to_shifts = true,
.lower_bitfield_extract_to_shifts = true,
.lower_pack_half_2x16 = true,
.lower_pack_half_2x16_split = true,
.lower_pack_snorm_4x8 = true,
.lower_pack_snorm_2x16 = true,
.lower_pack_unorm_4x8 = true,
.lower_pack_unorm_2x16 = true,
.lower_unpack_half_2x16 = true,
.lower_unpack_half_2x16_split = true,
.lower_unpack_snorm_4x8 = true,
.lower_unpack_snorm_2x16 = true,
.lower_unpack_unorm_4x8 = true,
.lower_unpack_unorm_2x16 = true,
.lower_pack_split = true,
.use_interpolated_input_intrinsics = true,
.lower_rotate = true,
.vectorize_io = true,
src/panfrost/bifrost/bifrost_compile.h
+1 -2
View File
@@ -52,17 +52,16 @@ static const nir_shader_compiler_options bifrost_nir_options = {
.lower_rotate = true,
.lower_pack_half_2x16 = true,
.lower_pack_half_2x16_split = true,
.lower_pack_unorm_2x16 = true,
.lower_pack_snorm_2x16 = true,
.lower_pack_unorm_4x8 = true,
.lower_pack_snorm_4x8 = true,
.lower_unpack_half_2x16 = true,
.lower_unpack_half_2x16_split = true,
.lower_unpack_unorm_2x16 = true,
.lower_unpack_snorm_2x16 = true,
.lower_unpack_unorm_4x8 = true,
.lower_unpack_snorm_4x8 = true,
.lower_pack_split = true,
.lower_doubles_options = nir_lower_dmod,
src/panfrost/midgard/midgard_compile.h
+1 -2
View File
@@ -62,17 +62,16 @@ static const nir_shader_compiler_options midgard_nir_options = {
.lower_rotate = true,
.lower_pack_half_2x16 = true,
.lower_pack_half_2x16_split = true,
.lower_pack_unorm_2x16 = true,
.lower_pack_snorm_2x16 = true,
.lower_pack_unorm_4x8 = true,
.lower_pack_snorm_4x8 = true,
.lower_unpack_half_2x16 = true,
.lower_unpack_half_2x16_split = true,
.lower_unpack_unorm_2x16 = true,
.lower_unpack_snorm_2x16 = true,
.lower_unpack_unorm_4x8 = true,
.lower_unpack_snorm_4x8 = true,
.lower_pack_split = true,
.lower_doubles_options = nir_lower_dmod,