Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/autotest/gem5-vec.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fs_path = ./configs/example/kmhv2.py --enable-riscv-vector --restore-rvv-cpt
task ={set_env} && ./build/RISCV/gem5.opt \
--outdir=$sublog$ \
{fs_path} \
--dramsim3-ini=./ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_8ch.ini \
--dramsim3-ini=./ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_2ch.ini \
--raw-cpt --generic-rv-cpt=$binfile$
post-task =
except-task = echo gem5 running error!
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/autotest/gem5.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ task = {set_var} && \
--l2-to-l3-pf-hint \
--l3-hwp-type=WorkerPrefetcher \
--mem-type=DRAMsim3 \
--dramsim3-ini=./ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_8ch.ini \
--dramsim3-ini=./ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_2ch.ini \
--generic-rv-cpt=$binfile$ \
--gcpt-restorer={gcpt_path} \
--bp-type=DecoupledBPUWithFTB --enable-loop-predictor --enable-jump-ahead-predictor \
Expand Down
2 changes: 1 addition & 1 deletion configs/common/xiangshan.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def config_xiangshan_inputs(args: argparse.Namespace, sys):
if args.mem_type == 'DRAMsim3' and args.dramsim3_ini is None:
# use relative path to find the dramsim3 ini file, from configs/common/ to root
root_dir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
args.dramsim3_ini = os.path.join(root_dir, 'ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_8ch.ini')
args.dramsim3_ini = os.path.join(root_dir, 'ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_2ch.ini')

if args.mem_type == 'Ramulator2' and args.ramulator2_ini is None:
# use relative path to find the ramulator ini file, from configs/common/ to root
Expand Down
2 changes: 1 addition & 1 deletion configs/example/se.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def setDefaultArgs(args):
# Set dramsim3_ini path
if not hasattr(args, 'dramsim3_ini') or args.dramsim3_ini is None:
root_dir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
args.dramsim3_ini = os.path.join(root_dir, 'ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_8ch.ini')
args.dramsim3_ini = os.path.join(root_dir, 'ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_2ch.ini')

args = parser.parse_args()

Expand Down
67 changes: 0 additions & 67 deletions ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_8ch.ini

This file was deleted.

2 changes: 1 addition & 1 deletion util/memory_check/run-xs-with-valgrind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ valgrind -s --track-origins=yes --log-file=valgrind-out.txt --error-limit=no \
--l2-wrapper-hwp-type=CompositeWithWorkerPrefetcher \
--l2-to-l3-pf-hint --l3-hwp-type=WorkerPrefetcher \
--mem-type=DRAMsim3 \
--dramsim3-ini=$gem5_home/ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_8ch.ini \
--dramsim3-ini=$gem5_home/ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_2ch.ini \
--bp-type=DecoupledBPUWithFTB --enable-loop-predictor \
--enable-difftest --difftest-ref-so=$ref_so_path \
--generic-rv-cpt=$test_cpt \
Expand Down
2 changes: 1 addition & 1 deletion util/pgo/basic_pgo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ $gem5_home/build/RISCV/gem5.opt \
--l1-to-l2-pf-hint --l2-hwp-type=WorkerPrefetcher \
--l2-to-l3-pf-hint --l3-hwp-type=WorkerPrefetcher \
--mem-type=DRAMsim3 \
--dramsim3-ini=$gem5_home/ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_8ch.ini \
--dramsim3-ini=$gem5_home/ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_2ch.ini \
--bp-type=DecoupledBPUWithFTB --enable-loop-predictor \
--generic-rv-cpt=$GEM5_PGO_CPT \
--gcpt-restorer=$GCPT_RESTORER \
Expand Down
2 changes: 1 addition & 1 deletion util/runse.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ WORKLOAD_PATH=$1
--l2-to-l3-pf-hint \
--l3-hwp-type=WorkerPrefetcher \
--mem-type=DRAMsim3 \
--dramsim3-ini=./ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_8ch.ini \
--dramsim3-ini=./ext/dramsim3/xiangshan_configs/xiangshan_DDR4_8Gb_x8_3200_2ch.ini \
--bp-type=DecoupledBPUWithFTB \
--enable-loop-predictor \
--enable-jump-ahead-predictor \
Expand Down