Skip to content

Commit ea24a9e

Browse files
committed
ODIN_II: corrected arch.xml file generation
Signed-off-by: Alessandro Comodi <[email protected]>
1 parent b5867ae commit ea24a9e

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

ODIN_II/verify_odin.sh

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ function help() {
109109
printf "Called program with $INPUT
110110
Usage:
111111
${THIS_SCRIPT_EXEC} [ OPTIONS / FLAGS ]
112-
113-
114112
OPTIONS:
115113
-h|--help $(_prt_cur_arg off) print this
116114
-t|--test < test name > $(_prt_cur_arg ${_TEST}) Test name is one of ( ${TEST_DIR_LIST} heavy_suite light_suite full_suite vtr_basic vtr_strong pre_commit failures debug_sim debug_synth)
@@ -121,7 +119,6 @@ printf "Called program with $INPUT
121119
-a|--adder_def < /abs/path > $(_prt_cur_arg ${_ADDER_DEF}) Use template to build adders
122120
-n|--simulation_count < N > $(_prt_cur_arg ${_SIM_COUNT}) Allow to run the simulation N times to benchmark the simulator
123121
-d|--output_dir < /abs/path > $(_prt_cur_arg ${_RUN_DIR_OVERRIDE}) Change the run directory output
124-
125122
FLAGS:
126123
-g|--generate_bench $(_prt_cur_arg ${_GENERATE_BENCH}) Generate input and output vector for test
127124
-o|--generate_output $(_prt_cur_arg ${_GENERATE_OUTPUT}) Generate output vector for test given its input vector
@@ -132,7 +129,6 @@ printf "Called program with $INPUT
132129
-b|--batch_sim $(_prt_cur_arg ${_BATCH_SIM}) Use Batch mode multithreaded simulation
133130
-p|--perf $(_prt_cur_arg ${_USE_PERF}) Use Perf for monitoring execution
134131
-f|--force_simulate $(_prt_cur_arg ${_FORCE_SIM}) Force the simulation to be executed regardless of the config
135-
136132
"
137133
}
138134

@@ -607,6 +603,7 @@ function sim() {
607603

608604
for arches in ${arch_list}
609605
do
606+
610607
arch_basename=${arches%.xml}
611608
arch_name=${arch_basename##*/}
612609

@@ -615,18 +612,18 @@ function sim() {
615612
DIR="${NEW_RUN_DIR}/${TEST_FULL_REF}"
616613
blif_file="${DIR}/odin.blif"
617614

615+
#build commands
616+
mkdir -p $DIR
617+
618618
arch_cmd=""
619619
if [ -e ${arches} ]
620620
then
621621
tiles_cmd="../vtr_flow/scripts/add_tiles.py"
622622
arch_file="${arch_name}.xml"
623-
${tiles_cmd} --arch_xml ${arches} > ${DIR}/${arch_name}.xml
624-
arch_cmd="-a ${DIR}/${arch_name}.xml"
623+
${tiles_cmd} --arch_xml ${arches} > $DIR/${arch_name}.xml
624+
arch_cmd="-a $DIR/${arch_name}.xml"
625625
fi
626626

627-
#build commands
628-
mkdir -p $DIR
629-
630627
###############################
631628
# Synthesis
632629
if [ "${_SYNTHESIS}" == "on" ]
@@ -644,7 +641,6 @@ function sim() {
644641
wrapper_synthesis_command="${wrapper_synthesis_command} ${_perf_flag} ${DIR}/perf.data"
645642
fi
646643

647-
648644
synthesis_command="${DEFAULT_CMD_PARAM}
649645
${arch_cmd}
650646
-V ${benchmark}
@@ -973,3 +969,16 @@ print_time_since $START
973969

974970
exit_program
975971
### end here
972+
© 2019 GitHub, Inc.
973+
Terms
974+
Privacy
975+
Security
976+
Status
977+
Help
978+
Contact GitHub
979+
Pricing
980+
API
981+
Training
982+
Blog
983+
About
984+

0 commit comments

Comments
 (0)