pan/mdg: Remove promote_float pass

Now unused.

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

diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources
index ac7ef9daa99ad88e20a9d160f6d6200fab95787a..083bd8d91af1fe699a46a1f7fa761b469be3f0d8 100644 (file)
--- a/src/panfrost/Makefile.sources
+++ b/src/panfrost/Makefile.sources
@@ -53,7 +53,6 @@ midgard_FILES := \
         midgard/midgard_ops.h \
         midgard/midgard_opt_copy_prop.c \
         midgard/midgard_opt_dce.c \
-        midgard/midgard_opt_float.c \
         midgard/midgard_opt_perspective.c \
         midgard/midgard-parse.h \
         midgard/midgard_print.c \

diff --git a/src/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h
index cc19b4fb6a1435cb84bd91fbadc283030376fcac..739c87d30b85a22ed0e5ec086bfc64035a8da070 100644 (file)
--- a/src/panfrost/midgard/compiler.h
+++ b/src/panfrost/midgard/compiler.h
@@ -661,6 +661,5 @@ bool midgard_opt_combine_projection(compiler_context *ctx, midgard_block *block)
 bool midgard_opt_varying_projection(compiler_context *ctx, midgard_block *block);
 bool midgard_opt_dead_code_eliminate(compiler_context *ctx);
 bool midgard_opt_dead_move_eliminate(compiler_context *ctx, midgard_block *block);
-bool midgard_opt_promote_fmov(compiler_context *ctx, midgard_block *block);
 
 #endif

diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/midgard/meson.build
index 65e1d096450ed2f66e9d98e5a8bb1340864968be..d47d73fd2731c6548db9fa41844d690d7ecf8936 100644 (file)
--- a/src/panfrost/midgard/meson.build
+++ b/src/panfrost/midgard/meson.build
@@ -36,7 +36,6 @@ libpanfrost_midgard_files = files(
   'mir_squeeze.c',
   'midgard_opt_copy_prop.c',
   'midgard_opt_dce.c',
-  'midgard_opt_float.c',
   'midgard_opt_perspective.c',
   'midgard_errata_lod.c',
   'nir_undef_to_zero.c',

diff --git a/src/panfrost/midgard/midgard_opt_float.c b/src/panfrost/midgard/midgard_opt_float.c
deleted file mode 100644 (file)
index 43e1cd2..0000000
--- a/src/panfrost/midgard/midgard_opt_float.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2019 Collabora, Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Authors (Collabora):
- *    Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
- */
-
-#include "compiler.h"
-#include "midgard_ops.h"
-#include <math.h>
-
-/* Could a 32-bit value represent exactly a 32-bit floating point? */
-
-static bool
-mir_constant_float(uint32_t u)
-{
-        /* Cast */
-        float f = 0;
-        memcpy(&f, &u, sizeof(u));
-
-        /* TODO: What exactly is the condition? */
-        return !(isnan(f) || isinf(f));
-}
-
-/* Promotes imov with a constant to fmov where the constant is exactly
- * representible as a float */
-
-bool
-midgard_opt_promote_fmov(compiler_context *ctx, midgard_block *block)
-{
-        bool progress = false;
-
-        mir_foreach_instr_in_block(block, ins) {
-                if (ins->type != TAG_ALU_4) continue;
-                if (ins->alu.op != midgard_alu_op_imov) continue;
-                if (ins->has_inline_constant) continue;
-                if (!ins->has_constants) continue;
-                if (mir_nontrivial_source2_mod_simple(ins)) continue;
-                if (mir_nontrivial_outmod(ins)) continue;
-                if (ins->alu.reg_mode != midgard_reg_mode_32) continue;
-
-                /* We found an imov with a constant. Check the constants */
-                bool ok = true;
-
-                for (unsigned i = 0; i < ARRAY_SIZE(ins->constants.u32); ++i)
-                        ok &= mir_constant_float(ins->constants.u32[i]);
-
-                if (!ok)
-                        continue;
-
-                /* Rewrite to fmov */
-                ins->alu.op = midgard_alu_op_fmov;
-                ins->alu.outmod = 0;
-
-                /* Clear the int mod */
-                midgard_vector_alu_src u = vector_alu_from_unsigned(ins->alu.src2);
-                u.mod = 0;
-                ins->alu.src2 = vector_alu_srco_unsigned(u);
-
-                progress |= true;
-        }
-
-        return progress;
-}