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

Merge pull request #5 from BriceBoisson/test-3 

Add: new test source code + Fix: gen_bin script and bin path
This commit is contained in:
BOISSON Brice 2023-11-25 23:19:04 +09:00 committed by GitHub
parent 38d35c3a63 7949850418
commit 0fa44c1830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/gen_test.py
View File

@ -12,9 +12,9 @@ test_file = []
def get_test(test, instr_addr, final = False): def get_test(test, instr_addr, final = False):
result = "" result = ""
pattern_r = re.compile(r'R\[(\d+)\]=(\d+)') pattern_r = re.compile(r'R\[(\d+)\]=([+-]?\d+)')
pattern_pc = re.compile(r'PC=(\d+)') pattern_pc = re.compile(r'PC=(\d+)')
pattern_mem = re.compile(r'MEM\[(\d+)\]=(\d+)') pattern_mem = re.compile(r'MEM\[(\d+)\]=([+-]?\d+)')
# Use the patterns to search for matches in the input string # Use the patterns to search for matches in the input string
match_r = pattern_r.search(test) match_r = pattern_r.search(test)
@ -40,12 +40,14 @@ def get_test(test, instr_addr, final = False):
instr_addr = 0 instr_addr = 0
for line in Lines: for line in Lines:
if line.isspace() or ':' in line or line[0] == '#': if line.isspace() or ':' in line or line[0] == '#' or line[0:2] == '/*' or line[0:2] == '*/' or line[0:2] == ' *':
continue continue
elif '#' in line: elif '#' in line:
print(line)
tests = re.split(r'\s|,', line[line.find('#') + 1:]) tests = re.split(r'\s|,', line[line.find('#') + 1:])
for test in tests: for test in tests:
new_test = get_test(test, instr_addr) new_test = get_test(test, instr_addr)
print(new_test)
if new_test != "": if new_test != "":
test_file.append(new_test) test_file.append(new_test)
instr_addr += 4 instr_addr += 4

8
scripts/get_bin.sh
View File

@ -18,10 +18,10 @@ NAME=$(basename $1)
NAME=${NAME%.*} NAME=${NAME%.*}
FOLDER=$(dirname $1) FOLDER=$(dirname $1)
riscv32-unknown-elf-as -march=rv32i -mabi=ilp32 ${FOLDER}/${NAME}.S -o ${NAME}.o riscv32-unknown-elf-as -march=rv32i -mabi=ilp32 ${FOLDER}/${NAME}.S -o test.o
riscv32-unknown-elf-ld -Ttext=0x0 ${NAME}.o -o ${NAME}.elf riscv32-unknown-elf-ld -Ttext=0x0 test.o -o test.elf
riscv32-unknown-elf-objcopy -O binary ${NAME}.elf ${NAME}.bin riscv32-unknown-elf-objcopy -O binary test.elf test.bin
rm -rf ${NAME}.o ${NAME}.elf rm -rf test.o test.elf
exit 0 exit 0

24
tb/tb_risc_v_cpu-dyn.v
View File

