# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1383581828 -3600
# Node ID 1fdecc36c8ac97d27168665774042d82e48b96cc
# Parent  7f507f082daa6443e14c8e1fe246f0b842f1efe1
HSAIL updates to integrate recent changes to the providers infrastructure.
Contributed-by: Tom Deneau <tom.deneau@amd.com>

diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/KernelTester.java
--- a/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/KernelTester.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/KernelTester.java	Mon Nov 04 17:17:08 2013 +0100
@@ -69,7 +69,7 @@
         COMPILED, INJECT_HSAIL, INJECT_OCL
     }
 
-    private DispatchMode dispatchMode;
+    public DispatchMode dispatchMode;
     // Where the hsail comes from.
     private HsailMode hsailMode;
     private Method testMethod;
@@ -84,6 +84,7 @@
     private static final String propPkgName = KernelTester.class.getPackage().getName();
     private static Level logLevel;
     private static ConsoleHandler consoleHandler;
+    private boolean runOkraFirst = Boolean.getBoolean("kerneltester.runOkraFirst");
 
     static {
         logger = Logger.getLogger(propPkgName);
@@ -692,25 +693,42 @@
         }
     }
 
-    private void compareOkraToSeq(HsailMode hsailMode1) {
-        compareOkraToSeq(hsailMode1, false);
+    private void compareOkraToSeq(HsailMode hsailModeToUse) {
+        compareOkraToSeq(hsailModeToUse, false);
     }
 
     /**
-     * Runs this instance on OKRA, and as SEQ and compares the output of the two executions.
+     * Runs this instance on OKRA, and as SEQ and compares the output of the two executions. the
+     * runOkraFirst flag controls which order they are done in. Note the compiler must use eager
+     * resolving if Okra is done first.
      */
-    private void compareOkraToSeq(HsailMode hsailMode1, boolean useLambda) {
+    private void compareOkraToSeq(HsailMode hsailModeToUse, boolean useLambda) {
+        KernelTester testerSeq;
+        if (runOkraFirst) {
+            runOkraInstance(hsailModeToUse, useLambda);
+            testerSeq = runSeqInstance();
+        } else {
+            testerSeq = runSeqInstance();
+            runOkraInstance(hsailModeToUse, useLambda);
+        }
+        assertTrue("failed comparison to SEQ", compareResults(testerSeq));
+    }
+
+    private void runOkraInstance(HsailMode hsailModeToUse, boolean useLambda) {
+        // run Okra instance in exiting KernelTester object
+        this.setHsailMode(hsailModeToUse);
+        this.setDispatchMode(DispatchMode.OKRA);
+        this.useLambdaMethod = useLambda;
+        this.runTest();
+        this.disposeKernelOkra();
+    }
+
+    private KernelTester runSeqInstance() {
         // Create and run sequential instance.
         KernelTester testerSeq = newInstance();
         testerSeq.setDispatchMode(DispatchMode.SEQ);
         testerSeq.runTest();
-        // Now do this object.
-        this.setHsailMode(hsailMode1);
-        this.setDispatchMode(DispatchMode.OKRA);
-        this.useLambdaMethod = useLambda;
-        this.runTest();
-        this.disposeKernelOkra();
-        assertTrue("failed comparison to SEQ", compareResults(testerSeq));
+        return testerSeq;
     }
 
     public void testGeneratedHsail() {
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/FloatSqrtTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/FloatSqrtTest.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/FloatSqrtTest.java	Mon Nov 04 17:17:08 2013 +0100
@@ -23,8 +23,6 @@
 
 package com.oracle.graal.compiler.hsail.test;
 
-import java.util.*;
-
 import org.junit.*;
 
 import com.oracle.graal.compiler.hsail.test.infra.*;
@@ -34,13 +32,13 @@
  */
 public class FloatSqrtTest extends GraalKernelTester {
 
-    static final int size = 128;
-    static final float[] input = new float[size];
-    @Result static final float[] output = new float[size];
-    static float[] seed = new float[size];
+    static final int size = 64;
+    float[] input = new float[size];
+    @Result float[] output = new float[size];
     {
-        for (int i = 0; i < seed.length; i++) {
-            seed[i] = (float) Math.random();
+        for (int i = 0; i < size; i++) {
+            input[i] = i;
+            output[i] = -1.0f;
         }
 
     }
@@ -51,9 +49,7 @@
 
     @Override
     public void runTest() {
-        System.arraycopy(seed, 0, input, 0, seed.length);
-        Arrays.fill(output, 0f);
-        dispatchMethodKernel(64, input, output);
+        dispatchMethodKernel(size, input, output);
     }
 
     @Test
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticNBodySpillTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticNBodySpillTest.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticNBodySpillTest.java	Mon Nov 04 17:17:08 2013 +0100
@@ -48,7 +48,7 @@
     @Result private float[] invxyz = new float[bodies * 3];
     @Result private float[] outvxyz = new float[bodies * 3];
     static float[] seedxyz = new float[bodies * 3];
-    {
+    static {
         final float maxDist = width / 4;
         for (int body = 0; body < (bodies * 3); body += 3) {
             final float theta = (float) (Math.random() * Math.PI * 2);
@@ -95,7 +95,6 @@
         dispatchMethodKernel(bodies, inxyz, outxyz, invxyz, outvxyz);
     }
 
-    // Marked to only run on hardware until simulator spill bug is fixed.
     @Test
     public void test() {
         testGeneratedHsail();
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticNBodyTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticNBodyTest.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticNBodyTest.java	Mon Nov 04 17:17:08 2013 +0100
@@ -27,7 +27,6 @@
 
 import org.junit.*;
 
-import com.oracle.graal.compiler.hsail.*;
 import com.oracle.graal.compiler.hsail.test.infra.*;
 
 /**
@@ -49,7 +48,7 @@
     @Result private float[] invxyz = new float[bodies * 3];
     @Result private float[] outvxyz = new float[bodies * 3];
     static float[] seedxyz = new float[bodies * 3];
-    {
+    static {
         final float maxDist = width / 4;
         for (int body = 0; body < (bodies * 3); body += 3) {
             final float theta = (float) (Math.random() * Math.PI * 2);
@@ -96,9 +95,6 @@
         dispatchMethodKernel(bodies, inxyz, outxyz, invxyz, outvxyz);
     }
 
-    /**
-     * Requires {@link HSAILLIRGenerator#emitDirectCall} to be implemented.
-     */
     @Test
     public void test() {
         testGeneratedHsail();
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StringContainsTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StringContainsTest.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StringContainsTest.java	Mon Nov 04 17:17:08 2013 +0100
@@ -24,9 +24,6 @@
 package com.oracle.graal.compiler.hsail.test;
 
 import com.oracle.graal.compiler.hsail.test.infra.GraalKernelTester;
-import com.oracle.graal.graph.*;
-import com.oracle.graal.hotspot.hsail.*;
-
 import org.junit.Test;
 
 /**
@@ -59,10 +56,7 @@
         dispatchMethodKernel(NUM, base);
     }
 
-    /**
-     * Requires {@link HSAILHotSpotForeignCallsProvider#lookupForeignCall} to be implemented.
-     */
-    @Test(expected = GraalInternalError.class)
+    @Test
     public void test() {
         testGeneratedHsail();
     }
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StringIndexOfTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StringIndexOfTest.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StringIndexOfTest.java	Mon Nov 04 17:17:08 2013 +0100
@@ -24,9 +24,6 @@
 package com.oracle.graal.compiler.hsail.test;
 
 import com.oracle.graal.compiler.hsail.test.infra.GraalKernelTester;
-import com.oracle.graal.graph.*;
-import com.oracle.graal.hotspot.hsail.*;
-
 import org.junit.Test;
 
 /**
@@ -59,10 +56,7 @@
         dispatchMethodKernel(NUM, base);
     }
 
-    /**
-     * Requires {@link HSAILHotSpotForeignCallsProvider#lookupForeignCall} to be implemented.
-     */
-    @Test(expected = GraalInternalError.class)
+    @Test
     public void test() {
         testGeneratedHsail();
     }
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILLIRGenerator.java
--- a/graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILLIRGenerator.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILLIRGenerator.java	Mon Nov 04 17:17:08 2013 +0100
@@ -45,8 +45,6 @@
 import com.oracle.graal.lir.hsail.HSAILControlFlow.CondMoveOp;
 import com.oracle.graal.lir.hsail.HSAILControlFlow.FloatCompareBranchOp;
 import com.oracle.graal.lir.hsail.HSAILControlFlow.FloatCondMoveOp;
-import com.oracle.graal.lir.hsail.HSAILControlFlow.ForeignCall1ArgOp;
-import com.oracle.graal.lir.hsail.HSAILControlFlow.ForeignCallNoArgOp;
 import com.oracle.graal.lir.hsail.HSAILControlFlow.ReturnOp;
 import com.oracle.graal.lir.hsail.HSAILMove.LeaOp;
 import com.oracle.graal.lir.hsail.HSAILMove.MoveFromRegOp;
@@ -628,27 +626,6 @@
     }
 
     @Override
-    protected void emitForeignCall(ForeignCallLinkage linkage, Value result, Value[] arguments, Value[] temps, LIRFrameState info) {
-        String callName = linkage.getDescriptor().getName();
-        if (callName.equals("createOutOfBoundsException") || callName.equals("createNullPointerException")) {
-            // hack Alert !!
-            switch (arguments.length) {
-                case 0:
-                    append(new ForeignCallNoArgOp(callName, result));
-                    break;
-                case 1:
-                    append(new ForeignCall1ArgOp(callName, result, arguments[0]));
-                    break;
-                default:
-                    throw GraalInternalError.unimplemented();
-            }
-
-        } else {
-            throw GraalInternalError.unimplemented();
-        }
-    }
-
-    @Override
     public void emitBitCount(Variable result, Value value) {
         if (value.getKind().getStackKind() == Kind.Int) {
             append(new HSAILBitManipulationOp(IPOPCNT, result, value));
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java	Mon Nov 04 17:17:08 2013 +0100
@@ -60,12 +60,6 @@
     }
 
     @Override
-    public void completeInitialization() {
-        HSAILHotSpotForeignCallsProvider foreignCalls = (HSAILHotSpotForeignCallsProvider) getProviders().getForeignCalls();
-        foreignCalls.initialize(getProviders(), getRuntime().getConfig());
-    }
-
-    @Override
     public boolean shouldAllocateRegisters() {
         return true;
     }
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotForeignCallsProvider.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotForeignCallsProvider.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotForeignCallsProvider.java	Mon Nov 04 17:17:08 2013 +0100
@@ -22,10 +22,6 @@
  */
 package com.oracle.graal.hotspot.hsail;
 
-import static com.oracle.graal.api.meta.LocationIdentity.*;
-import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.Transition.*;
-import static com.oracle.graal.java.GraphBuilderPhase.RuntimeCalls.*;
-
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.hotspot.*;
@@ -39,17 +35,32 @@
 
     @Override
     public HotSpotForeignCallLinkage lookupForeignCall(ForeignCallDescriptor descriptor) {
-        return super.lookupForeignCall(descriptor);
+        // we don't really support foreign calls yet, but we do want to generate dummy code for them
+        // so we lazily create dummy linkages here.
+        if (foreignCalls.get(descriptor) == null) {
+            return register(new HotSpotForeignCallLinkage(descriptor, 0x12345678, null, null, null, null, false, new LocationIdentity[0]));
+        } else {
+            return super.lookupForeignCall(descriptor);
+        }
+    }
+
+    @Override
+    public boolean isReexecutable(ForeignCallDescriptor descriptor) {
+        return lookupForeignCall(descriptor).isReexecutable();
+    }
+
+    @Override
+    public LocationIdentity[] getKilledLocations(ForeignCallDescriptor descriptor) {
+        return lookupForeignCall(descriptor).getKilledLocations();
+    }
+
+    @Override
+    public boolean canDeoptimize(ForeignCallDescriptor descriptor) {
+        return lookupForeignCall(descriptor).canDeoptimize();
     }
 
     public Value[] getNativeABICallerSaveRegisters() {
         // TODO is this correct?
         return new Value[0];
     }
-
-    public void initialize(HotSpotProviders providers, HotSpotVMConfig c) {
-        // TODO are these correct? what other foreign calls are supported on HSAIL?
-        linkForeignCall(providers, CREATE_NULL_POINTER_EXCEPTION, c.createNullPointerExceptionAddress, PREPEND_THREAD, NOT_LEAF, REEXECUTABLE, ANY_LOCATION);
-        linkForeignCall(providers, CREATE_OUT_OF_BOUNDS_EXCEPTION, c.createOutOfBoundsExceptionAddress, PREPEND_THREAD, NOT_LEAF, REEXECUTABLE, ANY_LOCATION);
-    }
 }
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLIRGenerator.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLIRGenerator.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLIRGenerator.java	Mon Nov 04 17:17:08 2013 +0100
@@ -29,10 +29,8 @@
 import com.oracle.graal.hotspot.*;
 import com.oracle.graal.lir.*;
 import com.oracle.graal.lir.hsail.*;
-import com.oracle.graal.lir.hsail.HSAILMove.LoadCompressedPointer;
-import com.oracle.graal.lir.hsail.HSAILMove.LoadOp;
-import com.oracle.graal.lir.hsail.HSAILMove.StoreCompressedPointer;
-import com.oracle.graal.lir.hsail.HSAILMove.StoreOp;
+import com.oracle.graal.lir.hsail.HSAILControlFlow.*;
+import com.oracle.graal.lir.hsail.HSAILMove.*;
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.phases.util.*;
 
@@ -79,4 +77,46 @@
             append(new StoreOp(kind, storeAddress, input, state));
         }
     }
+
+    /***
+     * This is a very temporary solution to emitForeignCall. We don't really support foreign calls
+     * yet, but we do want to generate dummy code for them. The ForeignCallXXXOps just end up
+     * emitting a comment as to what Foreign call they would have made.
+     **/
+    @Override
+    public Variable emitForeignCall(ForeignCallLinkage linkage, DeoptimizingNode info, Value... args) {
+        Variable result = newVariable(Kind.Object);  // linkage.getDescriptor().getResultType());
+
+        // to make the LIRVerifier happy, we move any constants into registers
+        Value[] argLocations = new Value[args.length];
+        for (int i = 0; i < args.length; i++) {
+            Value arg = args[i];
+            AllocatableValue loc = newVariable(arg.getKind());
+            emitMove(loc, arg);
+            argLocations[i] = loc;
+        }
+
+        // here we could check the callName if we wanted to only handle certain callnames
+        String callName = linkage.getDescriptor().getName();
+        switch (argLocations.length) {
+            case 0:
+                append(new ForeignCallNoArgOp(callName, result));
+                break;
+            case 1:
+                append(new ForeignCall1ArgOp(callName, result, argLocations[0]));
+                break;
+            case 2:
+                append(new ForeignCall2ArgOp(callName, result, argLocations[0], argLocations[1]));
+                break;
+            default:
+                throw new InternalError("NYI emitForeignCall " + callName + ", " + argLocations.length + ", " + linkage);
+        }
+        return result;
+    }
+
+    @Override
+    protected void emitForeignCall(ForeignCallLinkage linkage, Value result, Value[] arguments, Value[] temps, LIRFrameState info) {
+        // this version of emitForeignCall not used for now
+    }
+
 }
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotReplacementsImpl.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotReplacementsImpl.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotReplacementsImpl.java	Mon Nov 04 17:17:08 2013 +0100
@@ -22,6 +22,8 @@
  */
 package com.oracle.graal.hotspot.hsail;
 
+import java.lang.reflect.*;
+
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.nodes.*;
@@ -42,13 +44,37 @@
     }
 
     @Override
+    protected ResolvedJavaMethod registerMethodSubstitution(Member originalMethod, Method substituteMethod) {
+        // TODO: decide if we want to override this in any way
+        return super.registerMethodSubstitution(originalMethod, substituteMethod);
+    }
+
+    @Override
+    public Class<? extends FixedWithNextNode> getMacroSubstitution(ResolvedJavaMethod method) {
+        Class<? extends FixedWithNextNode> klass = super.getMacroSubstitution(method);
+        if (klass == null) {
+            // eventually we want to only defer certain macro substitutions to the host, but for now
+            // we will do everything
+            return host.getMacroSubstitution(method);
+        }
+        return klass;
+    }
+
+    @Override
+    public StructuredGraph getSnippet(ResolvedJavaMethod method) {
+        // TODO must work in cooperation with HSAILHotSpotLoweringProvider
+        return null;
+    }
+
+    @Override
     public StructuredGraph getMethodSubstitution(ResolvedJavaMethod original) {
         StructuredGraph m = super.getMethodSubstitution(original);
         if (m == null) {
-            if (original.getDeclaringClass().equals(providers.getMetaAccess().lookupJavaType(Math.class))) {
-                return host.getMethodSubstitution(original);
-            }
+            // eventually we want to only defer certain substitutions to the host, but for now we
+            // will defer everything
+            return host.getMethodSubstitution(original);
         }
         return m;
     }
+
 }
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.hsail/src/com/oracle/graal/hsail/HSAIL.java
--- a/graal/com.oracle.graal.hsail/src/com/oracle/graal/hsail/HSAIL.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.hsail/src/com/oracle/graal/hsail/HSAIL.java	Mon Nov 04 17:17:08 2013 +0100
@@ -22,7 +22,6 @@
  */
 package com.oracle.graal.hsail;
 
-import static com.oracle.graal.api.code.MemoryBarriers.*;
 import static com.oracle.graal.api.code.ValueUtil.*;
 
 import java.nio.*;
@@ -37,7 +36,6 @@
  */
 public class HSAIL extends Architecture {
 
-    // @formatter:off
     public static final RegisterCategory CPU = new RegisterCategory("CPU");
     public static final RegisterCategory FPU = new RegisterCategory("FPU");
 
@@ -51,236 +49,77 @@
     public static final Register c6 = new Register(6, 6, "c6", CPU);
     public static final Register c7 = new Register(7, 7, "c7", CPU);
 
-    //32 bit registers.
-    public static final Register s0  = new Register(8,  0,  "s0", CPU);
-    public static final Register s1  = new Register(9,  1,  "s1", CPU);
+    // 32 bit registers.
+    public static final Register s0 = new Register(8, 0, "s0", CPU);
+    public static final Register s1 = new Register(9, 1, "s1", CPU);
     public static final Register s2 = new Register(10, 2, "s2", CPU);
     public static final Register s3 = new Register(11, 3, "s3", CPU);
     public static final Register s4 = new Register(12, 4, "s4", CPU);
     public static final Register s5 = new Register(13, 5, "s5", CPU);
     public static final Register s6 = new Register(14, 6, "s6", CPU);
     public static final Register s7 = new Register(15, 7, "s7", CPU);
-    public static final Register s8  = new Register(16,  8,  "s8", CPU);
-    public static final Register s9  = new Register(17,  9,  "s9", CPU);
+    public static final Register s8 = new Register(16, 8, "s8", CPU);
+    public static final Register s9 = new Register(17, 9, "s9", CPU);
     public static final Register s10 = new Register(18, 10, "s10", CPU);
     public static final Register s11 = new Register(19, 11, "s11", CPU);
     public static final Register s12 = new Register(20, 12, "s12", CPU);
     public static final Register s13 = new Register(21, 13, "s13", CPU);
     public static final Register s14 = new Register(22, 14, "s14", CPU);
     public static final Register s15 = new Register(23, 15, "s15", CPU);
-    public static final Register s16  = new Register(24, 16,  "s16", CPU);
-    public static final Register s17  = new Register(25,  17,  "s17", CPU);
+    public static final Register s16 = new Register(24, 16, "s16", CPU);
+    public static final Register s17 = new Register(25, 17, "s17", CPU);
     public static final Register s18 = new Register(26, 18, "s18", CPU);
     public static final Register s19 = new Register(27, 19, "s19", CPU);
     public static final Register s20 = new Register(28, 20, "s20", CPU);
     public static final Register s21 = new Register(29, 21, "s21", CPU);
     public static final Register s22 = new Register(30, 22, "s22", CPU);
     public static final Register s23 = new Register(31, 23, "s23", CPU);
-    public static final Register s24  = new Register(32, 24,  "s24", CPU);
-    public static final Register s25  = new Register(33, 25,  "s25", CPU);
+    public static final Register s24 = new Register(32, 24, "s24", CPU);
+    public static final Register s25 = new Register(33, 25, "s25", CPU);
     public static final Register s26 = new Register(34, 26, "s26", CPU);
     public static final Register s27 = new Register(35, 27, "s27", CPU);
     public static final Register s28 = new Register(36, 28, "s28", CPU);
     public static final Register s29 = new Register(37, 29, "s29", CPU);
     public static final Register s30 = new Register(38, 30, "s30", CPU);
     public static final Register s31 = new Register(39, 31, "s31", CPU);
-    public static final Register s32  = new Register(40, 32,  "s32", CPU);
-    public static final Register s33  = new Register(41,  33,  "s33", CPU);
-    public static final Register s34 = new Register(42, 34, "s34", CPU);
-    public static final Register s35 = new Register(43, 35, "s35", CPU);
-    public static final Register s36 = new Register(44, 36, "s36", CPU);
-    public static final Register s37 = new Register(45, 37, "s37", CPU);
-    public static final Register s38 = new Register(45, 38, "s38", CPU);
-    public static final Register s39 = new Register(46, 39, "s39", CPU);
-    public static final Register s40  = new Register(47, 40,  "s40", CPU);
-    public static final Register s41  = new Register(48,  41,  "s41", CPU);
-    public static final Register s42 = new Register(49, 42, "s42", CPU);
-    public static final Register s43 = new Register(50, 43, "s43", CPU);
-    public static final Register s44 = new Register(51, 44, "s44", CPU);
-    public static final Register s45 = new Register(52, 45, "s45", CPU);
-    public static final Register s46 = new Register(53, 46, "s46", CPU);
-    public static final Register s47 = new Register(54, 47, "s47", CPU);
-    public static final Register s48  = new Register(55, 48,  "s48", CPU);
-    public static final Register s49  = new Register(56,  49,  "s49", CPU);
-    public static final Register s50 = new Register(57, 50, "s50", CPU);
-    public static final Register s51 = new Register(58, 51, "s51", CPU);
-    public static final Register s52 = new Register(59, 52, "s52", CPU);
-    public static final Register s53 = new Register(60, 53, "s53", CPU);
-    public static final Register s54 = new Register(61, 54, "s54", CPU);
-    public static final Register s55 = new Register(62, 55, "s55", CPU);
-    public static final Register s56  = new Register(64, 56,  "s56", CPU);
-    public static final Register s57  = new Register(64, 57,  "s57", CPU);
-    public static final Register s58 = new Register(65, 58, "s58", CPU);
-    public static final Register s59 = new Register(66, 59, "s59", CPU);
-    public static final Register s60 = new Register(67, 60, "s60", CPU);
-    public static final Register s61 = new Register(68, 61, "s61", CPU);
-    public static final Register s62 = new Register(69, 62, "s62", CPU);
-    public static final Register s63 = new Register(70, 63, "s63", CPU);
-    public static final Register s64  = new Register(71, 64,  "s64", CPU);
-    public static final Register s65  = new Register(72, 65,  "s65", CPU);
-    public static final Register s66 = new Register(73, 66, "s66", CPU);
-    public static final Register s67 = new Register(74, 67, "s67", CPU);
-    public static final Register s68 = new Register(75, 68, "s68", CPU);
-    public static final Register s69 = new Register(76, 69, "s69", CPU);
-    public static final Register s70 = new Register(77, 70, "s70", CPU);
-    public static final Register s71 = new Register(78, 71, "s71", CPU);
-    public static final Register s72  = new Register(79, 72,  "s72", CPU);
-    public static final Register s73  = new Register(80, 73,  "s73", CPU);
-    public static final Register s74 = new Register(81, 74, "s74", CPU);
-    public static final Register s75 = new Register(82, 75, "s75", CPU);
-    public static final Register s76 = new Register(83, 76, "s76", CPU);
-    public static final Register s77 = new Register(84, 77, "s77", CPU);
-    public static final Register s78 = new Register(85, 78, "s78", CPU);
-    public static final Register s79 = new Register(86, 79, "s79", CPU);
-    public static final Register s80  = new Register(87, 80,  "s80", CPU);
-    public static final Register s81  = new Register(88, 81,  "s81", CPU);
-    public static final Register s82 = new Register(89, 82, "s82", CPU);
-    public static final Register s83 = new Register(90, 83, "s83", CPU);
-    public static final Register s84 = new Register(91, 84, "s84", CPU);
-    public static final Register s85 = new Register(92, 85, "s85", CPU);
-    public static final Register s86 = new Register(93, 86, "s86", CPU);
-    public static final Register s87 = new Register(94, 87, "s87", CPU);
-    public static final Register s88  = new Register(95,  88,  "s88", CPU);
-    public static final Register s89  = new Register(96,  89,  "s89", CPU);
-    public static final Register s90 = new Register(97, 90, "s90", CPU);
-    public static final Register s91 = new Register(98, 91, "s91", CPU);
-    public static final Register s92 = new Register(99, 92, "s92", CPU);
-    public static final Register s93 = new Register(100, 93, "s93", CPU);
-    public static final Register s94 = new Register(101, 94, "s94", CPU);
-    public static final Register s95 = new Register(102, 95, "s95", CPU);
-    public static final Register s96  = new Register(103, 96,  "s96", CPU);
-    public static final Register s97  = new Register(104, 97,  "s97", CPU);
-    public static final Register s98 = new Register(105, 98, "s98", CPU);
-    public static final Register s99 = new Register(106, 99, "s99", CPU);
-    public static final Register s100 = new Register(107, 100, "s100", CPU);
-    public static final Register s101 = new Register(108, 101, "s101", CPU);
-    public static final Register s102 = new Register(109, 102, "s102", CPU);
-    public static final Register s103 = new Register(110, 103, "s103", CPU);
-    public static final Register s104  = new Register(111, 104,  "s104", CPU);
-    public static final Register s105  = new Register(112,  105,  "s105", CPU);
-    public static final Register s106 = new Register(113, 106, "s106", CPU);
-    public static final Register s107 = new Register(114, 107, "s107", CPU);
-    public static final Register s108 = new Register(115, 108, "s108", CPU);
-    public static final Register s109 = new Register(116, 109, "s109", CPU);
-    public static final Register s110 = new Register(117, 110, "s110", CPU);
-    public static final Register s111 = new Register(118, 111, "s111", CPU);
-    public static final Register s112  = new Register(119, 112,  "s112", CPU);
-    public static final Register s113  = new Register(120, 113,  "s113", CPU);
-    public static final Register s114 = new Register(121, 114, "s114", CPU);
-    public static final Register s115 = new Register(122, 115, "s115", CPU);
-    public static final Register s116 = new Register(123, 116, "s116", CPU);
-    public static final Register s117 = new Register(124, 117, "s117", CPU);
-    public static final Register s118 = new Register(125, 118, "s118", CPU);
-    public static final Register s119 = new Register(126, 119, "s119", CPU);
-    public static final Register s120  = new Register(127, 120,  "s120", CPU);
-    public static final Register s121  = new Register(128, 121,  "s121", CPU);
-    public static final Register s122 = new Register(129, 122, "s122", CPU);
-    public static final Register s123 = new Register(130, 123, "s123", CPU);
-    public static final Register s124 = new Register(131, 124, "s124", CPU);
-    public static final Register s125 = new Register(132, 125, "s125", CPU);
-    public static final Register s126 = new Register(133, 126, "s126", CPU);
-    public static final Register s127 = new Register(134, 127, "s127", CPU);
+
+    // 64 bit registers.
+    public static final Register d0 = new Register(40, 0, "d0", CPU);
+    public static final Register d1 = new Register(41, 1, "d1", CPU);
+    public static final Register d2 = new Register(42, 2, "d2", CPU);
+    public static final Register d3 = new Register(43, 3, "d3", CPU);
+    public static final Register d4 = new Register(44, 4, "d4", CPU);
+    public static final Register d5 = new Register(45, 5, "d5", CPU);
+    public static final Register d6 = new Register(46, 6, "d6", CPU);
+    public static final Register d7 = new Register(47, 7, "d7", CPU);
+    public static final Register d8 = new Register(48, 8, "d8", CPU);
+    public static final Register d9 = new Register(49, 9, "d9", CPU);
+    public static final Register d10 = new Register(50, 10, "d10", CPU);
+    public static final Register d11 = new Register(51, 11, "d11", CPU);
+    public static final Register d12 = new Register(52, 12, "d12", CPU);
+    public static final Register d13 = new Register(53, 13, "d13", CPU);
+    public static final Register d14 = new Register(54, 14, "d14", CPU);
+    public static final Register d15 = new Register(55, 15, "d15", CPU);
 
-    //64 bit registers.
-    public static final Register d0  = new Register(135,  0,  "d0", CPU);
-    public static final Register d1  = new Register(136,  1,  "d1", CPU);
-    public static final Register d2 = new Register(137, 2, "d2", CPU);
-    public static final Register d3 = new Register(138, 3, "d3", CPU);
-    public static final Register d4 = new Register(139, 4, "d4", CPU);
-    public static final Register d5 = new Register(140, 5, "d5", CPU);
-    public static final Register d6 = new Register(141, 6, "d6", CPU);
-    public static final Register d7 = new Register(142, 7, "d7", CPU);
-    public static final Register d8  = new Register(143,  8,  "d8", CPU);
-    public static final Register d9  = new Register(144,  9,  "d9", CPU);
-    public static final Register d10 = new Register(145, 10, "d10", CPU);
-    public static final Register d11 = new Register(146, 11, "d11", CPU);
-    public static final Register d12 = new Register(147, 12, "d12", CPU);
-    public static final Register d13 = new Register(148, 13, "d13", CPU);
-    public static final Register d14 = new Register(149, 14, "d14", CPU);
-    public static final Register d15 = new Register(150, 15, "d15", CPU);
-    public static final Register d16  = new Register(151, 16,  "d16", CPU);
-    public static final Register d17  = new Register(152,  17,  "d17", CPU);
-    public static final Register d18 = new Register(153, 18, "d18", CPU);
-    public static final Register d19 = new Register(154, 19, "d19", CPU);
-    public static final Register d20 = new Register(155, 20, "d20", CPU);
-    public static final Register d21 = new Register(156, 21, "d21", CPU);
-    public static final Register d22 = new Register(157, 22, "d22", CPU);
-    public static final Register d23 = new Register(158, 23, "d23", CPU);
-    public static final Register d24  = new Register(159, 24,  "d24", CPU);
-    public static final Register d25  = new Register(160, 25,  "d25", CPU);
-    public static final Register d26 = new Register(161, 26, "d26", CPU);
-    public static final Register d27 = new Register(162, 27, "d27", CPU);
-    public static final Register d28 = new Register(163, 28, "d28", CPU);
-    public static final Register d29 = new Register(164, 29, "d29", CPU);
-    public static final Register d30 = new Register(165, 30, "d30", CPU);
-    public static final Register d31 = new Register(166, 31, "d31", CPU);
-    public static final Register d32  = new Register(167, 32,  "d32", CPU);
-    public static final Register d33  = new Register(168,  33,  "d33", CPU);
-    public static final Register d34 = new Register(169, 34, "d34", CPU);
-    public static final Register d35 = new Register(170, 35, "d35", CPU);
-    public static final Register d36 = new Register(171, 36, "d36", CPU);
-    public static final Register d37 = new Register(172, 37, "d37", CPU);
-    public static final Register d38 = new Register(173, 38, "d38", CPU);
-    public static final Register d39 = new Register(174, 39, "d39", CPU);
-    public static final Register d40  = new Register(175, 40,  "d40", CPU);
-    public static final Register d41  = new Register(176,  41,  "d41", CPU);
-    public static final Register d42 = new Register(177, 42, "d42", CPU);
-    public static final Register d43 = new Register(178, 43, "d43", CPU);
-    public static final Register d44 = new Register(179, 44, "d44", CPU);
-    public static final Register d45 = new Register(180, 45, "d45", CPU);
-    public static final Register d46 = new Register(181, 46, "d46", CPU);
-    public static final Register d47 = new Register(182, 47, "d47", CPU);
-    public static final Register d48  = new Register(183, 48,  "d48", CPU);
-    public static final Register d49  = new Register(184,  49,  "d49", CPU);
-    public static final Register d50 = new Register(185, 50, "d50", CPU);
-    public static final Register d51 = new Register(186, 51, "d51", CPU);
-    public static final Register d52 = new Register(187, 52, "d52", CPU);
-    public static final Register d53 = new Register(188, 53, "d53", CPU);
-    public static final Register d54 = new Register(189, 54, "d54", CPU);
-    public static final Register d55 = new Register(190, 55, "d55", CPU);
-    public static final Register d56  = new Register(191, 56,  "d56", CPU);
-    public static final Register d57  = new Register(192, 57,  "d57", CPU);
-    public static final Register d58 = new Register(193, 58, "d58", CPU);
-    public static final Register d59 = new Register(194, 59, "d59", CPU);
-    public static final Register d60 = new Register(195, 60, "d60", CPU);
-    public static final Register d61 = new Register(196, 61, "d61", CPU);
-    public static final Register d62 = new Register(197, 62, "d62", CPU);
-    public static final Register d63 = new Register(198, 63, "d63", CPU);
+    // 128 bit registers.
+    public static final Register q0 = new Register(56, 0, "q0", CPU);
+    public static final Register q1 = new Register(57, 1, "q1", CPU);
+    public static final Register q2 = new Register(58, 2, "q2", CPU);
+    public static final Register q3 = new Register(59, 3, "q3", CPU);
+    public static final Register q4 = new Register(60, 4, "q4", CPU);
+    public static final Register q5 = new Register(61, 5, "q5", CPU);
+    public static final Register q6 = new Register(62, 6, "q6", CPU);
+    public static final Register q7 = new Register(63, 7, "q7", CPU);
+    public static final Register q8 = new Register(64, 8, "q8", CPU);
+    public static final Register q9 = new Register(65, 9, "q9", CPU);
+    public static final Register q10 = new Register(66, 10, "q10", CPU);
+    public static final Register q11 = new Register(67, 11, "q11", CPU);
+    public static final Register q12 = new Register(68, 12, "q12", CPU);
+    public static final Register q13 = new Register(69, 13, "q13", CPU);
+    public static final Register q14 = new Register(70, 14, "q14", CPU);
+    public static final Register q15 = new Register(71, 15, "q15", CPU);
 
-    //128 bit registers.
-    public static final Register q0 = new Register(199, 0, "q0", CPU);
-    public static final Register q1 = new Register(200, 1, "q1", CPU);
-    public static final Register q2 = new Register(201, 2, "q2", CPU);
-    public static final Register q3 = new Register(202, 3, "q3", CPU);
-    public static final Register q4 = new Register(203, 4, "q4", CPU);
-    public static final Register q5 = new Register(204, 5, "q5", CPU);
-    public static final Register q6 = new Register(205, 6, "q6", CPU);
-    public static final Register q7 = new Register(206, 7, "q7", CPU);
-    public static final Register q8 = new Register(207, 8, "q8", CPU);
-    public static final Register q9 = new Register(208, 9, "q9", CPU);
-    public static final Register q10 = new Register(209, 10, "q10", CPU);
-    public static final Register q11 = new Register(210, 11, "q11", CPU);
-    public static final Register q12 = new Register(211, 12, "q12", CPU);
-    public static final Register q13 = new Register(212, 13, "q13", CPU);
-    public static final Register q14 = new Register(213, 14, "q14", CPU);
-    public static final Register q15 = new Register(214, 15, "q15", CPU);
-    public static final Register q16 = new Register(215, 16, "q16", CPU);
-    public static final Register q17 = new Register(216, 17, "q17", CPU);
-    public static final Register q18 = new Register(217, 18, "q18", CPU);
-    public static final Register q19 = new Register(218, 19, "q19", CPU);
-    public static final Register q20 = new Register(219, 20, "q20", CPU);
-    public static final Register q21 = new Register(220, 21, "q21", CPU);
-    public static final Register q22 = new Register(221, 22, "q22", CPU);
-    public static final Register q23 = new Register(222, 23, "q23", CPU);
-    public static final Register q24 = new Register(223, 24, "q24", CPU);
-    public static final Register q25 = new Register(224, 25, "q25", CPU);
-    public static final Register q26 = new Register(225, 26, "q26", CPU);
-    public static final Register q27 = new Register(226, 27, "q27", CPU);
-    public static final Register q28 = new Register(227, 28, "q28", CPU);
-    public static final Register q29 = new Register(228, 29, "q29", CPU);
-    public static final Register q30 = new Register(229, 30, "q30", CPU);
-    public static final Register q31 = new Register(230, 31, "q31", CPU);
-
+    // @formatter:off
     public static final Register[] cRegisters = {
         c0, c1, c2, c3, c4, c5, c6, c7
     };
@@ -289,58 +128,28 @@
         s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10,
         s11, s12, s13, s14, s15, s16, s17, s18, s19,
         s20, s21, s22, s23, s24, s25, s26, s27, s28,
-        s29, s30, s31, s32, s33, s34, s35, s36, s37,
-        s38, s39, s40, s41, s42, s43, s44, s45, s46,
-        s47, s48, s49, s50, s51, s52, s53, s54, s55,
-        s56, s57, s58, s59, s60, s61, s62, s63, s64,
-        s65, s66, s67, s68, s69, s70, s71, s72, s73,
-        s74, s75, s76, s77, s78, s79, s80, s81, s82,
-        s83, s84, s85, s86, s87, s88, s89, s90, s91,
-        s92, s93, s94, s95, s96, s97, s98, s99, s100,
-        s101, s102, s103, s104, s105, s106, s107, s108,
-        s109, s110, s111, s112, s113, s114, s115, s116,
-        s117, s118, s119, s120, s121, s122, s123, s124,
-        s125, s126, s127
+        s29, s30, s31
     };
 
     public static final Register[] dRegisters = {
-        d0, d1, d2, d3, d4, d5, d6, d7, d8, d9, d10, d11, d12, d13, d14, d15, d16, d17, d18, d19, d20, d21, d22, d23, d24, d25, d26, d27, d28,
-        d29, d30, d31, d32, d33, d34, d35, d36, d37, d38, d39, d40, d41, d42, d43, d44, d45, d46, d47, d48, d49, d50, d51, d52, d53, d54, d55,
-        d56, d57, d58, d59, d60, d61, d62, d63
+        d0, d1, d2, d3, d4, d5, d6, d7, d8, d9, d10, d11, d12, d13, d14, d15
     };
 
     public static final Register[] qRegisters = {
-        q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11, q12, q13, q14, q15, q16, q17, q18, q19, q20, q21, q22, q23, q24, q25, q26, q27, q28, q29, q30, q31
+        q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11, q12, q13, q14, q15
     };
 
     public static final Register[] allRegisters = {
-        c0, c1, c2, c3, c4, c5, c6, c7, s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15, s16, s17, s18, s19,
-        s20, s21, s22, s23, s24, s25, s26, s27, s28, s29, s30, s31, s32, s33, s34, s35,
-        s36, s37, s38, s39, s40, s41, s42, s43, s44, s45, s46, s47, s48, s49, s50, s51, s52,
-        s53, s54, s55, s56, s57, s58, s59, s60, s61,
-        s62, s63, s64, s65, s66, s67, s68, s69, s70,
-        s71, s72, s73, s74, s75, s76, s77, s78, s79,
-        s80, s81, s82, s83, s84, s85, s86, s87, s88,
-        s89, s90, s91, s92, s93, s94, s95, s96, s97,
-        s98, s99, s100, s101, s102, s103, s104, s105,
-        s106, s107, s108, s109, s110, s111, s112, s113,
-        s114, s115, s116, s117, s118, s119, s120, s121,
-        s122, s123, s124, s125, s126, s127,  d0, d1, d2,
-        d3, d4, d5, d6, d7, d8, d9, d10, d11, d12, d13,
-        d14, d15, d16, d17, d18, d19, d20, d21, d22, d23,
-        d24, d25, d26, d27, d28, d29, d30, d31, d32, d33,
-        d34, d35, d36, d37, d38, d39, d40, d41, d42, d43,
-        d44, d45, d46, d47, d48, d49, d50, d51, d52, d53,
-        d54, d55, d56, d57, d58, d59, d60, d61, d62, d63,
-        q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11,
-        q12, q13, q14, q15, q16, q17, q18, q19, q20, q21,
-        q22, q23, q24, q25, q26, q27, q28, q29, q30, q31
+        c0, c1, c2, c3, c4, c5, c6, c7, s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15,
+        d0, d1, d2, d3, d4, d5, d6, d7, d8, d9, d10, d11, d12, d13,
+        d14, d15, q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11,
+        q12, q13, q14, q15
     };
 
     // @formatter:on
 
     public HSAIL() {
-        super("HSAIL", 8, ByteOrder.LITTLE_ENDIAN, false, allRegisters, LOAD_STORE | STORE_STORE, 1, q31.encoding + 1, 8);
+        super("HSAIL", 8, ByteOrder.LITTLE_ENDIAN, false, allRegisters, 0, 1, q15.encoding + 1, 8);
     }
 
     public static int getStackOffset(Value reg) {
@@ -368,7 +177,7 @@
         switch (argType) {
             case "float":
                 reg = asFloatReg(arg);
-                encoding = reg.encoding() + 16;
+                encoding = reg.encoding();
                 break;
             case "int":
                 reg = asIntReg(arg);
@@ -380,7 +189,7 @@
                 break;
             case "double":
                 reg = asDoubleReg(arg);
-                encoding = reg.encoding() + 16;
+                encoding = reg.encoding();
                 break;
             case "Object":
                 reg = asObjectReg(arg);
diff -r 7f507f082daa -r 1fdecc36c8ac graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILControlFlow.java
--- a/graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILControlFlow.java	Mon Nov 04 16:12:48 2013 +0100
+++ b/graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILControlFlow.java	Mon Nov 04 17:17:08 2013 +0100
@@ -79,6 +79,16 @@
         }
     }
 
+    public static class ForeignCall2ArgOp extends ForeignCall1ArgOp {
+
+        @Use({REG, ILLEGAL}) protected Value arg2;
+
+        public ForeignCall2ArgOp(String callName, Value out, Value arg1, Value arg2) {
+            super(callName, out, arg1);
+            this.arg2 = arg2;
+        }
+    }
+
     public static class CompareBranchOp extends HSAILLIRInstruction implements StandardOp.BranchOp {
 
         @Opcode protected final HSAILCompare opcode;
@@ -205,13 +215,13 @@
 
         @Opcode protected final HSAILCompare opcode;
         @Def({REG, HINT}) protected Value result;
-        @Alive({REG}) protected Value trueValue;
+        @Use({REG, STACK, CONST}) protected Value trueValue;
         @Use({REG, STACK, CONST}) protected Value falseValue;
         @Use({REG, STACK, CONST}) protected Value left;
         @Use({REG, STACK, CONST}) protected Value right;
         protected final Condition condition;
 
-        public CondMoveOp(HSAILCompare opcode, Variable left, Variable right, Variable result, Condition condition, Variable trueValue, Value falseValue) {
+        public CondMoveOp(HSAILCompare opcode, Variable left, Variable right, Variable result, Condition condition, Value trueValue, Value falseValue) {
             this.opcode = opcode;
             this.result = result;
             this.left = left;
diff -r 7f507f082daa -r 1fdecc36c8ac mx/projects
--- a/mx/projects	Mon Nov 04 16:12:48 2013 +0100
+++ b/mx/projects	Mon Nov 04 17:17:08 2013 +0100
@@ -154,7 +154,7 @@
 # graal.hotspot.hsail
 project@com.oracle.graal.hotspot.hsail@subDir=graal
 project@com.oracle.graal.hotspot.hsail@sourceDirs=src
-project@com.oracle.graal.hotspot.hsail@dependencies=com.oracle.graal.hotspot,com.oracle.graal.compiler.hsail
+project@com.oracle.graal.hotspot.hsail@dependencies=com.oracle.graal.compiler.hsail,com.oracle.graal.hotspot
 project@com.oracle.graal.hotspot.hsail@checkstyle=com.oracle.graal.graph
 project@com.oracle.graal.hotspot.hsail@annotationProcessors=com.oracle.graal.service.processor
 project@com.oracle.graal.hotspot.hsail@javaCompliance=1.7