pan/bi: Rename BI_ISUB to BI_IMATH

We'll use this for iadd, etc too which share similar characteristics.

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

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 50d2ca66c2c55d312cad0a6f639ee65217638d4f..d877602bdb2dfd1645445edab45ac0413986e2ea 100644 (file)
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -1171,7 +1171,7 @@ bi_pack_fma(bi_clause *clause, bi_bundle bundle, struct bi_registers *regs)
                 return bi_pack_fma_fma(bundle.fma, regs);
         case BI_FREXP:
                 return bi_pack_fma_frexp(bundle.fma, regs);
-        case BI_ISUB:
+        case BI_IMATH:
                 unreachable("Packing todo");
         case BI_MINMAX:
                 return bi_pack_fma_addmin(bundle.fma, regs);
@@ -1636,7 +1636,7 @@ bi_pack_add(bi_clause *clause, bi_bundle bundle, struct bi_registers *regs)
         case BI_DISCARD:
                 return bi_pack_add_discard(bundle.add, regs);
         case BI_FREXP:
-        case BI_ISUB:
+        case BI_IMATH:
         case BI_LOAD:
                 unreachable("Packing todo");
         case BI_LOAD_ATTR:

diff --git a/src/panfrost/bifrost/bi_print.c b/src/panfrost/bifrost/bi_print.c
index 151e2fe6c2dbac8979c63d314e7b247323b43078..066b96c41c426910b04857d852fc33186c36af29 100644 (file)
--- a/src/panfrost/bifrost/bi_print.c
+++ b/src/panfrost/bifrost/bi_print.c
@@ -140,7 +140,7 @@ bi_class_name(enum bi_class cl)
         case BI_FMA: return "fma";
         case BI_FMOV: return "fmov";
         case BI_FREXP: return "frexp";
-        case BI_ISUB: return "isub";
+        case BI_IMATH: return "imath";
         case BI_LOAD: return "load";
         case BI_LOAD_UNIFORM: return "load_uniform";
         case BI_LOAD_ATTR: return "load_attr";

diff --git a/src/panfrost/bifrost/bi_tables.c b/src/panfrost/bifrost/bi_tables.c
index bfa8c3bdae161e15a2f92444d021e54337e09334..105c33196ea1d9a82c7625184d91e996ce4fb751 100644 (file)
--- a/src/panfrost/bifrost/bi_tables.c
+++ b/src/panfrost/bifrost/bi_tables.c
@@ -39,7 +39,7 @@ unsigned bi_class_props[BI_NUM_CLASSES] = {
         [BI_DISCARD]           = BI_SCHED_HI_LATENCY | BI_SCHED_ADD | BI_CONDITIONAL,
         [BI_FMA]               = BI_ROUNDMODE | BI_SCHED_FMA | BI_MODS,
         [BI_FREXP]             = BI_SCHED_ALL,
-        [BI_ISUB]              = BI_SCHED_ALL,
+        [BI_IMATH]             = 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,

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 056d44718b3cbb6b45f8757e4dfe82a5fa30a12f..6a3a15932f4ab29e9413750377cdc59fcc6c512e 100644 (file)
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -503,7 +503,7 @@ bi_class_for_nir_alu(nir_op op)
         case nir_op_fsub:
                 return BI_ADD;
         case nir_op_isub:
-                return BI_ISUB;
+                return BI_IMATH;
 
         case nir_op_iand:
         case nir_op_ior:

diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h
index 16f44ff01037801b9ee344a08c8cfc53fbd7e948..3b54c4857d1ea2cb3168977c13e40ddae73c109c 100644 (file)
--- a/src/panfrost/bifrost/compiler.h
+++ b/src/panfrost/bifrost/compiler.h
@@ -60,7 +60,7 @@ enum bi_class {
         BI_FMA,
         BI_FMOV,
         BI_FREXP,
-        BI_ISUB,
+        BI_IMATH,
         BI_LOAD,
         BI_LOAD_UNIFORM,
         BI_LOAD_ATTR,

diff --git a/src/panfrost/bifrost/test/bi_interpret.c b/src/panfrost/bifrost/test/bi_interpret.c
index ec319650e68f99627562b44e4399aaa619485312..6a7fa694342fd8cf78c92ce0d30f7576da3635e1 100644 (file)
--- a/src/panfrost/bifrost/test/bi_interpret.c
+++ b/src/panfrost/bifrost/test/bi_interpret.c
@@ -525,7 +525,7 @@ bit_step(struct bit_state *s, bi_instruction *ins, bool FMA)
 
                 break;
         }
-        case BI_ISUB:
+        case BI_IMATH:
                 unreachable("Unsupported op");
 
         case BI_MINMAX: {