pan/bi: Remove nontrivial SPECIAL ops

These require a lot more handholding in the IR than we can deal with at
this stage; we need to restrict ourselves to frcp/sqrt.

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

diff --git a/src/panfrost/bifrost/bi_print.c b/src/panfrost/bifrost/bi_print.c
index c2acd28f223e0ccb4dde2bc83a25ae25d0f8c77f..70c8c9a88defbb64763a00e19d28d77be245e238 100644 (file)
--- a/src/panfrost/bifrost/bi_print.c
+++ b/src/panfrost/bifrost/bi_print.c
@@ -257,12 +257,6 @@ bi_special_op_name(enum bi_special_op op)
         switch (op) {
         case BI_SPECIAL_FRCP: return "frcp";
         case BI_SPECIAL_FRSQ: return "frsq";
-        case BI_SPECIAL_FATAN: return "fatan";
-        case BI_SPECIAL_FSIN: return "fsin";
-        case BI_SPECIAL_FCOS: return "fcos";
-        case BI_SPECIAL_FEXP: return "fexp";
-        case BI_SPECIAL_FLOG2: return "flog2";
-        case BI_SPECIAL_FLOGE: return "flog";
         default: return "invalid";
         }
 }

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 869e353624ed384c0f764a24e69dae088bf252a5..a43068e35d61225c344210ddc8f228f9fe0d7fbf 100644 (file)
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -424,8 +424,6 @@ bi_class_for_nir_alu(nir_op op)
 
         case nir_op_frcp:
         case nir_op_frsq:
-        case nir_op_fsin:
-        case nir_op_fcos:
                 return BI_SPECIAL;
 
         default:
@@ -609,12 +607,6 @@ emit_alu(bi_context *ctx, nir_alu_instr *instr)
         case nir_op_frsq:
                 alu.op.special = BI_SPECIAL_FRSQ;
                 break;
-        case nir_op_fsin:
-                alu.op.special = BI_SPECIAL_FSIN;
-                break;
-        case nir_op_fcos:
-                alu.op.special = BI_SPECIAL_FCOS;
-                break;
         BI_CASE_CMP(nir_op_flt)
         BI_CASE_CMP(nir_op_ilt)
         BI_CASE_CMP(nir_op_fge)

diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h
index 9cfd0c67d15894402eb019d05d8836d38934752b..6a75de7fdc0623b919fa0a697e9b9fe0b6254199 100644 (file)
--- a/src/panfrost/bifrost/compiler.h
+++ b/src/panfrost/bifrost/compiler.h
@@ -185,12 +185,6 @@ enum bi_round_op {
 enum bi_special_op {
         BI_SPECIAL_FRCP,
         BI_SPECIAL_FRSQ,
-        BI_SPECIAL_FATAN,
-        BI_SPECIAL_FSIN,
-        BI_SPECIAL_FCOS,
-        BI_SPECIAL_FEXP,
-        BI_SPECIAL_FLOG2,
-        BI_SPECIAL_FLOGE
 };
 
 typedef struct {