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 50d2ca6..d877602 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -1171,7 +1171,7 @@
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 @@
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 151e2fe..066b96c 100644
--- a/src/panfrost/bifrost/bi_print.c
+++ b/src/panfrost/bifrost/bi_print.c
@@ -140,7 +140,7 @@
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 bfa8c3b..105c331 100644
--- a/src/panfrost/bifrost/bi_tables.c
+++ b/src/panfrost/bifrost/bi_tables.c
@@ -39,7 +39,7 @@
[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 056d447..6a3a159 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -503,7 +503,7 @@
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 16f44ff..3b54c48 100644
--- a/src/panfrost/bifrost/compiler.h
+++ b/src/panfrost/bifrost/compiler.h
@@ -60,7 +60,7 @@
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 ec31965..6a7fa69 100644
--- a/src/panfrost/bifrost/test/bi_interpret.c
+++ b/src/panfrost/bifrost/test/bi_interpret.c
@@ -525,7 +525,7 @@
break;
}
- case BI_ISUB:
+ case BI_IMATH:
unreachable("Unsupported op");
case BI_MINMAX: {