ODIN II: regression script modifies arch.xml with tiles

Signed-off-by: Alessandro Comodi <[email protected]>

Author: acomodi

ODIN_II/verify_odin.sh

@@ -8,7 +8,7 @@ QUIT=0
 INPUT=$@
 
 BASE_DIR="regression_test/benchmark"
-TEST_DIR_LIST=$(find regression_test/benchmark -mindepth 1 -maxdepth 1 -type d | cut -d '/' -f 3 | tr '\n' ' ')  
+TEST_DIR_LIST=$(find regression_test/benchmark -mindepth 1 -maxdepth 1 -type d | cut -d '/' -f 3 | tr '\n' ' ')
 
 #include more generic names here for better vector generation
 HOLD_LOW_RESET="-L reset rst"
@@ -58,7 +58,7 @@ function help() {
 printf "
 Called program with $INPUT
 
-Usage: ./verify_odin 
+Usage: ./verify_odin
 			--test [test name]    * test name is one of ( ${TEST_DIR_LIST}full_suite vtr_basic vtr_strong pre_commit )
 			--generate_bench      * generate input and output vector for test
 			--generate_output     * generate output vector for test given its input vector
@@ -112,13 +112,13 @@ function init_temp() {
 	new_run=regression_test/${RUN_NAME}
 	echo "running benchmark @${new_run}"
 	mkdir -p ${new_run}
-	unlink regression_test/latest 
+	unlink regression_test/latest
 	ln -s ${RUN_NAME} regression_test/latest
 }
 
 function cleanup_temp() {
 	for runs in regression_test/run*
-	do 
+	do
 		rm -Rf ${runs}
 		unlink regression_test/latest || /bin/true
 	done
@@ -187,9 +187,9 @@ function sim() {
 	shift
 
 	while [[ "$#" > 0 ]]
-	do 
+	do
 		case $1 in
-			--custom_args_file) 
+			--custom_args_file)
 				with_custom_args=1
 				;;
 
@@ -227,7 +227,7 @@ function sim() {
 
 			*)
 				echo "Unknown internal parameter passed: $1"
-				config_help 
+				config_help
 				ctrl_c
 				;;
 		esac
@@ -264,8 +264,8 @@ function sim() {
 											${RUN_WITH_VALGRIND}"
 
 				odin_command="${DEFAULT_CMD_PARAM}
-								$(cat ${dir}/odin.args | tr '\n' ' ') 
-								-o ${blif_file} 
+								$(cat ${dir}/odin.args | tr '\n' ' ')
+								-o ${blif_file}
 								-sim_dir ${DIR}"
 
 				echo $(echo "${wrapper_odin_command} ${odin_command}" | tr '\n' ' ' | tr -s ' ' ) > ${DIR}/odin_param
@@ -294,25 +294,27 @@ function sim() {
 
 			for arches in ${arch_list}
 			do
-
-				arch_cmd=""
-				if [ -e ${arches} ]
-				then
-					arch_cmd="-a ${arches}"
-				fi
-
 				arch_basename=${arches%.xml}
 				arch_name=${arch_basename##*/}
 
 				TEST_FULL_REF="${bench_type}/${test_name}/${arch_name}"
-
 				DIR="${new_run}/${TEST_FULL_REF}"
+
 				blif_file="${DIR}/odin.blif"
 
 
 				#build commands
 				mkdir -p $DIR
 
+				arch_cmd=""
+				if [ -e ${arches} ]
+				then
+					tiles_cmd="../vtr_flow/scripts/add_tiles.py"
+					arch_file="${arch_name}.xml"
+					${tiles_cmd} --arch_xml ${arches} > ${DIR}/${arch_name}.xml
+					arch_cmd="-a ${DIR}/${arch_name}.xml"
+				fi
+
 				wrapper_synthesis_command="./wrapper_odin.sh
 											--log_file ${DIR}/synthesis.log
 											--test_name ${TEST_FULL_REF}
@@ -357,7 +359,7 @@ function sim() {
 						if [ "_$REGENERATE_OUTPUT" != "_1" ] && [ -e ${output_vector_file} ]; then
 							simulation_command="${simulation_command} -T ${output_vector_file}"
 						fi
-						
+
 					else
 						simulation_command="${simulation_command} ${GENERATE_VECTOR_COUNT}"
 
@@ -382,20 +384,20 @@ function sim() {
 		fi
 
 	fi
-	
+
 
 }
 
 function parse_args() {
 	while [[ "$#" > 0 ]]
-	do 
+	do
 		case $1 in
 			-h|--help)
 				help
 				exit_program
 				;;
 
-			--generate_output) 
+			--generate_output)
 				if [ $REGENERATE_BENCH != "0" ] || [ $REGENERATE_OUTPUT != "0" ]
 				then
 					echo "can only specify one of --generate_output or --generate_bench"
@@ -406,7 +408,7 @@ function parse_args() {
 				echo "regenerating output vector for test given predefined input"
 				;;
 
-			--generate_bench) 
+			--generate_bench)
 				if [ $REGENERATE_BENCH != "0" ] || [ $REGENERATE_OUTPUT != "0" ]
 				then
 					echo "can only specify one of --generate_output or --generate_bench"
@@ -417,7 +419,7 @@ function parse_args() {
 				echo "regenerating input and output vector for test"
 				;;
 
-			--limit_ressource) 
+			--limit_ressource)
 				USING_LOW_RESSOURCE="--limit_ressource"
 				echo "limiting ressources for benchmark, this can help with small hardware"
 				;;
@@ -457,13 +459,13 @@ function parse_args() {
 				shift
 				;;
 
-			*) 
+			*)
 				echo "Unknown parameter passed: $1"
-				help 
+				help
 				ctrl_c
 				;;
-		esac 
-		shift 
+		esac
+		shift
 	done
 }