Skip to content

Commit

Permalink
Merge branch 'riscv-non-isa:main' into alitariq4589/issue#300_revisited
Browse files Browse the repository at this point in the history
  • Loading branch information
@alitariq4589
alitariq4589 authored Oct 30, 2023
2 parents 893e79a + f484d91 commit 9ca34de
Show file tree
Hide file tree
Showing 32 changed files with 526 additions and 291 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
# CHANGELOG
## [3.8.0] - 2023-10-26
- Updated trap handler to handle delegated exceptions in S-mode for both bare and virtual modes.
- Added Hypervisor mode support in Trap handler
- Updated the save area within the trap handler file.
- Improved CSR Rename macro for code clarity.

## [3.7.5] - 2023-10-11
Add missing check ISA fields in recently modified div and amo tests

## [3.7.4] - 2023-10-04
- Fix typos in CONTRIBUTION.md

Expand Down
599 changes: 351 additions & 248 deletions riscv-test-suite/env/arch_test.h
View file

Large diffs are not rendered by default.

151 changes: 137 additions & 14 deletions riscv-test-suite/env/test_macros.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,47 @@
1: Superpage
*/

#define LEVEL0 0x00
#define LEVEL1 0x01
#define LEVEL2 0x02
#define LEVEL3 0x03
#define LEVEL4 0x04

#define sv39 0x00
#define sv48 0x01
#define sv57 0x02

#define CODE code_bgn_off
#define DATA data_bgn_off
#define SIG sig_bgn_off
#define VMEM vmem_bgn_off

#define ALL_MEM_PMP ;\
li t2, -1 ;\
csrw pmpaddr0, t2 ;\
li t2, 0x0F ;\
csrw pmpcfg0, t2 ;\
sfence.vma ;

#define SIGNATURE_AREA(TYPE,ARG1,ARG2, ...) ;\
LI (t0, ARG1) ;\
.if(TYPE == CODE) ;\
LI (t1, ARG2) ;\
sub t0, t0, t1 ;\
csrr sp, mscratch ;\
add t1,sp,t0 ;\
csrw sscratch, t1 ;\
.else ;\
LA (t1, ARG2) ;\
sub t0, t0, t1 ;\
.endif ;\
LREG t1, TYPE+0*sv_area_sz(sp) ;\
add t2, t1, t0 ;\
SREG t2, TYPE+1*sv_area_sz(sp) ;\
.if NARG(__VA_ARGS__) == 1 ;\
SREG t2, TYPE+2*sv_area_sz(sp) ;\
.endif ;

//****NOTE: label `rvtest_Sroot_pg_tbl` must be declared after RVTEST_DATA_END
// in the test aligned at 4kiB (use .align 12)

Expand All @@ -34,6 +75,68 @@
add _TR1, _TR1, _TR0 ;\
SREG _PAR, 0(_TR1);

#define PTE_SETUP_RV64(_PAR, _PR, _TR0, _TR1, VA, level, mode) ;\
srli _PAR, _PAR, 12 ;\
slli _PAR, _PAR, 10 ;\
or _PAR, _PAR, _PR ;\
.if (mode == sv39) ;\
.if (level == 2) ;\
LA(_TR1, rvtest_Sroot_pg_tbl) ;\
.set vpn, ((VA >> 30) & 0x1FF) << 3 ;\
.endif ;\
.if (level == 1) ;\
LA(_TR1, rvtest_slvl1_pg_tbl) ;\
.set vpn, ((VA >> 21) & 0x1FF) << 3 ;\
.endif ;\
.if (level == 0) ;\
LA(_TR1, rvtest_slvl2_pg_tbl) ;\
.set vpn, ((VA >> 12) & 0x1FF) << 3 ;\
.endif ;\
.endif ;\
.if (mode == sv48) ;\
.if (level == 3) ;\
LA(_TR1, rvtest_Sroot_pg_tbl) ;\
.set vpn, ((VA >> 39) & 0x1FF) << 3 ;\
.endif ;\
.if (level == 2) ;\
LA(_TR1, rvtest_slvl1_pg_tbl) ;\
.set vpn, ((VA >> 30) & 0x1FF) << 3 ;\
.endif ;\
.if (level == 1) ;\
LA(_TR1, rvtest_slvl2_pg_tbl) ;\
.set vpn, ((VA >> 21) & 0x1FF) << 3 ;\
.endif ;\
.if (level == 0) ;\
LA(_TR1, rvtest_slvl3_pg_tbl) ;\
.set vpn, ((VA >> 12) & 0x1FF) << 3 ;\
.endif ;\
.endif ;\
.if (mode == sv57) ;\
.if (level == 4) ;\
LA(_TR1, rvtest_Sroot_pg_tbl) ;\
.set vpn, ((VA >> 48) & 0x1FF) << 3 ;\
.endif ;\
.if (level == 3) ;\
LA(_TR1, rvtest_slvl1_pg_tbl) ;\
.set vpn, ((VA >> 39) & 0x1FF) << 3 ;\
.endif ;\
.if (level == 2) ;\
LA(_TR1, rvtest_slvl2_pg_tbl) ;\
.set vpn, ((VA >> 30) & 0x1FF) << 3 ;\
.endif ;\
.if (level == 1) ;\
LA(_TR1, rvtest_slvl3_pg_tbl) ;\
.set vpn, ((VA >> 21) & 0x1FF) << 3 ;\
.endif ;\
.if (level == 0) ;\
LA(_TR1, rvtest_slvl3_pg_tbl) ;\
.set vpn, ((VA >> 12) & 0x1FF) << 3 ;\
.endif ;\
.endif ;\
LI(_TR0, vpn) ;\
add _TR1, _TR1, _TR0 ;\
SREG _PAR, 0(_TR1) ;

