Implemented InOuts

Author: djns1

ODIN_II/SRC/ast_elaborate.cpp

@@ -2660,12 +2660,12 @@ void create_param_table_for_scope(ast_node_t* module_items, sc_hierarchy* local_
                     /* symbols are already dealt with */
                     if (var_declare->types.variable.is_input
                         || var_declare->types.variable.is_output
+                        || var_declare->types.variable.is_inout
                         || var_declare->types.variable.is_reg
                         || var_declare->types.variable.is_integer
                         || var_declare->types.variable.is_genvar
                         || var_declare->types.variable.is_wire
                         || var_declare->types.variable.is_defparam)
-
                         continue;
 
                     oassert(module_items->children[i]->children[j]->type == VAR_DECLARE);

ODIN_II/SRC/netlist_create_from_ast.cpp

@@ -1016,7 +1016,7 @@ static void build_top_input_node(const char* name_str, Hashtable* output_nets_ha
 
 void add_top_input_nodes(FILE* file, Hashtable* output_nets_hash) {
     /**
-     * insert a global clock for fall back. 
+     * insert a global clock for fall back.
      * in case of undriven internal clocks, they will attach to the global clock
      * this also fix the issue of constant verilog (no input)
      * that cannot simulate due to empty input vector

ODIN_II/SRC/parse_making_ast.cpp

@@ -16,6 +16,7 @@ arch_list_add=k6_frac_N10_frac_chain_mem32K_40nm.xml
 circuits_dir=regression_test/benchmark/verilog/
 
 circuit_list_add=syntax/*.v
+circuit_list_add=syntax/inout-syntax/*.v
 
 synthesis_parse_file=regression_test/parse_result/conf/synth.toml
 simulation_parse_file=regression_test/parse_result/conf/sim.toml

ODIN_II/SRC/read_blif.cpp

@@ -0,0 +1,8 @@
+module simple_op(in_out1,in_out2,en);
+	inout in_out1;
+	inout in_out2;
+	input  en;
+
+	assign in_out1 = (en) ? in_out2 : 1'bz;
+	assign in_out2 = (!en) ? in_out1 : 1'bz;
+endmodule

ODIN_II/regression_test/benchmark/task/syntax/task.conf

@@ -0,0 +1,7 @@
+GLOBAL_SIM_BASE_CLK en in_out1 in_out2
+0 1 z z
+1 0 z z
+0 1 z 0
+1 1 z 1
+0 0 1 z
+1 0 0 z

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/double_assign_inout.v

@@ -0,0 +1,7 @@
+in_out1 in_out2
+0 0
+1 1
+0 0
+0 x
+1 1
+x 1

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/double_assign_inout_input

@@ -0,0 +1,4 @@
+module inout_basic(input dir, inout io, output out);
+    assign io = (dir) ? dir : 1'bz;
+    assign out = (!dir) ? io : 1'bx;
+endmodule

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/double_assign_inout_output

@@ -0,0 +1,9 @@
+GLOBAL_SIM_BASE_CLK dir io
+0 1 0
+0 1 0
+0 1 1
+0 1 1
+0 0 0
+0 0 0
+0 0 1
+0 0 1

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/inout_basic.v

@@ -0,0 +1,9 @@
+io out
+1 x
+1 x
+1 x
+1 x
+0 0
+0 0
+1 1
+1 1

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/inout_basic_input

@@ -0,0 +1,7 @@
+module inout_assign(inout a, output b);
+    assign b = a;
+endmodule
+
+module inout_basic(input a, output b);
+    inout_assign c(a, b);
+endmodule

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/inout_basic_output

@@ -0,0 +1,6 @@
+GLOBAL_SIM_BASE_CLK a
+0 0
+0 1
+0 1
+0 0
+0 1

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/inout_input_only.v

@@ -0,0 +1,6 @@
+b
+0
+1
+1
+0
+1

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/inout_input_only_input

@@ -0,0 +1,7 @@
+module inout_assign(input a, inout b);
+    assign b = a;
+endmodule
+
+module inout_basic(input a, output b);
+    inout_assign c(a, b);
+endmodule

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/inout_input_only_output

@@ -0,0 +1,6 @@
+GLOBAL_SIM_BASE_CLK a
+0 0
+0 1
+0 1
+0 0
+0 1

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/inout_output_only.v

@@ -0,0 +1,6 @@
+b
+0
+1
+1
+0
+1

ODIN_II/regression_test/benchmark/verilog/syntax/inout-syntax/inout_output_only_input

@@ -99,7 +99,7 @@ _GENERATE_EXPECTATION="off"
 function help() {
 
 printf "Called program with $INPUT
-	Usage: 
+	Usage:
 		$0 [ OPTIONS / FLAGS ] [ SUBTEST_LIST ... ]
 
 	SUBTEST_LIST
@@ -114,17 +114,17 @@ printf "Called program with $INPUT
 		-c|--clean                      $(_prt_cur_arg off ) Clean temporary directory
 		-f|--force_simulate             $(_prt_cur_arg ${_FORCE_SIM}) Force the simulation to be executed regardless of the config
 		--override						$(_prt_cur_arg ${_OVERRIDE_CONFIG}) if a config file is passed in, override arguments rather than append
-		--dry_run                       $(_prt_cur_arg ${_DRY_RUN}) performs a dry run to check the validity of the task and flow 
-		--randomize                     $(_prt_cur_arg ${_RANDOM_DRY_RUN}) performs a dry run randomly to check the validity of the task and flow 
+		--dry_run                       $(_prt_cur_arg ${_DRY_RUN}) performs a dry run to check the validity of the task and flow
+		--randomize                     $(_prt_cur_arg ${_RANDOM_DRY_RUN}) performs a dry run randomly to check the validity of the task and flow
 		--regenerate_expectation        $(_prt_cur_arg ${_REGENERATE_EXPECTATION}) regenerate the expectation and overrides the expected value mismatches only
 		--generate_expectation          $(_prt_cur_arg ${_GENERATE_EXPECTATION}) generate the expectation and overrides the expectation file
 	OPTIONS
 		-h|--help                       $(_prt_cur_arg off) print this
 		-j|--nb_of_process < N >        $(_prt_cur_arg ${_NUMBER_OF_PROCESS}) Number of process requested to be used
 		-d|--output_dir < /abs/path >   $(_prt_cur_arg ${_RUN_DIR_OVERRIDE}) Change the run directory output
 		-C|--config <path/to/config>	$(_prt_cur_arg ${_EXTRA_CONFIG}) Add a config file to append to the config for the tests
-		-t|--test < test name >         $(_prt_cur_arg ${_TEST_INPUT_LIST[*]}) Test name is either a absolute or relative path to 
-		                                                       a directory containing a task.conf, task_list.conf 
+		-t|--test < test name >         $(_prt_cur_arg ${_TEST_INPUT_LIST[*]}) Test name is either a absolute or relative path to
+		                                                       a directory containing a task.conf, task_list.conf
 		                                                       (see CONFIG FILE HELP) or one of the following predefined test
 
 	AVAILABLE_TEST:
@@ -208,7 +208,7 @@ function create_temp() {
 
 		ln -s "${NEW_RUN_DIR}" "${REGRESSION_DIR}/latest"
 
-		# put in the passed parameter for keepsake 
+		# put in the passed parameter for keepsake
 		echo "${_TEST_INPUT_LIST[@]}" | xargs -n 1 -I {} echo {} > "${NEW_RUN_DIR}/cmd.task"
 		echo "========="
 		echo "$0 ${INPUT}" >> "${NEW_RUN_DIR}/cmd.task"
@@ -223,7 +223,7 @@ function cleanup_temp() {
 	fi
 
 	for runs in "${OUTPUT_DIRECTORY}"/run*
-	do 
+	do
 		rm -Rf "${runs}"
 	done
 
@@ -268,28 +268,28 @@ function disable_failed_bm() {
 function parse_args() {
 	PARSE_SUBTEST="off"
 	while [ "_$*" != "_" ]
-	do 
+	do
 		if [ ${PARSE_SUBTEST} == "on" ];
 		then
 		# parse subtest
 			_SUBTEST_LIST+=( "$1" )
 			shift
 		else
-		# parse [ OPTIONS / FLAGS ] 
-			case $1 in 
+		# parse [ OPTIONS / FLAGS ]
+			case $1 in
 
 			# Help Desk
 				-h|--help)
 					echo "Printing Help information"
 					help
 					_exit_with_code "0"
 
-				
+
 			## directory in benchmark
 				;;-t|--test)
 					# this is handled down stream
 					if [ "_$2" == "_" ]
-					then 
+					then
 						echo "empty argument for $1"
 						_exit_with_code "-1"
 					fi
@@ -300,11 +300,11 @@ function parse_args() {
 				;;-d|--output_dir)
 
 					if [ "_$2" == "_" ]
-					then 
+					then
 						echo "empty argument for $1"
 						_exit_with_code "-1"
 					fi
-					
+
 					_RUN_DIR_OVERRIDE=$2
 
 					if [ ! -d "${_RUN_DIR_OVERRIDE}" ]
@@ -318,11 +318,11 @@ function parse_args() {
 				;;-C|--config)
 
 					if [ "_$2" == "_" ]
-					then 
+					then
 						echo "empty argument for $1"
 						_exit_with_code "-1"
 					fi
-					
+
 					_EXTRA_CONFIG=$2
 					echo "Reading extra config directive from ${_EXTRA_CONFIG}"
 
@@ -335,29 +335,29 @@ function parse_args() {
 					shift
 
 			# Boolean flags
-				;;-g|--generate_bench)		
+				;;-g|--generate_bench)
 					_GENERATE_BENCH="on"
 					echo "generating output vector for test given predefined input"
 
-				;;-o|--generate_output)		
+				;;-o|--generate_output)
 					_GENERATE_OUTPUT="on"
 					echo "generating input and output vector for test"
 
-				;;-b|--build_config)		
+				;;-b|--build_config)
 					_GENERATE_CONFIG="on"
 					echo "generating a config file for test directory"
 
-				;;-c|--clean)				
+				;;-c|--clean)
 					echo "Cleaning temporary run in directory"
 					cleanup_temp
 
-				;;-f|--force_simulate)   
+				;;-f|--force_simulate)
 					_FORCE_SIM="on"
-					echo "Forcing Simulation"   
+					echo "Forcing Simulation"
 
 				;;--override)
 					_OVERRIDE_CONFIG="on"
-					echo "Forcing override of config"    
+					echo "Forcing override of config"
 
 				;;--dry_run)
 					_DRY_RUN="on"
@@ -375,7 +375,7 @@ function parse_args() {
 					_GENERATE_EXPECTATION="on"
 					echo "generating new expected values"
 
-				;;*) 
+				;;*)
 					PARSE_SUBTEST="on"
 			esac
 
@@ -432,9 +432,9 @@ printf "
 			simulation_parse_file 	= < path/to/parse/file >
 			script_synthesis_params = [see exec_wrapper.sh options]
 			script_simulation_params= [see exec_wrapper.sh options]
-			synthesis_params        = [see Odin options]	
+			synthesis_params        = [see Odin options]
 			simulation_params       = [see Odin options]
-			regression_params       = 
+			regression_params       =
 			{
 				--verbose                # display error logs after batch of tests
 				--concat_circuit_list    # concatenate the circuit list and pass it straight through to odin
@@ -486,13 +486,13 @@ function populate_arg_from_file() {
 			_key="$(echo "${formatted_line}" | cut -d '=' -f1 )"
 			_value="$(echo "${formatted_line}" | cut -d '=' -f2 )"
 
-			if [ "_${_key}" != "_" ] && [ "_${_value}" == "_" ] 
+			if [ "_${_key}" != "_" ] && [ "_${_value}" == "_" ]
 			then
 				echo "Specifying empty value for ${_key}, skipping assignment"
-			elif [ "_${_key}" == "_" ] && [ "_${_value}" != "_" ] 
+			elif [ "_${_key}" == "_" ] && [ "_${_value}" != "_" ]
 			then
 				echo "Specifying empty key for value: ${_value}, skipping assignment"
-			elif [ "_${_key}" != "_" ] && [ "_${_value}" != "_" ] 
+			elif [ "_${_key}" != "_" ] && [ "_${_value}" != "_" ]
 			then
 				case _${_key} in
 
@@ -505,7 +505,7 @@ function populate_arg_from_file() {
 
 					;;_circuit_list_add)
 						# glob the value
-						_circuit_list_add+=( "${_circuits_dir}"/${_value} )					
+						_circuit_list_add+=( "${_circuits_dir}"/${_value} )
 
 					;;_archs_dir)
 						if [ ! -d "${_value}" ]
@@ -531,8 +531,8 @@ function populate_arg_from_file() {
 						_local_synthesis_parse_file="${_value}"
 
 					;;_synthesis_params)
-						_local_synthesis_params="${_local_synthesis_params} ${_value}"					
-						
+						_local_synthesis_params="${_local_synthesis_params} ${_value}"
+
 					;;_simulation_params)
 						_local_simulation_params="${_local_simulation_params} ${_value}"
 
@@ -602,7 +602,7 @@ function populate_arg_from_file() {
 		fi
 	fi
 
-	
+
 	for circuit_list_item in "${_circuit_list_add[@]}"
 	do
 		if [ ! -f "${circuit_list_item}" ]
@@ -618,7 +618,7 @@ function populate_arg_from_file() {
 		echo "Passed a config file with no circuit to test"
 		_exit_with_code "-1"
 	fi
-	
+
 
 	for arch_list_item in "${_arch_list_add[@]}"
 	do
@@ -660,7 +660,7 @@ function move_vector() {
 	file_name="$2"
 	replacement_suffix="$3"
 
-	find_in_bench  "${file_dir}" "${file_name}" 
+	find_in_bench  "${file_dir}" "${file_name}"
 	# move the output vectors
 	for sim_vectors in "${TMP_BENCH_FIND_ARRAY[@]}"
 	do
@@ -1216,7 +1216,7 @@ function run_task() {
 	if [ ! -d "${test_dir}" ]
 	then
 		echo "${test_dir} Not Found! Skipping this test"
-	elif [ ! -f "${test_dir}/task.conf" ] 
+	elif [ ! -f "${test_dir}/task.conf" ]
 	then
 		if [ ${_GENERATE_CONFIG} == "on" ]
 		then