Mercurial > hg > truffle
changeset 16334:0e36e8377c99
HSAIL: cannot reference OkraContext if it cannot be loaded
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 30 Jun 2014 21:22:39 +0200 |
| parents | 75ea3123657f |
| children | 524f5cf6cb95 |
| files | graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/KernelTester.java graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMaxTest.java graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMinTest.java graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceSumTest.java |
| diffstat | 4 files changed, 33 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/KernelTester.java Mon Jun 30 19:01:27 2014 +0200 +++ b/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/KernelTester.java Mon Jun 30 21:22:39 2014 +0200 @@ -130,21 +130,14 @@ hsailMode = HsailMode.COMPILED; useLambdaMethod = false; - if (okraLibExists == false) { - // The okra native lib is not loaded yet, try to load the OkraContext - // explicitly and report a more useful error if there is a problem - try { - Class.forName("OkraContext"); - } catch (Exception e) { - logger.info("Okra native library cannot be found or loaded while running" + this.getClass().getSimpleName()); - this.okraLibExists = false; - return; - } + this.okraLibExists = okraLibExists || OkraUtil.okraLibExists(); + if (!this.okraLibExists) { + logger.info("Okra native library cannot be found or loaded while running" + this.getClass().getSimpleName()); + return; } - // Control which okra instances can run the tests (is Simulator is static). + // Control which okra instances can run the tests (isSimulator is static). onSimulator = OkraContext.isSimulator(); - this.okraLibExists = okraLibExists; } public abstract void runTest();
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMaxTest.java Mon Jun 30 19:01:27 2014 +0200 +++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMaxTest.java Mon Jun 30 21:22:39 2014 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.compiler.hsail.test.lambda; -import com.amd.okra.OkraContext; -import static com.oracle.graal.hotspot.HotSpotGraalRuntime.runtime; -import com.oracle.graal.hotspot.HotSpotVMConfig; +import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*; import static org.junit.Assert.*; -import static org.junit.Assume.assumeTrue; +import static org.junit.Assume.*; + +import java.util.*; +import java.util.stream.*; + import org.junit.*; -import java.util.*; -import java.util.stream.IntStream; +import com.amd.okra.*; +import com.oracle.graal.hotspot.*; public class ReduceMaxTest { // The length of the input array @@ -76,7 +78,7 @@ public void testReduce() { // The simulator does not support HSA local memory as of June 2014 - assumeTrue(OkraContext.isSimulator() == false); + assumeTrue(OkraUtil.okraLibExists() && OkraContext.isSimulator() == false); // Handmade reduce does not support +UseCompressedOops HotSpotVMConfig config = runtime().getConfig();
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMinTest.java Mon Jun 30 19:01:27 2014 +0200 +++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMinTest.java Mon Jun 30 21:22:39 2014 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.compiler.hsail.test.lambda; -import com.amd.okra.OkraContext; -import static com.oracle.graal.hotspot.HotSpotGraalRuntime.runtime; -import com.oracle.graal.hotspot.HotSpotVMConfig; +import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*; import static org.junit.Assert.*; -import static org.junit.Assume.assumeTrue; +import static org.junit.Assume.*; + +import java.util.*; +import java.util.stream.*; + import org.junit.*; -import java.util.*; -import java.util.stream.IntStream; +import com.amd.okra.*; +import com.oracle.graal.hotspot.*; public class ReduceMinTest { // The length of the input array @@ -76,7 +78,7 @@ public void testReduce() { // The simulator does not support HSA local memory as of June 2014 - assumeTrue(OkraContext.isSimulator() == false); + assumeTrue(OkraUtil.okraLibExists() && OkraContext.isSimulator() == false); // Handmade reduce does not support +UseCompressedOops HotSpotVMConfig config = runtime().getConfig();
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceSumTest.java Mon Jun 30 19:01:27 2014 +0200 +++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceSumTest.java Mon Jun 30 21:22:39 2014 +0200 @@ -22,15 +22,17 @@ */ package com.oracle.graal.compiler.hsail.test.lambda; -import com.amd.okra.OkraContext; -import static com.oracle.graal.hotspot.HotSpotGraalRuntime.runtime; -import com.oracle.graal.hotspot.HotSpotVMConfig; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeTrue; +import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*; +import static org.junit.Assert.*; +import static org.junit.Assume.*; + +import java.util.*; +import java.util.stream.*; + import org.junit.*; -import java.util.*; -import java.util.stream.IntStream; +import com.amd.okra.*; +import com.oracle.graal.hotspot.*; public class ReduceSumTest { // The length of the input array @@ -77,7 +79,7 @@ public void testReduce() { // The simulator does not support HSA local memory as of June 2014 - assumeTrue(OkraContext.isSimulator() == false); + assumeTrue(OkraUtil.okraLibExists() && OkraContext.isSimulator() == false); // Handmade reduce does not support +UseCompressedOops HotSpotVMConfig config = runtime().getConfig();