Mercurial > hg > truffle

changeset 13626:d368f5556059

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disabled new PTX tests if PTX GPU is not available
author Doug Simon <doug.simon@oracle.com>
date Mon, 13 Jan 2014 23:03:12 +0100
parents 881dd7f896de
children a2aac8373610
files graal/com.oracle.graal.hotspot.ptx.test/src/com/oracle/graal/hotspot/ptx/test/PTXLaunchKernelTest.java
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.ptx.test/src/com/oracle/graal/hotspot/ptx/test/PTXLaunchKernelTest.java	Mon Jan 13 22:36:19 2014 +0100
+++ b/graal/com.oracle.graal.hotspot.ptx.test/src/com/oracle/graal/hotspot/ptx/test/PTXLaunchKernelTest.java	Mon Jan 13 23:03:12 2014 +0100
@@ -67,7 +67,7 @@
 
         @Override
         protected CompilationResult compile(ResolvedJavaMethod method, StructuredGraph graph) {
-            CallingConvention cc = getCallingConvention(getCodeCache(), Type.JavaCallee, graph.method(), false);
+            Assume.assumeTrue(getBackend() instanceof PTXHotSpotBackend);
 
             /*
              * Use Suites.createDefaultSuites() instead of GraalCompilerTest.suites. The
@@ -78,6 +78,7 @@
              * Ultimately we might want to have both the kernel and the code natively compiled for
              * GPU fallback to CPU in cases of ECC failure on kernel invocation.
              */
+            CallingConvention cc = getCallingConvention(getCodeCache(), Type.JavaCallee, graph.method(), false);
             Suites suites = Suites.createDefaultSuites();
             PTXHotSpotBackend ptxBackend = (PTXHotSpotBackend) getBackend();
             ExternalCompilationResult kernelResult = compileGraph(graph, cc, method, getProviders(), ptxBackend, ptxBackend.getTarget(), null, getDefaultGraphBuilderSuite(),