Skip to content

U
urv-core
Commit 3c340f3d authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

testsuite: simplify harness, handle fault

parent a102497b
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 17 deletions
sw/common/test-common.c
View file @ 3c340f3d
#include <stdint.h> #include <stdint.h>
#include "pp-printf.h"
static const char hex[] = "0123456789abcdef";
static void uart_write_byte(int b)
{
*(volatile int *)0x100000 = b;
}
int puts(const char *s)
{
char c;
while(c=*s++)
uart_write_byte(c);
}
void rv_test_pass(int num) void rv_test_pass(int num)
{ {
pp_printf("Test passed\n"); puts("Test passed\n");
} }
void rv_test_fail(int num) void rv_test_fail(int num)
{ {
pp_printf("Test %d failed\n", num); puts ("Test 0x");
uart_write_byte(hex[(num >> 4) & 0xf]);
uart_write_byte(hex[(num >> 0) & 0xf]);
puts (" failed\n");
} }
sw/testsuite/isa/Makefile
View file @ 3c340f3d
...@@ -28,7 +28,7 @@ RISCV_GCC_OPTS = $(ENTROPY) -mcmodel=medany -nostartfiles -fvisibility=hidden -m ...@@ -28,7 +28,7 @@ RISCV_GCC_OPTS = $(ENTROPY) -mcmodel=medany -nostartfiles -fvisibility=hidden -m
RISCV_OBJDUMP = $(RISCV_PREFIX)objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.text.init --section=.data RISCV_OBJDUMP = $(RISCV_PREFIX)objdump --disassemble-all --disassemble-zeroes --section=.text --section=.text.startup --section=.text.init --section=.data
RISCV_SIM = spike --extension=hwacha RISCV_SIM = spike --extension=hwacha
COMMON_SRCS = ../../common/crt0.S ../../common/irq.S emulate.o ../../common/test-common.c ../../common/printf.c ../../common/uart.c ../../common/vsprintf-xint.c COMMON_SRCS = ../../common/crt0.S ../../common/irq.S emulate.o ../../common/test-common.c
vpath %.S $(isa_src_dir) vpath %.S $(isa_src_dir)
...@@ -40,7 +40,7 @@ emulate.o: ../../common/emulate.c ...@@ -40,7 +40,7 @@ emulate.o: ../../common/emulate.c
%.ram: % %.ram: %
$(RISCV_PREFIX)objcopy -O binary $< tmp.bin $(RISCV_PREFIX)objcopy -O binary $< tmp.bin
../../genraminit tmp.bin 16384 > $@ ../../genraminit tmp.bin 4096 > $@
%.dump: % %.dump: %
$(RISCV_OBJDUMP) $< > $@ $(RISCV_OBJDUMP) $< > $@
......
tb/cpu/main.sv
View file @ 3c340f3d
...@@ -177,6 +177,8 @@ module main; ...@@ -177,6 +177,8 @@ module main;
.irq_i(irq), .irq_i(irq),
.fault_o(),
// instruction mem I/F // instruction mem I/F
.im_addr_o(im_addr), .im_addr_o(im_addr),
.im_data_i(im_data), .im_data_i(im_data),
......
tb/isa-testsuite/main.sv
View file @ 3c340f3d
...@@ -53,6 +53,8 @@ module ICpuTestWrapper ...@@ -53,6 +53,8 @@ module ICpuTestWrapper
parameter int mem_size = 16384; parameter int mem_size = 16384;
wire cpu_fault[n_configs];
wire [31:0] im_addr_m[n_configs]; wire [31:0] im_addr_m[n_configs];
wire [31:0] dm_addr_m[n_configs]; wire [31:0] dm_addr_m[n_configs];
wire [31:0] dm_data_s_m[n_configs]; wire [31:0] dm_data_s_m[n_configs];
...@@ -66,10 +68,13 @@ module ICpuTestWrapper ...@@ -66,10 +68,13 @@ module ICpuTestWrapper
int r_active_cpu = 0; int r_active_cpu = 0;
wire fault = cpu_fault[r_active_cpu];
wire [31:0] im_addr = im_addr_m[r_active_cpu]; wire [31:0] im_addr = im_addr_m[r_active_cpu];
reg [31:0] im_data; reg [31:0] im_data;
reg im_valid; reg im_valid;
wire [31:0] dm_addr = dm_addr_m[r_active_cpu]; wire [31:0] dm_addr = dm_addr_m[r_active_cpu];
wire [31:0] dm_data_s = dm_data_s_m[r_active_cpu]; wire [31:0] dm_data_s = dm_data_s_m[r_active_cpu];
reg [31:0] dm_data_l_d[1:0]; reg [31:0] dm_data_l_d[1:0];
...@@ -87,6 +92,7 @@ module ICpuTestWrapper ...@@ -87,6 +92,7 @@ module ICpuTestWrapper
string current_msg; string current_msg;
int test_complete = 0; int test_complete = 0;
int fault_expected = 0;
task automatic selectConfiguration( int cpu ); task automatic selectConfiguration( int cpu );
r_active_cpu = cpu; r_active_cpu = cpu;
...@@ -120,6 +126,7 @@ module ICpuTestWrapper ...@@ -120,6 +126,7 @@ module ICpuTestWrapper
current_msg = ""; current_msg = "";
test_complete = 0; test_complete = 0;
fault_expected = 0;
rst <= 1; rst <= 1;
@(posedge clk_i); @(posedge clk_i);
...@@ -216,6 +223,8 @@ module ICpuTestWrapper ...@@ -216,6 +223,8 @@ module ICpuTestWrapper
.irq_i ( irq ), .irq_i ( irq ),
.fault_o (cpu_fault[i]),
// instruction mem I/F // instruction mem I/F
.im_addr_o(im_addr_m[i]), .im_addr_o(im_addr_m[i]),
.im_rd_o(), .im_rd_o(),
...@@ -247,20 +256,24 @@ module ICpuTestWrapper ...@@ -247,20 +256,24 @@ module ICpuTestWrapper
end end
always@(posedge clk_i) always@(posedge clk_i) begin
if(dm_store) if(dm_store)
begin begin
automatic bit [7:0] chr = dm_data_s[7:0]; automatic bit [7:0] chr = dm_data_s[7:0];
if(dm_addr == 'h100000) if(dm_addr == 'h100000)
begin current_msg = {current_msg, chr};
current_msg = $sformatf("%s%c", current_msg, chr);
end
else if(dm_addr == 'h100004) else if(dm_addr == 'h100004)
begin test_complete = 1;
test_complete = 1; else if(dm_addr == 'h100008)
end fault_expected = 1;
end end
if (fault) begin
current_msg = {current_msg, fault_expected ? "Test passed\n" : "Fault" };
test_complete = 1;
end
end
endmodule // ICpuTestWrapper endmodule // ICpuTestWrapper
...@@ -290,7 +303,7 @@ class ISATestRunner extends LoggerClient; ...@@ -290,7 +303,7 @@ class ISATestRunner extends LoggerClient;
automatic integer cnt = 0; automatic integer cnt = 0;
// $display("runTest task"); // $display("runTest task");
DUT.runTest(filename); DUT.runTest(filename);
failedTest = 0; failedTest = 0;
...@@ -308,10 +321,10 @@ class ISATestRunner extends LoggerClient; ...@@ -308,10 +321,10 @@ class ISATestRunner extends LoggerClient;
cnt++; cnt++;
end end
if ($sscanf( DUT.getTestResult(), "Test %d failed", failedTest ) == 1) if (DUT.getTestResult() == "Test passed\n")
status = R_FAIL;
else
status = R_OK; status = R_OK;
else
status = R_FAIL;
endtask // runTest endtask // runTest
task automatic runAllTests( string test_dir, string list_file, inout int failCount); task automatic runAllTests( string test_dir, string list_file, inout int failCount);
...@@ -342,7 +355,7 @@ class ISATestRunner extends LoggerClient; ...@@ -342,7 +355,7 @@ class ISATestRunner extends LoggerClient;
automatic string s; automatic string s;
// $display("Run %s", tests[i]); // $display("Run %s", tests[i]);
runTest({test_dir,"/",tests[i]}, status, failedTest ); runTest({test_dir,"/",tests[i]}, status, failedTest );
if ( status == R_OK ) if ( status == R_OK )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment