ODIN_II: Add basic task support

Author: j-b-1-7

ODIN_II/SRC/ast_elaborate.cpp

@@ -214,6 +214,44 @@ ast_node_t *finalize_ast(ast_node_t *node, ast_node_t *parent, STRING_CACHE_LIST
 
 				break;
 			}
+			case TASK:
+			{
+				if(parent != NULL)
+				{
+					skip_children = true;
+				}
+				break;
+			}
+			case TASK_INSTANCE:
+			{
+				// check ports
+				ast_node_t *connect_list = node->children[1]->children[1];
+				bool is_ordered_list;
+				if (connect_list->children[1]->children[0]) // skip first connection
+				{
+					is_ordered_list = false; // name was specified
+				}
+				else
+				{
+					is_ordered_list = true;
+				}
+				
+				for (int i = 1; i < connect_list->num_children; i++)
+				{
+					if ((connect_list->children[i] 
+						&& connect_list->children[i]->children)
+						&& (( connect_list->children[i]->children[0] && is_ordered_list)
+						|| (!connect_list->children[i]->children[0] && !is_ordered_list)))
+					{
+						error_message(PARSE_ERROR, node->line_number, node->file_number, 
+								"%s", "Cannot mix port connections by name and port connections by ordered list\n");
+					}
+				}
+
+				skip_children = true;
+
+				break;
+			}
 			case MODULE_ITEMS:
 			{
 				/* look in the string cache for in-line continuous assignments */
@@ -761,6 +799,65 @@ ast_node_t *finalize_ast(ast_node_t *node, ast_node_t *parent, STRING_CACHE_LIST
 					vtr::free(temp_instance_name);
 				}
 
+				int task_offset = function_offset + i;
+				for (i = 0; i < node->types.task.size_task_instantiations; i++)
+				{
+				
+					/* make the stringed up module instance name - instance name is
+					* MODULE_INSTANCE->MODULE_NAMED_INSTANCE(child[1])->IDENTIFIER(child[0]).
+					* module name is MODULE_INSTANCE->IDENTIFIER(child[0])
+					*/
+					ast_node_t *temp_instance = node->types.task.task_instantiations_instance[i];
+					char *instance_name_prefix = local_string_cache_list->instance_name_prefix;
+
+					char *temp_instance_name = make_full_ref_name(instance_name_prefix,
+						temp_instance->children[0]->types.identifier,
+						temp_instance->children[1]->children[0]->types.identifier,
+						NULL, -1);
+
+					long sc_spot;
+					/* lookup the name of the task associated with this instantiated point */
+					if ((sc_spot = sc_lookup_string(module_names_to_idx, temp_instance->children[0]->types.identifier)) == -1)
+					{
+						error_message(NETLIST_ERROR, node->line_number, node->file_number,
+								"Can't find task name %s\n", temp_instance->children[0]->types.identifier);
+					}
+
+					/* make a unique copy of this task */
+					ast_node_t *instance = ast_node_deep_copy((ast_node_t *)module_names_to_idx->data[sc_spot]);
+					
+					long sc_spot_2 = sc_add_string(module_names_to_idx, temp_instance_name);
+					oassert(sc_spot_2 > -1 && module_names_to_idx->data[sc_spot_2] == NULL);
+					module_names_to_idx->data[sc_spot_2] = (void *)instance;
+					
+					ast_modules = (ast_node_t **)vtr::realloc(ast_modules, sizeof(ast_node_t*)*(sc_spot_2 + 1));
+					ast_modules[sc_spot_2] = instance;
+
+					/* create the string cache list for the instantiated task */
+					STRING_CACHE_LIST *task_string_cache_list = (STRING_CACHE_LIST*)vtr::calloc(1, sizeof(STRING_CACHE_LIST));
+					task_string_cache_list->parent = local_string_cache_list;
+					
+					int num_children = local_string_cache_list->num_children;
+					local_string_cache_list->children = (STRING_CACHE_LIST **)vtr::realloc(local_string_cache_list->children, sizeof(STRING_CACHE_LIST *)*(num_children + 1));
+					local_string_cache_list->children[task_offset + i] = task_string_cache_list;
+					local_string_cache_list->num_children++;			
+					
+					task_string_cache_list->instance_name_prefix = vtr::strdup(temp_instance_name);
+					task_string_cache_list->scope_id = vtr::strdup(temp_instance->children[1]->children[0]->types.identifier);
+
+					/* create the symbol table for the instantiated module */
+					task_string_cache_list->local_symbol_table_sc = sc_new_string_cache();
+					task_string_cache_list->num_local_symbol_table = 0;
+					task_string_cache_list->local_symbol_table = NULL;
+					create_symbol_table_for_scope(instance->children[2], task_string_cache_list);
+
+					/* elaboration */
+					simplify_ast_module(&instance, task_string_cache_list);
+
+					/* clean up */
+					vtr::free(temp_instance_name);
+				}
+
 				break;
 			}
 			case MODULE_PARAMETER:
@@ -1131,6 +1228,11 @@ ast_node_t *reduce_expressions(ast_node_t *node, STRING_CACHE_LIST *local_string
 				skip_children = true;
 				break;
 			}	
+			case TASK:
+			{
+				skip_children = true;
+				break;
+			}
 			case BLOCKING_STATEMENT:
 			case NON_BLOCKING_STATEMENT:
 			{

ODIN_II/SRC/ast_util.cpp

@@ -704,7 +704,6 @@ char_list_t *get_name_of_pins(ast_node_t *var_node, char *instance_name_prefix,
 	int width = 0;
 
 	STRING_CACHE *local_symbol_table_sc = local_string_cache_list->local_symbol_table_sc;
-
 	if (var_node->type == ARRAY_REF)
 	{
 		width = 1;

ODIN_II/SRC/include/odin_types.h

@@ -271,6 +271,8 @@ enum ids
 	FUNCTION,
    	/* OTHER FUNCTION ITEMS */
   	FUNCTION_ITEMS,
+	TASK,
+	TASK_ITEMS,
 	/* primitives */
 	GATE,
 	GATE_INSTANCE,
@@ -287,6 +289,9 @@ enum ids
 	/* Function instances*/
 	FUNCTION_NAMED_INSTANCE,
 	FUNCTION_INSTANCE,
+
+	TASK_NAMED_INSTANCE,
+	TASK_INSTANCE,
 	/* Specify Items */
 	SPECIFY_ITEMS,
 	SPECIFY_PARAMETER,
@@ -375,6 +380,13 @@ struct typ
 		STRING_CACHE *parameter_list;
 	} function;
 	struct
+	{
+		short is_instantiated;
+		ast_node_t **task_instantiations_instance;
+		int size_task_instantiations;
+		int index;
+	}task;
+	struct
 	{
 		int num_bit_strings;
 		char **bit_strings;

ODIN_II/SRC/include/parse_making_ast.h

@@ -58,6 +58,8 @@ ast_node_t *newWhile(ast_node_t *compare_expression, ast_node_t *statement, int
 ast_node_t *newModuleConnection(char* id, ast_node_t *expression, int line_number);
 ast_node_t *newModuleNamedInstance(char* unique_name, ast_node_t *module_connect_list, ast_node_t *module_parameter_list, int line_number);
 ast_node_t *newFunctionNamedInstance(ast_node_t *module_connect_list, ast_node_t *module_parameter_list, int line_number);
+ast_node_t *newTaskInstance(char *task_name, ast_node_t *task_named_instace, ast_node_t *task_parameter_list, int line_number);
+ast_node_t *newTaskNamedInstance(ast_node_t *module_connect_list, int line_number);
 ast_node_t *newModuleInstance(char* module_ref_name, ast_node_t *module_named_instance, int line_number);
 ast_node_t *newFunctionInstance(char* function_ref_name, ast_node_t *function_named_instance, int line_number);
 ast_node_t *newHardBlockInstance(char* module_ref_name, ast_node_t *module_named_instance, int line_number);
@@ -80,9 +82,11 @@ ast_node_t *newIntegerTypeVarDeclare(char* symbol, ast_node_t *expression1, ast_
 
 /* HIGH LEVEL ITEMS */
 ast_node_t *newModule(char* module_name, ast_node_t *list_of_parameters, ast_node_t *list_of_ports, ast_node_t *list_of_module_items, int line_number);
-ast_node_t *newFunction(ast_node_t *list_of_ports, ast_node_t *list_of_module_items, int line_number);
+ast_node_t *newFunction(ast_node_t *list_of_ports, ast_node_t *list_of_module_items, int line_number, bool automatic);
+ast_node_t *newTask(char *task_name, ast_node_t *list_of_ports, ast_node_t *list_of_task_items, int line_number, bool automatic);
 void next_module();
 void next_function();
+void next_task();
 ast_node_t *newDefparam(ids id, ast_node_t *val, int line_number);
 
 void next_parsed_verilog_file(ast_node_t *file_items_list);