Skip to content

[dv] Mask read-only fields in CSR test generator (Fixes #1337) #2442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RKNAGA18 wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −2
Open

[dv] Mask read-only fields in CSR test generator (Fixes #1337) #2442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions vendor/google_riscv-dv/scripts/gen_csr_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,15 +349,18 @@ def gen_csr_instr(original_csr_map, csr_instructions, xlen,
csr_write_fields,
csr_read_mask)))
else:
safe_rs1_val = csr_val.copy()
csr_write(rand_rs1_val, safe_rs1_val, csr_write_fields)

first_li = "\tli {}, 0x{}\n".format(source_reg,
rand_rs1_val.hex)
safe_rs1_val.hex)
csr_inst = "\t{} {}, {}, {}\n".format(op, dest_reg,
csr_address,
source_reg)
predict_li = ("\tli {}, "
"{}\n".format(source_reg,
predict_csr_val(op,
rand_rs1_val,
safe_rs1_val,
csr_val,
csr_write_fields,
csr_read_mask)))
Expand Down
25 changes: 25 additions & 0 deletions vendor/patches/google_riscv-dv/0001-mask-readonly-csr-fields.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/vendor/google_riscv-dv/scripts/gen_csr_test.py b/vendor/google_riscv-dv/scripts/gen_csr_test.py
index ca4be2a6..36aec705 100644
--- a/vendor/google_riscv-dv/scripts/gen_csr_test.py
+++ b/vendor/google_riscv-dv/scripts/gen_csr_test.py
@@ -351,15 +351,18 @@ def gen_csr_instr(original_csr_map, csr_instructions, xlen,
csr_write_fields,
csr_read_mask)))
else:
+ safe_rs1_val = csr_val.copy()
+ csr_write(rand_rs1_val, safe_rs1_val, csr_write_fields)
+
first_li = "\tli {}, 0x{}\n".format(source_reg,
- rand_rs1_val.hex)
+ safe_rs1_val.hex)
csr_inst = "\t{} {}, {}, {}\n".format(op, dest_reg,
csr_address,
source_reg)
predict_li = ("\tli {}, "
"{}\n".format(source_reg,
predict_csr_val(op,
- rand_rs1_val,
+ safe_rs1_val,
csr_val,
csr_write_fields,
csr_read_mask)))