Make embind benchmarks read emscripten_get_now() in msecs.

2 files changed, 17 insertions, 17 deletions

diff --git a/tests/embind/embind.benchmark.js b/tests/embind/embind.benchmark.js
index 2d1cd3cf..4ce9355c 100644
--- a/tests/embind/embind.benchmark.js
+++ b/tests/embind/embind.benchmark.js
@@ -15,7 +15,7 @@ function _increment_counter_benchmark_js(N) {
     }
     var b = _emscripten_get_now();
     var ctr2 = _get_counter();
-    Module.print("JS increment_counter " + N + " iters: " + (b-a)*1000 + " msecs. result: " + (ctr2-ctr));
+    Module.print("JS increment_counter " + N + " iters: " + (b-a) + " msecs. result: " + (ctr2-ctr));
 }
 
 function _increment_class_counter_benchmark_embind_js(N) {
@@ -34,7 +34,7 @@ function _increment_class_counter_benchmark_embind_js(N) {
         foo['incr_class_counter']();
     }
     var b = _emscripten_get_now();
-    Module.print("JS embind increment_class_counter " + N + " iters: " + (b-a)*1000 + " msecs. result: " + foo['class_counter_val']());
+    Module.print("JS embind increment_class_counter " + N + " iters: " + (b-a) + " msecs. result: " + foo['class_counter_val']());
     foo['delete']();
 }
 
@@ -54,7 +54,7 @@ function _returns_input_benchmark_js() {
         t += _returns_input(i);
     }
     var b = _emscripten_get_now();
-    Module.print("JS returns_input 100000 iters: " + (b-a)*1000 + " msecs. result: " + t);
+    Module.print("JS returns_input 100000 iters: " + (b-a) + " msecs. result: " + t);
 }
 
 function _sum_int_benchmark_js() {
@@ -73,7 +73,7 @@ function _sum_int_benchmark_js() {
         r += _sum_int(i, 2, 3, 4, 5, 6, 7, 8, 9);
     }
     var b = _emscripten_get_now();
-    Module.print("JS sum_int 100000 iters: " + (b-a)*1000 + " msecs. result: " + r);
+    Module.print("JS sum_int 100000 iters: " + (b-a) + " msecs. result: " + r);
 }
 
 function _sum_float_benchmark_js() {
@@ -92,7 +92,7 @@ function _sum_float_benchmark_js() {
         r += _sum_float(i, 2, 3, 4, 5, 6, 7, 8, 9);
     }
     var b = _emscripten_get_now();
-    Module.print("JS sum_float 100000 iters: " + (b-a)*1000 + " msecs. result: " + r);
+    Module.print("JS sum_float 100000 iters: " + (b-a) + " msecs. result: " + r);
 }
 
 function _increment_counter_benchmark_embind_js(N) {
@@ -112,7 +112,7 @@ function _increment_counter_benchmark_embind_js(N) {
     }
     var b = _emscripten_get_now();
     var ctr2 = _get_counter();
-    Module.print("JS embind increment_counter " + N + " iters: " + (b-a)*1000 + " msecs. result: " + (ctr2-ctr));
+    Module.print("JS embind increment_counter " + N + " iters: " + (b-a) + " msecs. result: " + (ctr2-ctr));
 }
 
 function _returns_input_benchmark_embind_js() {
@@ -131,7 +131,7 @@ function _returns_input_benchmark_embind_js() {
         t += Module['returns_input'](i);
     }
     var b = _emscripten_get_now();
-    Module.print("JS embind returns_input 100000 iters: " + (b-a)*1000 + " msecs. result: " + t);
+    Module.print("JS embind returns_input 100000 iters: " + (b-a) + " msecs. result: " + t);
 }
 
 function _sum_int_benchmark_embind_js() {
@@ -150,7 +150,7 @@ function _sum_int_benchmark_embind_js() {
         r += Module['sum_int'](i, 2, 3, 4, 5, 6, 7, 8, 9);
     }
     var b = _emscripten_get_now();
-    Module.print("JS embind sum_int 100000 iters: " + (b-a)*1000 + " msecs. result: " + r);
+    Module.print("JS embind sum_int 100000 iters: " + (b-a) + " msecs. result: " + r);
 }
 
 function _sum_float_benchmark_embind_js() {
@@ -169,7 +169,7 @@ function _sum_float_benchmark_embind_js() {
         r += Module['sum_float'](i, 2, 3, 4, 5, 6, 7, 8, 9);
     }
     var b = _emscripten_get_now();
-    Module.print("JS embind sum_float 100000 iters: " + (b-a)*1000 + " msecs. result: " + r);
+    Module.print("JS embind sum_float 100000 iters: " + (b-a) + " msecs. result: " + r);
 }
 
 function _move_gameobjects_benchmark_embind_js() {
@@ -197,5 +197,5 @@ function _move_gameobjects_benchmark_embind_js() {
         t['delete']();
     }
     
-    Module.print("JS embind move_gameobjects " + N + " iters: " + 1000*(b-a) + " msecs. Result: " + (accum[0] + accum[1] + accum[2]));
+    Module.print("JS embind move_gameobjects " + N + " iters: " + (b-a) + " msecs. Result: " + (accum[0] + accum[1] + accum[2]));
 }
