Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / benchmark / Makefile.am

diff --git a/mono/benchmark/Makefile.am b/mono/benchmark/Makefile.am
index 6727b2cc569def34af7989e17515e33d2531fa15..62354f9311ead393b1b6d4e16f4f534c3b2ba313 100644 (file)
--- a/mono/benchmark/Makefile.am
+++ b/mono/benchmark/Makefile.am
@@ -1,20 +1,57 @@
-TEST_PROG=../jit/mono
+TEST_PROG=../mini/mono
+RUNTIME_ARGS="-O=all"
 
 CSC=mcs
 
 
 TESTSRC=                       \
        fib.cs                  \
+       life.cs                 \
        castclass.cs            \
+       cmov1.cs                \
+       cmov2.cs                \
+       cmov3.cs                \
+       cmov4.cs                \
+       cmov5.cs                \
+       commute.cs              \
        isinst.cs               \
+       sbperf1.cs              \
+       sbperf2.cs              \
+       iconst-byte.cs          \
        inline1.cs              \
-       inline2.cs
+       inline2.cs              \
+       inline3.cs              \
+       inline4.cs              \
+       inline5.cs              \
+       inline6.cs              \
+       inline-readonly.cs      \
+       max-min.cs              \
+       muldiv.cs               \
+       loops.cs                \
+       initlocals.cs           \
+       logic.cs                \
+       switch.cs               \
+       ctor-bench.cs           \
+       readonly.cs             \
+       readonly-byte-array.cs  \
+       readonly-inst.cs        \
+       readonly-vt.cs          \
+       regalloc.cs             \
+       regalloc-2.cs           \
+       bulkcpy.il              \
+       math.cs                 \
+       boxtest.cs              \
+       valuetype-hash-equals.cs \
+       vt2.cs
 
-TESTSI=$(TESTSRC:.cs=.exe)
-TESTBS=$(BENCHSRC:.cs=.exe)
+TESTSI_TMP=$(TESTSRC:.cs=.exe)
+TESTSI=$(TESTSI_TMP:.il=.exe)
 
 EXTRA_DIST=test-driver $(TESTSRC)
 
+%.exe: %.il
+       ilasm $< /OUTPUT=$@
+
 %.exe: %.cs
        $(CSC) $<
 
@@ -22,7 +59,7 @@ test: $(TEST_PROG) $(TESTSI)
        @failed=0; \
        passed=0; \
        for i in $(TESTSI); do  \
-               if ./test-driver $(TEST_PROG) $$i; \
+               if ./test-driver $(TEST_PROG) $$i $(RUNTIME_ARGS); \
                then \
                        passed=`expr $${passed} + 1`; \
                else \
@@ -31,12 +68,5 @@ test: $(TEST_PROG) $(TESTSI)
        done; \
        echo "$${passed} test(s) passed. $${failed} test(s) failed."
 
-
-testjitspeed: $(JITTEST_PROG) $(TESTBS)
-       for i in $(TESTBS); do  \
-               echo $$i;       \
-               time $(JITTEST_PROG) $$i;       \
-       done
-
 check:
        @echo no check yet