@ -117,29 +117,29 @@ module tb_risc_v_cpu ();
`next_cycle `next_cycle
if (test[curent_addr][5:0] != 6'b111111) begin if (test[curent_addr][5:0] != 6'b111111) begin
if (test[curent_addr][5:0] < 6'b100000) begin if (test[curent_addr][5:0] < 6'b100000) begin
`assert_no_wait_reg("RUNTIME", curent_addr, test[curent_addr][5:0], risc_v_cpu.registers_bank.registers[test[curent_addr][4:0]], test[curent_addr][37:6]) `assert_no_wait_reg("RUNTIME", curent_addr, test[curent_addr][5:0], test[curent_addr][37:6], risc_v_cpu.registers_bank.registers[test[curent_addr][4:0]])
end else if (test[curent_addr][5:0] == 6'b100000) begin end else if (test[curent_addr][5:0] == 6'b100000) begin
`assert_no_wait_pc("RUNTIME", curent_addr, risc_v_cpu.program_counter.pc_addr, test[curent_addr][37:6]) `assert_no_wait_pc("RUNTIME", curent_addr, test[curent_addr][37:6], risc_v_cpu.program_counter.pc_addr)
end else if (test[curent_addr][5:0] > 6'b100000) begin end else if (test[curent_addr][5:0] > 6'b100000) begin
`assert_no_wait_mem("RUNTIME", curent_addr, test[curent_addr][5:0], risc_v_cpu.memory.memory[test[curent_addr][5:0]], test[curent_addr][37:6]) `assert_no_wait_mem("RUNTIME", curent_addr, test[curent_addr][5:0], test[curent_addr][37:6], risc_v_cpu.memory.memory[test[curent_addr][5:0]])
end end
end end
if (test[curent_addr][43:38] != 6'b111111) begin if (test[curent_addr][43:38] != 6'b111111) begin
if (test[curent_addr][43:38] < 6'b100000) begin if (test[curent_addr][43:38] < 6'b100000) begin
`assert_no_wait_reg("RUNTIME", curent_addr, test[curent_addr][43:38], risc_v_cpu.registers_bank.registers[test[curent_addr][42:38]], test[curent_addr][75:44]) `assert_no_wait_reg("RUNTIME", curent_addr, test[curent_addr][43:38], test[curent_addr][75:44], risc_v_cpu.registers_bank.registers[test[curent_addr][42:38]])
end else if (test[curent_addr][43:38] == 6'b100000) begin end else if (test[curent_addr][43:38] == 6'b100000) begin
`assert_no_wait_pc("RUNTIME", curent_addr, risc_v_cpu.program_counter.pc_addr, test[curent_addr][75:44]) `assert_no_wait_pc("RUNTIME", curent_addr, test[curent_addr][75:44], risc_v_cpu.program_counter.pc_addr)
end else if (test[curent_addr][43:38] > 6'b100000) begin end else if (test[curent_addr][43:38] > 6'b100000) begin
`assert_no_wait_mem("RUNTIME", curent_addr, test[curent_addr][43:38], risc_v_cpu.memory.memory[test[curent_addr][43:38]], test[curent_addr][75:44]) `assert_no_wait_mem("RUNTIME", curent_addr, test[curent_addr][43:38], test[curent_addr][75:44], risc_v_cpu.memory.memory[test[curent_addr][43:38]])
end end
end end
if (test[curent_addr][81:76] != 6'b111111) begin if (test[curent_addr][81:76] != 6'b111111) begin
if (test[curent_addr][81:76] < 6'b100000) begin if (test[curent_addr][81:76] < 6'b100000) begin
`assert_no_wait_reg("RUNTIME", curent_addr, test[curent_addr][81:76], risc_v_cpu.registers_bank.registers[test[curent_addr][80:76]], test[curent_addr][81:76]) `assert_no_wait_reg("RUNTIME", curent_addr, test[curent_addr][81:76], test[curent_addr][81:76], risc_v_cpu.registers_bank.registers[test[curent_addr][80:76]])
end else if (test[curent_addr][81:76] == 6'b100000) begin end else if (test[curent_addr][81:76] == 6'b100000) begin
`assert_no_wait_pc("RUNTIME", curent_addr, risc_v_cpu.program_counter.pc_addr, test[curent_addr][113:83]) `assert_no_wait_pc("RUNTIME", curent_addr, test[curent_addr][113:83], risc_v_cpu.program_counter.pc_addr)
end else if (test[curent_addr][81:76] > 6'b100000) begin end else if (test[curent_addr][81:76] > 6'b100000) begin
`assert_no_wait_mem("RUNTIME", curent_addr, test[curent_addr][81:76], risc_v_cpu.memory.memory[test[curent_addr][81:76]], test[curent_addr][81:76]) `assert_no_wait_mem("RUNTIME", curent_addr, test[curent_addr][81:76], test[curent_addr][81:76], risc_v_cpu.memory.memory[test[curent_addr][81:76]])
end end
end end
end end
@ -163,11 +163,11 @@ module tb_risc_v_cpu ();
end end
if (reg_number < 6'b100000) begin if (reg_number < 6'b100000) begin
`assert_no_wait_reg("FINAL", 1'bx, reg_number, risc_v_cpu.registers_bank.registers[reg_number[4:0]], reg_test_value) `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 end else if (reg_number == 6'b100000) begin
`assert_no_wait_pc("FINAL", 1'bx, risc_v_cpu.program_counter.pc_addr, reg_test_value) `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 end else if (reg_number > 6'b100000) begin
`assert_no_wait_mem("FINAL", 1'bx, reg_number, risc_v_cpu.memory.memory[test[curent_addr][5:0]], reg_test_value) `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 end

26
tb/test_source_code/tb_risc_v_cpu/alu_instruction.S Normal file
View File

@ -0,0 +1,26 @@
/*
* 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
*/
/* addi dest, reg1, imm */
addi a0, zero, 10 # R[10]=10
addi a1, zero, 1 # R[11]=1
/* addi dest, reg1, reg2 */
add a2, a0, a1 # R[12]=11
/* sub dest, reg1, reg2 - reg1 - reg2 */
sub a1, a2, a0 # R[11]=1
/* add dest, reg1, reg2 - reg1 & reg2 */
and a2, zero, a1 # R[12]=0
/* or dest, reg1, reg2 - reg1 | reg2 */
or a2, a0, a1 # R[12]=11
/* xor dest, reg1, reg2 - reg1 ^ reg2 */
xor a0, a2, a1 # R[10]=10
/* li dest, imm */
li a0, -10 # R[10]=-10
/* mv dest, reg1 */
mv a1, a0 # R[11]=-10
/* neg dest, reg1 */
neg a1, a2 # R[11]=-11
# R[0]=0