Mercurial > hg > graal-compiler
changeset 16302:fb90ad461cdb
HSAIL: skip certain tests if running on the HSAIL simulator
Contributed-by: Eric Caspole <eric.caspole@amd.com>
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 30 Jun 2014 18:03:24 +0200 |
parents | b741f44cb277 |
children | 41d479400da8 |
files | 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 | 3 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMaxTest.java Mon Jun 30 17:47:45 2014 +0200 +++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMaxTest.java Mon Jun 30 18:03:24 2014 +0200 @@ -22,9 +22,11 @@ */ 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.*; +import static org.junit.Assume.assumeTrue; import org.junit.*; import java.util.*; @@ -72,6 +74,10 @@ @Test public void testReduce() { + + // The simulator does not support HSA local memory as of June 2014 + assumeTrue(OkraContext.isSimulator() == false); + // Handmade reduce does not support +UseCompressedOops HotSpotVMConfig config = runtime().getConfig(); if (config.useCompressedOops == true || config.useHSAILDeoptimization == true) {
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMinTest.java Mon Jun 30 17:47:45 2014 +0200 +++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMinTest.java Mon Jun 30 18:03:24 2014 +0200 @@ -22,9 +22,11 @@ */ 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.*; +import static org.junit.Assume.assumeTrue; import org.junit.*; import java.util.*; @@ -72,6 +74,10 @@ @Test public void testReduce() { + + // The simulator does not support HSA local memory as of June 2014 + assumeTrue(OkraContext.isSimulator() == false); + // Handmade reduce does not support +UseCompressedOops HotSpotVMConfig config = runtime().getConfig(); if (config.useCompressedOops == true || config.useHSAILDeoptimization == true) {
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceSumTest.java Mon Jun 30 17:47:45 2014 +0200 +++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceSumTest.java Mon Jun 30 18:03:24 2014 +0200 @@ -22,9 +22,11 @@ */ package com.oracle.graal.compiler.hsail.test.lambda; -//import com.oracle.graal.compiler.common.GraalInternalError; +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 org.junit.*; import java.util.*; @@ -73,6 +75,10 @@ @Test public void testReduce() { + + // The simulator does not support HSA local memory as of June 2014 + assumeTrue(OkraContext.isSimulator() == false); + // Handmade reduce does not support +UseCompressedOops HotSpotVMConfig config = runtime().getConfig(); if (config.useCompressedOops == true || config.useHSAILDeoptimization == true) { @@ -89,10 +95,10 @@ // Get OptionalInt version kernel sumOffload = evaluate(true); - assert sumStream == sumOffload : "Offload sum is wrong, stream:" + sumStream + " != offload:" + sumOffload; + assertTrue(sumStream == sumOffload); // Get identity version kernel sumOffload = evaluateWithIdentity(true); - assert sumStream == sumOffload : "Offload sum is wrong, stream:" + sumStream + " != offload:" + sumOffload; + assertTrue(sumStream == sumOffload); } }