From: Ian Romanick Date: Thu, 28 Feb 2019 04:15:32 +0000 (-0800) Subject: nir/algebraic: Add missing 16-bit extract_[iu]8 patterns X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae21b52e1dc5db5f7678ce9817364384dc0cbc87;p=mesa.git nir/algebraic: Add missing 16-bit extract_[iu]8 patterns No shader-db changes on any Intel platform. v2: Use a loop to generate patterns. Suggested by Jason. v3: Fix a copy-and-paste bug in the extract_[ui] of ishl loop that would replace an extract_i8 with and extract_u8. This broke ~180 tests. This bug was introduced in v2. Reviewed-by: Matt Turner [v1] Reviewed-by: Dylan Baker [v2] Acked-by: Jason Ekstrand [v2] --- diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py index 42cf7673071..bdf70787937 100644 --- a/src/compiler/nir/nir_opt_algebraic.py +++ b/src/compiler/nir/nir_opt_algebraic.py @@ -611,8 +611,10 @@ optimizations = [ ('unpack_64_2x32_split_y', a)), a), # Byte extraction + (('ushr', 'a@16', 8), ('extract_u8', a, 1), '!options->lower_extract_byte'), (('ushr', 'a@32', 24), ('extract_u8', a, 3), '!options->lower_extract_byte'), (('ushr', 'a@64', 56), ('extract_u8', a, 7), '!options->lower_extract_byte'), + (('ishr', 'a@16', 8), ('extract_i8', a, 1), '!options->lower_extract_byte'), (('ishr', 'a@32', 24), ('extract_i8', a, 3), '!options->lower_extract_byte'), (('ishr', 'a@64', 56), ('extract_i8', a, 7), '!options->lower_extract_byte'), (('iand', 0xff, a), ('extract_u8', a, 0), '!options->lower_extract_byte') @@ -630,6 +632,7 @@ optimizations.extend([(('extract_u8', ('extract_u16', a, 1), 0), ('extract_u8', # 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@16', 8), 1), (op, a, 0))]) optimizations.extend([((op, ('ishl', 'a@32', 24 - 8 * i), 3), (op, a, i)) for i in range(2, -1, -1)]) optimizations.extend([((op, ('ishl', 'a@64', 56 - 8 * i), 7), (op, a, i)) for i in range(6, -1, -1)])