Skip to content

Commit

Permalink
Add support for the Zvk* ISA extensions (#333)
Browse files Browse the repository at this point in the history
* Add initial vector support

This patch includes initial vector support for ACT.
It defines a couple of new macros that allow to test
vector instructions.

Key features:
- defines four GPRs that have be reserved
- enablement code for vector unit
- helper macro to update test signatures
- support for all SEW configurations (8, 16, 32, 64 bits)
- support for all immediate AVL values (0..31 elements)
- If VLENB indicates that a test can't be executed, then it will be skipped
- Support for several instruction formats (VV, VVR, VVU, VVV with and
  without vm bit set)

Known limitations:
- Vector configuration will be set with vsetivli x0, AVL, eSEW, m1, ta, ma
- No tests for invalid configurations (that would trigger exceptions)

Signed-off-by: Christoph Müllner <[email protected]>

* Add support for Zvkb

This patch introduces support for Zvkb:
- vandn.[vv,vx]
- vbrev8.v
- vclmul.[vv,vx]
- vclmulh.[vv,vx]
- vrev8.v

Support for RV32 and RV64 is added, but both versions are identical.

Signed-off-by: Christoph Müllner <[email protected]>

* Add support for Zvkg

This patch introduces support for Zvkg:
- vghsh.vv
- vgmul.vv

Support for RV32 and RV64 is added, but both versions are identical.

Signed-off-by: Christoph Müllner <[email protected]>

* Add support for Zvkned

This patch introduces support for Zvkned:
- vaesdf.[vs,vv]
- vaesdm.[vs,vv]
- vaesef.[vs,vv]
- vaesem.[vs,vv]
- vaeskf1.vi
- vaeskf2.vi
- vaesz.vs

Support for RV32 and RV64 is added, but both versions are identical.

Signed-off-by: Christoph Müllner <[email protected]>

* Add support for Zvknh[a,b]

This patch introduces support for Zvknh[a,b]:
- vsha2ch.vv
- vsha2cl.vv
- vsha2ms.vv

Support for RV32 and RV64 is added, but both versions are identical.

Signed-off-by: Christoph Müllner <[email protected]>

* Add support for Zvksed

This patch introduces support for Zvksed:
- vsm4k.vi
- vsm4r.vv
- vsm4r.vs

Support for RV32 and RV64 is added, but both versions are identical.

Signed-off-by: Christoph Müllner <[email protected]>

* Add support for Zvksh

This patch introduces support for Zvksh
- vsm3c.vi
- vsm3me.vv

Support for RV32 and RV64 is added, but both versions are identical.

Signed-off-by: Christoph Müllner <[email protected]>

---------

Signed-off-by: Christoph Müllner <[email protected]>
Co-authored-by: Umer Shahid <[email protected]>
  • Loading branch information
cmuellner and UmerShahidengr authored Jul 19, 2024
1 parent eb66181 commit 02aa1d4
Show file tree
Hide file tree
Showing 38 changed files with 6,621 additions and 0 deletions.
419 changes: 419 additions & 0 deletions riscv-test-suite/env/test_macros_vector.h

Large diffs are not rendered by default.

158 changes: 158 additions & 0 deletions riscv-test-suite/rv32i_m/Zvk/src/vaesdf.vs-01.S
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
// Copyright (c) 2023. RISC-V International. All rights reserved.
// SPDX-License-Identifier: BSD-3-Clause
// -----------
// This assembly file tests the vaesdf.vs instruction.

// Define special purpose registers before including test_macros_vector.h
#define DATA_BASE x3
#define SIG_BASE x4
#define VLENB_CACHE x5
#define HELPER_GPR x6

#include "test_macros_vector.h"

RVTEST_ISA("RV32IV_Zicsr_Zvkned,RV64IV_Zicsr_Zvkned")

.section .text.init
.globl rvtest_entry_point
rvtest_entry_point:
RVMODEL_BOOT

RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*V.*Zicsr.*Zvkned);def TEST_CASE_1=True;",vaesdf.vs)

RVTEST_V_ENABLE()
RVTEST_VALBASEUPD(DATA_BASE, dataset_tc1)
RVTEST_SIGBASE(SIG_BASE, signature_tc1)

