From 1b1f4bd35e4353d3fea91aa16f710e7f6ec958de Mon Sep 17 00:00:00 2001
From: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Date: Mon, 9 Mar 2026 11:19:32 +0100
Subject: [PATCH] pan/va: Remove non-existent unused CLPERs

These instructions were not generated as they do not exist.

Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Acked-by: Lorenzo Rossi <lorenzo.rossi@collabora.com>
Acked-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40199>
---
 src/panfrost/compiler/bifrost/valhall/ISA.xml      | 13 ++-----------
 src/panfrost/compiler/bifrost/valhall/valhall.c.py |  9 ---------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/panfrost/compiler/bifrost/valhall/ISA.xml b/src/panfrost/compiler/bifrost/valhall/ISA.xml
index 84b0e1c3af2..e6710327034 100644
--- a/src/panfrost/compiler/bifrost/valhall/ISA.xml
+++ b/src/panfrost/compiler/bifrost/valhall/ISA.xml
@@ -2023,16 +2023,7 @@
     </desc>
   </group>
 
-  <group name="CLPER" title="Cross-lane permute" dests="1" opcode2="0xF" unused="true" unit="SFU">
-    <ins name="CLPER.i32" opcode="0xA0"/>
-    <ins name="CLPER.v2u16" opcode="0xA1"/>
-    <ins name="CLPER.v4u8" opcode="0xA2"/>
-    <ins name="CLPER.s32" opcode="0xA8"/>
-    <ins name="CLPER.v2s16" opcode="0xA9"/>
-    <ins name="CLPER.v4s8" opcode="0xAA"/>
-    <ins name="CLPER.u64" opcode="0x1A3"/>
-    <ins name="CLPER.s64" opcode="0x1AB"/>
-    <!-- <ins name="CLPER.s32" opcode="0x1A0"/> -->
+  <ins name="CLPER.i32" title="Cross-lane permute" dests="1" opcode="0xA0" opcode2="0xF" unused="true" unit="SFU">
     <desc>
       Selects the value of A in the subgroup lane given by B. This implements
       subgroup broadcasts. It may be used as a primitive for screen space
@@ -2043,7 +2034,7 @@
     <subgroup/>
     <lane_op/>
     <inactive_result/>
-  </group>
+  </ins>
 
   <group name="FMA" title="Fused floating-point multiply add" dests="1" unused="true" unit="FMA">
     <ins name="FMA.f32" opcode="0xB2"/>
diff --git a/src/panfrost/compiler/bifrost/valhall/valhall.c.py b/src/panfrost/compiler/bifrost/valhall/valhall.c.py
index 5bf2c18479e..ea1a559b072 100644
--- a/src/panfrost/compiler/bifrost/valhall/valhall.c.py
+++ b/src/panfrost/compiler/bifrost/valhall/valhall.c.py
@@ -37,8 +37,6 @@ SKIP = set([
         "SHADDX.u64",
         "SHADDX.s64",
         "IMULD.u64",
-        "CLPER.s64",
-        "CLPER.u64",
         "LSHIFT_AND.i64",
         "RSHIFT_AND.i64",
         "LSHIFT_OR.i64",
@@ -46,13 +44,6 @@ SKIP = set([
         "LSHIFT_XOR.i64",
         "RSHIFT_XOR.i64",
 
-        # CLPER widens
-        "CLPER.s32",
-        "CLPER.v2s16",
-        "CLPER.v4s8",
-        "CLPER.v2u16",
-        "CLPER.v4u8",
-
         # VAR_TEX
         "VAR_TEX_SINGLE",
         "VAR_TEX_GATHER",