#define PTE_PERMUPD_RV32(_PR, _TR0, _TR1, VA, level) ;\
.if (level==1) ;\
LA(_TR1, rvtest_Sroot_pg_tbl) ;\
Expand All @@ -49,14 +152,46 @@
srli _TR0, _TR0, 10 ;\
slli _TR0, _TR0, 10 ;\
or _TR0, _TR0, _PR ;\
SREG _TR0, 0(_TR1) ;\
SREG _TR0, 0(_TR1) ;

#define SATP_SETUP_SV32 ;\
LA(t6, rvtest_Sroot_pg_tbl) ;\
LI(t5, SATP32_MODE) ;\
srli t6, t6, 12 ;\
or t6, t6, t5 ;\
csrw satp, t6 ;\
csrw satp, t6 ;

#define SATP_SETUP_RV64(MODE) ;\
LA(t6, rvtest_Sroot_pg_tbl) ;\
.if (MODE == sv39) ;\
LI(t5, (SATP64_MODE) & (SATP_MODE_SV39 << 60)) ;\
.endif ;\
.if (MODE == sv48) ;\
LI(t5, (SATP64_MODE) & (SATP_MODE_SV48 << 60)) ;\
.endif ;\
.if (MODE == sv57) ;\
LI(t5, (SATP64_MODE) & (SATP_MODE_SV57 << 60)) ;\
.endif ;\
.if (MODE == sv64) ;\
LI(t5, (SATP64_MODE) & (SATP_MODE_SV64 << 60)) ;\
.endif ;\
srli t6, t6, 12 ;\
or t6, t6, t5 ;\
csrw satp, t6 ;

//Tests for atomic memory operation(AMO) instructions
#define TEST_AMO_OP(inst, destreg, origptr, reg2, origval, updval, sigptr, ...) ;\
.if NARG(__VA_ARGS__) == 1 ;\
.set offset,_ARG1(__VA_OPT__(__VA_ARGS__,0)) ;\
.endif ;\
LI(reg2, MASK_XLEN(origval)) ;\
RVTEST_SIGUPD(sigptr, reg2) /*Write original AMO src */ ;\
LI(reg2, MASK_XLEN(updval)) ;\
addi origptr, sigptr, offset-REGWIDTH /* Calculate where orig AMO src is stored */ ;\
inst destreg, reg2, (origptr) /*origval -> destreg; updated val -> (origptr) */ ;\
RVTEST_SIGUPD(sigptr, destreg) /* write original AMO val */



#define NAN_BOXED(__val__,__width__,__max__) ;\
.if __width__ == 32 ;\
Expand Down Expand Up @@ -480,18 +615,6 @@ RVTEST_SIGUPD_F(swreg,destreg,flagreg)
RVTEST_SIGUPD_FID(swreg,destreg,flagreg) ;\
RVMODEL_IO_ASSERT_GPR_EQ(testreg, destreg, correctval)

//Tests for atomic memory operation(AMO) instructions
#define TEST_AMO_OP(inst, destreg, origptr, reg2, origval, updval, sigptr, ...) ;\
.if NARG(__VA_ARGS__) == 1 ;\
.set offset,_ARG1(__VA_OPT__(__VA_ARGS__,0)) ;\
.endif ;\
LI(reg2, MASK_XLEN(origval)) ;\
RVTEST_SIGUPD(sigptr, reg2) /*Write original AMO src */ ;\
LI(reg2, MASK_XLEN(updval)) ;\
addi origptr, sigptr, offset-REGWIDTH /* Calculate where orig AMO src is stored */ ;\
inst destreg, reg2, (origptr) /*origval -> destreg; updated val -> (origptr) */ ;\
RVTEST_SIGUPD(sigptr, destreg) /* write original AMO val */

#define TEST_AUIPC(inst, destreg, correctval, imm, swreg, offset, testreg) ;\
TEST_CASE(testreg, destreg, correctval, swreg, offset, \
LA testreg, 1f ;\
Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv32i_m/A/src/amoadd.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoadd.w)
RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoadd.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv32i_m/A/src/amoand.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoand.w)
RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoand.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv32i_m/A/src/amomax.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomax.w)
RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomax.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv32i_m/A/src/amomaxu.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomaxu.w)
RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomaxu.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv32i_m/A/src/amomin.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomin.w)
RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomin.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv32i_m/A/src/amominu.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amominu.w)
RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amominu.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv32i_m/A/src/amoor.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoor.w)
RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoor.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv32i_m/A/src/amoswap.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoswap.w)
RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoswap.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv32i_m/A/src/amoxor.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoxor.w)
RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoxor.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv32i_m/M/src/div-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*M.*);def TEST_CASE_1=True;",div)
RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*M.*);def TEST_CASE_1=True;",div)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amoadd.d-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoadd.d)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoadd.d)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amoadd.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoadd.w)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoadd.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amoand.d-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoand.d)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoand.d)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amoand.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoand.w)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amoand.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amomax.d-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomax.d)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomax.d)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amomax.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomax.w)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomax.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amomaxu.d-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomaxu.d)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomaxu.d)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amomaxu.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomaxu.w)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomaxu.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amomin.d-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomin.d)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomin.d)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amomin.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomin.w)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amomin.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amominu.d-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amominu.d)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amominu.d)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
2 changes: 1 addition & 1 deletion riscv-test-suite/rv64i_m/A/src/amominu.w-01.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RVTEST_CODE_BEGIN

#ifdef TEST_CASE_1

RVTEST_CASE(0,"//check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amominu.w)
RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*);def TEST_CASE_1=True;",amominu.w)

RVTEST_SIGBASE(x1,signature_x1_1)

Expand Down
Loading

0 comments on commit 9ca34de

Please sign in to comment.