From 470c2637fbbd8c1539179905ce93c8ff386e19c5 Mon Sep 17 00:00:00 2001
From: "Eric R. Smith" <eric.smith@collabora.com>
Date: Thu, 4 Jul 2024 17:10:15 -0300
Subject: [PATCH] panfrost: Make the unit to use for instructions explicit

We were using the first character of names to indicate the execution unit
('+' for add, '*' for fma). Change the ISA.xml file to have an explicit
`unit` attribute for instructions; this makes the XML more flexible
for future architectures and matches what the valhall ISA.xml does.

Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Acked-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30179>
---
 src/panfrost/compiler/ISA.xml        | 724 +++++++++++++--------------
 src/panfrost/compiler/bifrost_isa.py |  20 +-
 2 files changed, 381 insertions(+), 363 deletions(-)

diff --git a/src/panfrost/compiler/ISA.xml b/src/panfrost/compiler/ISA.xml
index 7ddd9993e1a..462d068b3bb 100644
--- a/src/panfrost/compiler/ISA.xml
+++ b/src/panfrost/compiler/ISA.xml
@@ -23,7 +23,7 @@
 
 <bifrost>
 
-  <ins name="*ARSHIFT.i32" mask="0x7ff838" exact="0x335018">
+  <ins name="ARSHIFT.i32" mask="0x7ff838" exact="0x335018" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0x8"/>
     <src start="6"/>
@@ -35,7 +35,7 @@
     </mod>
   </ins>
 
-  <ins name="*ARSHIFT.v2i16">
+  <ins name="ARSHIFT.v2i16" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0x8"/>
     <src start="6"/>
@@ -77,7 +77,7 @@
     </encoding>
   </ins>
 
-  <ins name="*ARSHIFT.v4i8">
+  <ins name="ARSHIFT.v4i8" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0x8"/>
     <src start="6"/>
@@ -102,7 +102,7 @@
     </encoding>
   </ins>
 
-  <ins name="*ARSHIFT_DOUBLE.i32" mask="0x7ff000" exact="0x33e000">
+  <ins name="ARSHIFT_DOUBLE.i32" mask="0x7ff000" exact="0x33e000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -117,7 +117,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_C.i32" mask="0x7fe000" exact="0x2f4000" last="true" dests="0">
+  <ins name="ATOM_C.i32" mask="0x7fe000" exact="0x2f4000" last="true" dests="0" unit="fma">
     <src start="0" mask="0xf3"/>
     <src start="3" mask="0xf3"/>
     <src start="6" mask="0xf7"/>
@@ -140,7 +140,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_C.i64" mask="0x7fe000" exact="0x2f0000" last="true" dests="0">
+  <ins name="ATOM_C.i64" mask="0x7fe000" exact="0x2f0000" last="true" dests="0" unit="fma">
     <src start="0" mask="0xf3"/>
     <src start="3" mask="0xf3"/>
     <src start="6" mask="0xf7"/>
@@ -163,7 +163,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_C1.i32" mask="0x7ffe00" exact="0x2f5e00" last="true" dests="0">
+  <ins name="ATOM_C1.i32" mask="0x7ffe00" exact="0x2f5e00" last="true" dests="0" unit="fma">
     <src start="0" mask="0xf3"/>
     <src start="3" mask="0xf3"/>
     <mod name="atom_opc" start="6" size="3">
@@ -175,7 +175,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_C1.i64" mask="0x7ffe00" exact="0x2f1e00" last="true" dests="0">
+  <ins name="ATOM_C1.i64" mask="0x7ffe00" exact="0x2f1e00" last="true" dests="0" unit="fma">
     <src start="0" mask="0xf3"/>
     <src start="3" mask="0xf3"/>
     <mod name="atom_opc" start="6" size="3">
@@ -187,7 +187,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_C1_RETURN.i32" mask="0x7ffe00" exact="0x2f7e00" last="true" dests="0">
+  <ins name="ATOM_C1_RETURN.i32" mask="0x7ffe00" exact="0x2f7e00" last="true" dests="0" unit="fma">
     <src start="0" mask="0xf3"/>
     <src start="3" mask="0xf3"/>
     <mod name="atom_opc" start="6" size="3">
@@ -199,7 +199,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_C1_RETURN.i64" mask="0x7ffe00" exact="0x2f3e00" last="true" dests="0">
+  <ins name="ATOM_C1_RETURN.i64" mask="0x7ffe00" exact="0x2f3e00" last="true" dests="0" unit="fma">
     <src start="0" mask="0xf3"/>
     <src start="3" mask="0xf3"/>
     <mod name="atom_opc" start="6" size="3">
@@ -211,7 +211,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_C_RETURN.i32" mask="0x7fe000" exact="0x2f6000" last="true" dests="0">
+  <ins name="ATOM_C_RETURN.i32" mask="0x7fe000" exact="0x2f6000" last="true" dests="0" unit="fma">
     <src start="0" mask="0xf3"/>
     <src start="3" mask="0xf3"/>
     <src start="6" mask="0xf7"/>
@@ -234,7 +234,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_C_RETURN.i64" mask="0x7fe000" exact="0x2f2000" last="true" dests="0">
+  <ins name="ATOM_C_RETURN.i64" mask="0x7fe000" exact="0x2f2000" last="true" dests="0" unit="fma">
     <src start="0" mask="0xf3"/>
     <src start="3" mask="0xf3"/>
     <src start="6" mask="0xf7"/>
@@ -257,7 +257,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_POST.i32" mask="0x7ffc00" exact="0x6ee400">
+  <ins name="ATOM_POST.i32" mask="0x7ffc00" exact="0x6ee400" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="atom_opc" start="6" size="4">
@@ -279,7 +279,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_POST.i64" mask="0x7ffc00" exact="0x6ee000">
+  <ins name="ATOM_POST.i64" mask="0x7ffc00" exact="0x6ee000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="atom_opc" start="6" size="4">
@@ -301,7 +301,7 @@
     </mod>
   </ins>
 
-  <ins name="*ATOM_PRE.i64" mask="0x7fe000" exact="0x6ec000">
+  <ins name="ATOM_PRE.i64" mask="0x7fe000" exact="0x6ec000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -324,16 +324,16 @@
     </mod>
   </ins>
 
-  <ins name="*BITREV.i32" mask="0x7ffff8" exact="0x701fc0">
+  <ins name="BITREV.i32" mask="0x7ffff8" exact="0x701fc0" unit="fma">
     <src start="0" mask="0xfb"/>
   </ins>
 
-  <ins name="*CLZ.u32" mask="0x7ffff0" exact="0x701fd0">
+  <ins name="CLZ.u32" mask="0x7ffff0" exact="0x701fd0" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="mask" start="3" size="1" opt="mask"/>
   </ins>
 
-  <ins name="*CLZ.v2u16" mask="0x7fffc0" exact="0x701ec0">
+  <ins name="CLZ.v2u16" mask="0x7fffc0" exact="0x701ec0" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="mask" start="3" size="1" opt="mask"/>
     <mod name="swz0" start="4" size="2" default="h01">
@@ -344,12 +344,12 @@
     </mod>
   </ins>
 
-  <ins name="*CLZ.v4u8" mask="0x7ffff0" exact="0x701f90">
+  <ins name="CLZ.v4u8" mask="0x7ffff0" exact="0x701f90" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="mask" start="3" size="1" opt="mask"/>
   </ins>
 
-  <ins name="*CSEL.f32" mask="0x7fc000" exact="0x2e0000">
+  <ins name="CSEL.f32" mask="0x7fc000" exact="0x2e0000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -386,7 +386,7 @@
     </swap>
   </ins>
 
-  <ins name="*CSEL.i32" mask="0x7f8000" exact="0x2e0000">
+  <ins name="CSEL.i32" mask="0x7f8000" exact="0x2e0000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -413,7 +413,7 @@
     </swap>
   </ins>
 
-  <ins name="*CSEL.s32" mask="0x7fe000" exact="0x2e4000">
+  <ins name="CSEL.s32" mask="0x7fe000" exact="0x2e4000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -440,7 +440,7 @@
     </swap>
   </ins>
 
-  <ins name="*CSEL.u32" mask="0x7fe000" exact="0x2e6000">
+  <ins name="CSEL.u32" mask="0x7fe000" exact="0x2e6000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -467,7 +467,7 @@
     </swap>
   </ins>
 
-  <ins name="*CSEL.v2f16" mask="0x7fc000" exact="0x6e0000">
+  <ins name="CSEL.v2f16" mask="0x7fc000" exact="0x6e0000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -504,7 +504,7 @@
     </swap>
   </ins>
 
-  <ins name="*CSEL.v2i16" mask="0x7f8000" exact="0x6e0000">
+  <ins name="CSEL.v2i16" mask="0x7f8000" exact="0x6e0000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -531,7 +531,7 @@
     </swap>
   </ins>
 
-  <ins name="*CSEL.v2s16" mask="0x7fe000" exact="0x6e4000">
+  <ins name="CSEL.v2s16" mask="0x7fe000" exact="0x6e4000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -558,7 +558,7 @@
     </swap>
   </ins>
 
-  <ins name="*CSEL.v2u16" mask="0x7fe000" exact="0x6e6000">
+  <ins name="CSEL.v2u16" mask="0x7fe000" exact="0x6e6000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -585,7 +585,7 @@
     </swap>
   </ins>
 
-  <ins name="*CUBEFACE1" mask="0x7ffc00" exact="0x706800">
+  <ins name="CUBEFACE1" mask="0x7ffc00" exact="0x706800" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -606,7 +606,7 @@
     </derived>
   </ins>
 
-  <ins name="*DTSEL_IMM" mask="0x7fffe0" exact="0x70f3e0">
+  <ins name="DTSEL_IMM" mask="0x7fffe0" exact="0x70f3e0" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="table" start="3" size="2">
       <opt>attribute_1</opt>
@@ -616,7 +616,7 @@
     </mod>
   </ins>
 
-  <ins name="*F16_TO_F32" mask="0x7ffff0" exact="0x700d10">
+  <ins name="F16_TO_F32" mask="0x7ffff0" exact="0x700d10" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="lane0" start="3" size="1" default="h0">
       <opt>h0</opt>
@@ -624,7 +624,7 @@
     </mod>
   </ins>
 
-  <ins name="*FADD.f32" mask="0x7e0000" exact="0x2c0000">
+  <ins name="FADD.f32" mask="0x7e0000" exact="0x2c0000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="abs1" start="6" size="1" opt="abs"/>
@@ -695,7 +695,7 @@
     </swap>
   </ins>
 
-  <ins name="*FADD.v2f16" mask="0x7e0000" exact="0x6c0000">
+  <ins name="FADD.v2f16" mask="0x7e0000" exact="0x6c0000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="abs0" size="1" opt="abs"/>
@@ -766,7 +766,7 @@
     </swap>
   </ins>
 
-  <ins name="*FADD_LSCALE.f32" mask="0x7ffc00" exact="0x70f400">
+  <ins name="FADD_LSCALE.f32" mask="0x7ffc00" exact="0x70f400" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="abs0" start="6" size="1" opt="abs"/>
@@ -775,7 +775,7 @@
     <mod name="neg1" start="9" size="1" opt="neg"/>
   </ins>
 
-  <ins name="*FCMP.f32" mask="0x7c0000" exact="0x240000">
+  <ins name="FCMP.f32" mask="0x7c0000" exact="0x240000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="widen0" size="2">
@@ -855,7 +855,7 @@
     </swap>
   </ins>
 
-  <ins name="*FCMP.v2f16" mask="0x7c0000" exact="0x640000">
+  <ins name="FCMP.v2f16" mask="0x7c0000" exact="0x640000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="abs0" size="1" opt="abs"/>
@@ -949,7 +949,7 @@
     </swap>
   </ins>
 
-  <ins name="*FLSHIFT_DOUBLE.i32" mask="0x7ff800" exact="0x33f800">
+  <ins name="FLSHIFT_DOUBLE.i32" mask="0x7ff800" exact="0x33f800" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -960,7 +960,7 @@
     </mod>
   </ins>
 
-  <ins name="*FMA.f32" mask="0x600000" exact="0x0">
+  <ins name="FMA.f32" mask="0x600000" exact="0x0" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1056,7 +1056,7 @@
     </swap>
   </ins>
 
-  <ins name="*FMA.v2f16" mask="0x600000" exact="0x400000">
+  <ins name="FMA.v2f16" mask="0x600000" exact="0x400000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1117,7 +1117,7 @@
     </derived>
   </ins>
 
-  <ins name="*FMA_RSCALE.f32" mask="0x7c0000" exact="0x280000">
+  <ins name="FMA_RSCALE.f32" mask="0x7c0000" exact="0x280000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1205,7 +1205,7 @@
     </derived>
   </ins>
 
-  <ins name="*FMA_RSCALE.v2f16" mask="0x7c0000" exact="0x680000">
+  <ins name="FMA_RSCALE.v2f16" mask="0x7c0000" exact="0x680000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1288,7 +1288,7 @@
     </derived>
   </ins>
 
-  <ins name="*FMUL_CSLICE" mask="0x7ffe00" exact="0x70d000">
+  <ins name="FMUL_CSLICE" mask="0x7ffe00" exact="0x70d000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="lane0" start="6" size="1" default="h0">
@@ -1299,12 +1299,12 @@
     <mod name="neg0" start="8" size="1" opt="neg"/>
   </ins>
 
-  <ins name="*FMUL_SLICE.f32" mask="0x7fffc0" exact="0x70cb40">
+  <ins name="FMUL_SLICE.f32" mask="0x7fffc0" exact="0x70cb40" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
   </ins>
 
-  <ins name="*FREXPE.f32">
+  <ins name="FREXPE.f32" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="neg0" size="1" opt="neg"/>
     <mod name="sqrt" size="1" opt="sqrt"/>
@@ -1329,7 +1329,7 @@
     </encoding>
   </ins>
 
-  <ins name="*FREXPE.v2f16">
+  <ins name="FREXPE.v2f16" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="neg0" size="1" opt="neg"/>
     <mod name="sqrt" size="1" opt="sqrt"/>
@@ -1354,7 +1354,7 @@
     </encoding>
   </ins>
 
-  <ins name="*FREXPM.f32">
+  <ins name="FREXPM.f32" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="abs0" start="6" size="1" opt="abs"/>
     <mod name="sqrt" size="1" opt="sqrt"/>
@@ -1382,7 +1382,7 @@
     </encoding>
   </ins>
 
-  <ins name="*FREXPM.v2f16">
+  <ins name="FREXPM.v2f16" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="abs0" start="6" size="1" opt="abs"/>
     <mod name="sqrt" size="1" opt="sqrt"/>
@@ -1410,7 +1410,7 @@
     </encoding>
   </ins>
 
-  <ins name="*FROUND.f32">
+  <ins name="FROUND.f32" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="abs0" start="7" size="1" opt="abs"/>
     <mod name="neg0" start="8" size="1" opt="neg"/>
@@ -1441,7 +1441,7 @@
     </encoding>
   </ins>
 
-  <ins name="*FROUND.v2f16">
+  <ins name="FROUND.v2f16" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="abs0" start="7" size="1" opt="abs"/>
     <mod name="neg0" start="8" size="1" opt="neg"/>
@@ -1472,7 +1472,7 @@
     </encoding>
   </ins>
 
-  <ins name="*FRSHIFT_DOUBLE.i32" mask="0x7ff800" exact="0x33f000">
+  <ins name="FRSHIFT_DOUBLE.i32" mask="0x7ff800" exact="0x33f000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1483,13 +1483,13 @@
     </mod>
   </ins>
 
-  <ins name="*IADDC.i32" mask="0x7ffe00" exact="0x27fc00">
+  <ins name="IADDC.i32" mask="0x7ffe00" exact="0x27fc00" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
   </ins>
 
-  <ins name="*IDP.v4i8" mask="0x7ff9c0" exact="0x73e8c0">
+  <ins name="IDP.v4i8" mask="0x7ff9c0" exact="0x73e8c0" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="sign0" start="9" size="1">
@@ -1502,7 +1502,7 @@
     </mod>
   </ins>
 
-  <ins name="*IMUL.i32">
+  <ins name="IMUL.i32" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="widen1" size="3">
@@ -1565,7 +1565,7 @@
     </encoding>
   </ins>
 
-  <ins name="*IMUL.v2i16" mask="0x7fe1c0" exact="0x7240c0">
+  <ins name="IMUL.v2i16" mask="0x7fe1c0" exact="0x7240c0" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="swz0" start="9" size="2" default="h01">
@@ -1582,7 +1582,7 @@
     </mod>
   </ins>
 
-  <ins name="*IMUL.v4i8">
+  <ins name="IMUL.v4i8" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="replicate0" size="3" default="b0123">
@@ -1615,7 +1615,7 @@
     </encoding>
   </ins>
 
-  <ins name="*IMULD" mask="0x7fff80" exact="0x70f100">
+  <ins name="IMULD" mask="0x7fff80" exact="0x70f100" unit="fma">
     <src start="0" mask="0x33"/>
     <src start="3" mask="0x33"/>
     <mod name="threads" start="6" size="1" default="odd">
@@ -1624,13 +1624,13 @@
     </mod>
   </ins>
 
-  <ins name="*ISUBB.i32" mask="0x7ffe00" exact="0x27fe00">
+  <ins name="ISUBB.i32" mask="0x7ffe00" exact="0x27fe00" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
   </ins>
 
-  <ins name="*JUMP_EX" mask="0x7ff000" exact="0x2eb000" last="true">
+  <ins name="JUMP_EX" mask="0x7ff000" exact="0x2eb000" last="true" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1646,7 +1646,7 @@
     </mod>
   </ins>
 
-  <ins name="*LROT_DOUBLE.i32" mask="0x7ff000" exact="0x33b000">
+  <ins name="LROT_DOUBLE.i32" mask="0x7ff000" exact="0x33b000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1661,7 +1661,7 @@
     </mod>
   </ins>
 
-  <ins name="*LSHIFT_AND.i32" mask="0x7f3800" exact="0x311000">
+  <ins name="LSHIFT_AND.i32" mask="0x7f3800" exact="0x311000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1678,7 +1678,7 @@
     </mod>
   </ins>
 
-  <ins name="*LSHIFT_AND.v2i16">
+  <ins name="LSHIFT_AND.v2i16" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1725,7 +1725,7 @@
     </encoding>
   </ins>
 
-  <ins name="*LSHIFT_AND.v4i8">
+  <ins name="LSHIFT_AND.v4i8" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1755,7 +1755,7 @@
     </encoding>
   </ins>
 
-  <ins name="*LSHIFT_DOUBLE.i32" mask="0x7ff000" exact="0x33c000">
+  <ins name="LSHIFT_DOUBLE.i32" mask="0x7ff000" exact="0x33c000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1770,7 +1770,7 @@
     </mod>
   </ins>
 
-  <ins name="*LSHIFT_OR.i32" mask="0x7f3800" exact="0x313000">
+  <ins name="LSHIFT_OR.i32" mask="0x7f3800" exact="0x313000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1787,7 +1787,7 @@
     <mod name="not_result" start="15" size="1" opt="not"/>
   </ins>
 
-  <ins name="*LSHIFT_OR.v2i16">
+  <ins name="LSHIFT_OR.v2i16" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1834,7 +1834,7 @@
     </encoding>
   </ins>
 
-  <ins name="*LSHIFT_OR.v4i8">
+  <ins name="LSHIFT_OR.v4i8" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1864,7 +1864,7 @@
     </encoding>
   </ins>
 
-  <ins name="*LSHIFT_XOR.i32" mask="0x7fd800" exact="0x325000">
+  <ins name="LSHIFT_XOR.i32" mask="0x7fd800" exact="0x325000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1877,7 +1877,7 @@
     <mod name="not_result" start="13" size="1" opt="not"/>
   </ins>
 
-  <ins name="*LSHIFT_XOR.v2i16">
+  <ins name="LSHIFT_XOR.v2i16" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1920,7 +1920,7 @@
     </encoding>
   </ins>
 
-  <ins name="*LSHIFT_XOR.v4i8">
+  <ins name="LSHIFT_XOR.v4i8" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1946,7 +1946,7 @@
     </encoding>
   </ins>
 
-  <ins name="*MKVEC.v2i16" mask="0x7fff00" exact="0x70f000">
+  <ins name="MKVEC.v2i16" mask="0x7fff00" exact="0x70f000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="lane0" start="6" size="1" default="h0">
@@ -1959,7 +1959,7 @@
     </mod>
   </ins>
 
-  <ins name="*MKVEC.v4i8" mask="0x7f0000" exact="0x710000">
+  <ins name="MKVEC.v4i8" mask="0x7f0000" exact="0x710000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -1982,21 +1982,21 @@
     </mod>
   </ins>
 
-  <ins name="*MOV.i32" mask="0x7ffff8" exact="0x701968">
+  <ins name="MOV.i32" mask="0x7ffff8" exact="0x701968" unit="fma">
     <src start="0" mask="0xfb"/>
   </ins>
 
-  <ins name="*NOP" mask="0x7fffff" exact="0x701963" dests="0"/>
+  <ins name="NOP" mask="0x7fffff" exact="0x701963" dests="0" unit="fma"/>
 
-  <ins name="*POPCOUNT.i32" mask="0x7ffff8" exact="0x73c6d8">
+  <ins name="POPCOUNT.i32" mask="0x7ffff8" exact="0x73c6d8" unit="fma">
     <src start="0" mask="0xfb"/>
   </ins>
 
-  <ins name="*QUIET.f32" mask="0x7ffff8" exact="0x701970">
+  <ins name="QUIET.f32" mask="0x7ffff8" exact="0x701970" unit="fma">
     <src start="0" mask="0xfb"/>
   </ins>
 
-  <ins name="*QUIET.v2f16" mask="0x7fffc8" exact="0x701900">
+  <ins name="QUIET.v2f16" mask="0x7fffc8" exact="0x701900" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="swz0" start="4" size="2" default="h01">
       <opt>h00</opt>
@@ -2006,7 +2006,7 @@
     </mod>
   </ins>
 
-  <ins name="*RROT_DOUBLE.i32" mask="0x7ff000" exact="0x33a000">
+  <ins name="RROT_DOUBLE.i32" mask="0x7ff000" exact="0x33a000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2021,7 +2021,7 @@
     </mod>
   </ins>
 
-  <ins name="*RSHIFT_AND.i32" mask="0x7f3800" exact="0x301000">
+  <ins name="RSHIFT_AND.i32" mask="0x7f3800" exact="0x301000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2039,7 +2039,7 @@
     <mod name="arithmetic" opt="arithmetic" size="1" start="1" pseudo="true"/>
   </ins>
 
-  <ins name="*RSHIFT_AND.v2i16">
+  <ins name="RSHIFT_AND.v2i16" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2087,7 +2087,7 @@
     </encoding>
   </ins>
 
-  <ins name="*RSHIFT_AND.v4i8">
+  <ins name="RSHIFT_AND.v4i8" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2118,7 +2118,7 @@
     </encoding>
   </ins>
 
-  <ins name="*RSHIFT_DOUBLE.i32" mask="0x7ff000" exact="0x33d000">
+  <ins name="RSHIFT_DOUBLE.i32" mask="0x7ff000" exact="0x33d000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2133,7 +2133,7 @@
     </mod>
   </ins>
 
-  <ins name="*RSHIFT_OR.i32" mask="0x7f3800" exact="0x303000">
+  <ins name="RSHIFT_OR.i32" mask="0x7f3800" exact="0x303000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2151,7 +2151,7 @@
     <mod name="not_result" start="15" size="1" opt="not"/>
   </ins>
 
-  <ins name="*RSHIFT_OR.v2i16">
+  <ins name="RSHIFT_OR.v2i16" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2199,7 +2199,7 @@
     </encoding>
   </ins>
 
-  <ins name="*RSHIFT_OR.v4i8">
+  <ins name="RSHIFT_OR.v4i8" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2230,7 +2230,7 @@
     </encoding>
   </ins>
 
-  <ins name="*RSHIFT_XOR.i32" mask="0x7fd800" exact="0x321000">
+  <ins name="RSHIFT_XOR.i32" mask="0x7fd800" exact="0x321000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2244,7 +2244,7 @@
     <mod name="arithmetic" opt="arithmetic" size="1" start="1" pseudo="true"/>
   </ins>
 
-  <ins name="*RSHIFT_XOR.v2i16">
+  <ins name="RSHIFT_XOR.v2i16" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2288,7 +2288,7 @@
     </encoding>
   </ins>
 
-  <ins name="*RSHIFT_XOR.v4i8">
+  <ins name="RSHIFT_XOR.v4i8" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2315,7 +2315,7 @@
     </encoding>
   </ins>
 
-  <ins name="*S16_TO_S32" mask="0x7fffe8" exact="0x700cc0">
+  <ins name="S16_TO_S32" mask="0x7fffe8" exact="0x700cc0" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="lane0" start="4" size="1" default="h0">
       <opt>h0</opt>
@@ -2323,7 +2323,7 @@
     </mod>
   </ins>
 
-  <ins name="*S8_TO_S32" mask="0x7fffc8" exact="0x700b40">
+  <ins name="S8_TO_S32" mask="0x7fffc8" exact="0x700b40" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="lane0" start="4" size="2" default="b0">
       <opt>b0</opt>
@@ -2333,7 +2333,7 @@
     </mod>
   </ins>
 
-  <ins name="*SEG_ADD" mask="0x7fff40" exact="0x701500">
+  <ins name="SEG_ADD" mask="0x7fff40" exact="0x701500" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="seg" start="3" size="3">
       <reserved/>
@@ -2348,7 +2348,7 @@
     <mod name="preserve_null" start="7" size="1" opt="preserve_null"/>
   </ins>
 
-  <ins name="*SEG_SUB" mask="0x7fff40" exact="0x701540" unused="true">
+  <ins name="SEG_SUB" mask="0x7fff40" exact="0x701540" unused="true" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="seg" start="3" size="3">
       <reserved/>
@@ -2363,13 +2363,13 @@
     <mod name="preserve_null" start="7" size="1" opt="preserve_null"/>
   </ins>
 
-  <ins name="*SHADDXL.i64" mask="0x7ffe00" exact="0x70e600">
+  <ins name="SHADDXL.i64" mask="0x7ffe00" exact="0x70e600" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <immediate name="shift" start="6" size="3"/>
   </ins>
 
-  <ins name="*SHADDXL.s32" mask="0x7ff800" exact="0x70e800">
+  <ins name="SHADDXL.s32" mask="0x7ff800" exact="0x70e800" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <immediate name="shift" start="6" size="3"/>
@@ -2380,7 +2380,7 @@
     </mod>
   </ins>
 
-  <ins name="*SHADDXL.u32" mask="0x7ff800" exact="0x70e000">
+  <ins name="SHADDXL.u32" mask="0x7ff800" exact="0x70e000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <immediate name="shift" start="6" size="3"/>
@@ -2391,7 +2391,7 @@
     </mod>
   </ins>
 
-  <ins name="*U16_TO_U32" mask="0x7fffe8" exact="0x700cc8">
+  <ins name="U16_TO_U32" mask="0x7fffe8" exact="0x700cc8" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="lane0" start="4" size="1" default="h0">
       <opt>h0</opt>
@@ -2399,7 +2399,7 @@
     </mod>
   </ins>
 
-  <ins name="*U8_TO_U32" mask="0x7fffc8" exact="0x700b48">
+  <ins name="U8_TO_U32" mask="0x7fffc8" exact="0x700b48" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="lane0" start="4" size="2" default="b0">
       <opt>b0</opt>
@@ -2409,7 +2409,7 @@
     </mod>
   </ins>
 
-  <ins name="*V2F32_TO_V2F16" mask="0x7fe000" exact="0x6e8000">
+  <ins name="V2F32_TO_V2F16" mask="0x7fe000" exact="0x6e8000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <mod name="abs0" size="1" opt="abs"/>
@@ -2452,7 +2452,7 @@
     </derived>
   </ins>
 
-  <ins name="*VN_ASST1.f16" mask="0x7ff000" exact="0x6eb000">
+  <ins name="VN_ASST1.f16" mask="0x7ff000" exact="0x6eb000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2461,7 +2461,7 @@
     <mod name="neg2" start="11" size="1" opt="neg"/>
   </ins>
 
-  <ins name="*VN_ASST1.f32" mask="0x7fe000" exact="0x27c000">
+  <ins name="VN_ASST1.f32" mask="0x7fe000" exact="0x27c000" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -2469,31 +2469,31 @@
     <mod name="neg2" start="12" size="1" opt="neg"/>
   </ins>
 
-  <ins name="+ACMPSTORE.i32" staging="r=2" mask="0xffdc0" exact="0x648c0" message="atomic" dests="0">
+  <ins name="ACMPSTORE.i32" staging="r=2" mask="0xffdc0" exact="0x648c0" message="atomic" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="9" size="1" opt="wls"/>
   </ins>
 
-  <ins name="+ACMPSTORE.i64" staging="r=4" mask="0xffdc0" exact="0x64900" message="atomic" dests="0">
+  <ins name="ACMPSTORE.i64" staging="r=4" mask="0xffdc0" exact="0x64900" message="atomic" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="9" size="1" opt="wls"/>
   </ins>
 
-  <ins name="+ACMPXCHG.i32" staging="rw=2" mask="0xffdc0" exact="0x644c0" message="atomic">
+  <ins name="ACMPXCHG.i32" staging="rw=2" mask="0xffdc0" exact="0x644c0" message="atomic" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="9" size="1" opt="wls"/>
   </ins>
 
-  <ins name="+ACMPXCHG.i64" staging="rw=4" mask="0xffdc0" exact="0x64500" message="atomic">
+  <ins name="ACMPXCHG.i64" staging="rw=4" mask="0xffdc0" exact="0x64500" message="atomic" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="9" size="1" opt="wls"/>
   </ins>
 
-  <ins name="+ATEST" staging="w=1" mask="0xfff00" exact="0xc8f00" message="atest" table="true">
+  <ins name="ATEST" staging="w=1" mask="0xfff00" exact="0xc8f00" message="atest" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <src start="3" mask="0xf7"/>
     <!-- ATEST parameter datum. Implicitly encoded into the tuple on Bifrost.
@@ -2507,7 +2507,7 @@
     </mod>
   </ins>
 
-  <ins name="+ATOM_CX" staging="rw=sr_count" mask="0xffe00" exact="0xd7400" message="atomic">
+  <ins name="ATOM_CX" staging="rw=sr_count" mask="0xffe00" exact="0xd7400" message="atomic" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -2515,21 +2515,21 @@
     <immediate name="sr_count" size="4" pseudo="true"/>
   </ins>
 
-  <ins name="+AXCHG.i32" staging="rw=1" mask="0xffdc0" exact="0x640c0" message="atomic">
+  <ins name="AXCHG.i32" staging="rw=1" mask="0xffdc0" exact="0x640c0" message="atomic" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="9" size="1" opt="wls"/>
   </ins>
 
-  <ins name="+AXCHG.i64" staging="rw=2" mask="0xffdc0" exact="0x64100" message="atomic">
+  <ins name="AXCHG.i64" staging="rw=2" mask="0xffdc0" exact="0x64100" message="atomic" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="9" size="1" opt="wls"/>
   </ins>
 
-  <ins name="+BARRIER" mask="0xfffff" exact="0xd7874" message="barrier" last="true" dests="0"/>
+  <ins name="BARRIER" mask="0xfffff" exact="0xd7874" message="barrier" last="true" dests="0" unit="add"/>
 
-  <ins name="+BLEND" staging="r=sr_count" mask="0xffe00" exact="0xca800" message="blend" last="true">
+  <ins name="BLEND" staging="r=sr_count" mask="0xffe00" exact="0xca800" message="blend" last="true" unit="add">
     <src start="0"/>
     <src start="3" mask="0xf7"/>
     <src start="6" mask="0xf7"/>
@@ -2551,7 +2551,7 @@
     </mod>
   </ins>
 
-  <ins name="+BRANCH.f16" mask="0xf8000" exact="0x68000" last="true" dests="0">
+  <ins name="BRANCH.f16" mask="0xf8000" exact="0x68000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -2718,7 +2718,7 @@
     </swap>
   </ins>
 
-  <ins name="+BRANCH.f32" mask="0xf8000" exact="0x68000" last="true" dests="0">
+  <ins name="BRANCH.f32" mask="0xf8000" exact="0x68000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -2885,7 +2885,7 @@
     </swap>
   </ins>
 
-  <ins name="+BRANCH.i16" mask="0xf8000" exact="0x68000" last="true" dests="0">
+  <ins name="BRANCH.i16" mask="0xf8000" exact="0x68000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -2976,7 +2976,7 @@
     </swap>
   </ins>
 
-  <ins name="+BRANCH.i32" mask="0xf8000" exact="0x68000" last="true" dests="0">
+  <ins name="BRANCH.i32" mask="0xf8000" exact="0x68000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -3043,7 +3043,7 @@
     </swap>
   </ins>
 
-  <ins name="+BRANCH.s16" mask="0xf8000" exact="0x68000" last="true" dests="0">
+  <ins name="BRANCH.s16" mask="0xf8000" exact="0x68000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -3171,7 +3171,7 @@
     </swap>
   </ins>
 
-  <ins name="+BRANCH.s32" mask="0xf8000" exact="0x68000" last="true" dests="0">
+  <ins name="BRANCH.s32" mask="0xf8000" exact="0x68000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -3252,7 +3252,7 @@
     </swap>
   </ins>
 
-  <ins name="+BRANCH.u16" mask="0xf8000" exact="0x68000" last="true" dests="0">
+  <ins name="BRANCH.u16" mask="0xf8000" exact="0x68000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -3365,7 +3365,7 @@
     </swap>
   </ins>
 
-  <ins name="+BRANCH.u32" mask="0xf8000" exact="0x68000" last="true" dests="0">
+  <ins name="BRANCH.u32" mask="0xf8000" exact="0x68000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -3431,7 +3431,7 @@
     </swap>
   </ins>
 
-  <ins name="+BRANCHC.i16" mask="0xff830" exact="0x6f030" last="true" dests="0">
+  <ins name="BRANCHC.i16" mask="0xff830" exact="0x6f030" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="combine" start="10" size="1">
@@ -3452,7 +3452,7 @@
     </derived>
   </ins>
 
-  <ins name="+BRANCHC.i32" mask="0xffa38" exact="0x6f238" last="true" dests="0">
+  <ins name="BRANCHC.i32" mask="0xffa38" exact="0x6f238" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="combine" start="10" size="1">
@@ -3461,7 +3461,7 @@
     </mod>
   </ins>
 
-  <ins name="+BRANCHZ.f16" mask="0xff000" exact="0x6f000" last="true" dests="0">
+  <ins name="BRANCHZ.f16" mask="0xff000" exact="0x6f000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="widen0" size="2">
@@ -3516,7 +3516,7 @@
     </derived>
   </ins>
 
-  <ins name="+BRANCHZ.f32" mask="0xff030" exact="0x6f000" last="true" dests="0">
+  <ins name="BRANCHZ.f32" mask="0xff030" exact="0x6f000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="cmpf" size="3">
@@ -3560,7 +3560,7 @@
     </derived>
   </ins>
 
-  <ins name="+BRANCHZ.i16" mask="0xffe00" exact="0x6f800" last="true" dests="0">
+  <ins name="BRANCHZ.i16" mask="0xffe00" exact="0x6f800" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="widen0" size="2">
@@ -3584,7 +3584,7 @@
     </derived>
   </ins>
 
-  <ins name="+BRANCHZ.i32" mask="0xffe30" exact="0x6f800" last="true" dests="0">
+  <ins name="BRANCHZ.i32" mask="0xffe30" exact="0x6f800" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="cmpf" size="1">
@@ -3597,7 +3597,7 @@
     </derived>
   </ins>
 
-  <ins name="+BRANCHZ.s16" mask="0xff008" exact="0x6f008" last="true" dests="0">
+  <ins name="BRANCHZ.s16" mask="0xff008" exact="0x6f008" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="widen0" size="2">
@@ -3629,7 +3629,7 @@
     </derived>
   </ins>
 
-  <ins name="+BRANCHZ.s32" mask="0xff038" exact="0x6f008" last="true" dests="0">
+  <ins name="BRANCHZ.s32" mask="0xff038" exact="0x6f008" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="cmpf" size="2">
@@ -3650,7 +3650,7 @@
     </derived>
   </ins>
 
-  <ins name="+BRANCHZ.u16" mask="0xff008" exact="0x6f000" last="true" dests="0">
+  <ins name="BRANCHZ.u16" mask="0xff008" exact="0x6f000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="widen0" size="2">
@@ -3682,7 +3682,7 @@
     </derived>
   </ins>
 
-  <ins name="+BRANCHZ.u32" mask="0xff038" exact="0x6f000" last="true" dests="0">
+  <ins name="BRANCHZ.u32" mask="0xff038" exact="0x6f000" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="cmpf" size="2">
@@ -3703,25 +3703,25 @@
     </derived>
   </ins>
 
-  <ins name="+BRANCH_DIVERG" mask="0xffe3f" exact="0x6f83c" last="true" dests="0">
+  <ins name="BRANCH_DIVERG" mask="0xffe3f" exact="0x6f83c" last="true" dests="0" unit="add">
     <src start="6" mask="0xf7"/>
   </ins>
 
-  <ins name="+BRANCH_LOWBITS.f32" mask="0xffe38" exact="0x6fa38" last="true" dests="0">
+  <ins name="BRANCH_LOWBITS.f32" mask="0xffe38" exact="0x6fa38" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
   </ins>
 
-  <ins name="+BRANCH_NO_DIVERG" mask="0xffe3f" exact="0x6fa34" last="true" dests="0">
+  <ins name="BRANCH_NO_DIVERG" mask="0xffe3f" exact="0x6fa34" last="true" dests="0" unit="add">
     <src start="6" mask="0xf7"/>
   </ins>
 
-  <ins name="+CLPER_OLD.i32" mask="0xfffc0" exact="0x3f0c0">
+  <ins name="CLPER_OLD.i32" mask="0xfffc0" exact="0x3f0c0" unit="add">
     <src start="0" mask="0x7"/>
     <src start="3"/>
   </ins>
 
-  <ins name="+CLPER.i32" mask="0xfc000" exact="0x7c000">
+  <ins name="CLPER.i32" mask="0xfc000" exact="0x7c000" unit="add">
     <src start="0" mask="0x7"/>
     <src start="3"/>
     <mod name="lane_op" start="6" size="2">
@@ -3756,11 +3756,11 @@
     </mod>
   </ins>
 
-  <ins name="+CUBEFACE2" mask="0xffff8" exact="0x3de58">
+  <ins name="CUBEFACE2" mask="0xffff8" exact="0x3de58" unit="add">
     <src start="0"/>
   </ins>
 
-  <ins name="+CUBE_SSEL" mask="0xffc00" exact="0x3e000">
+  <ins name="CUBE_SSEL" mask="0xffc00" exact="0x3e000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -3778,7 +3778,7 @@
     </derived>
   </ins>
 
-  <ins name="+CUBE_TSEL" mask="0xffc00" exact="0x3e400">
+  <ins name="CUBE_TSEL" mask="0xffc00" exact="0x3e400" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -3796,7 +3796,7 @@
     </derived>
   </ins>
 
