From 780da2891a763fe442242c22cd530b5920c5ca4b Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Sun, 5 May 2024 16:37:59 -0500 Subject: [PATCH 1/7] Mark Zihintntl as ratified --- unratified/rv_c_zihintntl => rv_c_zihintntl | 0 unratified/rv_zihintntl => rv_zihintntl | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename unratified/rv_c_zihintntl => rv_c_zihintntl (100%) rename unratified/rv_zihintntl => rv_zihintntl (100%) diff --git a/unratified/rv_c_zihintntl b/rv_c_zihintntl similarity index 100% rename from unratified/rv_c_zihintntl rename to rv_c_zihintntl diff --git a/unratified/rv_zihintntl b/rv_zihintntl similarity index 100% rename from unratified/rv_zihintntl rename to rv_zihintntl From 15100549d1dd75512b04df97516b2e9a340b81c3 Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Sun, 5 May 2024 16:38:40 -0500 Subject: [PATCH 2/7] Mark Zicond as ratified --- unratified/rv_zicond => rv_zicond | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename unratified/rv_zicond => rv_zicond (100%) diff --git a/unratified/rv_zicond b/rv_zicond similarity index 100% rename from unratified/rv_zicond rename to rv_zicond From 7f4f423f59b1d403b295891e6fce7d2e1377e935 Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Sun, 5 May 2024 16:41:16 -0500 Subject: [PATCH 3/7] Mark Zfa as ratified --- unratified/rv32_d_zfa => rv32_d_zfa | 0 unratified/rv64_q_zfa => rv64_q_zfa | 0 unratified/rv_d_zfa => rv_d_zfa | 0 unratified/rv_f_zfa => rv_f_zfa | 0 unratified/rv_q_zfa => rv_q_zfa | 0 unratified/rv_zfh_zfa => rv_zfh_zfa | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename unratified/rv32_d_zfa => rv32_d_zfa (100%) rename unratified/rv64_q_zfa => rv64_q_zfa (100%) rename unratified/rv_d_zfa => rv_d_zfa (100%) rename unratified/rv_f_zfa => rv_f_zfa (100%) rename unratified/rv_q_zfa => rv_q_zfa (100%) rename unratified/rv_zfh_zfa => rv_zfh_zfa (100%) diff --git a/unratified/rv32_d_zfa b/rv32_d_zfa similarity index 100% rename from unratified/rv32_d_zfa rename to rv32_d_zfa diff --git a/unratified/rv64_q_zfa b/rv64_q_zfa similarity index 100% rename from unratified/rv64_q_zfa rename to rv64_q_zfa diff --git a/unratified/rv_d_zfa b/rv_d_zfa similarity index 100% rename from unratified/rv_d_zfa rename to rv_d_zfa diff --git a/unratified/rv_f_zfa b/rv_f_zfa similarity index 100% rename from unratified/rv_f_zfa rename to rv_f_zfa diff --git a/unratified/rv_q_zfa b/rv_q_zfa similarity index 100% rename from unratified/rv_q_zfa rename to rv_q_zfa diff --git a/unratified/rv_zfh_zfa b/rv_zfh_zfa similarity index 100% rename from unratified/rv_zfh_zfa rename to rv_zfh_zfa From 53c9206a95b834d17d6aaaa0b6f004e7e9623921 Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Sun, 5 May 2024 16:46:25 -0500 Subject: [PATCH 4/7] Mark Zvbc as ratified --- unratified/rv_zvbc => rv_zvbc | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename unratified/rv_zvbc => rv_zvbc (100%) diff --git a/unratified/rv_zvbc b/rv_zvbc similarity index 100% rename from unratified/rv_zvbc rename to rv_zvbc From fbbbd5db9ed1be990577fd3bc21071740c49aa7b Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Sun, 5 May 2024 16:59:15 -0500 Subject: [PATCH 5/7] Mark Zbkb ratified --- unratified/rv64_zbe => rv64_zbe | 0 unratified/rv_zbe => rv_zbe | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename unratified/rv64_zbe => rv64_zbe (100%) rename unratified/rv_zbe => rv_zbe (100%) diff --git a/unratified/rv64_zbe b/rv64_zbe similarity index 100% rename from unratified/rv64_zbe rename to rv64_zbe diff --git a/unratified/rv_zbe b/rv_zbe similarity index 100% rename from unratified/rv_zbe rename to rv_zbe From 4bbd0127147a23e987b8084ff68133ac1f297e64 Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Sun, 5 May 2024 17:02:35 -0500 Subject: [PATCH 6/7] Mark xperm4/8 of Zbkx as ratified --- rv_zbkx | 4 ++-- rv_zk | 4 ++-- rv_zkn | 4 ++-- rv_zks | 4 ++-- unratified/rv_zbp | 2 -- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/rv_zbkx b/rv_zbkx index f6b64d94..12bc0b49 100644 --- 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/rv_zk b/rv_zk index c4dc854a..bdd85145 100644 --- a/rv_zk +++ b/rv_zk @@ -13,8 +13,8 @@ $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 index c4dc854a..bdd85145 100644 --- a/rv_zkn +++ b/rv_zkn @@ -13,8 +13,8 @@ $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 index f88a09b9..20516f34 100644 --- a/rv_zks +++ b/rv_zks @@ -13,8 +13,8 @@ $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_zbp b/unratified/rv_zbp index 61c47d3f..bd95dd26 100644 --- 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 From 8a5bc8b7a84a6ed851e9bb79a66bbaf542a7c5e1 Mon Sep 17 00:00:00 2001 From: Ved Shanbhogue Date: Sun, 5 May 2024 17:32:34 -0500 Subject: [PATCH 7/7] Update Zbkb - remove Zbe --- rv32_zbb | 2 +- rv64_zbb | 2 +- rv64_zbe | 2 -- rv64_zbkb | 2 +- rv64_zk | 2 +- rv64_zkn | 2 +- rv64_zks | 2 +- rv_zbe | 3 --- rv_zbkb | 4 ++-- rv_zk | 4 ++-- rv_zkn | 4 ++-- rv_zks | 4 ++-- 12 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 rv64_zbe delete mode 100644 rv_zbe diff --git a/rv32_zbb b/rv32_zbb index c1947251..bc23350d 100644 --- 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/rv64_zbb b/rv64_zbb index 4a8b24af..c7e4e8c1 100644 --- 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_zbe b/rv64_zbe deleted file mode 100644 index 185b2f0b..00000000 --- a/rv64_zbe +++ /dev/null @@ -1,2 +0,0 @@ -packw rd rs1 rs2 31..25=4 14..12=4 6..2=0x0E 1..0=3 - diff --git a/rv64_zbkb b/rv64_zbkb index ad2f4a90..b5e06061 100644 --- 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 index 0ebf71dc..891f48a4 100644 --- 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 index 0ebf71dc..891f48a4 100644 --- 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 index 6bbad27c..848a283d 100644 --- 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/rv_zbe b/rv_zbe deleted file mode 100644 index 492e943c..00000000 --- a/rv_zbe +++ /dev/null @@ -1,3 +0,0 @@ -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 - diff --git a/rv_zbkb b/rv_zbkb index 1499d786..d3f2f8da 100644 --- 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_zk b/rv_zk index bdd85145..dc60ee5e 100644 --- a/rv_zk +++ b/rv_zk @@ -4,8 +4,8 @@ $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 diff --git a/rv_zkn b/rv_zkn index bdd85145..dc60ee5e 100644 --- a/rv_zkn +++ b/rv_zkn @@ -4,8 +4,8 @@ $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 diff --git a/rv_zks b/rv_zks index 20516f34..0a571151 100644 --- a/rv_zks +++ b/rv_zks @@ -4,8 +4,8 @@ $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