Skip to content

Commit b8728d1

Browse files
nemecadnemecad
committed
Tests: add cmake logic to run virtual memory tests as CLI tests
Restructure the virtual memory test directory to align with the rest of the tests, and add CMake logic for running them.
1 parent 671c334 commit b8728d1

File tree

11 files changed

+65
-0
lines changed

11 files changed

+65
-0
lines changed

‎src/cli/CMakeLists.txt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,43 @@ add_cli_test(
7777
--asm "${CMAKE_SOURCE_DIR}/tests/cli/modifiers-pcrel/program.S"
7878
EXPECTED_OUTPUT "tests/cli/modifiers-pcrel/stdout.txt"
7979
)
80+
81+
add_cli_test(
82+
NAME virtual_memory_template
83+
ARGS
84+
--asm "${CMAKE_SOURCE_DIR}/tests/cli/virtual_memory/template/program.S"
85+
--dump-registers
86+
EXPECTED_OUTPUT "tests/cli/virtual_memory/template/stdout.txt"
87+
)
88+
89+
add_cli_test(
90+
NAME virtual_memory_dtlb
91+
ARGS
92+
--asm "${CMAKE_SOURCE_DIR}/tests/cli/virtual_memory/dtlb/program.S"
93+
--dump-registers
94+
EXPECTED_OUTPUT "tests/cli/virtual_memory/dtlb/stdout.txt"
95+
)
96+
97+
add_cli_test(
98+
NAME virtual_memory_itlb
99+
ARGS
100+
--asm "${CMAKE_SOURCE_DIR}/tests/cli/virtual_memory/itlb/program.S"
101+
--dump-registers
102+
EXPECTED_OUTPUT "tests/cli/virtual_memory/itlb/stdout.txt"
103+
)
104+
105+
add_cli_test(
106+
NAME virtual_memory_memrw
107+
ARGS
108+
--asm "${CMAKE_SOURCE_DIR}/tests/cli/virtual_memory/memrw/program.S"
109+
--dump-registers
110+
EXPECTED_OUTPUT "tests/cli/virtual_memory/memrw/stdout.txt"
111+
)
112+
113+
add_cli_test(
114+
NAME virtual_memory_exec
115+
ARGS
116+
--asm "${CMAKE_SOURCE_DIR}/tests/cli/virtual_memory/exec/program.S"
117+
--dump-registers
118+
EXPECTED_OUTPUT "tests/cli/virtual_memory/exec/stdout.txt"
119+
)

‎tests/vm_assmebly/vm_test_dtlb.s‎ renamed to ‎tests/cli/virtual_memory/dtlb/program.S‎

File renamed without changes.

‎tests/cli/virtual_memory/dtlb/stdout.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Machine stopped on BREAK exception.
2+
Machine state report:
3+
PC:0xc4000078
4+
R0:0x00000000 R1:0x00000000 R2:0xbfffff00 R3:0x00000000 R4:0x00000000 R5:0xffffffffffffc000 R6:0xffffffffc4008000 R7:0x00000008 R8:0x00000000 R9:0x00000000 R10:0x00000000 R11:0x00000000 R12:0x00000000 R13:0x00000000 R14:0x00000000 R15:0x00000000 R16:0x00000000 R17:0x00000000 R18:0x00000000 R19:0x00000000 R20:0x00000000 R21:0x00000000 R22:0x00000000 R23:0x00000000 R24:0x00000000 R25:0x00000000 R26:0x00000000 R27:0x00000000 R28:0x00000008 R29:0x00000001 R30:0x00001000 R31:0x00000048
5+
cycle: 0x00000098 mvendorid: 0x00000000 marchid: 0x00000000 mimpid: 0x00000000 mhardid: 0x00000000 mstatus: 0x00000080 misa: 0x40001111 mie: 0x00000000 mtvec: 0x00000000 mscratch: 0x00000000 mepc: 0xc4000074 mcause: 0x00000003 mtval: 0x00000000 mip: 0x00000000 mtinst: 0x00000000 mtval2: 0x00000000 mcycle: 0x00000098 minstret: 0x00000097 sstatus: 0x00000000 stvec: 0x00000000 sscratch: 0x00000000 sepc: 0x00000000 scause: 0x00000000 stval: 0x00000000 satp: 0x80000001

‎tests/vm_assmebly/vm_test_exec.s‎ renamed to ‎tests/cli/virtual_memory/exec/program.S‎

File renamed without changes.