diff --git a/tests/embind/embind_benchmark.cpp b/tests/embind/embind_benchmark.cpp
index 8ce33bc8..80abc7e7 100644
--- a/tests/embind/embind_benchmark.cpp
+++ b/tests/embind/embind_benchmark.cpp
@@ -175,7 +175,7 @@ void __attribute__((noinline)) emscripten_get_now_benchmark(int N)
         emscripten_get_now();
     }
     volatile float t2 = emscripten_get_now();
-    printf("C++ emscripten_get_now %d iters: %f msecs.\n", N, 1000.f*(t2-t));
+    printf("C++ emscripten_get_now %d iters: %f msecs.\n", N, (t2-t));
 }
 
 void __attribute__((noinline)) increment_counter_benchmark(int N)
@@ -195,7 +195,7 @@ void __attribute__((noinline)) increment_counter_benchmark(int N)
         increment_counter();
     }
     volatile float t2 = emscripten_get_now();
-    printf("C++ increment_counter %d iters: %f msecs.\n", N, 1000.f*(t2-t));
+    printf("C++ increment_counter %d iters: %f msecs.\n", N, (t2-t));
 }
 
 void __attribute__((noinline)) increment_class_counter_benchmark(int N)
@@ -216,7 +216,7 @@ void __attribute__((noinline)) increment_class_counter_benchmark(int N)
         foo.incr_class_counter();
     }
     volatile float t2 = emscripten_get_now();
-    printf("C++ increment_class_counter %d iters: %f msecs. result: %d\n", N, 1000.f*(t2-t), foo.class_counter);
+    printf("C++ increment_class_counter %d iters: %f msecs. result: %d\n", N, (t2-t), foo.class_counter);
 }
 
 void __attribute__((noinline)) returns_input_benchmark()
@@ -237,7 +237,7 @@ void __attribute__((noinline)) returns_input_benchmark()
         r += returns_input(i);
     }
     volatile float t2 = emscripten_get_now();
-    printf("C++ returns_input 100000 iters: %f msecs.\n", 1000.f*(t2-t));
+    printf("C++ returns_input 100000 iters: %f msecs.\n", (t2-t));
 }
 
 void __attribute__((noinline)) sum_int_benchmark()
@@ -258,7 +258,7 @@ void __attribute__((noinline)) sum_int_benchmark()
         r += sum_int(i,2,3,4,5,6,7,8,9);
     }
     volatile float t2 = emscripten_get_now();
-    printf("C++ sum_int 100000 iters: %f msecs.\n", 1000.f*(t2-t));
+    printf("C++ sum_int 100000 iters: %f msecs.\n", (t2-t));
 }
 
 void __attribute__((noinline)) sum_float_benchmark()
@@ -279,7 +279,7 @@ void __attribute__((noinline)) sum_float_benchmark()
         f += sum_float((float)i,2.f,3.f,4.f,5.f,6.f,7.f,8.f,9.f);
     }
     volatile float t2 = emscripten_get_now();
-    printf("C++ sum_float 100000 iters: %f msecs.\n", 1000.f*(t2-t));
+    printf("C++ sum_float 100000 iters: %f msecs.\n", (t2-t));
 }
 
 void __attribute__((noinline)) move_gameobjects_benchmark()
@@ -303,7 +303,7 @@ void __attribute__((noinline)) move_gameobjects_benchmark()
     Vec3 accum;
     for(int i = 0; i < N; ++i)
         accum = add(add(accum, objects[i]->GetTransform()->GetPosition()), objects[i]->GetTransform()->GetRotation());
-    printf("C++ move_gameobjects %d iters: %f msecs. Result: %f\n", N, 1000.f*(t2-t), accum.x+accum.y+accum.z);
+    printf("C++ move_gameobjects %d iters: %f msecs. Result: %f\n", N, (t2-t), accum.x+accum.y+accum.z);
 }
 
 int main()