Extend SIMD benchmark tests

test/wasmBenchmarker/benchmark.py

@@ -36,17 +36,21 @@
     "heapsort": 0,
     "huffman": 0,
     "k_nucleotide": 1,
-    "mandelbrot": 2091942736,
-    "nbody": -0.169083713,
+    "mandelbrot": 775007,
+    "nbody": -0.1691057,
     "nqueens": 0,
     "prime": 48611,
     "quick_sort": 0,
     "red-black": 4000000,
-    "salesman": 840
+    "salesman": 840,
+    "simdMandelbrot": 775007,
+    "simdNbody": -0.1691057
 }
 # https://benchmarksgame-team.pages.debian.net/benchmarksgame/description/simple.html#simple
 gameTests = ["mandelbrot", "nbody", "gregory", "fannkuch", "k_nucleotide"]
 
+simdTests = ["simdMandelbrot", "simdNbody"]
+
 def prepare_arg_pars():
     parser = argparse.ArgumentParser()
     parser.add_argument('--test-dir', metavar='PATH', help='path to the test files written in c', nargs='?',
@@ -58,6 +62,7 @@ def prepare_arg_pars():
     parser.add_argument('--iterations', metavar='NUMBER', help='how many times run the tests', nargs='?',
                         const='10', default=10, type=int)
     parser.add_argument('--compile-anyway', help='compile the tests even if they are compiled', action='store_true')
+    parser.add_argument('--enable-simd', help='run SIMD tests too', action='store_true')
     return parser.parse_args()
 
 
@@ -98,7 +103,7 @@ def get_emcc():
     return emcc_path
 
 
-def compile_tests(emcc_path, path, only_game=False, compile_anyway=False, run=None):
+def compile_tests(emcc_path, path, only_game=False, compile_anyway=False, simd=False, run=None):
     if not os.path.exists(emcc_path):
         print("invalid path for emcc: " + emcc_path)
         exit(1)
@@ -118,7 +123,9 @@ def compile_tests(emcc_path, path, only_game=False, compile_anyway=False, run=No
     for file in test_list:
         name = file.split('.')[0]
 
-        if (name not in gameTests and only_game) or (run is not None and name != run):
+        if (name not in gameTests and only_game) or \
+           (run is not None and name != run) or     \
+           (name in simdTests and not simd):
             continue
 
         test_names.append(name)
@@ -127,8 +134,10 @@ def compile_tests(emcc_path, path, only_game=False, compile_anyway=False, run=No
             print("target files are found; compilation skipped")
             continue
 
+        extraFlags = "-msimd128" if file.startswith("simd") else ""
+
         print("compiling " + name)
-        bob_the_stringbuilder = emcc_path + " " + path + "/" + file + " --no-entry -s WASM=1 -s EXPORTED_FUNCTIONS=_runtime -s EXPORTED_RUNTIME_METHODS=ccall,cwrap -o " + path + "/wasm/" + name + ".wasm"
+        bob_the_stringbuilder = emcc_path + " " + path + "/" + file + " " + extraFlags + " --no-entry -s WASM=1 -s EXPORTED_FUNCTIONS=_runtime -s EXPORTED_RUNTIME_METHODS=ccall,cwrap -o " + path + "/wasm/" + name + ".wasm"
         print(bob_the_stringbuilder)
         os.system(bob_the_stringbuilder)
 
@@ -217,7 +226,7 @@ def main():
 
     check_programs(args.engines)
     emcc_path = get_emcc()
-    test_names = compile_tests(emcc_path, args.test_dir, args.only_game, args.compile_anyway, args.run)
+    test_names = compile_tests(emcc_path, args.test_dir, args.only_game, args.compile_anyway, args.enable_simd, args.run)
     generate_report(
         run_tests(args.test_dir, test_names, args.engines, args.iterations),
         args.report)

test/wasmBenchmarker/ctests/mandelbrot.c

@@ -14,57 +14,67 @@
  * limitations under the License.
  */
 
-#include <stdint.h>
 #include <stdio.h>
+#include <stdbool.h>
+#include <math.h>
+#include <stdint.h>
 
-#define LOOP 600
-#define X_MIN -1.5
-#define X_MAX 0.5
-#define Y_MIN -1.0
-#define Y_MAX 1.0
-#define X_RES 512
+#define WIDTH 1600
+#define HIGHT 1400
+#define N 20
+#define REAL_AXIS_SHIFT -1.8 // ~ horizontal shift
+#define IMAGINARY_AXIS_SHIFT -1.0 // ~ vertical shift
+#define ZOOM 0.0015
 
-uint32_t runtime() {
-    const int yRes = (X_RES * (Y_MAX - Y_MIN)) / (X_MAX - X_MIN);
+#define getNthBit(b, n) ((b & (1 << (7 - n))) > 0)
 
-    double dx = (X_MAX - X_MIN) / X_RES;
-    double dy = (Y_MAX - Y_MIN) / yRes;
-    double x, y;
-    int k;
+#define clearNthBit(b, n) b = b & (0xFF - (1 << (7 - n)))
 
-    uint16_t retValLower = 0;
-    uint16_t retValHigher = 0;
+#define setNthBit(b, n) b = b | (1 << (7 - n))
 
-    for (int j = 0; j < yRes; j++) {
-        y = Y_MAX - j * dy;
+#define ABS_COMPLEX(z_real, z_complex) (sqrtf(z_real * z_real + z_complex * z_complex))
 
-        for (int i = 0; i < X_RES; i++) {
-            double u = 0;
-            double v = 0;
-            double u2 = 0;
-            double v2 = 0;
+typedef uint8_t byte;
 
-            x = X_MIN + i * dx;
+byte isInMandelbrotSet(float c_real, float c_imaginary)
+{
+    byte result = 0b10000000;
+    float z_real = 0;
+    float z_imaginary = 0;
+    for (size_t k = 0; k < N; k++) {
+        float complex_abs = ABS_COMPLEX(z_real, z_imaginary);
+        if (getNthBit(result, 0) == 1 && complex_abs > 2) {
+            clearNthBit(result, 0);
+        } else {
+            float next_z_real = (z_real * z_real - z_imaginary * z_imaginary) + c_real;
+            float next_z_imaginary = ((float)2.0 * z_real * z_imaginary) + c_imaginary;
+            z_real = next_z_real;
+            z_imaginary = next_z_imaginary;
+        }
 
-            for (k = 1; k < LOOP && (u2 + v2 < 4.0); k++) {
-                v = 2 * u * v + y;
-                u = u2 - v2 + x;
-                u2 = u * u;
-                v2 = v * v;
-            }
+        if (result == 0) {
+            break;
+        }
+    }
+    return result;
+}
 
-            if (k >= LOOP) {
-                retValLower++;
-            } else {
-                retValHigher++;
+uint32_t runtime() {
+    uint32_t setSize = 0;
+    for (int i = 0; i < HIGHT; i++) {
+        for (int j = 0; j < WIDTH; j++) {
+            float real = ((float)j * (float)ZOOM) + (float)REAL_AXIS_SHIFT;
+            float imaginary = ((float)i * (float)ZOOM) + (float)IMAGINARY_AXIS_SHIFT;
+            if (getNthBit(isInMandelbrotSet(real, imaginary),0)) {
+                setSize++;
             }
         }
     }
-
-    return retValLower + (retValHigher << 16);
+    return setSize;
 }
 
+
 int main() {
-    printf("%d\n", runtime());
+    printf("%u\n", runtime());
     return 0;
-}
+}