Skip to content

Commit b1961b2

Browse files
authored
fix(cfg): renamed mc100-32-riscv-tests.yaml to rv32-riscv-tests.yaml (#1143)
Better name of the configuration used for testing the ISS and regression tests
1 parent c4ee396 commit b1961b2

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "cppdbg",
77
"request": "launch",
88
"program": "${workspaceFolder}/gen/cpp_hart_gen/rv32_Debug/build/iss",
9-
"args": ["-m", "rv32", "-c", "${workspaceFolder}/cfgs/mc100-32-riscv-tests.yaml", "${workspaceFolder}/ext/riscv-tests/isa/rv32ui-p-addi"],
9+
"args": ["-m", "rv32", "-c", "${workspaceFolder}/cfgs/rv32-riscv-tests.yaml", "${workspaceFolder}/ext/riscv-tests/isa/rv32ui-p-addi"],
1010
"stopAtEntry": true,
1111
"cwd": "${workspaceFolder}",
1212
"environment": [],

backends/cpp_hart_gen/tasks.rake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,22 +407,22 @@ namespace :test do
407407
"srli", "sub", "xor", "xori"]
408408

409409
rv32uiTests.each do |t|
410-
sh "#{CPP_HART_GEN_DST}/#{build_name}/build/iss -m rv32 -c #{$root}/cfgs/mc100-32-riscv-tests.yaml ext/riscv-tests/isa/rv32ui-p-#{t}"
410+
sh "#{CPP_HART_GEN_DST}/#{build_name}/build/iss -m rv32 -c #{$root}/cfgs/rv32-riscv-tests.yaml ext/riscv-tests/isa/rv32ui-p-#{t}"
411411
end
412412

413413
rv32umTests = [ "div", "divu", "mul", "mulh", "mulhsu", "mulhu", "rem", "remu" ]
414414
rv32umTests.each do |t|
415-
sh "#{CPP_HART_GEN_DST}/#{build_name}/build/iss -m rv32 -c #{$root}/cfgs/mc100-32-riscv-tests.yaml ext/riscv-tests/isa/rv32um-p-#{t}"
415+
sh "#{CPP_HART_GEN_DST}/#{build_name}/build/iss -m rv32 -c #{$root}/cfgs/rv32-riscv-tests.yaml ext/riscv-tests/isa/rv32um-p-#{t}"
416416
end
417417

418418
rv32ucTests = [ "rvc" ]
419419
rv32ucTests.each do |t|
420-
sh "#{CPP_HART_GEN_DST}/#{build_name}/build/iss -m rv32 -c #{$root}/cfgs/mc100-32-riscv-tests.yaml ext/riscv-tests/isa/rv32uc-p-#{t}"
420+
sh "#{CPP_HART_GEN_DST}/#{build_name}/build/iss -m rv32 -c #{$root}/cfgs/rv32-riscv-tests.yaml ext/riscv-tests/isa/rv32uc-p-#{t}"
421421
end
422422

423423
rv32siTests = ["csr", "dirty", "ma_fetch", "scall", "sbreak"]
424424
rv32siTests.each do |t|
425-
sh "#{CPP_HART_GEN_DST}/#{build_name}/build/iss -m rv32 -c #{$root}/cfgs/mc100-32-riscv-tests.yaml ext/riscv-tests/isa/rv32si-p-#{t}"
425+
sh "#{CPP_HART_GEN_DST}/#{build_name}/build/iss -m rv32 -c #{$root}/cfgs/rv32-riscv-tests.yaml ext/riscv-tests/isa/rv32si-p-#{t}"
426426
end
427427
end
428428
end

cfgs/mc100-32-riscv-tests.yaml renamed to cfgs/rv32-riscv-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
$schema: https://riscv.org/udb/schemas/config_schema-0.1.0.json
44
kind: architecture configuration
55
type: fully configured
6-
name: MC100-32-riscv-tests
7-
description: An example MC100-32-compliant full config for riscv-tests
6+
name: rv32-riscv-tests
7+
description: A compliant full config for rv32 riscv-tests
88
implemented_extensions:
99
- [Sm, "1.11.0"]
1010
- [I, "2.1"]

0 commit comments

Comments
 (0)