|
20 | 20 | import java.util.Arrays; |
21 | 21 | import java.util.HashSet; |
22 | 22 | import java.util.Set; |
23 | | -import java.util.concurrent.ExecutionException; |
24 | 23 |
|
25 | 24 | import uk.ac.manchester.tornado.api.TornadoDriver; |
26 | 25 | import uk.ac.manchester.tornado.api.common.TornadoDevice; |
@@ -58,6 +57,7 @@ public void run() { |
58 | 57 | final double refFirstIteration; |
59 | 58 |
|
60 | 59 | if (!SKIP_SERIAL) { |
| 60 | + // Run the Java Reference |
61 | 61 | final BenchmarkDriver referenceTest = getJavaDriver(); |
62 | 62 | referenceTest.benchmark(null); |
63 | 63 |
|
@@ -112,16 +112,16 @@ private void benchmarkAll(String id, double refElapsed, double refElapsedMedian, |
112 | 112 | TornadoDevice tornadoDevice = driver.getDevice(deviceIndex); |
113 | 113 |
|
114 | 114 | TornadoRuntime.setProperty("benchmark.device", driverIndex + ":" + deviceIndex); |
115 | | - final BenchmarkDriver deviceTest = getTornadoDriver(); |
| 115 | + final BenchmarkDriver benchmarkDriver = getTornadoDriver(); |
116 | 116 |
|
117 | 117 | try { |
118 | | - deviceTest.benchmark(tornadoDevice); |
| 118 | + benchmarkDriver.benchmark(tornadoDevice); |
119 | 119 | } catch (Exception e) { |
120 | 120 | e.printStackTrace(); |
121 | 121 | } |
122 | 122 | System.out.printf("bm=%-15s, device=%-5s, %s, speedupAvg=%.4f, speedupMedian=%.4f, speedupFirstIteration=%.4f, CV=%.4f%%, deviceName=%s\n", id, driverIndex + ":" + deviceIndex, |
123 | | - deviceTest.getPreciseSummary(), refElapsed / deviceTest.getMean(), refElapsedMedian / deviceTest.getMedian(), refFirstIteration / deviceTest.getFirstIteration(), |
124 | | - deviceTest.getCV(), driver.getDevice(deviceIndex)); |
| 123 | + benchmarkDriver.getPreciseSummary(), refElapsed / benchmarkDriver.getMean(), refElapsedMedian / benchmarkDriver.getMedian(), |
| 124 | + refFirstIteration / benchmarkDriver.getFirstIteration(), benchmarkDriver.getCV(), driver.getDevice(deviceIndex)); |
125 | 125 |
|
126 | 126 | } |
127 | 127 | } |
|
0 commit comments