brice/RISC-V_Verilog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add: loop and multiplication source code test | expend instruction memory size | Fix: on empty test file

Browse Source
This commit is contained in:
brice.boisson
2023-11-27 14:27:09 +09:00
parent f6b6e0f285
commit 91514de821
5 changed files with 118 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
tb/tb_risc_v_cpu-dyn.v
View File

@@ -88,21 +88,24 @@ module tb_risc_v_cpu ();
begin
res = $fscanf(code_file_inputs, "%d:%d=%d\n", instruction_addr, reg_number, reg_test_value);
if (res != 3) begin // If fscanf failed, the test file structure is wrong, then exit
$display("Parsing test file failed");
$finish;
end
res = $fgetc(code_file_inputs); // Check if the file is empty
if (!$feof(code_file_inputs)) begin
$display("Parsing test file failed");
$finish;
end
end else begin
instruction_addr = instruction_addr / 4;
instruction_addr = instruction_addr / 4;
if (test[instruction_addr][5:0] == 6'b111111) begin
test[instruction_addr][5:0] = reg_number;
test[instruction_addr][37:6] = reg_test_value;
end else if (test[instruction_addr][43:38] == 6'b111111) begin
test[instruction_addr][43:38] = reg_number;
test[instruction_addr][75:44] = reg_test_value;
end else if (test[instruction_addr][81:76] == 6'b111111) begin
test[instruction_addr][81:76] = reg_number;
test[instruction_addr][113:83] = reg_test_value;
if (test[instruction_addr][5:0] == 6'b111111) begin
test[instruction_addr][5:0] = reg_number;
test[instruction_addr][37:6] = reg_test_value;
end else if (test[instruction_addr][43:38] == 6'b111111) begin
test[instruction_addr][43:38] = reg_number;
test[instruction_addr][75:44] = reg_test_value;
end else if (test[instruction_addr][81:76] == 6'b111111) begin
test[instruction_addr][81:76] = reg_number;
test[instruction_addr][113:83] = reg_test_value;
end
end
end
@@ -110,7 +113,7 @@ module tb_risc_v_cpu ();
/* Run The Program */
for (i = 0; i < 100; i = i + 1) begin
for (i = 0; i < 200; i = i + 1) begin
if (test[risc_v_cpu.program_counter.pc_addr / 4][5:0] != 6'b111111) begin
curent_addr = risc_v_cpu.program_counter.pc_addr / 4;
`next_cycle
@@ -157,16 +160,19 @@ module tb_risc_v_cpu ();
begin
res = $fscanf(code_file_inputs, "%d=%d\n", reg_number, reg_test_value);
if (res != 2) begin // If fscanf failed, the test file structure is wrong, then exit
$display("Parsing test file failed");
$finish;
end
if (reg_number < 6'b100000) begin
`assert_no_wait_reg("FINAL", 1'bx, reg_number, reg_test_value, risc_v_cpu.registers_bank.registers[reg_number[4:0]])
end else if (reg_number == 6'b100000) begin
`assert_no_wait_pc("FINAL", 1'bx, reg_test_value, risc_v_cpu.program_counter.pc_addr)
end else if (reg_number > 6'b100000) begin
`assert_no_wait_mem("FINAL", 1'bx, reg_number, reg_test_value, risc_v_cpu.memory.memory[test[curent_addr][5:0]])
res = $fgetc(code_file_inputs); // Check if the file is empty
if (!$feof(code_file_inputs)) begin
$display("Parsing test file failed");
$finish;
end
end else begin
if (reg_number < 6'b100000) begin
`assert_no_wait_reg("FINAL", 1'bx, reg_number, reg_test_value, risc_v_cpu.registers_bank.registers[reg_number[4:0]])
end else if (reg_number == 6'b100000) begin
`assert_no_wait_pc("FINAL", 1'bx, reg_test_value, risc_v_cpu.program_counter.pc_addr)
end else if (reg_number > 6'b100000) begin
`assert_no_wait_mem("FINAL", 1'bx, reg_number, reg_test_value, risc_v_cpu.memory.memory[test[curent_addr][5:0]])
end
end
end

22
tb/test_source_code/tb_risc_v_cpu/loop.S Normal file
View File

@@ -0,0 +1,22 @@
/*
* 0:zero, 1:ra, 2:sp, 3:gp, 4:tp, 5:t0-2, 8:s0/fp
* 9:s1, 10:a0-7, 18:s2-11, 28:t3-6
*/
li t0, 0 # R[5]=0
li t1, 10 # R[6]=10
loop_pos_start:
bge t0, t1, loop_pos_end
addi t0, t0, 1
j loop_pos_start
loop_pos_end:
li a0, 10 # R[10]=10
loop_neg_start:
ble a0, zero, loop_neg_end
addi a0, a0, -1
j loop_neg_start
loop_neg_end:
# R[5]=10
# R[10]=0

63
tb/test_source_code/tb_risc_v_cpu/multiplication.S Normal file
View File

@@ -0,0 +1,63 @@
/*
* 0:zero, 1:ra, 2:sp, 3:gp, 4:tp, 5:t0-2, 8:s0/fp
* 9:s1, 10:a0-7, 18:s2-11, 28:t3-6
*/
j test
mult:
li a0, 0
li a2, 1
mult_loop_start:
blt t1, a2, mult_loop_end
and a1, t1, 1
beq a1, zero, mult_even_compute
add a0, a0, t2
mult_even_compute:
add t2, t2, t2
srl t1, t1, 1
j mult_loop_start
mult_loop_end:
jalr ra, t0, 0
test:
li t1, 0
li t2, 0
jal t0, mult
nop # R[10]=0
li t1, 0
li t2, 1
jal t0, mult
nop # R[10]=0
li t1, 1
li t2, 0
jal t0, mult
nop # R[10]=0
li t1, 1
li t2, 1
jal t0, mult
nop # R[10]=1
li t1, 2
li t2, 1
jal t0, mult
nop # R[10]=2
li t1, 1
li t2, 3
jal t0, mult
nop # R[10]=3
li t1, 2
li t2, 2
jal t0, mult
nop # R[10]=4
li t1, 2
li t2, 3
jal t0, mult
nop # R[10]=6
li t1, 5
li t2, 3
jal t0, mult
nop # R[10]=15
li t1, 5
li t2, 25
jal t0, mult
nop # R[10]=125