-  <ins name="+DISCARD.f32" mask="0xff800" exact="0xc8800" dests="0">
+  <ins name="DISCARD.f32" mask="0xff800" exact="0xc8800" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="cmpf" size="3">
@@ -3860,15 +3860,15 @@
     </swap>
   </ins>
 
-  <ins name="+DOORBELL" mask="0xffff8" exact="0xd7860" unused="true" message="job_management" dests="0">
+  <ins name="DOORBELL" mask="0xffff8" exact="0xd7860" unused="true" message="job_management" dests="0" unit="add">
     <src start="0"/>
   </ins>
 
-  <ins name="+EUREKA" mask="0xffff8" exact="0xd7850" unused="true" message="job_management" dests="0">
+  <ins name="EUREKA" mask="0xffff8" exact="0xd7850" unused="true" message="job_management" dests="0" unit="add">
     <src start="0"/>
   </ins>
 
-  <ins name="+F16_TO_F32" mask="0xffff0" exact="0x3cd10">
+  <ins name="F16_TO_F32" mask="0xffff0" exact="0x3cd10" unit="add">
     <src start="0"/>
     <mod name="lane0" start="3" size="1" default="h0">
       <opt>h0</opt>
@@ -3877,7 +3877,7 @@
     <mod name="ftz" start="9" size="1" opt="ftz" pseudo="true"/>
   </ins>
 
-  <ins name="+F16_TO_S32">
+  <ins name="F16_TO_S32" unit="add">
     <src start="0"/>
     <mod name="round" size="3">
       <opt>none</opt>
@@ -3906,7 +3906,7 @@
     </encoding>
   </ins>
 
-  <ins name="+F16_TO_U32">
+  <ins name="F16_TO_U32" unit="add">
     <src start="0"/>
     <mod name="round" size="3">
       <opt>none</opt>
@@ -3935,7 +3935,7 @@
     </encoding>
   </ins>
 
-  <ins name="+F32_TO_S32">
+  <ins name="F32_TO_S32" unit="add">
     <src start="0"/>
     <mod name="round" size="3">
       <opt>none</opt>
@@ -3958,7 +3958,7 @@
     </encoding>
   </ins>
 
-  <ins name="+F32_TO_U32">
+  <ins name="F32_TO_U32" unit="add">
     <src start="0"/>
     <mod name="round" size="3">
       <opt>none</opt>
@@ -3981,7 +3981,7 @@
     </encoding>
   </ins>
 
-  <ins name="+FADD.f32">
+  <ins name="FADD.f32" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="round" size="3">
@@ -4069,7 +4069,7 @@
     </swap>
   </ins>
 
-  <ins name="+FADD.v2f16" mask="0xf0000" exact="0xa0000">
+  <ins name="FADD.v2f16" mask="0xf0000" exact="0xa0000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="abs1" start="6" size="1" opt="abs"/>
@@ -4096,7 +4096,7 @@
     <mod name="abs0" start="15" size="1" opt="abs"/>
   </ins>
 
-  <ins name="+FADD_RSCALE.f32" mask="0xe8000" exact="0x88000">
+  <ins name="FADD_RSCALE.f32" mask="0xe8000" exact="0x88000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -4153,7 +4153,7 @@
     </derived>
   </ins>
 
-  <ins name="+FATAN_ASSIST.f16" mask="0xfff00" exact="0x67800" unused="true" table="true">
+  <ins name="FATAN_ASSIST.f16" mask="0xfff00" exact="0x67800" unused="true" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <src start="3" mask="0xf7"/>
     <mod name="lane1" start="6" size="1" default="h0">
@@ -4166,12 +4166,12 @@
     </mod>
   </ins>
 
-  <ins name="+FATAN_ASSIST.f32" mask="0xfffc0" exact="0x67a00" unused="true" table="true">
+  <ins name="FATAN_ASSIST.f32" mask="0xfffc0" exact="0x67a00" unused="true" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <src start="3" mask="0xf7"/>
   </ins>
 
-  <ins name="+FATAN_TABLE.f16" mask="0xfff00" exact="0x67900" unused="true" table="true">
+  <ins name="FATAN_TABLE.f16" mask="0xfff00" exact="0x67900" unused="true" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <src start="3" mask="0xf7"/>
     <mod name="lane1" start="6" size="1" default="h0">
@@ -4184,12 +4184,12 @@
     </mod>
   </ins>
 
-  <ins name="+FATAN_TABLE.f32" mask="0xfffc0" exact="0x67a40" unused="true" table="true">
+  <ins name="FATAN_TABLE.f32" mask="0xfffc0" exact="0x67a40" unused="true" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <src start="3" mask="0xf7"/>
   </ins>
 
-  <ins name="+FCMP.f32" mask="0xf0000" exact="0x30000">
+  <ins name="FCMP.f32" mask="0xf0000" exact="0x30000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="widen0" size="2">
@@ -4273,7 +4273,7 @@
     </swap>
   </ins>
 
-  <ins name="+FCMP.v2f16" mask="0xf0000" exact="0xb0000">
+  <ins name="FCMP.v2f16" mask="0xf0000" exact="0xb0000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="neg0" size="1" opt="neg"/>
@@ -4329,17 +4329,17 @@
     </swap>
   </ins>
 
-  <ins name="+FCOS_TABLE.u6" mask="0xfffe8" exact="0x67a88" table="true">
+  <ins name="FCOS_TABLE.u6" mask="0xfffe8" exact="0x67a88" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="offset" start="4" size="1" opt="offset"/>
   </ins>
 
-  <ins name="+FEXP.f32" mask="0xfffc0" exact="0x66ac0" table="true">
+  <ins name="FEXP.f32" mask="0xfffc0" exact="0x66ac0" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <src start="3" mask="0xf7"/>
   </ins>
 
-  <ins name="+FEXP_TABLE.u4" mask="0xfffe0" exact="0x67ac0" table="true">
+  <ins name="FEXP_TABLE.u4" mask="0xfffe0" exact="0x67ac0" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="adj" start="3" size="2">
       <opt>none</opt>
@@ -4348,11 +4348,11 @@
     </mod>
   </ins>
 
-  <ins name="+FLOGD.f32" mask="0xffff8" exact="0x66340" table="true">
+  <ins name="FLOGD.f32" mask="0xffff8" exact="0x66340" table="true" unit="add">
     <src start="0" mask="0xf7"/>
   </ins>
 
-  <ins name="+FLOG_TABLE.f32" table="true">
+  <ins name="FLOG_TABLE.f32" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="widen0" size="2">
       <opt>none</opt>
@@ -4448,7 +4448,7 @@
     </encoding>
   </ins>
 
-  <ins name="+FMAX.f32" mask="0xf0600" exact="0x0">
+  <ins name="FMAX.f32" mask="0xf0600" exact="0x0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="abs1" start="6" size="1" opt="abs"/>
@@ -4469,7 +4469,7 @@
     <mod name="abs0" start="15" size="1" opt="abs"/>
   </ins>
 
-  <ins name="+FMAX.v2f16" mask="0xf8000" exact="0x80000">
+  <ins name="FMAX.v2f16" mask="0xf8000" exact="0x80000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="abs0" size="1" opt="abs"/>
@@ -4538,7 +4538,7 @@
     </swap>
   </ins>
 
-  <ins name="+FMIN.f32" mask="0xf0600" exact="0x10000">
+  <ins name="FMIN.f32" mask="0xf0600" exact="0x10000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="abs1" start="6" size="1" opt="abs"/>
@@ -4559,7 +4559,7 @@
     <mod name="abs0" start="15" size="1" opt="abs"/>
   </ins>
 
-  <ins name="+FMIN.v2f16" mask="0xf8000" exact="0x90000">
+  <ins name="FMIN.v2f16" mask="0xf8000" exact="0x90000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="abs0" size="1" opt="abs"/>
@@ -4628,7 +4628,7 @@
     </swap>
   </ins>
 
-  <ins name="+FPCLASS.f16" mask="0xffff0" exact="0x67c40" table="true">
+  <ins name="FPCLASS.f16" mask="0xffff0" exact="0x67c40" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="lane0" start="3" size="1" default="h0">
       <opt>h0</opt>
@@ -4636,16 +4636,16 @@
     </mod>
   </ins>
 
-  <ins name="+FPCLASS.f32" mask="0xffff8" exact="0x67c50" table="true">
+  <ins name="FPCLASS.f32" mask="0xffff8" exact="0x67c50" table="true" unit="add">
     <src start="0" mask="0xf7"/>
   </ins>
 
-  <ins name="+FPOW_SC_APPLY" mask="0xfffc0" exact="0x75080">
+  <ins name="FPOW_SC_APPLY" mask="0xfffc0" exact="0x75080" unit="add">
     <src start="0"/>
     <src start="3"/>
   </ins>
 
-  <ins name="+FPOW_SC_DET.f16" table="true">
+  <ins name="FPOW_SC_DET.f16" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <src start="3" mask="0xf7"/>
     <mod name="func" size="2">
@@ -4695,7 +4695,7 @@
     </encoding>
   </ins>
 
-  <ins name="+FPOW_SC_DET.f32" mask="0xffe40" exact="0x67640" table="true">
+  <ins name="FPOW_SC_DET.f32" mask="0xffe40" exact="0x67640" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <src start="3" mask="0xf7"/>
     <mod name="func" start="7" size="2">
@@ -4706,7 +4706,7 @@
     </mod>
   </ins>
 
-  <ins name="+FRCBRT_APPROX_A.f32" unused="true" table="true">
+  <ins name="FRCBRT_APPROX_A.f32" unused="true" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="widen0" size="2">
       <opt>none</opt>
@@ -4728,15 +4728,15 @@
     </encoding>
   </ins>
 
-  <ins name="+FRCBRT_APPROX_B.f32" mask="0xffff8" exact="0x67ab0" unused="true" table="true">
+  <ins name="FRCBRT_APPROX_B.f32" mask="0xffff8" exact="0x67ab0" unused="true" table="true" unit="add">
     <src start="0" mask="0xf7"/>
   </ins>
 
-  <ins name="+FRCBRT_APPROX_C.f32" mask="0xffff8" exact="0x67ab8" unused="true" table="true">
+  <ins name="FRCBRT_APPROX_C.f32" mask="0xffff8" exact="0x67ab8" unused="true" table="true" unit="add">
     <src start="0" mask="0xf7"/>
   </ins>
 
-  <ins name="+FRCP.f16" mask="0xffec0" exact="0x67080" table="true">
+  <ins name="FRCP.f16" mask="0xffec0" exact="0x67080" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="neg0" start="3" size="1" opt="neg"/>
     <mod name="abs0" start="4" size="1" opt="abs"/>
@@ -4747,7 +4747,7 @@
     </mod>
   </ins>
 
-  <ins name="+FRCP.f32" mask="0xfffa0" exact="0x66000" table="true">
+  <ins name="FRCP.f32" mask="0xfffa0" exact="0x66000" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="widen0" size="2">
       <opt>none</opt>
@@ -4760,7 +4760,7 @@
     </derived>
   </ins>
 
-  <ins name="+FRCP_APPROX.f32" table="true">
+  <ins name="FRCP_APPROX.f32" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="widen0" size="2">
       <opt>none</opt>
@@ -4782,7 +4782,7 @@
     </encoding>
   </ins>
 
-  <ins name="+FREXPE.f32">
+  <ins name="FREXPE.f32" unit="add">
     <src start="0"/>
     <mod name="neg0" size="1" opt="neg"/>
     <mod name="sqrt" size="1" opt="sqrt"/>
@@ -4807,7 +4807,7 @@
     </encoding>
   </ins>
 
-  <ins name="+FREXPE.v2f16">
+  <ins name="FREXPE.v2f16" unit="add">
     <src start="0"/>
     <mod name="neg0" size="1" opt="neg"/>
     <mod name="sqrt" size="1" opt="sqrt"/>
@@ -4832,7 +4832,7 @@
     </encoding>
   </ins>
 
-  <ins name="+FREXPM.f32">
+  <ins name="FREXPM.f32" unit="add">
     <src start="0"/>
     <mod name="abs0" start="6" size="1" opt="abs"/>
     <mod name="sqrt" size="1" opt="sqrt"/>
@@ -4860,7 +4860,7 @@
     </encoding>
   </ins>
 
-  <ins name="+FREXPM.v2f16">
+  <ins name="FREXPM.v2f16" unit="add">
     <src start="0"/>
     <mod name="abs0" start="6" size="1" opt="abs"/>
     <mod name="sqrt" size="1" opt="sqrt"/>
@@ -4888,7 +4888,7 @@
     </encoding>
   </ins>
 
-  <ins name="+FROUND.f32" mask="0xff860" exact="0x3e820">
+  <ins name="FROUND.f32" mask="0xff860" exact="0x3e820" unit="add">
     <src start="0"/>
     <mod name="abs0" start="7" size="1" opt="abs"/>
     <mod name="neg0" start="8" size="1" opt="neg"/>
@@ -4906,7 +4906,7 @@
     </mod>
   </ins>
 
-  <ins name="+FROUND.v2f16" mask="0xff860" exact="0x3e800">
+  <ins name="FROUND.v2f16" mask="0xff860" exact="0x3e800" unit="add">
     <src start="0"/>
     <mod name="abs0" start="7" size="1" opt="abs"/>
     <mod name="neg0" start="8" size="1" opt="neg"/>
@@ -4924,7 +4924,7 @@
     </mod>
   </ins>
 
