Skip to content
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

Jump to bottom

fix(lrsc): configure NEMU's reservation set size to 64B to match XS #654

Merged
merged 1 commit into from
Nov 14, 2024
Merged

fix(lrsc): configure NEMU's reservation set size to 64B to match XS #654

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
1 change: 1 addition & 0 deletions configs/riscv64-dual-xs-ref_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ CONFIG_AC_NONE=y
CONFIG_VECTOR_AC_SOFT=y
CONFIG_MMIO_AC_SOFT=y
CONFIG_AMO_AC_SOFT=y
CONFIG_RESERVATION_SET_WIDTH=6

#
# Processor difftest reference config
Expand Down
1 change: 1 addition & 0 deletions configs/riscv64-xs-ahead-ref_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ CONFIG_FPU_SOFT=y
# CONFIG_AC_HOST is not set
CONFIG_AC_SOFT=y
# CONFIG_AC_NONE is not set
CONFIG_RESERVATION_SET_WIDTH=6

#
# Processor difftest reference config
Expand Down
1 change: 1 addition & 0 deletions configs/riscv64-xs-cpt_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ CONFIG_AC_NONE=y
CONFIG_VECTOR_AC_SOFT=y
CONFIG_MMIO_AC_SOFT=y
CONFIG_AMO_AC_SOFT=y
CONFIG_RESERVATION_SET_WIDTH=6

#
# Processor difftest reference config
Expand Down
1 change: 1 addition & 0 deletions configs/riscv64-xs-diff-spike-agnostic_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ CONFIG_FPU_SOFT=y
# CONFIG_AC_HOST is not set
CONFIG_AC_SOFT=y
# CONFIG_AC_NONE is not set
CONFIG_RESERVATION_SET_WIDTH=6

#
# Processor difftest reference config
Expand Down
1 change: 1 addition & 0 deletions configs/riscv64-xs-diff-spike_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ CONFIG_AC_NONE=y
# CONFIG_VECTOR_AC_SOFT is not set
# CONFIG_MMIO_AC_SOFT is not set
# CONFIG_AMO_AC_SOFT is not set
CONFIG_RESERVATION_SET_WIDTH=6

#
# Processor difftest reference config
Expand Down
1 change: 1 addition & 0 deletions configs/riscv64-xs-fpga_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ CONFIG_FPU_SOFT=y
# CONFIG_AC_HOST is not set
CONFIG_AC_SOFT=y
# CONFIG_AC_NONE is not set
CONFIG_RESERVATION_SET_WIDTH=6

#
# Processor difftest reference config
Expand Down
1 change: 1 addition & 0 deletions configs/riscv64-xs-novga_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ CONFIG_FPU_SOFT=y
# CONFIG_AC_HOST is not set
CONFIG_AC_SOFT=y
# CONFIG_AC_NONE is not set
CONFIG_RESERVATION_SET_WIDTH=6

#
# Processor difftest reference config
Expand Down
1 change: 1 addition & 0 deletions configs/riscv64-xs-ref_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ CONFIG_AC_NONE=y
CONFIG_VECTOR_AC_SOFT=y
CONFIG_MMIO_AC_SOFT=y
CONFIG_AMO_AC_SOFT=y
CONFIG_RESERVATION_SET_WIDTH=6

#
# Processor difftest reference config
Expand Down
1 change: 1 addition & 0 deletions configs/riscv64-xs_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ CONFIG_AC_NONE=y
CONFIG_VECTOR_AC_SOFT=y
CONFIG_MMIO_AC_SOFT=y
CONFIG_AMO_AC_SOFT=y
CONFIG_RESERVATION_SET_WIDTH=6

#
# Processor difftest reference config
Expand Down
4 changes: 4 additions & 0 deletions src/isa/riscv64/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,4 +451,8 @@ config RV_ZCB
bool "RISC-V Zcb Extension, Version 1.0.0"
default n

config RESERVATION_SET_WIDTH
int "The Width of the Reservation Set Size"
default 0

endmenu
2 changes: 1 addition & 1 deletion src/isa/riscv64/instr/rva/amo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def_rtl(amo_slow_path, rtlreg_t *dest, const rtlreg_t *src1, const rtlreg_t *src
cpu.amo = true;
#endif
// should check overlapping instead of equality
int success = (cpu.lr_addr == *src1) && cpu.lr_valid;
int success = ((cpu.lr_addr ^ *src1) >> CONFIG_RESERVATION_SET_WIDTH == 0) && cpu.lr_valid;
Logti("cpu sc addr=%lx scr1=%lx vaild=%ld success=%d", cpu.lr_addr,*src1, cpu.lr_valid,success);
cpu.lr_valid = 0;
if (success) {
Expand Down
Loading