// VAESDF.VS has the following inputs and outputs:
// - input VD: Round state
// - input VS2: Round key
// - output VD: New round state
// VAESDF.VS requires that SEW=32 and AVL=multiple of 4

#define VINST vaesdf.vs

inst_0:
TEST_CASE_WV(4, 32, VINST, v0, 0*4, v1, 0*4)
//sig[4*4]

inst_1:
TEST_CASE_WV(8, 32, VINST, v3, 1*4, v2, 0*4)
//sig[12*4]

inst_2:
TEST_CASE_WV(12, 32, VINST, v4, 2*4, v5, 2*4)
//sig[24*4]

inst_3:
TEST_CASE_WV(16, 32, VINST, v7, 0*4, v6, 0*4)
//sig[40*4]

inst_4:
TEST_CASE_WV(20, 32, VINST, v8, 2*4, v9, 3*4)
//sig[60*4]

inst_5:
TEST_CASE_WV(24, 32, VINST, v11, 2*4, v10, 3*4)
//sig[84*4]

inst_6:
TEST_CASE_WV(28, 32, VINST, v12, 2*4, v13, 3*4)
//sig[112*4]

inst_7:
TEST_CASE_WV(4, 32, VINST, v15, 2*4, v14, 3*4)
//sig[116*4]

inst_8:
TEST_CASE_WV(4, 32, VINST, v16, 0*4, v17, 4*4)
//sig[120*4]

inst_9:
TEST_CASE_WV(4, 32, VINST, v19, 4*4, v18, 0*4)
//sig[124*4]

inst_10:
TEST_CASE_WV(4, 32, VINST, v20, 0*4, v21, 0*4)
//sig[128*4]

inst_11:
TEST_CASE_WV(4, 32, VINST, v20, 0*4, v21, 11*4)
//sig[132*4]

inst_12:
TEST_CASE_WV(4, 32, VINST, v23, 2*4, v22, 9*4)
//sig[136*4]

inst_13:
TEST_CASE_WV(4, 32, VINST, v24, 4*4, v25, 7*4)
//sig[140*4]

inst_14:
TEST_CASE_WV(4, 32, VINST, v27, 6*4, v26, 5*4)
//sig[144*4]

inst_15:
TEST_CASE_WV(4, 32, VINST, v28, 8*4, v29, 3*4)
//sig[148*4]

inst_16:
TEST_CASE_WV(4, 32, VINST, v31, 10*4, v30, 1*4)
//sig[156*4]

#endif // TEST_CASE_1

RVTEST_CODE_END

RVMODEL_HALT

RVTEST_DATA_BEGIN
.word 0xbabecafe // trapreg_sv
.word 0xabecafeb // tramptbl_sv
.word 0xbecafeba // mtvec_save
.word 0xecafebab // mscratch_save

.p2align 6
dataset_tc1:
TEST_CASE_BLOCK_256B_0
RVTEST_DATA_END

RVMODEL_DATA_BEGIN
rvtest_sig_begin:
sig_begin_canary:
CANARY;

signature_tc1:
//sig[0*4..255*4]
.fill 256, 4, 0xdeadbeef

#ifdef rvtest_mtrap_routine

tsig_begin_canary:
CANARY;
tsig_begin_canary:
CANARY;
mtrap_sigptr:
.fill 64*(XLEN/32),4,0xdeadbeef
tsig_end_canary:
CANARY;
tsig_end_canary:
CANARY;

#endif // rvtest_mtrap_routine

#ifdef rvtest_gpr_save

gpr_save:
.fill 32*XLEN/32,4,0xdeadbeef

#endif // rvtest_gpr_save

sig_end_canary:
CANARY;
rvtest_sig_end:
RVMODEL_DATA_END
158 changes: 158 additions & 0 deletions riscv-test-suite/rv32i_m/Zvk/src/vaesdf.vv-01.S
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
// Copyright (c) 2023. RISC-V International. All rights reserved.
// SPDX-License-Identifier: BSD-3-Clause
// -----------
// This assembly file tests the vaesdf.vv instruction.

// Define special purpose registers before including test_macros_vector.h
#define DATA_BASE x3
#define SIG_BASE x4
#define VLENB_CACHE x5
#define HELPER_GPR x6

#include "test_macros_vector.h"

