pan/bi: Rename NOP.i32 to NOP

Simpler and matches the syntax of Valhall I've picked out.

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

diff --git a/src/panfrost/bifrost/ISA.xml b/src/panfrost/bifrost/ISA.xml
index e1eb918..d5b6103 100644 (file)
--- a/src/panfrost/bifrost/ISA.xml
+++ b/src/panfrost/bifrost/ISA.xml
@@ -1986,7 +1986,7 @@
     <src start="0" mask="0xfb"/>
   </ins>
 
-  <ins name="*NOP.i32" mask="0x7fffff" exact="0x701963"/>
+  <ins name="*NOP" mask="0x7fffff" exact="0x701963"/>
 
   <ins name="*POPCOUNT.i32" mask="0x7ffff8" exact="0x73c6d8">
     <src start="0" mask="0xfb"/>
@@ -7395,7 +7395,7 @@
     </mod>
   </ins>
 
-  <ins name="+NOP.i32" mask="0xfffff" exact="0x3d964"/>
+  <ins name="+NOP" mask="0xfffff" exact="0x3d964"/>
 
   <ins name="+QUIET.f32" mask="0xffff8" exact="0x3d970">
     <src start="0"/>

diff --git a/src/panfrost/bifrost/bi_packer.c.py b/src/panfrost/bifrost/bi_packer.c.py
index 0c63ed6..c014519 100644 (file)
--- a/src/panfrost/bifrost/bi_packer.c.py
+++ b/src/panfrost/bifrost/bi_packer.c.py
@@ -310,7 +310,7 @@ bi_pack_${'fma' if unit == '*' else 'add'}(bi_instr *I,
     enum bifrost_packed_src src3)
 {
     if (!I)
-        return bi_pack_${opname_to_c(unit + 'NOP.i32')}(I, src0, src1, src2, src3);
+        return bi_pack_${opname_to_c(unit + 'NOP')}(I, src0, src1, src2, src3);
 
 % if unit == '*':
     assert((1 << src0) & 0xfb);

diff --git a/src/panfrost/bifrost/bi_schedule.c b/src/panfrost/bifrost/bi_schedule.c
index 3392c89..89f139e 100644 (file)
--- a/src/panfrost/bifrost/bi_schedule.c
+++ b/src/panfrost/bifrost/bi_schedule.c
@@ -1905,7 +1905,7 @@ bi_add_nop_for_atest(bi_context *ctx)
          * execute */
 
         bi_instr *I = rzalloc(ctx, bi_instr);
-        I->op = BI_OPCODE_NOP_I32;
+        I->op = BI_OPCODE_NOP;
         I->dest[0] = bi_null();
 
         bi_clause *new_clause = ralloc(ctx, bi_clause);