X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Ftests%2FSpeedTest.java;h=c3c21a3bba45c97c0b62a5a581e4f62c3066c73a;hb=98f786ce8ee1fcd9568d1c367160851d32e1c786;hp=53629613581e83139a4066fa76f0942e65e8cab8;hpb=3eb15f58ca0911489d7d9bdc0ac2c575d27a68d8;p=nestedvm.git

diff --git a/src/tests/SpeedTest.java b/src/tests/SpeedTest.java
index 5362961..c3c21a3 100644
--- a/src/tests/SpeedTest.java
+++ b/src/tests/SpeedTest.java
@@ -1,7 +1,6 @@
 package tests;
 
-import org.xwt.mips.Runtime;
-import org.xwt.mips.Interpreter;
+import org.ibex.nestedvm.Runtime;
 
 class SpeedTest {
     private static long start,end;
@@ -37,22 +36,24 @@ class SpeedTest {
             System.out.println("c.newInstance() took " + d + "sec");
             
             if(!Runtime.class.isAssignableFrom(c)) { System.err.println(className + " isn't a MIPS compiled class"); System.exit(1); }
+        } else {
+            throw new Error("Interpreter not supported in speedtest");
         }
             
         float times[] = new float[runs];
         
         for(int i=0;i<runs;i++) {
-            Runtime runtime = binary ? new Interpreter(className) : (Runtime) c.newInstance();
+            //Runtime runtime = binary ? new Interpreter(className) : (Runtime) c.newInstance();
+            Runtime runtime = (Runtime) c.newInstance();
             System.gc();
             start();
             int status = runtime.run(appArgs);
             if(status != 0) { System.err.println(className + " failed with exit status: " + status); System.exit(1); }
             end();
             times[i] = diff();
+            System.err.println("Run " + (i+1) + ": " + times[i] + " sec");
         }
         
-        for(int i=0;i<runs;i++)
-            System.out.println("Run " + (i+1) + ": " + times[i] + " sec");
         java.util.Arrays.sort(times);
         
         System.out.println("Best: " + times[0]);