RVTEST_ISA("RV32IV_Zicsr_Zvkned,RV64IV_Zicsr_Zvkned")

.section .text.init
.globl rvtest_entry_point
rvtest_entry_point:
RVMODEL_BOOT

RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*V.*Zicsr.*Zvkned);def TEST_CASE_1=True;",vaesdf.vv)

RVTEST_V_ENABLE()
RVTEST_VALBASEUPD(DATA_BASE, dataset_tc1)
RVTEST_SIGBASE(SIG_BASE, signature_tc1)

// VAESDF.VV has the following inputs and outputs:
// - input VD: Round state
// - input VS2: Round key
// - output VD: New round state
// VAESDF.VV requires that SEW=32 and AVL=multiple of 4

#define VINST vaesdf.vv

inst_0:
TEST_CASE_WV(4, 32, VINST, v0, 0*4, v1, 0*4)
//sig[4*4]

inst_1:
TEST_CASE_WV(8, 32, VINST, v3, 1*4, v2, 0*4)
//sig[12*4]

inst_2:
TEST_CASE_WV(12, 32, VINST, v4, 2*4, v5, 2*4)
//sig[24*4]

inst_3:
TEST_CASE_WV(16, 32, VINST, v7, 0*4, v6, 0*4)
//sig[40*4]

inst_4:
TEST_CASE_WV(20, 32, VINST, v8, 2*4, v9, 3*4)
//sig[60*4]

inst_5:
TEST_CASE_WV(24, 32, VINST, v11, 2*4, v10, 3*4)
//sig[84*4]

inst_6:
TEST_CASE_WV(28, 32, VINST, v12, 2*4, v13, 3*4)
//sig[112*4]

inst_7:
TEST_CASE_WV(4, 32, VINST, v15, 2*4, v14, 3*4)
//sig[116*4]

inst_8:
TEST_CASE_WV(4, 32, VINST, v16, 0*4, v17, 4*4)
//sig[120*4]

inst_9:
TEST_CASE_WV(4, 32, VINST, v19, 4*4, v18, 0*4)
//sig[124*4]

inst_10:
TEST_CASE_WV(4, 32, VINST, v20, 0*4, v21, 0*4)
//sig[128*4]

inst_11:
TEST_CASE_WV(4, 32, VINST, v20, 0*4, v21, 11*4)
//sig[132*4]

inst_12:
TEST_CASE_WV(4, 32, VINST, v23, 2*4, v22, 9*4)
//sig[136*4]

inst_13:
TEST_CASE_WV(4, 32, VINST, v24, 4*4, v25, 7*4)
//sig[140*4]

inst_14:
TEST_CASE_WV(4, 32, VINST, v27, 6*4, v26, 5*4)
//sig[144*4]

inst_15:
TEST_CASE_WV(4, 32, VINST, v28, 8*4, v29, 3*4)
//sig[148*4]

inst_16:
TEST_CASE_WV(4, 32, VINST, v31, 10*4, v30, 1*4)
//sig[156*4]

#endif // TEST_CASE_1

RVTEST_CODE_END

RVMODEL_HALT

RVTEST_DATA_BEGIN
.word 0xbabecafe // trapreg_sv
.word 0xabecafeb // tramptbl_sv
.word 0xbecafeba // mtvec_save
.word 0xecafebab // mscratch_save

.p2align 6
dataset_tc1:
TEST_CASE_BLOCK_256B_0
RVTEST_DATA_END

RVMODEL_DATA_BEGIN
rvtest_sig_begin:
sig_begin_canary:
CANARY;

signature_tc1:
//sig[0*4..255*4]
.fill 256, 4, 0xdeadbeef

#ifdef rvtest_mtrap_routine

tsig_begin_canary:
CANARY;
tsig_begin_canary:
CANARY;
mtrap_sigptr:
.fill 64*(XLEN/32),4,0xdeadbeef
tsig_end_canary:
CANARY;
tsig_end_canary:
CANARY;

#endif // rvtest_mtrap_routine

#ifdef rvtest_gpr_save

gpr_save:
.fill 32*XLEN/32,4,0xdeadbeef

#endif // rvtest_gpr_save

sig_end_canary:
CANARY;
rvtest_sig_end:
RVMODEL_DATA_END
Loading

0 comments on commit 02aa1d4

Please sign in to comment.