‎tests/cli/virtual_memory/exec/stdout.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Machine stopped on BREAK exception.
2+
Machine state report:
3+
PC:0xc4000124
4+
R0:0x00000000 R1:0x00000000 R2:0xbfffff00 R3:0x00000000 R4:0x00000000 R5:0x00000001 R6:0x00000058 R7:0x00000c40 R8:0x00000000 R9:0x00000000 R10:0xffffffffffffc000 R11:0x00000000 R12:0x00000000 R13:0x00000000 R14:0x00000000 R15:0x00000000 R16:0x00000000 R17:0x00000000 R18:0x00000000 R19:0x00000000 R20:0x00000000 R21:0x00000000 R22:0x00000000 R23:0x00000000 R24:0x00000000 R25:0x00000000 R26:0x00000000 R27:0x00000000 R28:0x00001c40 R29:0xffffffffc4000000 R30:0x00000310 R31:0x000000cf
5+
cycle: 0x0000002d mvendorid: 0x00000000 marchid: 0x00000000 mimpid: 0x00000000 mhardid: 0x00000000 mstatus: 0x00000080 misa: 0x40001111 mie: 0x00000000 mtvec: 0x00000000 mscratch: 0x00000000 mepc: 0xc4000120 mcause: 0x00000003 mtval: 0x00000000 mip: 0x00000000 mtinst: 0x00000000 mtval2: 0x00000000 mcycle: 0x0000002d minstret: 0x0000002c sstatus: 0x00000000 stvec: 0x00000000 sscratch: 0x00000000 sepc: 0x00000000 scause: 0x00000000 stval: 0x00000000 satp: 0x80000001

‎tests/vm_assmebly/vm_test_itlb.s‎ renamed to ‎tests/cli/virtual_memory/itlb/program.S‎

File renamed without changes.

‎tests/cli/virtual_memory/itlb/stdout.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Machine stopped on BREAK exception.
2+
Machine state report:
3+
PC:0xc40070d0
4+
R0:0x00000000 R1:0x00000000 R2:0xbfffff00 R3:0x00000000 R4:0x00000000 R5:0xffffffffffffc000 R6:0xffffffffc4006000 R7:0x00000000 R8:0x00000000 R9:0x00000000 R10:0x00000000 R11:0x00000000 R12:0x00000000 R13:0x00000000 R14:0x00000000 R15:0x00000000 R16:0x00000000 R17:0x00000000 R18:0x00000000 R19:0x00000000 R20:0x00000000 R21:0x00000000 R22:0x00000000 R23:0x00000000 R24:0x00000000 R25:0x00000000 R26:0x00000000 R27:0x00000000 R28:0xffffffffc40070c8 R29:0x00000049 R30:0x000000cf R31:0x00000001
5+
cycle: 0x00000077 mvendorid: 0x00000000 marchid: 0x00000000 mimpid: 0x00000000 mhardid: 0x00000000 mstatus: 0x00000080 misa: 0x40001111 mie: 0x00000000 mtvec: 0x00000000 mscratch: 0x00000000 mepc: 0xc40070cc mcause: 0x00000003 mtval: 0x00000000 mip: 0x00000000 mtinst: 0x00000000 mtval2: 0x00000000 mcycle: 0x00000077 minstret: 0x00000076 sstatus: 0x00000000 stvec: 0x00000000 sscratch: 0x00000000 sepc: 0x00000000 scause: 0x00000000 stval: 0x00000000 satp: 0x80000001

‎tests/vm_assmebly/vm_test_memrw.s‎ renamed to ‎tests/cli/virtual_memory/memrw/program.S‎

File renamed without changes.

‎tests/cli/virtual_memory/memrw/stdout.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Machine stopped on BREAK exception.
2+
Machine state report:
3+
PC:0xc40000a4
4+
R0:0x00000000 R1:0x00000000 R2:0xbfffff00 R3:0x00000000 R4:0x00000000 R5:0x00000001 R6:0x00000048 R7:0x00000c40 R8:0x00000000 R9:0x00000000 R10:0xffffffffffffc000 R11:0xffffffffc4000008 R12:0x00000000 R13:0x00000000 R14:0x00000000 R15:0x00000000 R16:0x00000000 R17:0x00000000 R18:0x00000000 R19:0x00000000 R20:0x00000000 R21:0x00000000 R22:0x00000000 R23:0x00000000 R24:0x00000000 R25:0x00000000 R26:0x00000000 R27:0x00000000 R28:0x00001c40 R29:0xffffffffc4000000 R30:0x00000008 R31:0x00000008
5+
cycle: 0x0000008e mvendorid: 0x00000000 marchid: 0x00000000 mimpid: 0x00000000 mhardid: 0x00000000 mstatus: 0x00000080 misa: 0x40001111 mie: 0x00000000 mtvec: 0x00000000 mscratch: 0x00000000 mepc: 0xc40000a0 mcause: 0x00000003 mtval: 0x00000000 mip: 0x00000000 mtinst: 0x00000000 mtval2: 0x00000000 mcycle: 0x0000008e minstret: 0x0000008d sstatus: 0x00000000 stvec: 0x00000000 sscratch: 0x00000000 sepc: 0x00000000 scause: 0x00000000 stval: 0x00000000 satp: 0x80000001

‎tests/vm_assmebly/vm_template.s‎ renamed to ‎tests/cli/virtual_memory/template/program.S‎

File renamed without changes.

0 commit comments

Comments
 (0)