| From e428a6a7eb374f40277dc4c4eccc6cc6ab0f4ea1 Mon Sep 17 00:00:00 2001 |
| From: Isabella Basso <isabellabdoamaral@usp.br> |
| Date: Fri, 10 Mar 2023 17:20:07 -0300 |
| Subject: [PATCH] nir/algebraic: insert patterns inside optimizations list |
| |
| Some patterns were outside the list of optimizations. |
| |
| Fixes: b86305bb ("nir/algebraic: collapse conversion opcodes (many patterns)") |
| |
| Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> |
| Reviewed-by: Georg Lehmann <dadschoorse@gmail.com> |
| Signed-off-by: Isabella Basso <isabellabdoamaral@usp.br> |
| Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20965> |
| --- |
| src/compiler/nir/nir_opt_algebraic.py | 18 +++++++++--------- |
| 1 file changed, 9 insertions(+), 9 deletions(-) |
| |
| diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py |
| index 5f8757c1651..4153a5951c6 100644 |
| --- a/src/compiler/nir/nir_opt_algebraic.py |
| +++ b/src/compiler/nir/nir_opt_algebraic.py |
| @@ -923,18 +923,18 @@ for s in [16, 32, 64]: |
| |
| (('fadd', ('b2f{}'.format(s), ('flt', 0.0, 'a@{}'.format(s))), ('fneg', ('b2f{}'.format(s), ('flt', 'a@{}'.format(s), 0.0)))), ('fsign', a), '!options->lower_fsign'), |
| (('iadd', ('b2i{}'.format(s), ('flt', 0, 'a@{}'.format(s))), ('ineg', ('b2i{}'.format(s), ('flt', 'a@{}'.format(s), 0)))), ('f2i{}'.format(s), ('fsign', a)), '!options->lower_fsign'), |
| - ]) |
| |
| - # float? -> float? -> floatS ==> float? -> floatS |
| - (('~f2f{}'.format(s), ('f2f', a)), ('f2f{}'.format(s), a)), |
| + # float? -> float? -> floatS ==> float? -> floatS |
| + (('~f2f{}'.format(s), ('f2f', a)), ('f2f{}'.format(s), a)), |
| |
| - # int? -> float? -> floatS ==> int? -> floatS |
| - (('~f2f{}'.format(s), ('u2f', a)), ('u2f{}'.format(s), a)), |
| - (('~f2f{}'.format(s), ('i2f', a)), ('i2f{}'.format(s), a)), |
| + # int? -> float? -> floatS ==> int? -> floatS |
| + (('~f2f{}'.format(s), ('u2f', a)), ('u2f{}'.format(s), a)), |
| + (('~f2f{}'.format(s), ('i2f', a)), ('i2f{}'.format(s), a)), |
| |
| - # float? -> float? -> intS ==> float? -> intS |
| - (('~f2u{}'.format(s), ('f2f', a)), ('f2u{}'.format(s), a)), |
| - (('~f2i{}'.format(s), ('f2f', a)), ('f2i{}'.format(s), a)), |
| + # float? -> float? -> intS ==> float? -> intS |
| + (('~f2u{}'.format(s), ('f2f', a)), ('f2u{}'.format(s), a)), |
| + (('~f2i{}'.format(s), ('f2f', a)), ('f2i{}'.format(s), a)), |
| + ]) |
| |
| for B in [32, 64]: |
| if s < B: |
| -- |
| 2.40.0.rc1.284.g88254d51c5-goog |
| |
