From c70a198f24cbf5127d48673d96ad8f8153dbe729 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 3 Mar 2020 08:16:50 -0500 Subject: pan/bi: Clarify special op scheduling They're encoded on ADD but eat the full cycle. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bi_tables.c | 2 +- src/panfrost/bifrost/compiler.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/panfrost') diff --git a/src/panfrost/bifrost/bi_tables.c b/src/panfrost/bifrost/bi_tables.c index cf3e774efd8..97244817301 100644 --- a/src/panfrost/bifrost/bi_tables.c +++ b/src/panfrost/bifrost/bi_tables.c @@ -47,7 +47,7 @@ unsigned bi_class_props[BI_NUM_CLASSES] = { [BI_SHIFT] = BI_SCHED_ALL, [BI_STORE] = BI_SCHED_ADD, [BI_STORE_VAR] = BI_SCHED_ADD, - [BI_SPECIAL] = BI_SCHED_ALL, + [BI_SPECIAL] = BI_SCHED_ADD | BI_SCHED_SLOW, [BI_TEX] = BI_SCHED_ADD, [BI_ROUND] = BI_GENERIC | BI_ROUNDMODE | BI_SCHED_ALL, }; diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h index ed9dd751910..6eddf448ad7 100644 --- a/src/panfrost/bifrost/compiler.h +++ b/src/panfrost/bifrost/compiler.h @@ -95,6 +95,10 @@ extern unsigned bi_class_props[BI_NUM_CLASSES]; /* Most ALU ops can do either, actually */ #define BI_SCHED_ALL (BI_SCHED_FMA | BI_SCHED_ADD) +/* Along with setting BI_SCHED_ADD, eats up the entire cycle, so FMA must be + * nopped out. Used for _FAST operations. */ +#define BI_SCHED_SLOW (1 << 5) + /* It can't get any worse than csel4... can it? */ #define BIR_SRC_COUNT 4 -- cgit v1.2.3