-  <ins name="+FRSQ.f16" mask="0xffec0" exact="0x67280" table="true">
+  <ins name="FRSQ.f16" mask="0xffec0" exact="0x67280" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="neg0" start="3" size="1" opt="neg"/>
     <mod name="abs0" start="4" size="1" opt="abs"/>
@@ -4935,7 +4935,7 @@
     </mod>
   </ins>
 
-  <ins name="+FRSQ.f32" mask="0xfffa0" exact="0x66100" table="true">
+  <ins name="FRSQ.f32" mask="0xfffa0" exact="0x66100" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="widen0" size="2">
       <opt>none</opt>
@@ -4948,7 +4948,7 @@
     </derived>
   </ins>
 
-  <ins name="+FRSQ_APPROX.f32" table="true">
+  <ins name="FRSQ_APPROX.f32" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="widen0" size="2">
       <opt>none</opt>
@@ -4970,17 +4970,17 @@
     </encoding>
   </ins>
 
-  <ins name="+FSINCOS_OFFSET.u6" mask="0xffff0" exact="0x67aa0" table="true">
+  <ins name="FSINCOS_OFFSET.u6" mask="0xffff0" exact="0x67aa0" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="scale" start="3" size="1" opt="scale"/>
   </ins>
 
-  <ins name="+FSIN_TABLE.u6" mask="0xfffe8" exact="0x67a80" table="true">
+  <ins name="FSIN_TABLE.u6" mask="0xfffe8" exact="0x67a80" table="true" unit="add">
     <src start="0" mask="0xf7"/>
     <mod name="offset" start="4" size="1" opt="offset"/>
   </ins>
 
-  <ins name="+HADD.s32" mask="0xfefc0" exact="0xbc640">
+  <ins name="HADD.s32" mask="0xfefc0" exact="0xbc640" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="round" start="12" size="1" default="rtn">
@@ -4989,7 +4989,7 @@
     </mod>
   </ins>
 
-  <ins name="+HADD.u32" mask="0xfefc0" exact="0xbc6c0">
+  <ins name="HADD.u32" mask="0xfefc0" exact="0xbc6c0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="round" start="12" size="1" default="rtn">
@@ -4998,7 +4998,7 @@
     </mod>
   </ins>
 
-  <ins name="+HADD.v2s16" mask="0xfe9c0" exact="0xbc840">
+  <ins name="HADD.v2s16" mask="0xfe9c0" exact="0xbc840" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="round" start="12" size="1" default="rtn">
@@ -5015,7 +5015,7 @@
     </mod>
   </ins>
 
-  <ins name="+HADD.v2u16" mask="0xfe9c0" exact="0xbc8c0">
+  <ins name="HADD.v2u16" mask="0xfe9c0" exact="0xbc8c0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="round" start="12" size="1" default="rtn">
@@ -5032,7 +5032,7 @@
     </mod>
   </ins>
 
-  <ins name="+HADD.v4s8" mask="0xfefc0" exact="0xbc440">
+  <ins name="HADD.v4s8" mask="0xfefc0" exact="0xbc440" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="round" start="12" size="1" default="rtn">
@@ -5041,7 +5041,7 @@
     </mod>
   </ins>
 
-  <ins name="+HADD.v4u8" mask="0xfefc0" exact="0xbc4c0">
+  <ins name="HADD.v4u8" mask="0xfefc0" exact="0xbc4c0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="round" start="12" size="1" default="rtn">
@@ -5050,11 +5050,11 @@
     </mod>
   </ins>
 
-  <ins name="+IABS.s32" mask="0xffff8" exact="0x3dea0">
+  <ins name="IABS.s32" mask="0xffff8" exact="0x3dea0" unit="add">
     <src start="0"/>
   </ins>
 
-  <ins name="+IABS.v2s16" mask="0xfffc8" exact="0x3de88">
+  <ins name="IABS.v2s16" mask="0xfffc8" exact="0x3de88" unit="add">
     <src start="0"/>
     <mod name="swz0" start="4" size="2" default="h01">
       <opt>h00</opt>
@@ -5064,11 +5064,11 @@
     </mod>
   </ins>
 
-  <ins name="+IABS.v4s8" mask="0xffff8" exact="0x3deb0">
+  <ins name="IABS.v4s8" mask="0xffff8" exact="0x3deb0" unit="add">
     <src start="0"/>
   </ins>
 
-  <ins name="+IADD.s32">
+  <ins name="IADD.s32" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -5110,7 +5110,7 @@
     </encoding>
   </ins>
 
-  <ins name="+IADD.u32">
+  <ins name="IADD.u32" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -5182,7 +5182,7 @@
     </encoding>
   </ins>
 
-  <ins name="+IADD.v2s16">
+  <ins name="IADD.v2s16" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -5246,7 +5246,7 @@
     </encoding>
   </ins>
 
-  <ins name="+IADD.v2u16">
+  <ins name="IADD.v2u16" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -5346,7 +5346,7 @@
     </encoding>
   </ins>
 
-  <ins name="+IADD.v4s8">
+  <ins name="IADD.v4s8" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -5400,7 +5400,7 @@
     </encoding>
   </ins>
 
-  <ins name="+IADD.v4u8">
+  <ins name="IADD.v4u8" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -5466,7 +5466,7 @@
     </encoding>
   </ins>
 
-  <ins name="+ICMP.i32" mask="0xffb80" exact="0x7b300">
+  <ins name="ICMP.i32" mask="0xffb80" exact="0x7b300" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="result_type" start="10" size="1" default="i1">
@@ -5479,7 +5479,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP.s32" mask="0xffb80" exact="0x7b200">
+  <ins name="ICMP.s32" mask="0xffb80" exact="0x7b200" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="result_type" start="10" size="1" default="i1">
@@ -5508,7 +5508,7 @@
     </swap>
   </ins>
 
-  <ins name="+ICMP.u32" mask="0xffb80" exact="0x7b280">
+  <ins name="ICMP.u32" mask="0xffb80" exact="0x7b280" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="result_type" start="10" size="1" default="i1">
@@ -5537,7 +5537,7 @@
     </swap>
   </ins>
 
-  <ins name="+ICMP.v2i16" mask="0xff000" exact="0x7a000">
+  <ins name="ICMP.v2i16" mask="0xff000" exact="0x7a000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="swz0" start="6" size="2" default="h01">
@@ -5562,7 +5562,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP.v2s16" mask="0xfe800" exact="0x78000">
+  <ins name="ICMP.v2s16" mask="0xfe800" exact="0x78000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="swz0" start="6" size="2" default="h01">
@@ -5603,7 +5603,7 @@
     </swap>
   </ins>
 
-  <ins name="+ICMP.v2u16" mask="0xfe800" exact="0x78800">
+  <ins name="ICMP.v2u16" mask="0xfe800" exact="0x78800" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="swz0" start="6" size="2" default="h01">
@@ -5644,7 +5644,7 @@
     </swap>
   </ins>
 
-  <ins name="+ICMP.v4i8" mask="0xffb80" exact="0x7b100">
+  <ins name="ICMP.v4i8" mask="0xffb80" exact="0x7b100" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="result_type" start="10" size="1" default="i1">
@@ -5657,7 +5657,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP.v4s8" mask="0xffb80" exact="0x7b000">
+  <ins name="ICMP.v4s8" mask="0xffb80" exact="0x7b000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="result_type" start="10" size="1" default="i1">
@@ -5686,7 +5686,7 @@
     </swap>
   </ins>
 
-  <ins name="+ICMP.v4u8" mask="0xffb80" exact="0x7b080">
+  <ins name="ICMP.v4u8" mask="0xffb80" exact="0x7b080" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="result_type" start="10" size="1" default="i1">
@@ -5715,13 +5715,13 @@
     </swap>
   </ins>
 
-  <ins name="+ICMPF.i32" mask="0xffe00" exact="0x7be00">
+  <ins name="ICMPF.i32" mask="0xffe00" exact="0x7be00" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
   </ins>
 
-  <ins name="+ICMPI.i32" mask="0xffb80" exact="0x7b900">
+  <ins name="ICMPI.i32" mask="0xffb80" exact="0x7b900" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="result_type" start="10" size="1" default="i1">
@@ -5734,7 +5734,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMPI.s32" mask="0xffb80" exact="0x7b800">
+  <ins name="ICMPI.s32" mask="0xffb80" exact="0x7b800" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="result_type" start="10" size="1" default="i1">
@@ -5747,7 +5747,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMPI.u32" mask="0xffb80" exact="0x7b880">
+  <ins name="ICMPI.u32" mask="0xffb80" exact="0x7b880" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="result_type" start="10" size="1" default="i1">
@@ -5760,13 +5760,13 @@
     </mod>
   </ins>
 
-  <ins name="+ICMPM.i32" mask="0xffe00" exact="0x7ba00">
+  <ins name="ICMPM.i32" mask="0xffe00" exact="0x7ba00" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
   </ins>
 
-  <ins name="+ILOGB.f32" mask="0xfffe0" exact="0x3d9e0">
+  <ins name="ILOGB.f32" mask="0xfffe0" exact="0x3d9e0" unit="add">
     <src start="0"/>
     <mod name="widen0" start="3" size="2">
       <reserved/>
@@ -5776,7 +5776,7 @@
     </mod>
   </ins>
 
-  <ins name="+ILOGB.v2f16" mask="0xfffe0" exact="0x3d9c0">
+  <ins name="ILOGB.v2f16" mask="0xfffe0" exact="0x3d9c0" unit="add">
     <src start="0"/>
     <mod name="swz0" start="3" size="2" default="h01">
       <opt>h00</opt>
@@ -5786,14 +5786,14 @@
     </mod>
   </ins>
 
-  <ins name="+IMOV_FMA" mask="0xffff7" exact="0xd7820">
+  <ins name="IMOV_FMA" mask="0xffff7" exact="0xd7820" unit="add">
     <mod name="threads" start="3" size="1" default="odd">
       <opt>even</opt>
       <opt>odd</opt>
     </mod>
   </ins>
 
-  <ins name="+ISUB.s32">
+  <ins name="ISUB.s32" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -5835,7 +5835,7 @@
     </encoding>
   </ins>
 
-  <ins name="+ISUB.u32">
+  <ins name="ISUB.u32" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -5907,7 +5907,7 @@
     </encoding>
   </ins>
 
-  <ins name="+ISUB.v2s16">
+  <ins name="ISUB.v2s16" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -5971,7 +5971,7 @@
     </encoding>
   </ins>
 
-  <ins name="+ISUB.v2u16">
+  <ins name="ISUB.v2u16" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -6071,7 +6071,7 @@
     </encoding>
   </ins>
 
-  <ins name="+ISUB.v4s8">
+  <ins name="ISUB.v4s8" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -6125,7 +6125,7 @@
     </encoding>
   </ins>
 
-  <ins name="+ISUB.v4u8">
+  <ins name="ISUB.v4u8" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="saturate" start="8" size="1" opt="sat"/>
@@ -6191,15 +6191,15 @@
     </encoding>
   </ins>
 
-  <ins name="+JUMP" mask="0xffe3f" exact="0x6fe34" last="true" dests="0">
+  <ins name="JUMP" mask="0xffe3f" exact="0x6fe34" last="true" dests="0" unit="add">
     <src start="6" mask="0xf7"/>
   </ins>
 
-  <ins name="+KABOOM" mask="0xffff8" exact="0xd7858" message="job" dests="0">
+  <ins name="KABOOM" mask="0xffff8" exact="0xd7858" message="job" dests="0" unit="add">
     <src start="0"/>
   </ins>
 
-  <ins name="+LDEXP.f32" mask="0xffe00" exact="0x74c00">
+  <ins name="LDEXP.f32" mask="0xffe00" exact="0x74c00" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="round" start="6" size="3">
@@ -6214,7 +6214,7 @@
     </mod>
   </ins>
 
-  <ins name="+LDEXP.v2f16" mask="0xffe00" exact="0x74e00">
+  <ins name="LDEXP.v2f16" mask="0xffe00" exact="0x74e00" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="round" start="6" size="3">
@@ -6229,7 +6229,7 @@
     </mod>
   </ins>
 
-  <ins name="+LD_ATTR" staging="w=format" message="attribute">
+  <ins name="LD_ATTR" staging="w=format" message="attribute" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -6268,7 +6268,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LD_ATTR_IMM" staging="w=format" message="attribute">
+  <ins name="LD_ATTR_IMM" staging="w=format" message="attribute" unit="add">
     <src start="0"/>
     <src start="3"/>
     <immediate name="attribute_index" start="6" size="4"/>
@@ -6307,7 +6307,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LD_ATTR_TEX" staging="w=format" message="attribute">
+  <ins name="LD_ATTR_TEX" staging="w=format" message="attribute" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -6346,7 +6346,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LD_CVT" staging="w=format" mask="0xff800" exact="0xc9000" message="load">
+  <ins name="LD_CVT" staging="w=format" mask="0xff800" exact="0xc9000" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -6368,7 +6368,7 @@
     </mod>
   </ins>
 
-  <ins name="+LD_GCLK.u64" staging="w=2" mask="0xffff8" exact="0xd7800" message="attribute">
+  <ins name="LD_GCLK.u64" staging="w=2" mask="0xffff8" exact="0xd7800" message="attribute" unit="add">
     <mod name="source" start="0" size="3">
       <reserved/>
       <reserved/>
