From a6ae2d8f940df3d9e0b71b13336ca01e5b6a2c47 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 6 Apr 2020 10:16:06 -0400 Subject: [PATCH] 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 Part-of: --- src/panfrost/bifrost/bi_print.c | 6 ------ src/panfrost/bifrost/bifrost_compile.c | 8 -------- src/panfrost/bifrost/compiler.h | 6 ------ 3 files changed, 20 deletions(-) diff --git a/src/panfrost/bifrost/bi_print.c b/src/panfrost/bifrost/bi_print.c index c2acd28f223..70c8c9a88de 100644 --- 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 869e353624e..a43068e35d6 100644 --- 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 9cfd0c67d15..6a75de7fdc0 100644 --- 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 { -- 2.30.2