diff --git a/opcodes-hwacha b/opcodes-hwacha
index d919786499ccfbfc4fdf4072f301cd1d7e129787..4927f6f15e43273955fe08e8ddfbba6cbd404005 100644
--- a/opcodes-hwacha
+++ b/opcodes-hwacha
@@ -1,11 +1,3 @@
-# vector scalar instructions
-stop    31..25=0 24..20=0 19..15=0 14..12=5 11..7=0 6..2=0x1D 1..0=3
-utidx   31..25=0 24..20=0 19..15=0 14..12=6 rd      6..2=0x1D 1..0=3
-movz    31..25=0 rs2      rs1      14..12=7 rd      6..2=0x1D 1..0=3
-movn    31..25=1 rs2      rs1      14..12=7 rd      6..2=0x1D 1..0=3
-fmovz   31..25=2 rs2      rs1      14..12=7 rd      6..2=0x1D 1..0=3
-fmovn   31..25=3 rs2      rs1      14..12=7 rd      6..2=0x1D 1..0=3
-
 # rocc format, xd = inst[14], xs1 = inst[13], xs2 = inst[12]
 
 # vector instructions
diff --git a/opcodes-hwacha-ut b/opcodes-hwacha-ut
index ad88fed11f6c081525bece662eac6c237e939f1b..eeb693718f1b0835c563912753dca54802f9add8 100644
--- a/opcodes-hwacha-ut
+++ b/opcodes-hwacha-ut
@@ -7,6 +7,14 @@
 # <args> is one of rd, rs1, rs2, rs3, imm25, imm20, imm12, imm12lo, imm12hi,
 # shamtw, shamt, rm
 
+# vector scalar instructions
+stop    31..25=0 24..20=0 19..15=0 14..12=5 11..7=0 6..2=0x1D 1..0=3
+utidx   31..25=0 24..20=0 19..15=0 14..12=6 rd      6..2=0x1D 1..0=3
+movz    31..25=0 rs2      rs1      14..12=7 rd      6..2=0x1D 1..0=3
+movn    31..25=1 rs2      rs1      14..12=7 rd      6..2=0x1D 1..0=3
+fmovz   31..25=2 rs2      rs1      14..12=7 rd      6..2=0x1D 1..0=3
+fmovn   31..25=3 rs2      rs1      14..12=7 rd      6..2=0x1D 1..0=3
+
 # half-precision floating-point operations for hwacha microthreads
 
 fadd.h      rd rs1 rs2      31..27=0x0  rm       26..25=2 6..2=0x14 1..0=3