Mercurial > hg > truffle
changeset 18256:1daaa2c62142
Add description for PTX/HSAIL JUnit assumptions.
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/GraalKernelTester.java Wed Nov 05 11:48:13 2014 +0100 +++ b/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/GraalKernelTester.java Wed Nov 05 13:01:20 2014 +0100 @@ -66,7 +66,7 @@ protected static HSAILHotSpotBackend getHSAILBackend() { Backend backend = runtime().getBackend(HSAIL.class); - Assume.assumeTrue(backend instanceof HSAILHotSpotBackend); + Assume.assumeTrue("No HSAIL backend, skipping test!", backend instanceof HSAILHotSpotBackend); return (HSAILHotSpotBackend) backend; } @@ -201,7 +201,7 @@ @Override public void testGeneratedHsail() { try (OverrideScope s = getOverrideScope()) { - assumeTrue(supportsRequiredCapabilities() && okraEnvIsInitialized()); + assumeTrue("Orka environment not initialized or unsupported!", supportsRequiredCapabilities() && okraEnvIsInitialized()); super.testGeneratedHsail(); } } @@ -209,7 +209,7 @@ @Override public void testGeneratedHsailUsingLambdaMethod() { try (OverrideScope s = getOverrideScope()) { - assumeTrue(supportsRequiredCapabilities() && okraEnvIsInitialized()); + assumeTrue("Orka environment not initialized or unsupported!", supportsRequiredCapabilities() && okraEnvIsInitialized()); super.testGeneratedHsailUsingLambdaMethod(); } }
--- a/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/KernelTester.java Wed Nov 05 11:48:13 2014 +0100 +++ b/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/KernelTester.java Wed Nov 05 13:01:20 2014 +0100 @@ -405,7 +405,7 @@ } } // Ignore any kerneltester test if okra does not exist. - assumeTrue(okraLibExists); + assumeTrue("No Okra library detected, skipping test!", okraLibExists); // Control which okra instances can run the tests. onSimulator = OkraContext.isSimulator(); okraContext = new OkraContext();
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/BasicHSAILTest.java Wed Nov 05 11:48:13 2014 +0100 +++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/BasicHSAILTest.java Wed Nov 05 13:01:20 2014 +0100 @@ -339,7 +339,7 @@ @Override protected HSAILHotSpotBackend getBackend() { Backend backend = super.getBackend(); - Assume.assumeTrue(backend instanceof HSAILHotSpotBackend); + Assume.assumeTrue("No HSAIL backend, skipping test!", backend instanceof HSAILHotSpotBackend); return (HSAILHotSpotBackend) backend; }
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMaxTest.java Wed Nov 05 11:48:13 2014 +0100 +++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMaxTest.java Wed Nov 05 13:01:20 2014 +0100 @@ -78,7 +78,7 @@ public void testReduce() { // The simulator does not support HSA local memory as of June 2014 - assumeTrue(OkraUtil.okraLibExists() && OkraContext.isSimulator() == false); + assumeTrue("The simulator does not support HSA local memory, skipping!", 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 Wed Nov 05 11:48:13 2014 +0100 +++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMinTest.java Wed Nov 05 13:01:20 2014 +0100 @@ -78,7 +78,7 @@ public void testReduce() { // The simulator does not support HSA local memory as of June 2014 - assumeTrue(OkraUtil.okraLibExists() && OkraContext.isSimulator() == false); + assumeTrue("The simulator does not support HSA local memory, skipping!", 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 Wed Nov 05 11:48:13 2014 +0100 +++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceSumTest.java Wed Nov 05 13:01:20 2014 +0100 @@ -79,7 +79,7 @@ public void testReduce() { // The simulator does not support HSA local memory as of June 2014 - assumeTrue(OkraUtil.okraLibExists() && OkraContext.isSimulator() == false); + assumeTrue("The simulator does not support HSA local memory, skipping!", OkraUtil.okraLibExists() && OkraContext.isSimulator() == false); // Handmade reduce does not support +UseCompressedOops HotSpotVMConfig config = runtime().getConfig();
--- a/graal/com.oracle.graal.compiler.ptx.test/src/com/oracle/graal/compiler/ptx/test/PTXMethodInvalidation2Test.java Wed Nov 05 11:48:13 2014 +0100 +++ b/graal/com.oracle.graal.compiler.ptx.test/src/com/oracle/graal/compiler/ptx/test/PTXMethodInvalidation2Test.java Wed Nov 05 13:01:20 2014 +0100 @@ -56,7 +56,7 @@ while (ref.get() != null) { System.gc(); // Give up after 1000 attempts - Assume.assumeTrue(++attempts < 1000); + Assume.assumeTrue("Giving up after too many attempts!", ++attempts < 1000); } Assert.assertFalse(code.getStart() == 0L);
--- a/graal/com.oracle.graal.compiler.ptx.test/src/com/oracle/graal/compiler/ptx/test/PTXTest.java Wed Nov 05 11:48:13 2014 +0100 +++ b/graal/com.oracle.graal.compiler.ptx.test/src/com/oracle/graal/compiler/ptx/test/PTXTest.java Wed Nov 05 13:01:20 2014 +0100 @@ -46,7 +46,7 @@ public static PTXHotSpotBackend getPTXBackend() { Backend backend = runtime().getBackend(PTX.class); - Assume.assumeTrue(backend instanceof PTXHotSpotBackend); + Assume.assumeTrue("No PTX backend, skipping test!", backend instanceof PTXHotSpotBackend); return (PTXHotSpotBackend) backend; } @@ -67,7 +67,7 @@ protected InstalledCode getCode(ResolvedJavaMethod installedCodeOwner, StructuredGraph graph) { PTXHotSpotBackend ptxBackend = getPTXBackend(); ExternalCompilationResult ptxCode = compileKernel(installedCodeOwner); - Assume.assumeTrue(ptxBackend.isDeviceInitialized()); + Assume.assumeTrue("Skipping PTX test: device not initialized!", ptxBackend.isDeviceInitialized()); HotSpotNmethod installedPTXCode = installKernel(installedCodeOwner, ptxCode); StructuredGraph wrapper = new PTXWrapperBuilder(installedCodeOwner, installedPTXCode, (HotSpotProviders) getProviders()).getGraph();