Mesa (master): pan/mdg: Ingest actual isub ops

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f47c60b41123e19c443968af2a311d84d8c96ac1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f47c60b41123e19c443968af2a311d84d8c96ac1

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Thu Apr 30 15:41:10 2020 -0400

pan/mdg: Ingest actual isub ops

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4852>

---

 src/panfrost/midgard/midgard_compile.h        | 1 -
 src/panfrost/midgard/midgard_nir_algebraic.py | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/panfrost/midgard/midgard_compile.h b/src/panfrost/midgard/midgard_compile.h
index c59732fbd60..bf98342c4f6 100644
--- a/src/panfrost/midgard/midgard_compile.h
+++ b/src/panfrost/midgard/midgard_compile.h
@@ -38,7 +38,6 @@ midgard_compile_shader_nir(nir_shader *nir, panfrost_program *program, bool is_b
 
 static const nir_shader_compiler_options midgard_nir_options = {
         .lower_ffma = true,
-        .lower_sub = true,
         .lower_scmp = true,
         .lower_flrp16 = true,
         .lower_flrp32 = true,
diff --git a/src/panfrost/midgard/midgard_nir_algebraic.py b/src/panfrost/midgard/midgard_nir_algebraic.py
index 3dc1900cca1..e8547a5067c 100644
--- a/src/panfrost/midgard/midgard_nir_algebraic.py
+++ b/src/panfrost/midgard/midgard_nir_algebraic.py
@@ -37,6 +37,9 @@ algebraic_late = [
 
     (('ineg', a), ('isub', 0, a)),
 
+    # Likewise we want fsub lowered but not isub
+    (('fsub', a, b), ('fadd', a, ('fneg', b))),
+
     # These two special-cases save space/an op than the actual csel op +
     # scheduler flexibility