@@ -6381,7 +6381,7 @@
     </mod>
   </ins>
 
-  <ins name="+LD_TILE" staging="w=format" mask="0xff800" exact="0xcb000" message="tile">
+  <ins name="LD_TILE" staging="w=format" mask="0xff800" exact="0xcb000" message="tile" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -6399,7 +6399,7 @@
     </mod>
   </ins>
 
-  <ins name="+LD_VAR" staging="w=format" message="varying">
+  <ins name="LD_VAR" staging="w=format" message="varying" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="vecsize" start="8" size="2">
@@ -6540,7 +6540,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LD_VAR_FLAT" staging="w=format" message="varying">
+  <ins name="LD_VAR_FLAT" staging="w=format" message="varying" unit="add">
     <src start="3"/>
     <mod name="vecsize" start="8" size="2">
       <opt>none</opt>
@@ -6593,7 +6593,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LD_VAR_FLAT_IMM" staging="w=format" message="varying">
+  <ins name="LD_VAR_FLAT_IMM" staging="w=format" message="varying" unit="add">
     <immediate name="index" start="3" size="5"/>
     <mod name="vecsize" start="8" size="2">
       <opt>none</opt>
@@ -6646,7 +6646,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LD_VAR_IMM" staging="w=format" message="varying">
+  <ins name="LD_VAR_IMM" staging="w=format" message="varying" unit="add">
     <src start="0"/>
     <immediate name="index" start="3" size="5"/>
     <mod name="vecsize" start="8" size="2">
@@ -6787,7 +6787,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LD_VAR_SPECIAL" staging="w=format" message="varying">
+  <ins name="LD_VAR_SPECIAL" staging="w=format" message="varying" unit="add">
     <src start="0"/>
     <mod name="varying_name" size="5">
       <opt>point</opt>
@@ -6973,7 +6973,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LEA_ATTR" staging="w=3" message="attribute">
+  <ins name="LEA_ATTR" staging="w=3" message="attribute" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -7006,7 +7006,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LEA_ATTR_IMM" staging="w=3" message="attribute">
+  <ins name="LEA_ATTR_IMM" staging="w=3" message="attribute" unit="add">
     <src start="0"/>
     <src start="3"/>
     <immediate name="attribute_index" start="6" size="4"/>
@@ -7039,7 +7039,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LEA_ATTR_TEX" staging="w=3" message="attribute">
+  <ins name="LEA_ATTR_TEX" staging="w=3" message="attribute" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -7072,7 +7072,7 @@
     </encoding>
   </ins>
 
-  <ins name="+LEA_TEX" staging="w=3" mask="0xff600" exact="0xd6600" message="attribute">
+  <ins name="LEA_TEX" staging="w=3" mask="0xff600" exact="0xd6600" message="attribute" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -7082,7 +7082,7 @@
     </mod>
   </ins>
 
-  <ins name="+LEA_TEX_IMM" staging="w=3" mask="0xff000" exact="0xd6000" message="attribute">
+  <ins name="LEA_TEX_IMM" staging="w=3" mask="0xff000" exact="0xd6000" message="attribute" unit="add">
     <src start="0"/>
     <src start="3"/>
     <immediate name="texture_index" start="6" size="5"/>
@@ -7092,7 +7092,7 @@
     </mod>
   </ins>
 
-  <ins name="+LOAD.i128" staging="w=4" mask="0xffe00" exact="0x61000" message="load">
+  <ins name="LOAD.i128" staging="w=4" mask="0xffe00" exact="0x61000" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7108,7 +7108,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+LOAD.i16" staging="w=1" message="load">
+  <ins name="LOAD.i16" staging="w=1" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7168,7 +7168,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+LOAD.i24" staging="w=1" mask="0xffe00" exact="0x65000" message="load">
+  <ins name="LOAD.i24" staging="w=1" mask="0xffe00" exact="0x65000" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7184,7 +7184,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+LOAD.i32" staging="w=1" message="load">
+  <ins name="LOAD.i32" staging="w=1" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7222,7 +7222,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+LOAD.i48" staging="w=2" mask="0xffe00" exact="0x65200" message="load">
+  <ins name="LOAD.i48" staging="w=2" mask="0xffe00" exact="0x65200" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7238,7 +7238,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+LOAD.i64" staging="w=2" mask="0xffe00" exact="0x60e00" message="load">
+  <ins name="LOAD.i64" staging="w=2" mask="0xffe00" exact="0x60e00" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7254,7 +7254,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+LOAD.i8" staging="w=1" message="load">
+  <ins name="LOAD.i8" staging="w=1" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7339,7 +7339,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+LOAD.i96" staging="w=3" mask="0xffe00" exact="0x65400" message="load">
+  <ins name="LOAD.i96" staging="w=3" mask="0xffe00" exact="0x65400" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7355,7 +7355,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+LOGB.f32" mask="0xfffe0" exact="0x3d9a0">
+  <ins name="LOGB.f32" mask="0xfffe0" exact="0x3d9a0" unit="add">
     <src start="0"/>
     <mod name="widen0" start="3" size="2">
       <reserved/>
@@ -7365,7 +7365,7 @@
     </mod>
   </ins>
 
-  <ins name="+LOGB.v2f16" mask="0xfffe0" exact="0x3d980">
+  <ins name="LOGB.v2f16" mask="0xfffe0" exact="0x3d980" unit="add">
     <src start="0"/>
     <mod name="swz0" start="3" size="2" default="h01">
       <opt>h00</opt>
@@ -7375,7 +7375,7 @@
     </mod>
   </ins>
 
-  <ins name="+MKVEC.v2i16" mask="0xfff00" exact="0x75300">
+  <ins name="MKVEC.v2i16" mask="0xfff00" exact="0x75300" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="lane0" start="6" size="1" default="h0">
@@ -7388,11 +7388,11 @@
     </mod>
   </ins>
 
-  <ins name="+MOV.i32" mask="0xffff8" exact="0x3d968">
+  <ins name="MOV.i32" mask="0xffff8" exact="0x3d968" unit="add">
     <src start="0"/>
   </ins>
 
-  <ins name="+MUX.i32" mask="0xff800" exact="0x74000">
+  <ins name="MUX.i32" mask="0xff800" exact="0x74000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -7404,7 +7404,7 @@
     </mod>
   </ins>
 
-  <ins name="+MUX.v2i16" mask="0xfc000" exact="0x70000">
+  <ins name="MUX.v2i16" mask="0xfc000" exact="0x70000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -7428,7 +7428,7 @@
     </mod>
   </ins>
 
-  <ins name="+MUX.v4i8" mask="0xffc00" exact="0x74800">
+  <ins name="MUX.v4i8" mask="0xffc00" exact="0x74800" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -7438,13 +7438,13 @@
     </mod>
   </ins>
 
-  <ins name="+NOP" mask="0xfffff" exact="0x3d964" dests="0"/>
+  <ins name="NOP" mask="0xfffff" exact="0x3d964" dests="0" unit="add"/>
 
-  <ins name="+QUIET.f32" mask="0xffff8" exact="0x3d970">
+  <ins name="QUIET.f32" mask="0xffff8" exact="0x3d970" unit="add">
     <src start="0"/>
   </ins>
 
-  <ins name="+QUIET.v2f16" mask="0xfffc8" exact="0x3d900">
+  <ins name="QUIET.v2f16" mask="0xfffc8" exact="0x3d900" unit="add">
     <src start="0"/>
     <mod name="swz0" start="4" size="2" default="h01">
       <opt>h00</opt>
@@ -7454,7 +7454,7 @@
     </mod>
   </ins>
 
-  <ins name="+S16_TO_F32" mask="0xfffe8" exact="0x3cce0">
+  <ins name="S16_TO_F32" mask="0xfffe8" exact="0x3cce0" unit="add">
     <src start="0"/>
     <mod name="lane0" start="4" size="1" default="h0">
       <opt>h0</opt>
@@ -7462,7 +7462,7 @@
     </mod>
   </ins>
 
-  <ins name="+S16_TO_S32" mask="0xfffe8" exact="0x3ccc0">
+  <ins name="S16_TO_S32" mask="0xfffe8" exact="0x3ccc0" unit="add">
     <src start="0"/>
     <mod name="lane0" start="4" size="1" default="h0">
       <opt>h0</opt>
@@ -7470,7 +7470,7 @@
     </mod>
   </ins>
 
-  <ins name="+S32_TO_F32">
+  <ins name="S32_TO_F32" unit="add">
     <src start="0"/>
     <mod name="round" size="3">
       <opt>none</opt>
@@ -7493,7 +7493,7 @@
     </encoding>
   </ins>
 
-  <ins name="+S8_TO_F32" mask="0xfffc8" exact="0x3cb80">
+  <ins name="S8_TO_F32" mask="0xfffc8" exact="0x3cb80" unit="add">
     <src start="0"/>
     <mod name="lane0" start="4" size="2" default="b0">
       <opt>b0</opt>
@@ -7503,7 +7503,7 @@
     </mod>
   </ins>
 
-  <ins name="+S8_TO_S32" mask="0xfffc8" exact="0x3cb40">
+  <ins name="S8_TO_S32" mask="0xfffc8" exact="0x3cb40" unit="add">
     <src start="0"/>
     <mod name="lane0" start="4" size="2" default="b0">
       <opt>b0</opt>
@@ -7513,7 +7513,7 @@
     </mod>
   </ins>
 
-  <ins name="+SEG_ADD" mask="0xfff40" exact="0x3d500">
+  <ins name="SEG_ADD" mask="0xfff40" exact="0x3d500" unit="add">
     <src start="0"/>
     <mod name="seg" start="3" size="3">
       <reserved/>
@@ -7528,7 +7528,7 @@
     <mod name="preserve_null" start="7" size="1" opt="preserve_null"/>
   </ins>
 
-  <ins name="+SEG_SUB" mask="0xfff40" exact="0x3d540" unused="true">
+  <ins name="SEG_SUB" mask="0xfff40" exact="0x3d540" unused="true" unit="add">
     <src start="0"/>
     <mod name="seg" start="3" size="3">
       <reserved/>
@@ -7543,18 +7543,18 @@
     <mod name="preserve_null" start="7" size="1" opt="preserve_null"/>
   </ins>
 
-  <ins name="+SHADDXH.i32" mask="0xfffc0" exact="0x3f8c0">
+  <ins name="SHADDXH.i32" mask="0xfffc0" exact="0x3f8c0" unit="add">
     <src start="0"/>
     <src start="3"/>
   </ins>
 
-  <ins name="+SHIFT_DOUBLE.i32" mask="0xffe00" exact="0xefe00">
+  <ins name="SHIFT_DOUBLE.i32" mask="0xffe00" exact="0xefe00" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
   </ins>
 
-  <ins name="+STORE.i128" staging="r=4" mask="0xffe00" exact="0x61200" message="store" dests="0">
+  <ins name="STORE.i128" staging="r=4" mask="0xffe00" exact="0x61200" message="store" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7570,7 +7570,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+STORE.i16" staging="r=1" mask="0xffe00" exact="0x62800" message="store" dests="0">
+  <ins name="STORE.i16" staging="r=1" mask="0xffe00" exact="0x62800" message="store" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7586,7 +7586,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+STORE.i24" staging="r=1" mask="0xffe00" exact="0x65800" message="store" dests="0">
+  <ins name="STORE.i24" staging="r=1" mask="0xffe00" exact="0x65800" message="store" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7602,7 +7602,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+STORE.i32" staging="r=1" mask="0xffe00" exact="0x62c00" message="store" dests="0">
+  <ins name="STORE.i32" staging="r=1" mask="0xffe00" exact="0x62c00" message="store" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7618,7 +7618,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+STORE.i48" staging="r=2" mask="0xffe00" exact="0x65a00" message="store" dests="0">
+  <ins name="STORE.i48" staging="r=2" mask="0xffe00" exact="0x65a00" message="store" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7634,7 +7634,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+STORE.i64" staging="r=2" mask="0xffe00" exact="0x62e00" message="store" dests="0">
+  <ins name="STORE.i64" staging="r=2" mask="0xffe00" exact="0x62e00" message="store" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7650,7 +7650,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+STORE.i8" staging="r=1" mask="0xffe00" exact="0x62000" message="store" dests="0">
+  <ins name="STORE.i8" staging="r=1" mask="0xffe00" exact="0x62000" message="store" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7666,7 +7666,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+STORE.i96" staging="r=3" mask="0xffe00" exact="0x65c00" message="store" dests="0">
+  <ins name="STORE.i96" staging="r=3" mask="0xffe00" exact="0x65c00" message="store" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" start="6" size="3">
@@ -7682,7 +7682,7 @@
     <immediate name="byte_offset" size="16" pseudo="true"/>
   </ins>
 
-  <ins name="+ST_CVT" staging="r=format" mask="0xff800" exact="0xc9800" message="store" dests="0">
+  <ins name="ST_CVT" staging="r=format" mask="0xff800" exact="0xc9800" message="store" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -7704,7 +7704,7 @@
     </mod>
   </ins>
 
-  <ins name="+ST_TILE" staging="r=format" mask="0xff800" exact="0xcb800" message="tile" dests="0">
+  <ins name="ST_TILE" staging="r=format" mask="0xff800" exact="0xcb800" message="tile" dests="0" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -7722,7 +7722,7 @@
     </mod>
   </ins>
 
