Remove fixed point math

Author: Raimo33

src/bench.h

@@ -34,67 +34,6 @@ static int64_t gettime_i64(void) {
 #endif
 }
 
-#define FP_EXP (6)
-#define FP_MULT (1000000LL)
-
-/* Format fixed point number. */
-static void print_number(const int64_t x) {
-    int64_t x_abs, y;
-    int c, i, rounding, g; /* g = integer part size, c = fractional part size */
-    size_t ptr;
-    char buffer[30];
-
-    if (x == INT64_MIN) {
-        /* Prevent UB. */
-        printf("ERR");
-        return;
-    }
-    x_abs = x < 0 ? -x : x;
-
-    /* Determine how many decimals we want to show (more than FP_EXP makes no
-     * sense). */
-    y = x_abs;
-    c = 0;
-    while (y > 0LL && y < 100LL * FP_MULT && c < FP_EXP) {
-        y *= 10LL;
-        c++;
-    }
-
-    /* Round to 'c' decimals. */
-    y = x_abs;
-    rounding = 0;
-    for (i = c; i < FP_EXP; ++i) {
-        rounding = (y % 10) >= 5;
-        y /= 10;
-    }
-    y += rounding;
-
-    /* Format and print the number. */
-    ptr = sizeof(buffer) - 1;
-    buffer[ptr] = 0;
-    g = 0;
-    if (c != 0) { /* non zero fractional part */
-        for (i = 0; i < c; ++i) {
-            buffer[--ptr] = '0' + (y % 10);
-            y /= 10;
-        }
-    } else if (c == 0) { /* fractional part is 0 */
-        buffer[--ptr] = '0'; 
-    }
-    buffer[--ptr] = '.';
-    do {
-        buffer[--ptr] = '0' + (y % 10);
-        y /= 10;
-        g++;
-    } while (y != 0);
-    if (x < 0) {
-        buffer[--ptr] = '-';
-        g++;
-    }
-    printf("%5.*s", g, &buffer[ptr]); /* Prints integer part */
-    printf("%-*s", FP_EXP, &buffer[ptr + g]); /* Prints fractional part */
-}
-
 static void run_benchmark(char *name, void (*benchmark)(void*, int), void (*setup)(void*), void (*teardown)(void*, int), void* data, int count, int iter) {
     int i;
     int64_t min = INT64_MAX;
@@ -120,13 +59,7 @@ static void run_benchmark(char *name, void (*benchmark)(void*, int), void (*setu
         sum += total;
     }
     /* ',' is used as a column delimiter */
-    printf("%-30s, ", name);
-    print_number(min * FP_MULT / iter);
-    printf("   , ");
-    print_number(((sum * FP_MULT) / count) / iter);
-    printf("   , ");
-    print_number(max * FP_MULT / iter);
-    printf("\n");
+    printf("%-30s, %-15.1f, %-15.1f, %-15.1f\n", name, (double)min / iter, (double)sum / count / iter, (double)max / iter);
 }
 
 static int have_flag(int argc, char** argv, char *flag) {
@@ -177,12 +110,11 @@ static int get_iters(int default_iters) {
 }
 
 static void print_output_table_header_row(void) {
-    char* bench_str = "Benchmark";     /* left justified */
-    char* min_str = "    Min(us)    "; /* center alignment */
-    char* avg_str = "    Avg(us)    ";
-    char* max_str = "    Max(us)    ";
-    printf("%-30s,%-15s,%-15s,%-15s\n", bench_str, min_str, avg_str, max_str);
-    printf("\n");
+    char* bench_str = "Benchmark";
+    char* min_str = "Min(us)";
+    char* avg_str = "Avg(us)";
+    char* max_str = "Max(us)";
+    printf("%-30s,%-15s,%-15s,%-15s\n\n", bench_str, min_str, avg_str, max_str);
 }
 
 #endif /* SECP256K1_BENCH_H */