finish

Author: mateuspinto

c/fsm/SimpleWriteOnExec.c

@@ -21,6 +21,8 @@
 
 #define swe_blacklist 15
 
+#define swe_verilog_frequency 200000000 // In hz
+
 void FSM_SimpleWriteOnExec(CGRA * out_grid, InputEdgesVector * out_input, FILE * out_output)
 {
     // Constants
@@ -68,6 +70,7 @@ void FSM_SimpleWriteOnExec(CGRA * out_grid, InputEdgesVector * out_input, FILE *
 
         case swe_init:
             DEBUG_PRINT("swe_init\n");
+            clock_t begin = clock();
 
             next_inputIndex = 0;
 
@@ -315,6 +318,7 @@ void FSM_SimpleWriteOnExec(CGRA * out_grid, InputEdgesVector * out_input, FILE *
             break;
         case swe_end:
             DEBUG_PRINT("swe_end\n");
+            clock_t end = clock();
 
             for (size_t i = 0; i < 4*out_grid->gridSize; i++)
             {
@@ -324,8 +328,8 @@ void FSM_SimpleWriteOnExec(CGRA * out_grid, InputEdgesVector * out_input, FILE *
                 }
             }
 
-            DEBUG_PRINT("[DEBUG] %u, %u, %u, %f\n", debug_clock, debug_bl, debug_routed, (double)debug_usedOutputs/(out_grid->gridSize*4));
-            fprintf(out_output, "%u, %u, %u, %f", debug_clock, debug_bl, debug_routed, (double)debug_usedOutputs/(out_grid->gridSize*4));
+            DEBUG_PRINT("[DEBUG] %u, %u, %u, %f, %f, %f", debug_bl, debug_routed, debug_clock, (double)debug_usedOutputs/(out_grid->gridSize*4), (double)(end - begin) / CLOCKS_PER_SEC, (double)debug_clock/swe_verilog_frequency);
+            fprintf(out_output, "%u, %u, %u, %f, %f, %f", debug_bl, debug_routed, debug_clock, (double)debug_usedOutputs/(out_grid->gridSize*4), (double)(end - begin) / CLOCKS_PER_SEC, (double)debug_clock/swe_verilog_frequency);
 
             return;
             break;

c/fsm/SimpleWriteOnExec.h

@@ -2,6 +2,7 @@
 #define SIMPLEWRITEONEXEC_H
 
 #include "common.h"
+#include "time.h"
 
 void FSM_SimpleWriteOnExec(CGRA * grid, InputEdgesVector * input, FILE * output);
 

c/main.c

@@ -23,7 +23,7 @@ int main(int argc, char const *argv[])
     gridFile = fopen(argv[1], "r");
     outputFile = fopen(argv[3], "w");
 
-    fprintf(outputFile, "size, empty, trivial, nontrivial, cycles, bl, routed, usage\n");
+    fprintf(outputFile, "size, empty, trivial, nontrivial, routed, bl, cycles, usage, ctime, verilogtime\n");
 
     while (!feof(gridFile))
     {

wrapper.py

@@ -57,11 +57,16 @@
         acc=[]
         for csv in sorted(glob.glob(bench + "/*")):
             acc.append(pd.read_csv(csv))
-        tables.append((pd.concat(acc).mean().round(decimals=2)))
+        tables.append((pd.concat(acc).mean()))
 
     for i in range(12):
-        print(str(int(tables[i][0])) + " " + str(tables[i][1]) + " " + str(tables[i][2]) + " " 
-        + str(tables[i][3]) + " " + str(tables[i][6]) + " " + str(tables[i][5]) + " " + str(tables[i][4]) + " " +
-        str(int(round(tables[i][7]*100))) + "%")
+        for j in range(len(tables[i])):
+            if j==8 or j==9:
+                print(str(round(tables[i][j], 10)) + " ", end='')
+            elif j==7:
+                print(str(round(tables[i][j]*100, 2)) + "% ", end='')
+            else:
+                print(str(round(tables[i][j],2)) + " ", end='')
+        print()
 else:
     print("Error")