fix junit tests: BenchmarkTests

cosminbasca · cosminbasca · commit dbfc947d1899 · 2018-08-29T11:25:41.000+02:00
- fix path to meso/image-magix

- fix image-magix success pattern

- fix ai-nqueen bench arg in tests
diff --git a/graalpython/benchmarks/src/meso/ai-nqueen.py b/graalpython/benchmarks/src/meso/ai-nqueen.py
@@ -99,3 +99,15 @@ def measure(queen_count):
 
 def __benchmark__(queen_count=10):
     measure(queen_count)
+
+
+if __name__ == '__main__':
+    import sys
+    import time
+    start = time.time()
+    if len(sys.argv) >= 2:
+        num = int(sys.argv[1])
+        __benchmark__(num)
+    else:
+        __benchmark__()
+    print("%s took %s s" % (__file__, time.time() - start))
diff --git a/graalpython/benchmarks/src/meso/image-magix.py b/graalpython/benchmarks/src/meso/image-magix.py
@@ -118,7 +118,23 @@ def measure(num):
     for i in range(num):
         img = img.sobel(horizontal=True, vertical=True)
         img = img.fisheye(bilinear=True, fraction=3)
+    return img
+
 
-        
 def __benchmark__(num=10000):
-    measure(num)
+    return measure(num)
+
+
+if __name__ == '__main__':
+    import sys
+    import time
+    global SZ
+    SZ = 5
+    start = time.time()
+    if len(sys.argv) >= 2:
+        num = int(sys.argv[1])
+        img = __benchmark__(num)
+    else:
+        img = __benchmark__(2)
+    print(img.data)
+    print("%s took %s s" % (__file__, time.time() - start))
diff --git a/graalpython/benchmarks/src/meso/mandelbrot3.py b/graalpython/benchmarks/src/meso/mandelbrot3.py
@@ -89,3 +89,15 @@ def measure(num):
 
 def __benchmark__(num=4000):
     measure(num)
+
+
+if __name__ == '__main__':
+    import sys
+    import time
+    start = time.time()
+    if len(sys.argv) >= 2:
+        num = int(sys.argv[1])
+        __benchmark__(num)
+    else:
+        __benchmark__()
+    print("%s took %s s" % (__file__, time.time() - start))
diff --git a/graalpython/benchmarks/src/meso/richards3.py b/graalpython/benchmarks/src/meso/richards3.py
@@ -445,3 +445,15 @@ def measure(iteration):
 
 def __benchmark__(num=200):
     measure(num)
