diff --git a/src/etnaviv/isa/etnaviv.xml b/src/etnaviv/isa/etnaviv.xml
index 16389fab574..2a8d905b9c0 100644
--- a/src/etnaviv/isa/etnaviv.xml
+++ b/src/etnaviv/isa/etnaviv.xml
@@ -1164,36 +1164,6 @@ SPDX-License-Identifier: MIT
 	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
 </bitset>
 
-<bitset name="or" extends="#instruction-alu-src0-src2">
-	<pattern low="0" high="5">011100</pattern> <!-- OPC -->
-	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
-</bitset>
-
-<bitset name="and" extends="#instruction-alu-src0-src2">
-	<pattern low="0" high="5">011101</pattern> <!-- OPC -->
-	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
-</bitset>
-
-<bitset name="xor" extends="#instruction-alu-src0-src2">
-	<pattern low="0" high="5">011110</pattern> <!-- OPC -->
-	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
-</bitset>
-
-<bitset name="not" extends="#instruction-alu-src2">
-	<pattern low="0" high="5">011111</pattern> <!-- OPC -->
-	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
-</bitset>
-
-<bitset name="bit_extract" extends="#instruction-alu-src0-src1-src2">
-	<pattern low="0" high="5">100000</pattern> <!-- OPC -->
-	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
-</bitset>
-
-<bitset name="popcount" extends="#instruction-alu-src2">
-	<pattern low="0" high="5">100001</pattern> <!-- OPC -->
-	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
-</bitset>
-
 <bitset name="movai" extends="#instruction-alu-src2">
 	<pattern low="0" high="5">010110</pattern> <!-- OPC -->
 	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
@@ -1224,6 +1194,36 @@ SPDX-License-Identifier: MIT
 	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
 </bitset>
 
+<bitset name="or" extends="#instruction-alu-src0-src2">
+	<pattern low="0" high="5">011100</pattern> <!-- OPC -->
+	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
+</bitset>
+
+<bitset name="and" extends="#instruction-alu-src0-src2">
+	<pattern low="0" high="5">011101</pattern> <!-- OPC -->
+	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
+</bitset>
+
+<bitset name="xor" extends="#instruction-alu-src0-src2">
+	<pattern low="0" high="5">011110</pattern> <!-- OPC -->
+	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
+</bitset>
+
+<bitset name="not" extends="#instruction-alu-src2">
+	<pattern low="0" high="5">011111</pattern> <!-- OPC -->
+	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
+</bitset>
+
+<bitset name="bit_extract" extends="#instruction-alu-src0-src1-src2">
+	<pattern low="0" high="5">100000</pattern> <!-- OPC -->
+	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
+</bitset>
+
+<bitset name="popcount" extends="#instruction-alu-src2">
+	<pattern low="0" high="5">100001</pattern> <!-- OPC -->
+	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->
+</bitset>
+
 <bitset name="div" extends="#instruction-alu-src1-src2">
 	<pattern low="0" high="5">100100</pattern> <!-- OPC -->
 	<pattern pos="80">1</pattern> <!-- OPCODE_BIT6 -->