From 76159ee379376d200e8e191534bc05f4c1c9e7e0 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Sun, 13 Mar 2022 14:06:54 -0400
Subject: [PATCH] pan/va: Remove immediate modes from XML/asm

Now replaced by inference in the assembler, as they should be.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15364>
---
 src/panfrost/bifrost/valhall/ISA.xml | 8 --------
 src/panfrost/bifrost/valhall/asm.py  | 7 -------
 2 files changed, 15 deletions(-)

diff --git a/src/panfrost/bifrost/valhall/ISA.xml b/src/panfrost/bifrost/valhall/ISA.xml
index c0fa2c3d9c0..53cf0cc5311 100644
--- a/src/panfrost/bifrost/valhall/ISA.xml
+++ b/src/panfrost/bifrost/valhall/ISA.xml
@@ -94,14 +94,6 @@
     <value name="Return from shader">return</value>
   </enum>
 
-  <enum name="Immediate mode">
-    <desc>Selects how immediates sources are interpreted.</desc>
-    <value desc="No special immediates" default="true">none</value>
-    <value desc="Thread storage pointers">ts</value>
-    <reserved/>
-    <value desc="Thread identification">id</value>
-  </enum>
-
   <enum name="Thread storage pointers">
     <desc>
       Situated between the immediates hard-coded in the hardware and the
diff --git a/src/panfrost/bifrost/valhall/asm.py b/src/panfrost/bifrost/valhall/asm.py
index f69325146d5..9a7f0d22f7b 100644
--- a/src/panfrost/bifrost/valhall/asm.py
+++ b/src/panfrost/bifrost/valhall/asm.py
@@ -181,12 +181,6 @@ def parse_asm(line):
 
     mods = head[len(ins.name) + 1:].split(".")
     modifier_map = {}
-    immediate_mode = 'none'
-
-    for mod in mods:
-        if mod in enums['immediate_mode'].bare_values:
-            die_if(immediate_mode != 'none', 'Multiple immediate modes specified')
-            immediate_mode = mod
 
     tail = line[(len(head) + 1):]
     operands = [x.strip() for x in tail.split(",") if len(x.strip()) > 0]
@@ -407,7 +401,6 @@ def parse_asm(line):
         assert(value < (1 << mod.size))
         encoded |= (value << mod.start)
 
-    encoded |= (enums['immediate_mode'].bare_values.index(immediate_mode) << 57)
     return encoded
 
 if __name__ == "__main__":