From aa91f9dcc0bba2fcb940fe5e8d982ac4d8bf6c7e Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 27 Nov 2020 14:48:44 -0500
Subject: [PATCH] pan/bi: Use consistent naming of lane/lane0

It's always a source modifier.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8213>
---
 src/panfrost/bifrost/ISA.xml | 50 ++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/panfrost/bifrost/ISA.xml b/src/panfrost/bifrost/ISA.xml
index 4cb7fbe..5fadf0b 100644
--- a/src/panfrost/bifrost/ISA.xml
+++ b/src/panfrost/bifrost/ISA.xml
@@ -7066,7 +7066,7 @@
       <reserved/>
       <opt>tl</opt>
     </mod>
-    <mod name="lane" size="2" default="h0">
+    <mod name="lane0" size="2" default="h0">
       <opt>h0</opt>
       <opt>h1</opt>
       <opt>w0</opt>
@@ -7081,19 +7081,19 @@
       <and>
         <eq left="extend" right="#none"/>
         <or>
-          <eq left="lane" right="#h0"/>
-          <eq left="lane" right="#h1"/>
+          <eq left="lane0" right="#h0"/>
+          <eq left="lane0" right="#h1"/>
         </or>
       </and>
       <derived start="9" size="1">
-        <eq left="lane" right="#h0"/>
-        <eq left="lane" right="#h1"/>
+        <eq left="lane0" right="#h0"/>
+        <eq left="lane0" right="#h1"/>
       </derived>
     </encoding>
     <encoding mask="0xffc00" exact="0x63000">
       <and>
         <neq left="extend" right="#none"/>
-        <eq left="lane" right="#w0"/>
+        <eq left="lane0" right="#w0"/>
       </and>
       <derived start="9" size="1">
         <eq left="extend" right="#sext"/>
@@ -7103,7 +7103,7 @@
     <encoding mask="0xffc00" exact="0x61800">
       <and>
         <neq left="extend" right="#none"/>
-        <eq left="lane" right="#d0"/>
+        <eq left="lane0" right="#d0"/>
       </and>
       <derived start="9" size="1">
         <eq left="extend" right="#sext"/>
@@ -7140,7 +7140,7 @@
       <reserved/>
       <opt>tl</opt>
     </mod>
-    <mod name="lane" size="1" opt="d0"/>
+    <mod name="lane0" size="1" opt="d0"/>
     <mod name="extend" size="2">
       <opt>none</opt>
       <opt>sext</opt>
@@ -7149,13 +7149,13 @@
     <encoding mask="0xffe00" exact="0x60c00">
       <and>
         <eq left="extend" right="#none"/>
-        <eq left="lane" right="#none"/>
+        <eq left="lane0" right="#none"/>
       </and>
     </encoding>
     <encoding mask="0xffc00" exact="0x61c00">
       <and>
         <neq left="extend" right="#none"/>
-        <eq left="lane" right="#d0"/>
+        <eq left="lane0" right="#d0"/>
       </and>
       <derived start="9" size="1">
         <eq left="extend" right="#sext"/>
@@ -7207,7 +7207,7 @@
       <reserved/>
       <opt>tl</opt>
     </mod>
-    <mod name="lane" size="3" default="b0">
+    <mod name="lane0" size="3" default="b0">
       <opt>b0</opt>
       <opt>b1</opt>
       <opt>b2</opt>
@@ -7226,25 +7226,25 @@
       <and>
         <eq left="extend" right="#none"/>
         <or>
-          <eq left="lane" right="#b0"/>
-          <eq left="lane" right="#b1"/>
-          <eq left="lane" right="#b2"/>
-          <eq left="lane" right="#b3"/>
+          <eq left="lane0" right="#b0"/>
+          <eq left="lane0" right="#b1"/>
+          <eq left="lane0" right="#b2"/>
+          <eq left="lane0" right="#b3"/>
         </or>
       </and>
       <derived start="9" size="2">
-        <eq left="lane" right="#b0"/>
-        <eq left="lane" right="#b1"/>
-        <eq left="lane" right="#b2"/>
-        <eq left="lane" right="#b3"/>
+        <eq left="lane0" right="#b0"/>
+        <eq left="lane0" right="#b1"/>
+        <eq left="lane0" right="#b2"/>
+        <eq left="lane0" right="#b3"/>
       </derived>
     </encoding>
     <encoding mask="0xff800" exact="0x63800">
       <and>
         <neq left="extend" right="#none"/>
         <or>
-          <eq left="lane" right="#h0"/>
-          <eq left="lane" right="#h1"/>
+          <eq left="lane0" right="#h0"/>
+          <eq left="lane0" right="#h1"/>
         </or>
       </and>
       <derived start="9" size="1">
@@ -7252,14 +7252,14 @@
         <eq left="extend" right="#zext"/>
       </derived>
       <derived start="10" size="1">
-        <eq left="lane" right="#h0"/>
-        <eq left="lane" right="#h1"/>
+        <eq left="lane0" right="#h0"/>
+        <eq left="lane0" right="#h1"/>
       </derived>
     </encoding>
     <encoding mask="0xffc00" exact="0x63400">
       <and>
         <neq left="extend" right="#none"/>
-        <eq left="lane" right="#w0"/>
+        <eq left="lane0" right="#w0"/>
       </and>
       <derived start="9" size="1">
         <eq left="extend" right="#sext"/>
@@ -7269,7 +7269,7 @@
     <encoding mask="0xffc00" exact="0x61400">
       <and>
         <neq left="extend" right="#none"/>
-        <eq left="lane" right="#d0"/>
+        <eq left="lane0" right="#d0"/>
       </and>
       <derived start="9" size="1">
         <eq left="extend" right="#sext"/>
-- 
2.7.4