From d831a13c704f718d6ad56b3a2f0b774721ac7a2c Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Wed, 30 Mar 2022 10:27:16 -0400
Subject: [PATCH] pan/va: Mark NOT instructions as deprecated

The inverters on the bitwise ops should be used instead.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15588>
---
 src/panfrost/bifrost/valhall/ISA.xml      | 4 ++--
 src/panfrost/bifrost/valhall/valhall.c.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/panfrost/bifrost/valhall/ISA.xml b/src/panfrost/bifrost/valhall/ISA.xml
index e736b8cda8f..939f2c5aae9 100644
--- a/src/panfrost/bifrost/valhall/ISA.xml
+++ b/src/panfrost/bifrost/valhall/ISA.xml
@@ -1618,14 +1618,14 @@
     <src/>
   </ins>
 
-  <ins name="NOT.i32" title="Bitwise complement" dests="1" opcode="0x91" opcode2="0xE" unit="SFU">
+  <ins name="NOT_OLD.i32" title="Bitwise complement" dests="1" opcode="0x91" opcode2="0xE" unit="SFU">
     <desc>
       For fully featured bitwise operation, see the shift opcodes.
     </desc>
     <src/>
   </ins>
 
-  <ins name="NOT.i64" title="Bitwise complement" dests="1" opcode="0x191" opcode2="0xE" unit="SFU">
+  <ins name="NOT_OLD.i64" title="Bitwise complement" dests="1" opcode="0x191" opcode2="0xE" unit="SFU">
     <desc>
       For fully featured bitwise operation, see the shift opcodes.
     </desc>
diff --git a/src/panfrost/bifrost/valhall/valhall.c.py b/src/panfrost/bifrost/valhall/valhall.c.py
index 18ccf9e19fe..171359e922d 100644
--- a/src/panfrost/bifrost/valhall/valhall.c.py
+++ b/src/panfrost/bifrost/valhall/valhall.c.py
@@ -38,7 +38,6 @@ SKIP = set([
         "IMUL.v4s8",
 
         # 64-bit support
-        "NOT.i64",
         "IADD.u64",
         "IADD.s64",
         "ISUB.u64",
@@ -72,7 +71,8 @@ SKIP = set([
         "FMA_RSCALE_SCALE16.f32",
 
         # Deprecated instruction
-        "NOT.i32",
+        "NOT_OLD.i32",
+        "NOT_OLD.i64",
 
         # TODO
         "IDP.v4s8",