Mark Zihintntl, Zicond, Zfa, Zbkb, and Zvbc as ratified (#246)

* Mark Zihintntl as ratified * Mark Zicond as ratified * Mark Zfa as ratified * Mark Zvbc as ratified * Mark Zbkb ratified * Mark xperm4/8 of Zbkx as ratified * Update Zbkb - remove Zbe
riscv · May 5, 2024 · 638198c · 638198c
1 parent 5a22f44
commit 638198c
Show file tree

Hide file tree

Showing 24 changed files with 22 additions and 29 deletions.
diff --git a/unratified/rv32_d_zfa → rv32_d_zfa b/unratified/rv32_d_zfa → rv32_d_zfa
diff --git a/rv32_zbb b/rv32_zbb
@@ -1,3 +1,3 @@
-$pseudo_op rv_zbe::pack     zext.h.rv32 rd rs1 31..25=0x04 24..20=0 14..12=0x4 6..0=0x33
+$pseudo_op rv_zbkb::pack     zext.h.rv32 rd rs1 31..25=0x04 24..20=0 14..12=0x4 6..0=0x33
 $pseudo_op rv64_zbp::grevi  rev8.rv32 rd rs1   31..20=0x698 14..12=5 6..0=0x13
 $pseudo_op rv64_zbb::rori   rori.rv32 rd rs1   31..25=0x30 shamtw 14..12=5 6..2=0x04 1..0=3
diff --git a/unratified/rv64_q_zfa → rv64_q_zfa b/unratified/rv64_q_zfa → rv64_q_zfa
diff --git a/rv64_zbb b/rv64_zbb
@@ -5,5 +5,5 @@ rolw  rd rs1 rs2                            31..25=0x30 14..12=1 6..2=0x0E 1..0=
 rorw  rd rs1 rs2                            31..25=0x30 14..12=5 6..2=0x0E 1..0=3
 roriw rd rs1                                31..25=0x30 shamtw 14..12=5 6..2=0x06 1..0=3
 rori  rd rs1                                31..26=0x18 shamtd 14..12=5 6..2=0x04 1..0=3
-$pseudo_op rv64_zbe::packw zext.h rd rs1    31..25=0x04 24..20=0 14..12=0x4 6..2=0xE 1..0=0x3 
+$pseudo_op rv64_zbkb::packw zext.h rd rs1    31..25=0x04 24..20=0 14..12=0x4 6..2=0xE 1..0=0x3 
 $pseudo_op rv64_zbp::grevi rev8 rd rs1      31..20=0x6B8 14..12=5 6..0=0x13
diff --git a/rv64_zbkb b/rv64_zbkb
@@ -3,4 +3,4 @@ $import rv64_zbb::rolw
 $import rv64_zbb::rorw
 $import rv64_zbb::roriw
 $import rv64_zbb::rori
-$import rv64_zbe::packw
+packw      rd rs1 rs2 31..25=4  14..12=4 6..2=0x0E 1..0=3
diff --git a/rv64_zk b/rv64_zk
@@ -4,7 +4,7 @@ $import rv64_zbb::rolw
 $import rv64_zbb::rorw
 $import rv64_zbb::roriw
 $import rv64_zbb::rori
-$import rv64_zbe::packw
+$import rv64_zbkb::packw
 
 #import zkne
 # Scalar AES - RV64

diff --git a/rv64_zkn b/rv64_zkn
@@ -4,7 +4,7 @@ $import rv64_zbb::rolw
 $import rv64_zbb::rorw
 $import rv64_zbb::roriw
 $import rv64_zbb::rori
-$import rv64_zbe::packw
+$import rv64_zbkb::packw
 
 #import zkne
 # Scalar AES - RV64

diff --git a/rv64_zks b/rv64_zks
@@ -4,4 +4,4 @@ $import rv64_zbb::rolw
 $import rv64_zbb::rorw
 $import rv64_zbb::roriw
 $import rv64_zbb::rori
-$import rv64_zbe::packw
+$import rv64_zbkb::packw
diff --git a/unratified/rv_c_zihintntl → rv_c_zihintntl b/unratified/rv_c_zihintntl → rv_c_zihintntl
diff --git a/unratified/rv_d_zfa → rv_d_zfa b/unratified/rv_d_zfa → rv_d_zfa
diff --git a/unratified/rv_f_zfa → rv_f_zfa b/unratified/rv_f_zfa → rv_f_zfa
diff --git a/unratified/rv_q_zfa → rv_q_zfa b/unratified/rv_q_zfa → rv_q_zfa
diff --git a/rv_zbkb b/rv_zbkb
@@ -3,6 +3,6 @@ $import rv_zbb::ror
 $import rv_zbb::andn
 $import rv_zbb::orn
 $import rv_zbb::xnor
-$import rv_zbe::pack
-$import rv_zbe::packh
+pack       rd rs1 rs2 31..25=4  14..12=4 6..2=0x0C 1..0=3
+packh      rd rs1 rs2 31..25=4  14..12=7 6..2=0x0C 1..0=3
 $pseudo_op rv64_zbp::grevi brev8 rd rs1 31..20=0x687 14..12=5 6..2=0x4 1..0=0x3
diff --git a/rv_zbkx b/rv_zbkx
@@ -1,2 +1,2 @@
-$import rv_zbp::xperm4
-$import rv_zbp::xperm8
+xperm4     rd rs1 rs2 31..25=20 14..12=2 6..2=0x0C 1..0=3
+xperm8     rd rs1 rs2 31..25=20 14..12=4 6..2=0x0C 1..0=3
diff --git a/unratified/rv_zfh_zfa → rv_zfh_zfa b/unratified/rv_zfh_zfa → rv_zfh_zfa
diff --git a/unratified/rv_zicond → rv_zicond b/unratified/rv_zicond → rv_zicond
diff --git a/unratified/rv_zihintntl → rv_zihintntl b/unratified/rv_zihintntl → rv_zihintntl
diff --git a/rv_zk b/rv_zk
@@ -4,17 +4,17 @@ $import rv_zbb::ror
 $import rv_zbb::andn
 $import rv_zbb::orn
 $import rv_zbb::xnor
-$import rv_zbe::pack
-$import rv_zbe::packh
+$import rv_zbkb::pack
+$import rv_zbkb::packh
 $pseudo_op rv64_zbp::grevi brev8 rd rs1 31..20=0x687 14..12=5 6..2=0x4 1..0=0x3
 
 #import zbkc
 $import rv_zbc::clmul
 $import rv_zbc::clmulh
 
 #import zbkx
-$import rv_zbp::xperm4
-$import rv_zbp::xperm8
+$import rv_zbkx::xperm4
+$import rv_zbkx::xperm8
 
 #import zknh
 # Scalar SHA256 - RV32/RV64

diff --git a/rv_zkn b/rv_zkn
@@ -4,17 +4,17 @@ $import rv_zbb::ror
 $import rv_zbb::andn
 $import rv_zbb::orn
 $import rv_zbb::xnor
-$import rv_zbe::pack
-$import rv_zbe::packh
+$import rv_zbkb::pack
+$import rv_zbkb::packh
 $pseudo_op rv64_zbp::grevi brev8 rd rs1 31..20=0x687 14..12=5 6..2=0x4 1..0=0x3
 
 #import zbkc
 $import rv_zbc::clmul
 $import rv_zbc::clmulh
 
 #import zbkx
-$import rv_zbp::xperm4
-$import rv_zbp::xperm8
+$import rv_zbkx::xperm4
+$import rv_zbkx::xperm8
 
 #import zknh
 # Scalar SHA256 - RV32/RV64

diff --git a/rv_zks b/rv_zks
@@ -4,17 +4,17 @@ $import rv_zbb::ror
 $import rv_zbb::andn
 $import rv_zbb::orn
 $import rv_zbb::xnor
-$import rv_zbe::pack
-$import rv_zbe::packh
+$import rv_zbkb::pack
+$import rv_zbkb::packh
 $pseudo_op rv64_zbp::grevi brev8 rd rs1 31..20=0x687 14..12=5 6..2=0x4 1..0=0x3
 
 #import zbkc
 $import rv_zbc::clmul
 $import rv_zbc::clmulh
 
 #import zbkx
-$import rv_zbp::xperm4
-$import rv_zbp::xperm8
+$import rv_zbkx::xperm4
+$import rv_zbkx::xperm8
 
 # Scalar SM4 - RV32, RV64
 $import rv_zksed::sm4ed

diff --git a/unratified/rv_zvbc → rv_zvbc b/unratified/rv_zvbc → rv_zvbc
diff --git a/unratified/rv64_zbe b/unratified/rv64_zbe
diff --git a/unratified/rv_zbe b/unratified/rv_zbe
diff --git a/unratified/rv_zbp b/unratified/rv_zbp
@@ -1,3 +1 @@
-xperm4     rd rs1 rs2 31..25=20 14..12=2 6..2=0x0C 1..0=3
-xperm8     rd rs1 rs2 31..25=20 14..12=4 6..2=0x0C 1..0=3
 xperm16    rd rs1 rs2 31..25=20 14..12=6 6..2=0x0C 1..0=3