Skip to content

Commit 61a6e8a

Browse files
committed
update valgrind command, use no_arch for syntax, add more arch sweep list
1 parent 48bc65e commit 61a6e8a

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
--arch_list small_sweep
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--arch_list small_sweep
1+
--arch_list valgrind_sweep
22
--disable_simulation
33
--source ../operators
44
--valgrind

ODIN_II/verify_odin.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@ NEW_RUN_DIR="${REGRESSION_DIR}/run001/"
2525

2626
##############################################
2727
# Arch Sweep Arrays to use during benchmarking
28+
NO_ARCH="no_arch"
2829
DEFAULT_ARCH="${VTR_ROOT_DIR}/libs/libarchfpga/arch/sample_arch.xml"
29-
MEM_ARCH="${VTR_ROOT_DIR}/vtr_flow/arch/timing/k6_frac_N10_frac_chain_mem32K_40nm.xml"
30-
SMALL_ARCH_SWEEP="no_arch ${DEFAULT_ARCH} ${MEM_ARCH}"
30+
CHAIN_ARCH="${VTR_ROOT_DIR}/vtr_flow/arch/timing/k6_frac_N10_frac_chain_mem32K_40nm.xml"
31+
MEM_ARCH="${VTR_ROOT_DIR}/vtr_flow/arch/timing/k6_N10_mem32K_40nm.xml"
32+
33+
SMALL_ARCH_SWEEP="${DEFAULT_ARCH} ${MEM_ARCH}"
34+
VALGRIND_ARCH_SWEEP="${CHAIN_ARCH}"
3135
FULL_ARCH_SWEEP=$(find ${VTR_ROOT_DIR}/vtr_flow/arch/timing -maxdepth 1 | grep xml | grep mem)
3236

3337
##############################################
@@ -145,6 +149,7 @@ printf "
145149
--arch_list [list_name]*
146150
*memories use VTR k6_N10_mem32k architecture
147151
*small_sweep use a small set of timing architecture
152+
*valgrind_sweep use a small set of arch with hardblocks
148153
*full_sweep sweep the whole vtr directory *** WILL FAIL ***
149154
*default use the sample_arch.xml
150155
--disable_simulation request simulation NOT to be ran
@@ -445,7 +450,7 @@ function sim() {
445450
####################################
446451
# parse the function commands passed
447452
with_custom_args="0"
448-
arch_list="no_arch"
453+
arch_list=${NO_ARCH}
449454
with_sim="0"
450455
threads=${_NUMBER_OF_PROCESS}
451456
test_src="./"
@@ -503,6 +508,10 @@ function sim() {
503508
arch_list="${SMALL_ARCH_SWEEP}"
504509
;;
505510

511+
valgrind_sweep)
512+
arch_list="${VALGRIND_ARCH_SWEEP}"
513+
;;
514+
506515
full_sweep)
507516
arch_list="${FULL_ARCH_SWEEP}"
508517
;;

ODIN_II/wrapper_odin.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if [ ! -f ${EXEC} ]; then
3030
fi
3131

3232
TIME_EXEC=$($SHELL -c "which time")
33-
VALGRIND_EXEC="valgrind --leak-check=full --max-stackframe=128000000 --error-exitcode=1"
33+
VALGRIND_EXEC="valgrind --leak-check=full --max-stackframe=128000000 --errors-for-leak-kinds=none --error-exitcode=1 --track-origins=yes"
3434
PERF_EXEC="perf stat record -a -d -d -d -o"
3535
GDB_EXEC="gdb --args"
3636
LOG=""

0 commit comments

Comments
 (0)