-  <ins name="+SWZ.v2i16" mask="0xfffc8" exact="0x3d948">
+  <ins name="SWZ.v2i16" mask="0xfffc8" exact="0x3d948" unit="add">
     <src start="0"/>
     <mod name="swz0" start="4" size="2">
       <opt>h00</opt>
@@ -7732,7 +7732,7 @@
     </mod>
   </ins>
 
-  <ins name="+SWZ.v4i8" mask="0xfffc0" exact="0x3df40">
+  <ins name="SWZ.v4i8" mask="0xfffc0" exact="0x3df40" unit="add">
     <src start="0"/>
     <mod name="swz0" start="3" size="3">
       <opt>b0000</opt>
@@ -7746,7 +7746,7 @@
     </mod>
   </ins>
 
-  <ins name="+TEXC" staging="rw=sr_count" mask="0xffc00" exact="0xd7000" message="tex">
+  <ins name="TEXC" staging="rw=sr_count" mask="0xffc00" exact="0xd7000" message="tex" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -7763,7 +7763,7 @@
   <!-- Pseudo instruction representing dual texturing on Bifrost. Lowered to
        TEXC after register allocation, when the second destination register can
        be combined with the texture operation descriptor. -->
-  <ins name="+TEXC_DUAL" staging="rw=sr_count" pseudo="true" message="tex" dests="2">
+  <ins name="TEXC_DUAL" staging="rw=sr_count" pseudo="true" message="tex" dests="2" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>
@@ -7776,7 +7776,7 @@
     </mod>
   </ins>
 
-  <ins name="+TEXS_2D.f16" staging="w=2" mask="0xfc000" exact="0xd8000" message="tex">
+  <ins name="TEXS_2D.f16" staging="w=2" mask="0xfc000" exact="0xd8000" message="tex" unit="add">
     <src start="0"/>
     <src start="3"/>
     <immediate name="texture_index" start="6" size="3"/>
@@ -7788,7 +7788,7 @@
     </mod>
   </ins>
 
-  <ins name="+TEXS_2D.f32" staging="w=4" mask="0xfc000" exact="0x58000" message="tex">
+  <ins name="TEXS_2D.f32" staging="w=4" mask="0xfc000" exact="0x58000" message="tex" unit="add">
     <src start="0"/>
     <src start="3"/>
     <immediate name="texture_index" start="6" size="3"/>
@@ -7800,7 +7800,7 @@
     </mod>
   </ins>
 
-  <ins name="+TEXS_CUBE.f16" staging="w=2" mask="0xfc000" exact="0xdc000" message="tex">
+  <ins name="TEXS_CUBE.f16" staging="w=2" mask="0xfc000" exact="0xdc000" message="tex" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -7809,7 +7809,7 @@
     <mod name="skip" start="9" size="1" opt="skip"/>
   </ins>
 
-  <ins name="+TEXS_CUBE.f32" staging="w=4" mask="0xfc000" exact="0x5c000" message="tex">
+  <ins name="TEXS_CUBE.f32" staging="w=4" mask="0xfc000" exact="0x5c000" message="tex" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -7818,7 +7818,7 @@
     <mod name="skip" start="9" size="1" opt="skip"/>
   </ins>
 
-  <ins name="+U16_TO_F32" mask="0xfffe8" exact="0x3cce8">
+  <ins name="U16_TO_F32" mask="0xfffe8" exact="0x3cce8" unit="add">
     <src start="0"/>
     <mod name="lane0" start="4" size="1" default="h0">
       <opt>h0</opt>
@@ -7826,7 +7826,7 @@
     </mod>
   </ins>
 
-  <ins name="+U16_TO_U32" mask="0xfffe8" exact="0x3ccc8">
+  <ins name="U16_TO_U32" mask="0xfffe8" exact="0x3ccc8" unit="add">
     <src start="0"/>
     <mod name="lane0" start="4" size="1" default="h0">
       <opt>h0</opt>
@@ -7834,7 +7834,7 @@
     </mod>
   </ins>
 
-  <ins name="+U32_TO_F32">
+  <ins name="U32_TO_F32" unit="add">
     <src start="0"/>
     <mod name="round" size="3">
       <opt>none</opt>
@@ -7857,7 +7857,7 @@
     </encoding>
   </ins>
 
-  <ins name="+U8_TO_F32" mask="0xfffc8" exact="0x3cb88">
+  <ins name="U8_TO_F32" mask="0xfffc8" exact="0x3cb88" unit="add">
     <src start="0"/>
     <mod name="lane0" start="4" size="2" default="b0">
       <opt>b0</opt>
@@ -7867,7 +7867,7 @@
     </mod>
   </ins>
 
-  <ins name="+U8_TO_U32" mask="0xfffc8" exact="0x3cb48">
+  <ins name="U8_TO_U32" mask="0xfffc8" exact="0x3cb48" unit="add">
     <src start="0"/>
     <mod name="lane0" start="4" size="2" default="b0">
       <opt>b0</opt>
@@ -7877,7 +7877,7 @@
     </mod>
   </ins>
 
-  <ins name="+V2F16_TO_V2S16">
+  <ins name="V2F16_TO_V2S16" unit="add">
     <src start="0"/>
     <mod name="round" size="3">
       <opt>none</opt>
@@ -7908,7 +7908,7 @@
     </encoding>
   </ins>
 
-  <ins name="+V2F16_TO_V2U16">
+  <ins name="V2F16_TO_V2U16" unit="add">
     <src start="0"/>
     <mod name="round" size="3">
       <opt>none</opt>
@@ -7939,7 +7939,7 @@
     </encoding>
   </ins>
 
-  <ins name="+V2F32_TO_V2F16" mask="0xfe000" exact="0x76000">
+  <ins name="V2F32_TO_V2F16" mask="0xfe000" exact="0x76000" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="abs0" size="1" opt="abs"/>
@@ -7982,7 +7982,7 @@
     </derived>
   </ins>
 
-  <ins name="+V2S16_TO_V2F16">
+  <ins name="V2S16_TO_V2F16" unit="add">
     <src start="0"/>
     <mod name="round" size="3">
       <opt>none</opt>
@@ -8013,7 +8013,7 @@
     </encoding>
   </ins>
 
-  <ins name="+V2S8_TO_V2F16" mask="0xfff08" exact="0x3c800">
+  <ins name="V2S8_TO_V2F16" mask="0xfff08" exact="0x3c800" unit="add">
     <src start="0"/>
     <mod name="swz0" start="4" size="4" default="b01">
       <opt>b00</opt>
@@ -8035,7 +8035,7 @@
     </mod>
   </ins>
 
-  <ins name="+V2S8_TO_V2S16" mask="0xfff08" exact="0x3c700">
+  <ins name="V2S8_TO_V2S16" mask="0xfff08" exact="0x3c700" unit="add">
     <src start="0"/>
     <mod name="swz0" start="4" size="4" default="b01">
       <opt>b00</opt>
@@ -8057,7 +8057,7 @@
     </mod>
   </ins>
 
-  <ins name="+V2U16_TO_V2F16">
+  <ins name="V2U16_TO_V2F16" unit="add">
     <src start="0"/>
     <mod name="round" size="3">
       <opt>none</opt>
@@ -8088,7 +8088,7 @@
     </encoding>
   </ins>
 
-  <ins name="+V2U8_TO_V2F16" mask="0xfff08" exact="0x3c808">
+  <ins name="V2U8_TO_V2F16" mask="0xfff08" exact="0x3c808" unit="add">
     <src start="0"/>
     <mod name="swz0" start="4" size="4" default="b01">
       <opt>b00</opt>
@@ -8110,7 +8110,7 @@
     </mod>
   </ins>
 
-  <ins name="+V2U8_TO_V2U16" mask="0xfff08" exact="0x3c708">
+  <ins name="V2U8_TO_V2U16" mask="0xfff08" exact="0x3c708" unit="add">
     <src start="0"/>
     <mod name="swz0" start="4" size="4" default="b01">
       <opt>b00</opt>
@@ -8132,7 +8132,7 @@
     </mod>
   </ins>
 
-  <ins name="+VAR_TEX.f16" staging="w=2" mask="0xffd00" exact="0xca100" message="vartex">
+  <ins name="VAR_TEX.f16" staging="w=2" mask="0xffd00" exact="0xca100" message="vartex" unit="add">
     <immediate name="varying_index" start="0" size="3"/>
     <immediate name="texture_index" start="3" size="2"/>
     <mod name="update" size="1">
@@ -8162,7 +8162,7 @@
     </derived>
   </ins>
 
-  <ins name="+VAR_TEX.f32" staging="w=4" mask="0xffd00" exact="0xca000" message="vartex">
+  <ins name="VAR_TEX.f32" staging="w=4" mask="0xffd00" exact="0xca000" message="vartex" unit="add">
     <immediate name="varying_index" start="0" size="3"/>
     <immediate name="texture_index" start="3" size="2"/>
     <mod name="update" size="1">
@@ -8192,7 +8192,7 @@
     </derived>
   </ins>
 
-  <ins name="+VN_ASST2.f32">
+  <ins name="VN_ASST2.f32" unit="add">
     <src start="0"/>
     <mod name="scale" size="1" opt="scale"/>
     <mod name="neg0" size="1" opt="neg"/>
@@ -8206,12 +8206,12 @@
     </encoding>
   </ins>
 
-  <ins name="+VN_ASST2.v2f16" mask="0xffff0" exact="0x3dfa0">
+  <ins name="VN_ASST2.v2f16" mask="0xffff0" exact="0x3dfa0" unit="add">
     <src start="0"/>
     <mod name="neg0" start="3" size="1" opt="neg"/>
   </ins>
 
-  <ins name="+WMASK" mask="0xfffc0" exact="0x3d700">
+  <ins name="WMASK" mask="0xfffc0" exact="0x3d700" unit="add">
     <src start="0"/>
     <immediate name="fill" start="3" size="1"/>
     <mod name="subgroup" start="4" size="2">
@@ -8221,7 +8221,7 @@
     </mod>
   </ins>
 
-  <ins name="+ZS_EMIT" staging="w=1" mask="0xff800" exact="0xd7800" message="z_stencil">
+  <ins name="ZS_EMIT" staging="w=1" mask="0xff800" exact="0xd7800" message="z_stencil" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -8245,7 +8245,7 @@
   </ins>
 
   <!--- Lowered to *SEG_ADD/+SEG_ADD -->
-  <ins name="+SEG_ADD.i64" pseudo="true">
+  <ins name="SEG_ADD.i64" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="seg" size="3">
@@ -8262,7 +8262,7 @@
   </ins>
 
   <!-- Scheduler lowered to *ATOM_C.i32/+ATOM_CX. Real Valhall instructions. -->
-  <ins name="+ATOM_RETURN.i32" pseudo="true" staging="rw=sr_count" message="atomic">
+  <ins name="ATOM_RETURN.i32" pseudo="true" staging="rw=sr_count" message="atomic" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="atom_opc" start="9" size="5">
@@ -8288,7 +8288,7 @@
     <immediate name="sr_count" size="4" pseudo="true"/>
   </ins>
 
-  <ins name="+ATOM1_RETURN.i32" pseudo="true" staging="w=sr_count" message="atomic">
+  <ins name="ATOM1_RETURN.i32" pseudo="true" staging="w=sr_count" message="atomic" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="atom_opc" start="6" size="3">
@@ -8302,7 +8302,7 @@
     <immediate name="sr_count" size="4" pseudo="true"/>
   </ins>
 
-  <ins name="+ATOM.i32" pseudo="true" staging="r=sr_count" message="atomic">
+  <ins name="ATOM.i32" pseudo="true" staging="r=sr_count" message="atomic" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="atom_opc" start="9" size="4">
@@ -8327,7 +8327,7 @@
   </ins>
 
   <!-- *CUBEFACE1/+CUBEFACE2 pair, two destinations, scheduler lowered -->
-  <ins name="+CUBEFACE" pseudo="true" dests="2">
+  <ins name="CUBEFACE" pseudo="true" dests="2" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -8336,32 +8336,32 @@
     <mod name="neg2" size="1" opt="neg"/>
   </ins>
 
-  <ins name="+IADD_IMM.i32" pseudo="true">
+  <ins name="IADD_IMM.i32" pseudo="true" unit="add">
     <src start="0"/>
     <immediate name="index" size="32"/>
   </ins>
 
-  <ins name="+IADD_IMM.v2i16" pseudo="true">
+  <ins name="IADD_IMM.v2i16" pseudo="true" unit="add">
     <src start="0"/>
     <immediate name="index" size="32"/>
   </ins>
 
-  <ins name="+IADD_IMM.v4i8" pseudo="true">
+  <ins name="IADD_IMM.v4i8" pseudo="true" unit="add">
     <src start="0"/>
     <immediate name="index" size="32"/>
   </ins>
 
-  <ins name="+FADD_IMM.f32" pseudo="true">
+  <ins name="FADD_IMM.f32" pseudo="true" unit="add">
     <src start="0"/>
     <immediate name="index" size="32"/>
   </ins>
 
-  <ins name="+FADD_IMM.v2f16" pseudo="true">
+  <ins name="FADD_IMM.v2f16" pseudo="true" unit="add">
     <src start="0"/>
     <immediate name="index" size="32"/>
   </ins>
 
