Merge pull request #1 from jeanlego/tested

Tested

Author: jeanlego

Makefile

@@ -15,7 +15,7 @@
 # Possible values:
 #    release
 #    debug
-BUILD_TYPE = release
+BUILD_TYPE = debug
 
 #Allows users to pass parameters to cmake
 #  e.g. make CMAKE_PARAMS="-DVTR_ENABLE_SANITIZE=true"

ODIN_II/SRC/ace.c

@@ -27,6 +27,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "ace.h"
 #include "st.h"
 
+
 #define ACE_P0TO1(P1,PS)		((P1)==0.0)?0.0:(((P1)==1.0)?1.0:0.5*PS/(1.0-(P1)))
 #define ACE_P1TO0(P1,PS)		((P1)==0.0)?1.0:(((P1)==0.0)?0.0:0.5*PS/(P1))
 
@@ -59,7 +60,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 typedef unsigned int *pset;
 
-#define ALLOC(type, num)	((type *) malloc(sizeof(type) * (num)))
+#define ALLOC(type, num)	(type*)calloc(num,sizeof(type))
 
 #define set_remove(set, e)      (set[WHICH_WORD(e)] &= ~ (1 << WHICH_BIT(e)))
 #define set_insert(set, e)      (set[WHICH_WORD(e)] |= 1 << WHICH_BIT(e))
@@ -332,6 +333,8 @@ void compute_switching_activities ( netlist_t *net ) {
             }
         }
     }
+    Cudd_RecursiveDeref(dd,Cudd_ReadOne(dd));
+    Cudd_Quit(dd); 
 }
 
 
