Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/isa/riscv64/include/isa-all-instr.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@
f(vfwsub) f(vfwredosum) f(vfwadd_w) f(vfwsub_w) \
f(vfwmul) f(vfwmacc) f(vfwnmacc) f(vfwmsac) f(vfwnmsac) \
f(vandn) f(vbrev_v) f(vbrev8_v) f(vrev8_v) f(vclz_v) f(vctz_v) \
f(vrol) f(vror) f(vwsll) f(vcpop_v)
f(vrol) f(vror) f(vwsll) f(vcpop_v) \
f(vsha2ms) f(vsha2ch) f(vsha2cl)
#else // CONFIG_RVV
#define VECTOR_INSTR_TERNARY(f)
#endif // CONFIG_RVV
Expand Down
3 changes: 3 additions & 0 deletions src/isa/riscv64/include/isa-exec.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
#ifdef CONFIG_RV_ZFA
#include "../instr/rvzfa/exec.h"
#endif

#include "../instr/rvzvk/exec.h"

#ifdef CONFIG_CUSTOM_TENSOR
#include "../instr/rvt/exec.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions src/isa/riscv64/instr/decode.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ static inline uint64_t get_instr(Decode *s) {
#ifdef CONFIG_RV_CBO
#include "rvcbo/decode.h"
#endif// CONFIG_RV_CBO
#include "rvzvk/decode.h"