+
+
+if __name__ == '__main__':
+    import sys
+    import time
+    start = time.time()
+    if len(sys.argv) >= 2:
+        num = int(sys.argv[1])
+        __benchmark__(num)
+    else:
+        __benchmark__()
+    print("%s took %s s" % (__file__, time.time() - start))
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/PythonTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/PythonTests.java
@@ -220,12 +220,7 @@ public static File getBenchFile(Path filename) {
 
         Path fullPath = Paths.get(path.toString(), filename.toString());
         if (!Files.isReadable(fullPath)) {
-            fullPath = Paths.get(path.toString(), "benchmarks", filename.toString());
-            if (!Files.isReadable(fullPath)) {
-                fullPath = Paths.get(path.toString(), "micro", filename.toString());
-                if (!Files.isReadable(fullPath))
-                    throw new IllegalStateException("Unable to locate " + path + " (benchmarks or micro) " + filename.toString());
-            }
+            throw new IllegalStateException("Unable to locate " + path + " (benchmarks or micro) " + filename.toString());
         }
 
         File file = new File(fullPath.toString());
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advance/BenchmarkTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advance/BenchmarkTests.java
@@ -30,55 +30,27 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class BenchmarkTests {
+    private static final String BENCH_SUITE_MESO = "meso";
 
     @Test
     public void richards3() {
-        Path script = Paths.get("richards3.py");
-        assertBenchNoError(script, new String[]{script.toString(), "3"});
+        Path script = Paths.get(BENCH_SUITE_MESO, "richards3.py");
+        assertBenchNoError(script, new String[]{script.toString(), "20"});
     }
 
     @Test
     public void bm_ai() {
-        Path script = Paths.get("bm-ai.py");
-        assertBenchNoError(script, new String[]{script.toString(), "0"});
+        Path script = Paths.get(BENCH_SUITE_MESO, "ai-nqueen.py");
+        assertBenchNoError(script, new String[]{script.toString(), "5"});
     }
 
     @Test
     public void mandelbrot3_300() {
-        Path script = Paths.get("mandelbrot3_noprint.py");
-        assertBenchNoError(script, new String[]{script.toString(), "300"});
-    }
-
-    @Ignore
-    @Test
-    public void simplejson_bench_test() {
-        Path script = Paths.get("simplejson-bench.py");
-        assertBenchNoError(script, new String[]{"simplejson-bench.py", "100"});
-    }
-
-    @Ignore
-    @Test
-    public void whoosh_bench_test() {
-        Path script = Paths.get("whoosh-bench.py");
-        assertBenchNoError(script, new String[]{"whoosh-bench.py", "50"});
-    }
-
-    @Ignore
-    @Test
-    public void pymaging_bench_test() {
-        Path script = Paths.get("pymaging-bench.py");
-        assertBenchNoError(script, new String[]{"pymaging-bench.py", "50"});
-    }
-
-    @Ignore
-    @Test
-    public void sympy_bench_test() {
-        Path script = Paths.get("sympy-bench.py");
-        assertBenchNoError(script, new String[]{"sympy-bench.py", "200"});
+        Path script = Paths.get(BENCH_SUITE_MESO, "mandelbrot3.py");
+        assertBenchNoError(script, new String[]{script.toString(), "200"});
     }
 
 }
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
@@ -25,7 +25,6 @@
 import platform
 import re
 import shutil
-import subprocess
 import sys
 import tempfile
 from argparse import ArgumentParser
@@ -37,6 +36,7 @@
 import mx_subst
 import mx_urlrewrites
 from mx_gate import Task
+from mx_graalpython_bench_param import PATH_MESO
 from mx_graalpython_benchmark import PythonBenchmarkSuite
 from mx_unittest import unittest
 
@@ -413,17 +413,16 @@ def is_included(path):
     with Task('GraalPython GraalVM build', tasks, tags=[GraalPythonTags.downstream, GraalPythonTags.graalvm]) as task:
         if task:
             svm_image = python_svm(["--version"])
-            benchmark = os.path.join("graalpython", "benchmarks", "src", "benchmarks", "image_magix.py")
+            benchmark = os.path.join(PATH_MESO, "image-magix.py")
             out = mx.OutputCapture()
             mx.run(
                 [svm_image, benchmark],
                 nonZeroIsFatal=True,
                 out=mx.TeeOutputCapture(out)
             )
             success = "\n".join([
-                "[0, 0, 0, 0, 0, 0, 20, 20, 20, 0, 0, 20, 20, 20, 0, 0, 20, 20, 20, 0, 0, 0, 0, 0, 0]",
-                "[11, 12, 13, 14, 15, 21, 22, 23, 24, 25, 31, 32, 33, 34, 35, 41, 42, 43, 44, 45, 51, 52, 53, 54, 55]",
-                "[11, 12, 13, 14, 15, 21, 22, 23, 24, 25, 31, 32, 36, 36, 35, 41, 41, 40, 40, 45, 51, 52, 53, 54, 55]"])
+                "[0, 0, 0, 0, 0, 0, 10, 10, 10, 0, 0, 10, 3, 10, 0, 0, 10, 10, 10, 0, 0, 0, 0, 0, 0]",
+            ])
             if success not in out.data:
                 mx.abort('Output from generated SVM image "' + svm_image + '" did not match success pattern:\n' + success)
 
