From: Ian Romanick Date: Thu, 28 Feb 2019 04:08:38 +0000 (-0800) Subject: nir/algebraic: Remove redundant extract_[iu]8 patterns X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bc17f5a2a3b2340f46de709d4364b845a8f4cb5f;p=mesa.git nir/algebraic: Remove redundant extract_[iu]8 patterns No shader-db changes on any Intel platform. Reviewed-by: Matt Turner Reviewed-by: Dylan Baker Acked-by: Jason Ekstrand --- diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index cb47a4bbba3..70720efe048 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -611,22 +611,13 @@ optimizations = [ ('unpack_64_2x32_split_y', a)), a), # Byte extraction - (('ushr', ('ishl', 'a@32', 24), 24), ('extract_u8', a, 0), '!options->lower_extract_byte'), - (('ushr', ('ishl', 'a@32', 16), 24), ('extract_u8', a, 1), '!options->lower_extract_byte'), - (('ushr', ('ishl', 'a@32', 8), 24), ('extract_u8', a, 2), '!options->lower_extract_byte'), (('ushr', 'a@32', 24), ('extract_u8', a, 3), '!options->lower_extract_byte'), - (('ishr', ('ishl', 'a@32', 24), 24), ('extract_i8', a, 0), '!options->lower_extract_byte'), - (('ishr', ('ishl', 'a@32', 16), 24), ('extract_i8', a, 1), '!options->lower_extract_byte'), - (('ishr', ('ishl', 'a@32', 8), 24), ('extract_i8', a, 2), '!options->lower_extract_byte'), (('ishr', 'a@32', 24), ('extract_i8', a, 3), '!options->lower_extract_byte'), - (('iand', 0xff, ('ushr', a, 16)), ('extract_u8', a, 2), '!options->lower_extract_byte'), - (('iand', 0xff, ('ushr', a, 8)), ('extract_u8', a, 1), '!options->lower_extract_byte'), (('iand', 0xff, a), ('extract_u8', a, 0), '!options->lower_extract_byte') ] -# The ('extract_u8', a, 0) pattern, above, can trigger in cases where the -# shift count is based on a loop induction variable. Once the loop is -# unrolled, constant folding will generate patterns like those below. +# After the ('extract_u8', a, 0) pattern, above, triggers, there will be +# patterns like those below. for op in ('ushr', 'ishr'): optimizations.extend([(('extract_u8', (op, 'a@16', 8), 0), ('extract_u8', a, 1))]) optimizations.extend([(('extract_u8', (op, 'a@32', 8 * i), 0), ('extract_u8', a, i)) for i in range(1, 4)]) @@ -634,9 +625,8 @@ for op in ('ushr', 'ishr'): optimizations.extend([(('extract_u8', ('extract_u16', a, 1), 0), ('extract_u8', a, 2))]) -# The ('extract_[iu]8', a, 3) patterns, above, can trigger in cases where the -# shift count is based on a loop induction variable. Once the loop is -# unrolled, constant folding will generate patterns like those below. +# After the ('extract_[iu]8', a, 3) patterns, above, trigger, there will be +# patterns like those below. for op in ('extract_u8', 'extract_i8'): optimizations.extend([((op, ('ishl', 'a@32', 24 - 8 * i), 3), (op, a, i)) for i in range(2, -1, -1)])