From 569886359bad365ccd2695616cd6db62f41909ed Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 27 Nov 2020 14:59:12 -0500
Subject: [PATCH] pan/bi: Don't treat extend as per-source

There is only one per instruction so it just complicates things.

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 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/panfrost/bifrost/ISA.xml b/src/panfrost/bifrost/ISA.xml
index 5fadf0b8053..1126e651a67 100644
--- a/src/panfrost/bifrost/ISA.xml
+++ b/src/panfrost/bifrost/ISA.xml
@@ -1509,20 +1509,20 @@
       <opt>b2</opt>
       <opt>b3</opt>
     </mod>
-    <mod name="extend1" size="2">
+    <mod name="extend" size="2">
       <opt>none</opt>
       <opt>sext</opt>
       <opt>zext</opt>
     </mod>
     <encoding mask="0x7fffc0" exact="0x73c0c0">
       <and>
-        <eq left="extend1" right="#none"/>
+        <eq left="extend" right="#none"/>
         <eq left="widen1" right="#none"/>
       </and>
     </encoding>
     <encoding mask="0x7ff9c0" exact="0x73c8c0">
       <and>
-        <neq left="extend1" right="#none"/>
+        <neq left="extend" right="#none"/>
         <or>
           <eq left="widen1" right="#h0"/>
           <eq left="widen1" right="#h1"/>
@@ -1533,13 +1533,13 @@
         <eq left="widen1" right="#h1"/>
       </derived>
       <derived start="10" size="1">
-        <eq left="extend1" right="#zext"/>
-        <eq left="extend1" right="#sext"/>
+        <eq left="extend" right="#zext"/>
+        <eq left="extend" right="#sext"/>
       </derived>
     </encoding>
     <encoding mask="0x7ff1c0" exact="0x73b0c0">
       <and>
-        <neq left="extend1" right="#none"/>
+        <neq left="extend" right="#none"/>
         <or>
           <eq left="widen1" right="#b0"/>
           <eq left="widen1" right="#b1"/>
@@ -1554,8 +1554,8 @@
         <eq left="widen1" right="#b3"/>
       </derived>
       <derived start="11" size="1">
-        <eq left="extend1" right="#zext"/>
-        <eq left="extend1" right="#sext"/>
+        <eq left="extend" right="#zext"/>
+        <eq left="extend" right="#sext"/>
       </derived>
     </encoding>
   </ins>