Skip to content

Commit 945cf51

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

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
@@ -102,8 +102,6 @@ function help() {
102102
printf "Called program with $INPUT
103103
Usage:
104104
${THIS_SCRIPT_EXEC} [ OPTIONS / FLAGS ]
105-
106-
107105
OPTIONS:
108106
-h|--help $(_prt_cur_arg off) print this
109107
-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)
@@ -114,7 +112,6 @@ printf "Called program with $INPUT
114112
-a|--adder_def < /abs/path > $(_prt_cur_arg ${_ADDER_DEF}) Use template to build adders
115113
-n|--simulation_count < N > $(_prt_cur_arg ${_SIM_COUNT}) Allow to run the simulation N times to benchmark the simulator
116114
-d|--output_dir < /abs/path > $(_prt_cur_arg ${_RUN_DIR_OVERRIDE}) Change the run directory output
117-
118115
FLAGS:
119116
-g|--generate_bench $(_prt_cur_arg ${_GENERATE_BENCH}) Generate input and output vector for test
120117
-o|--generate_output $(_prt_cur_arg ${_GENERATE_OUTPUT}) Generate output vector for test given its input vector
@@ -125,7 +122,6 @@ printf "Called program with $INPUT
125122
-b|--batch_sim $(_prt_cur_arg ${_BATCH_SIM}) Use Batch mode multithreaded simulation
126123
-p|--perf $(_prt_cur_arg ${_USE_PERF}) Use Perf for monitoring execution
127124
-f|--force_simulate $(_prt_cur_arg ${_FORCE_SIM}) Force the simulation to be executed regardless of the config
128-
129125
"
130126
}
131127

@@ -578,6 +574,7 @@ function sim() {
578574

579575
for arches in ${arch_list}
580576
do
577+
581578
arch_basename=${arches%.xml}
582579
arch_name=${arch_basename##*/}
583580

@@ -586,18 +583,18 @@ function sim() {
586583
DIR="${NEW_RUN_DIR}/${TEST_FULL_REF}"
587584
blif_file="${DIR}/odin.blif"
588585

586+
#build commands
587+
mkdir -p $DIR
588+
589589
arch_cmd=""
590590
if [ -e ${arches} ]
591591
then
592592
tiles_cmd="../vtr_flow/scripts/add_tiles.py"
593593
arch_file="${arch_name}.xml"
594-
${tiles_cmd} --arch_xml ${arches} > ${DIR}/${arch_name}.xml
595-
arch_cmd="-a ${DIR}/${arch_name}.xml"
594+
${tiles_cmd} --arch_xml ${arches} > $DIR/${arch_name}.xml
595+
arch_cmd="-a $DIR/${arch_name}.xml"
596596
fi
597597

598-
#build commands
599-
mkdir -p $DIR
600-
601598
###############################
602599
# Synthesis
603600
if [ "${_SYNTHESIS}" == "on" ]
@@ -615,7 +612,6 @@ function sim() {
615612
wrapper_synthesis_command="${wrapper_synthesis_command} ${_perf_flag} ${DIR}/perf.data"
616613
fi
617614

618-
619615
synthesis_command="${DEFAULT_CMD_PARAM}
620616
${arch_cmd}
621617
-V ${benchmark}
@@ -934,3 +930,16 @@ print_time_since $START
934930

935931
exit_program
936932
### end here
933+
© 2019 GitHub, Inc.
934+
Terms
935+
Privacy
936+
Security
937+
Status
938+
Help
939+
Contact GitHub
940+
Pricing
941+
API
942+
Training
943+
Blog
944+
About
945+

0 commit comments

Comments
 (0)