def_THelper(main) {
def_INSTR_IDTAB("??????? ????? ????? ??? ????? 00000 ??", load , load);
Expand Down Expand Up @@ -102,6 +103,7 @@ def_THelper(main) {
#else
def_INSTR_IDTAB("??????? ????? ????? ??? ????? 11100 ??", csr , system);
#endif
def_INSTR_IDTAB("??????? ????? ????? ??? ????? 11101 ??", OP_V , op_ve);
return table_inv(s);
};

Expand Down
40 changes: 40 additions & 0 deletions src/isa/riscv64/instr/rvzvk/decode.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/***************************************************************************************
* Copyright (c) 2025 Institute of Computing Technology, Chinese Academy of Sciences
* Copyright (c) 2025 Beijing Institute of Open Source Chip
*
* NEMU is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
*
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
*
* See the Mulan PSL v2 for more details.
***************************************************************************************/

#ifndef RVZVK_DECODE_H
#define RVZVK_DECODE_H

def_THelper(ve_opmvv) {
def_INSTR_TAB("101101 1 ????? ????? ??? ????? ????? ??", vsha2ms);
def_INSTR_TAB("101110 1 ????? ????? ??? ????? ????? ??", vsha2ch);
def_INSTR_TAB("101111 1 ????? ????? ??? ????? ????? ??", vsha2cl);

return EXEC_ID_inv;
}

def_THelper(op_ve) {
// def_INSTR_TAB("?????? ? ????? ????? 000 ????? ????? ??", ve_opivv);
// def_INSTR_TAB("?????? ? ????? ????? 001 ????? ????? ??", ve_opfvv);
def_INSTR_TAB("?????? ? ????? ????? 010 ????? ????? ??", ve_opmvv);
// def_INSTR_TAB("?????? ? ????? ????? 011 ????? ????? ??", ve_opivi);
// def_INSTR_TAB("?????? ? ????? ????? 100 ????? ????? ??", ve_opivx);
// def_INSTR_TAB("?????? ? ????? ????? 101 ????? ????? ??", ve_opfvf);
// def_INSTR_TAB("?????? ? ????? ????? 110 ????? ????? ??", ve_opmvx);

return EXEC_ID_inv;
}

#endif // RVZVK_DECODE_H
17 changes: 17 additions & 0 deletions src/isa/riscv64/instr/rvzvk/exec.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/***************************************************************************************
* Copyright (c) 2025 Institute of Computing Technology, Chinese Academy of Sciences
* Copyright (c) 2025 Beijing Institute of Open Source Chip
*
* NEMU is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
*
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
*
* See the Mulan PSL v2 for more details.
***************************************************************************************/

#include "zvknh.h"
29 changes: 29 additions & 0 deletions src/isa/riscv64/instr/rvzvk/zvknh.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/***************************************************************************************
* Copyright (c) 2025 Institute of Computing Technology, Chinese Academy of Sciences
* Copyright (c) 2025 Beijing Institute of Open Source Chip
*
* NEMU is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
*
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
*
* See the Mulan PSL v2 for more details.
***************************************************************************************/

#include "zvknh_impl.h"

def_EHelper(vsha2ms) {
vsha2ms(s);
}

def_EHelper(vsha2ch) {
vsha2c(0, s);
}

def_EHelper(vsha2cl) {
vsha2c(1, s);
}
194 changes: 194 additions & 0 deletions src/isa/riscv64/instr/rvzvk/zvknh_impl.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
/***************************************************************************************
* Copyright (c) 2025 Institute of Computing Technology, Chinese Academy of Sciences
* Copyright (c) 2025 Beijing Institute of Open Source Chip
*
* NEMU is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
*
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
*
* See the Mulan PSL v2 for more details.
***************************************************************************************/

#include <cpu/decode.h>
#include <cpu/cpu.h>
#include <stdint.h>
#include "../rvv/vcommon.h"
#include "../rvv/vcompute_impl.h"
#include "../rvk/crypto_impl.h"


#define id_src1 (&s->src1)
#define id_src2 (&s->src2)
#define id_dest (&s->dest)

#define ch(x, y, z) ((x & y) ^ ((~x) & z))
#define maj(x, y, z) ((x & y) ^ (x & z) ^ (y & z))

void vsha2ms(Decode *s) {
uint64_t sew = 8 << vtype->vsew;
uint64_t egw = 4 * sew;
uint64_t egs = 4;

if (sew != 32 && sew != 64) {
Log("vsha2ms: invalid sew %ld\n", sew);
longjmp_exception(EX_II);
}

double vflmul = compute_vflmul();

if (vflmul * VLEN < egw) {
Log("vsha2ms: invalid vlmul %d for sew %ld\n", vtype->vlmul, sew);
longjmp_exception(EX_II);
}

uint64_t w0, w1, w2, w3;
uint64_t w4, w9, w10, w11;
uint64_t w12, w13, w14, w15;
uint64_t w16, w17, w18, w19;

uint64_t eg_len = vl->val / egs;
uint64_t eg_start = vstart->val / egs;

for (int i = eg_start; i < eg_len; i++) {
get_vreg(id_dest->reg, i * 4 + 0, &w3, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_dest->reg, i * 4 + 1, &w2, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_dest->reg, i * 4 + 2, &w1, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_dest->reg, i * 4 + 3, &w0, vtype->vsew, vtype->vlmul, 0, 0);

get_vreg(id_src2->reg, i * 4 + 0, &w11, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src2->reg, i * 4 + 1, &w10, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src2->reg, i * 4 + 2, &w9, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src2->reg, i * 4 + 3, &w4, vtype->vsew, vtype->vlmul, 0, 0);

get_vreg(id_src1->reg, i * 4 + 0, &w15, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src1->reg, i * 4 + 1, &w14, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src1->reg, i * 4 + 2, &w13, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src1->reg, i * 4 + 3, &w12, vtype->vsew, vtype->vlmul, 0, 0);

if (sew == 32) {
w16 = (uint32_t) (sha256sig0(w14) + w9 + sha256sig0(w1) + w0);
w17 = (uint32_t) (sha256sig0(w15) + w10 + sha256sig0(w2) + w1);
w18 = (uint32_t) (sha256sig0(w16) + w11 + sha256sig0(w3) + w2);
w19 = (uint32_t) (sha256sig0(w17) + w12 + sha256sig0(w4) + w3);
} else if (sew == 64) {
w16 = (uint64_t) (sha512sig0(w14) + w9 + sha512sig0(w1) + w0);
w17 = (uint64_t) (sha512sig0(w15) + w10 + sha512sig0(w2) + w1);
w18 = (uint64_t) (sha512sig0(w16) + w11 + sha512sig0(w3) + w2);
w19 = (uint64_t) (sha512sig0(w17) + w12 + sha512sig0(w4) + w3);
}

set_vreg(id_dest->reg, i * 4 + 0, w19, vtype->vsew, vtype->vlmul, 0);
set_vreg(id_dest->reg, i * 4 + 1, w18, vtype->vsew, vtype->vlmul, 0);
set_vreg(id_dest->reg, i * 4 + 2, w17, vtype->vsew, vtype->vlmul, 0);
set_vreg(id_dest->reg, i * 4 + 3, w16, vtype->vsew, vtype->vlmul, 0);
}

}

void vsha2c(int is_vsha2cl, Decode *s) {
uint64_t sew = 8 << vtype->vsew;
uint64_t egw = 4 * sew;
uint64_t egs = 4;

if (sew != 32 && sew != 64) {
Log("vsha2c: invalid sew %ld\n", sew);
longjmp_exception(EX_II);
}

double vflmul = compute_vflmul();

if (vflmul * VLEN < egw) {
Log("vsha2c: invalid vlmul %d for sew %ld\n", vtype->vlmul, sew);
longjmp_exception(EX_II);
}

uint64_t a, b, c, d;
uint64_t e, f, g, h;
uint64_t mspc0, mspc1, mspc2, mspc3; // MessageSchedPlusC
uint64_t w0, w1;
uint64_t t1, t2;

uint64_t eg_len = vl->val / egs;
uint64_t eg_start = vstart->val / egs;

for (int i = eg_start; i < eg_len; i++) {
get_vreg(id_src2->reg, i * 4 + 0, &a, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src2->reg, i * 4 + 1, &b, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src2->reg, i * 4 + 2, &e, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src2->reg, i * 4 + 3, &f, vtype->vsew, vtype->vlmul, 0, 0);

get_vreg(id_dest->reg, i * 4 + 0, &c, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_dest->reg, i * 4 + 1, &d, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_dest->reg, i * 4 + 2, &g, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_dest->reg, i * 4 + 3, &h, vtype->vsew, vtype->vlmul, 0, 0);

get_vreg(id_src1->reg, i * 4 + 0, &mspc3, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src1->reg, i * 4 + 1, &mspc2, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src1->reg, i * 4 + 2, &mspc1, vtype->vsew, vtype->vlmul, 0, 0);
get_vreg(id_src1->reg, i * 4 + 3, &mspc0, vtype->vsew, vtype->vlmul, 0, 0);

if (is_vsha2cl) {
w1 = mspc1;
w0 = mspc0;
} else {
w1 = mspc3;
w0 = mspc2;
}

if (sew == 32) {
t1 = (uint32_t) (h + sha256sum1(e) + ch(e, f, g) + w0);
t2 = (uint32_t) (sha256sum0(a) + maj(a, b, c));
h = g;
g = f;
f = e;
e = (uint32_t)(d + t1);
d = c;
c = b;
b = a;
a = (uint32_t)(t1 + t2);

t1 = (uint32_t) (h + sha256sum1(e) + ch(e, f, g) + w1);
t2 = (uint32_t) (sha256sum0(a) + maj(a, b, c));
h = g;
g = f;
f = e;
e = (uint32_t)(d + t1);
d = c;
c = b;
b = a;
a = (uint32_t)(t1 + t2);
} else if (sew == 64) {
t1 = (uint64_t) (h + sha512sum1(e) + ch(e, f, g) + w0);
t2 = (uint64_t) (sha512sum0(a) + maj(a, b, c));
h = g;
g = f;
f = e;
e = (uint64_t)(d + t1);
d = c;
c = b;
b = a;
a = (uint64_t)(t1 + t2);

t1 = (uint64_t) (h + sha512sum1(e) + ch(e, f, g) + w1);
t2 = (uint64_t) (sha512sum0(a) + maj(a, b, c));
h = g;
g = f;
f = e;
e = (uint64_t)(d + t1);
d = c;
c = b;
b = a;
a = (uint64_t)(t1 + t2);
}

set_vreg(id_dest->reg, i * 4 + 0, a, vtype->vsew, vtype->vlmul, 0);
set_vreg(id_dest->reg, i * 4 + 1, b, vtype->vsew, vtype->vlmul, 0);
set_vreg(id_dest->reg, i * 4 + 2, e, vtype->vsew, vtype->vlmul, 0);
set_vreg(id_dest->reg, i * 4 + 3, f, vtype->vsew, vtype->vlmul, 0);
}
}
25 changes: 25 additions & 0 deletions src/isa/riscv64/instr/rvzvk/zvknh_impl.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/***************************************************************************************
* Copyright (c) 2025 Institute of Computing Technology, Chinese Academy of Sciences
* Copyright (c) 2025 Beijing Institute of Open Source Chip
*
* NEMU is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
*
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
*
* See the Mulan PSL v2 for more details.
***************************************************************************************/

#ifndef RVZVK_ZVKNH_IMPL_H
#define RVZVK_ZVKNH_IMPL_H

#include <cpu/decode.h>

void vsha2ms(Decode *s);
void vsha2c(int is_vsha2cl, Decode *s);

#endif // RVZVK_ZVKNH_IMPL_H
Loading