updated debug-prints

Author: dderjoel

Diff for: lib/src/alloc_helper.c

@@ -27,7 +27,7 @@
 
 int realloc_or_fail(struct measuresuite *ms, void **dest, size_t new_len) {
 
-  DEBUG("Reallocing to new length of %d bytes\n", new_len);
+  DEBUG("Reallocing to new length of %lu bytes\n", new_len);
 
   *dest = realloc(*dest, new_len);
 
@@ -102,7 +102,7 @@ int init_arithmetic_results(measuresuite_t ms, struct function_tuple *fct) {
   /** +---------------------------------------------------------+ */
 
   size_t size = ms->arg_width * ms->num_arg_out * sizeof(uint64_t);
-  DEBUG("init_arithmetic_results, size: %d\n", size);
+  DEBUG("init_arithmetic_results, size: %lu\n", size);
 
   fct->arithmetic_results = malloc(size);
 

Diff for: lib/src/evaluator.c

@@ -83,15 +83,17 @@ static void run_batch(struct measuresuite *ms, struct function_tuple *fct,
 
   int (*func)(uint64_t * out, ...) = fct->code;
   assert(func != NULL);
-  DEBUG("Function to evaluate is not NULL. Running with a batch size of %d\n",
-        batch_size);
+  DEBUG("Function to evaluate is not NULL (%p). Running with a batch size of "
+        "%lu",
+        func, batch_size);
 
   while (batch_size > 0) {
     func(arg0, arg1, arg2, arg3, arg4, arg5);
     batch_size--;
   }
 
   *count = stop_timer(ms, start_time);
+  DEBUG("Done. Ran for %lu cycles.\n", count);
 }
 
 int run_measurement(struct measuresuite *ms) {
@@ -105,14 +107,14 @@ int run_measurement(struct measuresuite *ms) {
   // START MEASUREMENT
   uint64_t start_time = current_timestamp();
 
-  DEBUG("Evaluating %d batches %d\n", ms->num_batches);
+  DEBUG("Evaluating %lu batches\n", ms->num_batches);
   for (size_t batch_i = 0; batch_i < ms->num_batches; batch_i++) {
 
     if (randomize(ms) != 0 || shuffle_permutations(ms) != 0) {
       return 1;
     }
 
-    DEBUG("Evaluating %d function %d\n", ms->num_functions);
+    DEBUG("Evaluating %lu functions\n", ms->num_functions);
     // for as many functions as we need to measure
     for (size_t func_i = 0; func_i < ms->num_functions; func_i++) {
 
@@ -121,7 +123,7 @@ int run_measurement(struct measuresuite *ms) {
       struct function_tuple *fct = &ms->functions[function_index];
 
       // measure
-      DEBUG("Run batch for function %d\n", batch_i);
+      DEBUG("Run batch %lu for function %lu\n", batch_i, function_index);
       run_batch(ms, fct, &fct->cycle_results[batch_i]);
     }
 
@@ -134,7 +136,7 @@ int run_measurement(struct measuresuite *ms) {
         struct function_tuple *prev = &ms->functions[func_i - 1];
 
         // check
-        DEBUG("Checking correctness for function %d and previous\n", func_i);
+        DEBUG("Checking correctness for function %lu and previous\n", func_i);
         if (check(ms->arg_width * ms->num_arg_out, fct->arithmetic_results,
                   prev->arithmetic_results)) {
           check_result = func_i;

Diff for: lib/src/loader.c

@@ -58,7 +58,7 @@ static int create_new_function(measuresuite_t ms, enum load_type type,
   // check size and allocate more if needed
   if (ms->size_functions <= ms->num_functions) {
     ms->size_functions *= 2;
-    DEBUG("Doubled size_functions to %d\n", ms->size_functions);
+    DEBUG("Doubled size_functions to %lu\n", ms->size_functions);
     if (realloc_or_fail(ms, (void **)&ms->functions,
                         ms->size_functions * sizeof(struct function_tuple))) {
       return 1;