From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 1 May 2020 22:07:55 +0000 (-0400)
Subject: pan/bi: Remove BI_GENERIC
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6e5d2072939617bd6e0abe8b36cfadca83bed6f6;p=mesa.git

pan/bi: Remove BI_GENERIC

Goofy.

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

diff --git a/src/panfrost/bifrost/bi_tables.c b/src/panfrost/bifrost/bi_tables.c
index 5a4d02718ed..4bae5216e2d 100644
--- a/src/panfrost/bifrost/bi_tables.c
+++ b/src/panfrost/bifrost/bi_tables.c
@@ -27,25 +27,25 @@
 #include "compiler.h"
 
 unsigned bi_class_props[BI_NUM_CLASSES] = {
-        [BI_ADD] 		= BI_GENERIC | BI_MODS | BI_SCHED_ALL | BI_NO_ABS_ABS_FP16_FMA,
+        [BI_ADD] 		= BI_MODS | BI_SCHED_ALL | BI_NO_ABS_ABS_FP16_FMA,
         [BI_ATEST] 		= BI_SCHED_HI_LATENCY | BI_SCHED_ADD,
         [BI_BRANCH] 		= BI_SCHED_HI_LATENCY | BI_SCHED_ADD,
-        [BI_CMP] 		= BI_GENERIC | BI_MODS | BI_SCHED_ALL,
+        [BI_CMP] 		= BI_MODS | BI_SCHED_ALL,
         [BI_BLEND] 		= BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_SRC,
-        [BI_BITWISE] 		= BI_GENERIC | BI_SCHED_ALL,
+        [BI_BITWISE] 		= BI_SCHED_ALL,
         [BI_COMBINE] 		= 0,
         [BI_CONVERT] 		= BI_SCHED_ADD | BI_SWIZZLABLE | BI_ROUNDMODE, /* +FMA on G71 */
         [BI_CSEL] 		= BI_SCHED_FMA,
         [BI_DISCARD] 		= BI_SCHED_HI_LATENCY | BI_SCHED_ADD,
         [BI_FMA] 		= BI_ROUNDMODE | BI_SCHED_FMA | BI_MODS,
         [BI_FREXP] 		= BI_SCHED_ALL,
-        [BI_ISUB] 		= BI_GENERIC | BI_SCHED_ALL,
+        [BI_ISUB] 		= BI_SCHED_ALL,
         [BI_LOAD] 		= BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_DEST,
         [BI_LOAD_UNIFORM]	= BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_DEST,
         [BI_LOAD_ATTR] 		= BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_DEST,
         [BI_LOAD_VAR] 		= BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_DEST,
         [BI_LOAD_VAR_ADDRESS] 	= BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_DEST,
-        [BI_MINMAX] 		= BI_GENERIC | BI_SCHED_ADD | BI_NO_ABS_ABS_FP16_FMA | BI_MODS, /* | FMA on some? */
+        [BI_MINMAX] 		= BI_SCHED_ADD | BI_NO_ABS_ABS_FP16_FMA | BI_MODS, /* | FMA on some? */
         [BI_MOV] 		= BI_SCHED_ALL,
         [BI_FMOV]               = BI_MODS | BI_SCHED_ALL,
         [BI_REDUCE_FMA]         = BI_SCHED_FMA,
@@ -56,5 +56,5 @@ unsigned bi_class_props[BI_NUM_CLASSES] = {
         [BI_TABLE]              = BI_SCHED_ADD,
         [BI_SELECT]             = BI_SCHED_ALL | BI_SWIZZLABLE,
         [BI_TEX] 		= BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_VECTOR | BI_DATA_REG_DEST,
-        [BI_ROUND] 		= BI_GENERIC | BI_ROUNDMODE | BI_SCHED_ALL,
+        [BI_ROUND] 		= BI_ROUNDMODE | BI_SCHED_ALL,
 };
diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h
index f33595dfe40..e438a58845e 100644
--- a/src/panfrost/bifrost/compiler.h
+++ b/src/panfrost/bifrost/compiler.h
@@ -86,10 +86,7 @@ extern unsigned bi_class_props[BI_NUM_CLASSES];
 /* abs/neg/outmod valid for a float op */
 #define BI_MODS (1 << 0)
 
-/* Generic enough that little class-specific information is required. In other
- * words, it acts as a "normal" ALU op, even if the encoding ends up being
- * irregular enough to warrant a separate class */
-#define BI_GENERIC (1 << 1)
+/* bit 1 unused */
 
 /* Accepts a bifrost_roundmode */
 #define BI_ROUNDMODE (1 << 2)