-  <ins name="*FABSNEG.f32" pseudo="true">
+  <ins name="FABSNEG.f32" pseudo="true" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="neg0" start="7" size="1" opt="neg"/>
     <mod name="abs0" start="12" size="1" opt="abs"/>
@@ -8372,7 +8372,7 @@
     </mod>
   </ins>
 
-  <ins name="*FABSNEG.v2f16" pseudo="true">
+  <ins name="FABSNEG.v2f16" pseudo="true" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="abs0" size="1" opt="abs"/>
     <mod name="neg0" start="7" size="1" opt="neg"/>
@@ -8384,7 +8384,7 @@
     </mod>
   </ins>
 
-  <ins name="*FCLAMP.f32" pseudo="true">
+  <ins name="FCLAMP.f32" pseudo="true" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="clamp" start="15" size="2">
       <opt>none</opt>
@@ -8394,7 +8394,7 @@
     </mod>
   </ins>
 
-  <ins name="*FCLAMP.v2f16" pseudo="true">
+  <ins name="FCLAMP.v2f16" pseudo="true" unit="fma">
     <src start="0" mask="0xfb"/>
     <mod name="clamp" start="15" size="2">
       <opt>none</opt>
@@ -8404,7 +8404,7 @@
     </mod>
   </ins>
 
-  <ins name="+DISCARD.b32" pseudo="true" dests="0">
+  <ins name="DISCARD.b32" pseudo="true" dests="0" unit="add">
     <src start="0"/>
     <mod name="widen0" size="2">
       <opt>none</opt>
@@ -8413,7 +8413,7 @@
     </mod>
   </ins>
 
-  <ins name="+TEX_SINGLE" staging="rw=sr_count" message="tex" pseudo="true">
+  <ins name="TEX_SINGLE" staging="rw=sr_count" message="tex" pseudo="true" unit="add">
     <src start="0"/>
     <src start="1"/>
     <immediate name="sr_count" size="4" pseudo="true"/>
@@ -8463,7 +8463,7 @@
     </mod>
   </ins>
 
-  <ins name="+TEX_FETCH" staging="rw=sr_count" message="tex" pseudo="true">
+  <ins name="TEX_FETCH" staging="rw=sr_count" message="tex" pseudo="true" unit="add">
     <src start="0"/>
     <src start="1"/>
     <immediate name="sr_count" size="4" pseudo="true"/>
@@ -8505,7 +8505,7 @@
     </mod>
   </ins>
 
-  <ins name="+TEX_GATHER" staging="rw=sr_count" message="tex" pseudo="true">
+  <ins name="TEX_GATHER" staging="rw=sr_count" message="tex" pseudo="true" unit="add">
     <src start="0"/>
     <src start="1"/>
     <immediate name="sr_count" size="4" pseudo="true"/>
@@ -8555,7 +8555,7 @@
     </mod>
   </ins>
 
-  <ins name="+CUBEFACE2_V9" pseudo="true">
+  <ins name="CUBEFACE2_V9" pseudo="true" unit="add">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6"/>
@@ -8564,7 +8564,7 @@
     <mod name="neg2" size="1" opt="neg"/>
   </ins>
 
-  <ins name="+LD_VAR_BUF_IMM.f32" staging="w=format" message="varying" pseudo="true">
+  <ins name="LD_VAR_BUF_IMM.f32" staging="w=format" message="varying" pseudo="true" unit="add">
     <src start="0"/>
     <immediate name="index" start="3" size="5"/>
     <mod name="vecsize" start="8" size="2">
@@ -8600,7 +8600,7 @@
     </mod>
   </ins>
 
-  <ins name="+LD_VAR_BUF.f32" staging="w=format" message="varying" pseudo="true">
+  <ins name="LD_VAR_BUF.f32" staging="w=format" message="varying" pseudo="true" unit="add">
     <src start="0"/>
     <src start="1"/>
     <mod name="vecsize" start="8" size="2">
@@ -8636,7 +8636,7 @@
     </mod>
   </ins>
 
-  <ins name="+LD_VAR_BUF_IMM.f16" staging="w=format" message="varying" pseudo="true">
+  <ins name="LD_VAR_BUF_IMM.f16" staging="w=format" message="varying" pseudo="true" unit="add">
     <src start="0"/>
     <immediate name="index" start="3" size="5"/>
     <mod name="vecsize" start="8" size="2">
@@ -8672,7 +8672,7 @@
     </mod>
   </ins>
 
-  <ins name="+LD_VAR_BUF.f16" staging="w=format" message="varying" pseudo="true">
+  <ins name="LD_VAR_BUF.f16" staging="w=format" message="varying" pseudo="true" unit="add">
     <src start="0"/>
     <src start="1"/>
     <mod name="vecsize" start="8" size="2">
@@ -8708,16 +8708,16 @@
     </mod>
   </ins>
 
-  <ins name="+LEA_BUF_IMM" staging="w=2" message="attribute" pseudo="true">
+  <ins name="LEA_BUF_IMM" staging="w=2" message="attribute" pseudo="true" unit="add">
     <src start="0"/>
   </ins>
 
-  <ins name="+LD_BUFFER.i128" staging="w=4" pseudo="true" message="load">
+  <ins name="LD_BUFFER.i128" staging="w=4" pseudo="true" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
   </ins>
 
-  <ins name="+LD_BUFFER.i16" staging="w=1" pseudo="true" message="load">
+  <ins name="LD_BUFFER.i16" staging="w=1" pseudo="true" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="lane_dest" size="2" default="h0">
@@ -8733,12 +8733,12 @@
     </mod>
   </ins>
 
-  <ins name="+LD_BUFFER.i24" staging="w=1" pseudo="true" message="load">
+  <ins name="LD_BUFFER.i24" staging="w=1" pseudo="true" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
   </ins>
 
-  <ins name="+LD_BUFFER.i32" staging="w=1" pseudo="true" message="load">
+  <ins name="LD_BUFFER.i32" staging="w=1" pseudo="true" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="lane_dest" size="1" opt="d0"/>
@@ -8749,17 +8749,17 @@
     </mod>
   </ins>
 
-  <ins name="+LD_BUFFER.i48" staging="w=2" pseudo="true" message="load">
+  <ins name="LD_BUFFER.i48" staging="w=2" pseudo="true" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
   </ins>
 
-  <ins name="+LD_BUFFER.i64" staging="w=2" pseudo="true" message="load">
+  <ins name="LD_BUFFER.i64" staging="w=2" pseudo="true" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
   </ins>
 
-  <ins name="+LD_BUFFER.i8" staging="w=1" pseudo="true" message="load">
+  <ins name="LD_BUFFER.i8" staging="w=1" pseudo="true" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
     <mod name="lane_dest" size="3" default="b0">
@@ -8779,12 +8779,12 @@
     </mod>
   </ins>
 
-  <ins name="+LD_BUFFER.i96" staging="w=3" pseudo="true" message="load">
+  <ins name="LD_BUFFER.i96" staging="w=3" pseudo="true" message="load" unit="add">
     <src start="0"/>
     <src start="3"/>
   </ins>
 
-  <ins name="+BRANCHZI" pseudo="true" last="true" dests="0">
+  <ins name="BRANCHZI" pseudo="true" last="true" dests="0" unit="add">
     <src start="0"/>
     <src start="6" mask="0xf7"/>
     <mod name="cmpf" size="1">
@@ -8793,7 +8793,7 @@
     </mod>
   </ins>
 
-  <ins name="+LD_TEX" pseudo="true" staging="w=format" message="attribute">
+  <ins name="LD_TEX" pseudo="true" staging="w=format" message="attribute" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -8816,7 +8816,7 @@
     </mod>
   </ins>
 
-  <ins name="+LD_TEX_IMM" pseudo="true" staging="w=format" message="attribute">
+  <ins name="LD_TEX_IMM" pseudo="true" staging="w=format" message="attribute" unit="add">
     <src start="0"/>
     <src start="3"/>
     <immediate name="texture_index" start="6" size="4"/>
@@ -8839,7 +8839,7 @@
     </mod>
   </ins>
 
-  <ins name="*MKVEC.v2i8" pseudo="true">
+  <ins name="MKVEC.v2i8" pseudo="true" unit="fma">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -8857,15 +8857,15 @@
     </mod>
   </ins>
 
-  <ins name="+PHI" pseudo="true" variable_srcs="true"/>
+  <ins name="PHI" pseudo="true" variable_srcs="true" unit="add"/>
 
-  <ins name="+COLLECT.i32" pseudo="true" variable_srcs="true"/>
+  <ins name="COLLECT.i32" pseudo="true" variable_srcs="true" unit="add"/>
 
-  <ins name="+SPLIT.i32" pseudo="true" variable_dests="true">
+  <ins name="SPLIT.i32" pseudo="true" variable_dests="true" unit="add">
     <src start="0"/>
   </ins>
 
-  <ins name="*FCMP_OR.f32" pseudo="true">
+  <ins name="FCMP_OR.f32" pseudo="true" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6" mask="0xfb"/>
@@ -8900,7 +8900,7 @@
     </mod>
   </ins>
 
-  <ins name="*FCMP_OR.v2f16" pseudo="true">
+  <ins name="FCMP_OR.v2f16" pseudo="true" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6" mask="0xfb"/>
@@ -8937,7 +8937,7 @@
     </mod>
   </ins>
 
-  <ins name="*FCMP_AND.f32" pseudo="true">
+  <ins name="FCMP_AND.f32" pseudo="true" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6" mask="0xfb"/>
@@ -8972,7 +8972,7 @@
     </mod>
   </ins>
 
-  <ins name="*FCMP_AND.v2f16" pseudo="true">
+  <ins name="FCMP_AND.v2f16" pseudo="true" unit="fma">
     <src start="0" mask="0xfb"/>
     <src start="3" mask="0xfb"/>
     <src start="6" mask="0xfb"/>
@@ -9009,7 +9009,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_MULTI.s32" pseudo="true">
+  <ins name="ICMP_MULTI.s32" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9027,7 +9027,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_MULTI.u32" pseudo="true">
+  <ins name="ICMP_MULTI.u32" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9045,7 +9045,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_OR.s32" pseudo="true">
+  <ins name="ICMP_OR.s32" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9063,7 +9063,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_OR.u32" pseudo="true">
+  <ins name="ICMP_OR.u32" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9081,7 +9081,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_OR.v2s16" pseudo="true">
+  <ins name="ICMP_OR.v2s16" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9111,7 +9111,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_OR.v2u16" pseudo="true">
+  <ins name="ICMP_OR.v2u16" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9141,7 +9141,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_OR.v4s8" pseudo="true">
+  <ins name="ICMP_OR.v4s8" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9163,7 +9163,7 @@
     </derived>
   </ins>
 
-  <ins name="+ICMP_OR.v4u8" pseudo="true">
+  <ins name="ICMP_OR.v4u8" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9181,7 +9181,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_AND.s32" pseudo="true">
+  <ins name="ICMP_AND.s32" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9199,7 +9199,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_AND.u32" pseudo="true">
+  <ins name="ICMP_AND.u32" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9217,7 +9217,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_AND.v2s16" pseudo="true">
+  <ins name="ICMP_AND.v2s16" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9247,7 +9247,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_AND.v2u16" pseudo="true">
+  <ins name="ICMP_AND.v2u16" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9277,7 +9277,7 @@
     </mod>
   </ins>
 
-  <ins name="+ICMP_AND.v4s8" pseudo="true">
+  <ins name="ICMP_AND.v4s8" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
@@ -9299,7 +9299,7 @@
     </derived>
   </ins>
 
-  <ins name="+ICMP_AND.v4u8" pseudo="true">
+  <ins name="ICMP_AND.v4u8" pseudo="true" unit="add">
     <src start="0"/>
     <src start="3"/>
     <src start="6"/>
diff --git a/src/panfrost/compiler/bifrost_isa.py b/src/panfrost/compiler/bifrost_isa.py
index 7152509bc39..4be004c3417 100644
--- a/src/panfrost/compiler/bifrost_isa.py
+++ b/src/panfrost/compiler/bifrost_isa.py
@@ -195,6 +195,23 @@ def parse_instruction(ins, include_pseudo):
 
     return variants
 
+def ins_name(ins, group = False):
+    # a historical artifact: the first character of the name should contain
+    # a single character tag to indicate the unit: '+' for add, '*' for fma
+    # bifrost has only those two units, valhall has others but for those
+    # it doesn't matter (pretend they are '+')
+    if not group:
+        group = ins
+
+    base_name = ins.attrib['name']
+    if group.attrib['unit'] == 'fma':
+        tagged_name = '*' + base_name
+    elif group.attrib.get('ir_unit', '') == 'fma':
+        tagged_name = '*' + base_name
+    else:
+        tagged_name = '+' + base_name
+    return tagged_name
+
 def parse_instructions(xml, include_unused = False, include_pseudo = False):
     final = {}
     instructions = ET.parse(xml).getroot().findall('ins')
@@ -211,7 +228,8 @@ def parse_instructions(xml, include_unused = False, include_pseudo = False):
         if parsed[0][1]["pseudo"] and not include_pseudo:
             continue
 
-        final[ins.attrib['name']] = parsed
+        tagged_name = ins_name(ins)
+        final[tagged_name] = parsed
 
     return final