@@ -465,7 +468,7 @@ ace_cube_t * ace_cube_dup(ace_cube_t * cube) {
     int i;
     ace_cube_t * cube_copy;
 
-    cube_copy = (ace_cube_t * ) malloc(sizeof(ace_cube_t));
+    cube_copy = (ace_cube_t * ) calloc(1,sizeof(ace_cube_t));
     cube_copy->static_prob = cube->static_prob;
     cube_copy->num_literals = cube->num_literals;
     cube_copy->cube = set_new (2 * cube->num_literals);
@@ -499,7 +502,7 @@ ace_cube_t * ace_cube_new_dc(int num_literals) {
     int i;
     ace_cube_t * new_cube;
 
-    new_cube = (ace_cube_t * ) malloc(sizeof(ace_cube_t));
+    new_cube = (ace_cube_t * ) calloc(1,sizeof(ace_cube_t));
     new_cube->num_literals = num_literals;
     new_cube->static_prob = 1.0;
     new_cube->cube = set_new (2 * num_literals);
@@ -616,7 +619,7 @@ double calc_cube_switch_prob_recur(DdManager * mgr, DdNode * bdd, ace_cube_t * c
 
     i = Cudd_Regular(bdd)->index;
 
-    current_prob = ( double * ) malloc(sizeof(double));
+    current_prob = ( double * ) calloc(1,sizeof(double));
 
     if (Cudd_IsComplement(bdd)) {
 	bdd_if1 = Cudd_E(bdd);

ODIN_II/SRC/activity_estimation.c

@@ -33,6 +33,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "activity_estimation.h"
 #include "netlist_check.h"
 
+
 #define DEFAULT_STATIC_PROBABILITY .5
 #define DEFAULT_TRANSITION_DENSITY .5
 
@@ -102,7 +103,7 @@ void calc_transition_density(netlist_t *netlist)
 			if (current_node->type == BLIF_FUNCTION)
 			{
 				/* only one output */
-				act_data->transition_density = (double*)malloc(sizeof(double)); // only one output
+				act_data->transition_density = (double*)calloc(1,sizeof(double)); // only one output
 
 				if (current_node->num_input_pins == 1)
 				{
@@ -155,7 +156,7 @@ void calc_transition_density(netlist_t *netlist)
 				oassert(input_node->unique_node_data_id == ACTIVATION);
 
 				/* just store since allocated in the initialization */
-				act_data->transition_density = (double*)malloc(sizeof(double));
+				act_data->transition_density = (double*)calloc(1,sizeof(double));
 				act_data->transition_density[0] = 2 * (input_data->static_probability[input_node_pin] * (1-input_data->static_probability[input_node_pin])); 
 			}
 			else if (current_node->type == OUTPUT_NODE)
@@ -166,7 +167,7 @@ void calc_transition_density(netlist_t *netlist)
 				oassert(input_node->unique_node_data_id == ACTIVATION);
 
 				/* allocate and stre through */
-				act_data->transition_density = (double*)malloc(sizeof(double));
+				act_data->transition_density = (double*)calloc(1,sizeof(double));
 				act_data->transition_density[0] = input_data->static_probability[input_node_pin];
 			}
 			else if ((current_node->type == INPUT_NODE) || (current_node->type == VCC_NODE) || (current_node->type == GND_NODE))
@@ -198,7 +199,7 @@ void initialize_probabilities(char *input_file, netlist_t *netlist)
 			oassert(current_node->unique_node_data_id == RESET);
 
 			current_node->unique_node_data_id = ACTIVATION;
-			act_data = (activation_t*)malloc(sizeof(activation_t));
+			act_data = (activation_t*)calloc(1,sizeof(activation_t));
 			current_node->node_data = (void*)act_data;
 
 			if (current_node->type == INPUT_NODE)
@@ -218,9 +219,9 @@ void initialize_probabilities(char *input_file, netlist_t *netlist)
 				else
 				{
 					/* initialize all the initial probabilities */
-					act_data->static_probability = (double*)malloc(sizeof(double));
-					act_data->transition_probability = (double*)malloc(sizeof(double));
-					act_data->transition_density = (double*)malloc(sizeof(double));
+					act_data->static_probability = (double*)calloc(1,sizeof(double));
+					act_data->transition_probability = (double*)calloc(1,sizeof(double));
+					act_data->transition_density = (double*)calloc(1,sizeof(double));
 
 					act_data->static_probability[0] = DEFAULT_STATIC_PROBABILITY;
 					act_data->transition_probability[0] = -1;
@@ -230,9 +231,9 @@ void initialize_probabilities(char *input_file, netlist_t *netlist)
 			else if (current_node->type == GND_NODE)
 			{
 				/* initialize all the initial probabilities */
-				act_data->static_probability = (double*)malloc(sizeof(double));
-				act_data->transition_probability = (double*)malloc(sizeof(double));
-				act_data->transition_density = (double*)malloc(sizeof(double));
+				act_data->static_probability = (double*)calloc(1,sizeof(double));
+				act_data->transition_probability = (double*)calloc(1,sizeof(double));
+				act_data->transition_density = (double*)calloc(1,sizeof(double));
 
 				act_data->static_probability[0] = 0.0;
 				act_data->transition_probability[0] = -1;
@@ -242,9 +243,9 @@ void initialize_probabilities(char *input_file, netlist_t *netlist)
 			else if (current_node->type == VCC_NODE)
 			{
 				/* initialize all the initial probabilities */
-				act_data->static_probability = (double*)malloc(sizeof(double));
-				act_data->transition_probability = (double*)malloc(sizeof(double));
-				act_data->transition_density = (double*)malloc(sizeof(double));
+				act_data->static_probability = (double*)calloc(1,sizeof(double));
+				act_data->transition_probability = (double*)calloc(1,sizeof(double));
+				act_data->transition_density = (double*)calloc(1,sizeof(double));
 
 				act_data->static_probability[0] = 1.0;
 				act_data->transition_probability[0] = -1;
@@ -254,9 +255,9 @@ void initialize_probabilities(char *input_file, netlist_t *netlist)
 			else if (current_node->type == FF_NODE)
 			{
 				/* initialize all the initial probabilities */
-				act_data->static_probability = (double*)malloc(sizeof(double));
-				act_data->transition_probability = (double*)malloc(sizeof(double));
-				act_data->transition_density = (double*)malloc(sizeof(double));
+				act_data->static_probability = (double*)calloc(1,sizeof(double));
+				act_data->transition_probability = (double*)calloc(1,sizeof(double));
+				act_data->transition_density = (double*)calloc(1,sizeof(double));
 
 				act_data->static_probability[0] = DEFAULT_STATIC_PROBABILITY;
 				act_data->transition_probability[0] = -1;
@@ -296,7 +297,7 @@ void calc_probabilities_and_init_act_data(netlist_t *netlist)
 					if (rep == 0)
 					{
 						/* only one output */
-						act_data->static_probability = (double*)malloc(sizeof(double));
+						act_data->static_probability = (double*)calloc(1,sizeof(double));
 					}
 
 					for (k = 0; k < function_size; k++)
@@ -356,7 +357,7 @@ void calc_probabilities_and_init_act_data(netlist_t *netlist)
 					if (rep == 0)
 					{
 						/* only one output */
-						act_data->static_probability = (double*)malloc(sizeof(double));
+						act_data->static_probability = (double*)calloc(1,sizeof(double));
 					}
 
 					act_data->static_probability[0] = input_data->static_probability[input_node_pin];
@@ -374,7 +375,7 @@ void calc_probabilities_and_init_act_data(netlist_t *netlist)
 				if (rep == 0)
 				{
 					/* calculate transition probability */
-					act_data->transition_probability = (double*)malloc(sizeof(double)*current_node->num_output_pins);
+					act_data->transition_probability = (double*)calloc(current_node->num_output_pins,sizeof(double));
 				}
 
 				for (k = 0; k < current_node->num_output_pins; k++)
@@ -404,7 +405,7 @@ short *boolean_difference(nnode_t *node, int variable_spot)
 	/* calculate the size of the boolean difference */
 	function_size = pow2(node->num_input_pins-1);
 
-	return_function = (short*)calloc(sizeof(short), function_size);
+	return_function = (short*)calloc(function_size,sizeof(short));
 
 	for (i = 0; i < function_size; i++)
 	{
@@ -529,9 +530,9 @@ double calc_density(nnode_t *node, int variable_spot, short *boolean_difference)
  *-------------------------------------------------------------------------------------------*/
 void output_activation_file_ace_and_function_file(char *output_filename, int lut_size, netlist_t *LUT_netlist, netlist_t *CLUSTER_netlist)
 {
-	char *ace_file_name = (char*)malloc(sizeof(char)*(strlen(output_filename)+4+1));
-	char *ac2_file_name = (char*)malloc(sizeof(char)*(strlen(output_filename)+4+1));
-	char *function_file_name = (char*)malloc(sizeof(char)*(strlen(output_filename)+4+1));
+	char *ace_file_name = (char*)calloc((strlen(output_filename)+4+1),sizeof(char));
+	char *ac2_file_name = (char*)calloc((strlen(output_filename)+4+1),sizeof(char));
+	char *function_file_name = (char*)calloc((strlen(output_filename)+4+1),sizeof(char));
 	int i, j, k, l;
 	FILE *ace_out;
 	FILE *ac2_out;
@@ -545,20 +546,22 @@ void output_activation_file_ace_and_function_file(char *output_filename, int lut
 	sprintf(function_file_name, "%s.fun", output_filename);
 
 	ace_out = fopen(ace_file_name, "w");
-	if (ace_out == NULL)
-	{
+	if (!ace_out){
 		error_message(ACTIVATION_ERROR, -1, -1, "Could not open output file %s\n", ace_file_name);
 	}
+	free(ace_out);
+	
 	ac2_out = fopen(ac2_file_name, "w");
-	if (ac2_out == NULL)
-	{
+	if (!ac2_out){
 		error_message(ACTIVATION_ERROR, -1, -1, "Could not open output file %s\n", ac2_file_name);
 	}
+	free(ac2_out);
+	
 	function_out = fopen(function_file_name, "w");
-	if (function_out == NULL)
-	{
+	if (!function_out){
 		error_message(ACTIVATION_ERROR, -1, -1, "Could not open output file %s\n", function_file_name);
 	}
+	free(function_out);
 
 	/* Go through the LUT netlist and print out the ace files */
 	for (i = 0; i < LUT_netlist->num_forward_levels; i++)
@@ -658,7 +661,7 @@ void output_activation_file_ace_and_function_file(char *output_filename, int lut
 		for (k = 0; k < internal_subblocks->num_internal_nodes; k++)
 		{
 			nnode_t *current_subblock = internal_subblocks->internal_nodes[k];
-			char *output_search_name = (char*)malloc(sizeof(char)*(strlen(current_subblock->name)+1+4));
+			char *output_search_name = (char*)calloc((strlen(current_subblock->name)+1+4),sizeof(char));
 			sprintf(output_search_name, "out:%s", current_subblock->name);
 
 			if ((sc_spot = sc_lookup_string(internal_subblocks->nodes_sc, output_search_name)) != -1)

ODIN_II/SRC/activity_estimation.h

@@ -1,2 +1 @@
-
 void activity_estimation(char *input_filename, char *output_filename, int lut_size, netlist_t *LUT_netlist, netlist_t *CLUSTER_netlist);