--- a/graal/com.oracle.graal.asm.hsail/src/com/oracle/graal/asm/hsail/AbstractHSAILAssembler.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.hsail;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.asm.*;
-
-/**
- * The platform-dependent base class for the HSAIL assembler.
- */
-public abstract class AbstractHSAILAssembler extends Assembler {
-
-    public AbstractHSAILAssembler(TargetDescription target) {
-        super(target);
-    }
-
-    @Override
-    public final void bind(Label l) {
-        super.bind(l);
-        emitString0(nameOf(l) + ":\n");
-    }
-
-    @Override
-    public void align(int modulus) {
-        // Nothing to do
-    }
-
-    @Override
-    public void jmp(Label l) {
-        emitJumpToLabelName(nameOf(l));
-    }
-
-    public void emitJumpToLabelName(String labelName) {
-        emitString("brn " + labelName + ";");
-    }
-
-    @Override
-    protected void patchJumpTarget(int branch, int jumpTarget) {
-        // Nothing to do
-    }
-
-    @Override
-    protected String createLabelName(Label l, int id) {
-        int blockId = l.getBlockId();
-        return "@L" + (blockId == -1 ? id : blockId);
-    }
-}

--- a/graal/com.oracle.graal.asm.hsail/src/com/oracle/graal/asm/hsail/HSAILAddress.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.hsail;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.api.meta.*;
-
-/**
- * Represents an address in target machine memory, specified via some combination of a base register
- * and a displacement.
- */
-public final class HSAILAddress extends AbstractAddress {
-
-    private final Register base;
-    private final long displacement;
-
-    /**
-     * Creates an {@link HSAILAddress} with given base register and no displacement.
-     * 
-     * 
-     * @param base the base register
-     */
-    public HSAILAddress(Register base) {
-        this(base, 0);
-    }
-
-    /**
-     * Creates an {@link HSAILAddress} with given base register and a displacement. This is the most
-     * general constructor.
-     * 
-     * @param base the base register
-     * @param displacement the displacement
-     */
-    public HSAILAddress(Register base, long displacement) {
-        this.base = base;
-        this.displacement = displacement;
-    }
-
-    /**
-     * @return Base register that defines the start of the address computation. If not present, is
-     *         denoted by {@link Value#ILLEGAL}.
-     */
-    public Register getBase() {
-        return base;
-    }
-
-    /**
-     * @return Optional additive displacement.
-     */
-    public long getDisplacement() {
-        return displacement;
-    }
-
-}

--- a/graal/com.oracle.graal.asm.hsail/src/com/oracle/graal/asm/hsail/HSAILAssembler.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,661 +0,0 @@
-/*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.hsail;
-
-import static com.oracle.graal.api.code.MemoryBarriers.*;
-import static com.oracle.graal.api.code.ValueUtil.*;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.compiler.common.*;
-import com.oracle.graal.hsail.*;
-
-/**
- * This class contains routines to emit HSAIL assembly code.
- */
-public abstract class HSAILAssembler extends AbstractHSAILAssembler {
-
-    /**
-     * Stack size in bytes (used to keep track of spilling).
-     */
-    private int maxDataTypeSize;
-
-    /**
-     * Maximum stack offset used by a store operation.
-     */
-    private long maxStackOffset = 0;
-
-    public long upperBoundStackSize() {
-        return maxStackOffset + maxDataTypeSize;
-    }
-
-    public HSAILAssembler(TargetDescription target) {
-        super(target);
-    }
-
-    @Override
-    public HSAILAddress makeAddress(Register base, int displacement) {
-        return new HSAILAddress(base, displacement);
-    }
-
-    @Override
-    public HSAILAddress getPlaceholder() {
-        return null;
-    }
-
-    @Override
-    public final void ensureUniquePC() {
-        throw GraalInternalError.unimplemented();
-    }
-
-    public final void undefined(String str) {
-        emitString("undefined operation " + str);
-    }
-
-    public final void exit() {
-        emitString("ret;" + "");
-    }
-
-    /**
-     * Moves an Object into a register.
-     *
-     * Because Object references become stale after Garbage collection (GC) the technique used here
-     * is to load a JNI global reference to that Object into the register. These JNI global
-     * references get updated by the GC whenever the GC moves an Object.
-     *
-     * @param a the destination register
-     * @param src the Object Constant being moved
-     */
-    public abstract void mov(Register a, JavaConstant src);
-
-    private static String getBitTypeFromKind(Kind kind) {
-        switch (kind) {
-            case Boolean:
-            case Byte:
-            case Short:
-            case Char:
-            case Int:
-            case Float:
-                return "b32";
-            case Long:
-            case Double:
-            case Object:
-                return "b64";
-            default:
-                throw GraalInternalError.shouldNotReachHere();
-        }
-    }
-
-    public final void emitMov(Kind kind, Value dst, Value src) {
-        if (isRegister(dst) && isConstant(src) && kind.getStackKind() == Kind.Object) {
-            mov(asRegister(dst), asConstant(src));
-        } else {
-            String argtype = getBitTypeFromKind(kind);
-            emitString("mov_" + argtype + " " + mapRegOrConstToString(dst) + ", " + mapRegOrConstToString(src) + ";");
-        }
-    }
-
-    private void emitAddrOp(String instr, Value reg, HSAILAddress addr) {
-        String storeValue = mapRegOrConstToString(reg);
-        emitString(instr + " " + storeValue + ", " + mapAddress(addr) + ";");
-    }
-
-    /**
-     * Emits a memory barrier instruction.
-     *
-     * @param barriers the kind of barrier to emit
-     */
-    public final void emitMembar(int barriers) {
-        if (barriers == 0) {
-            emitString("// no barrier before volatile read");
-        } else if (barriers == JMM_POST_VOLATILE_READ) {
-            emitString("sync; // barriers=" + MemoryBarriers.barriersString(barriers));
-        } else if (barriers == JMM_PRE_VOLATILE_WRITE) {
-            emitString("sync; // barriers=" + MemoryBarriers.barriersString(barriers));
-        } else if (barriers == JMM_POST_VOLATILE_WRITE) {
-            emitString("sync; // barriers=" + MemoryBarriers.barriersString(barriers));
-        }
-    }
-
-    public final void emitLoad(Kind kind, Value dest, HSAILAddress addr) {
-        emitLoad(dest, addr, getArgTypeFromKind(kind));
-    }
-
-    public final void emitLoad(Value dest, HSAILAddress addr, String argTypeStr) {
-        emitAddrOp("ld_global_" + argTypeStr, dest, addr);
-    }
-
-    public final void emitLda(Value dest, HSAILAddress addr) {
-        emitAddrOp("lda_global_u64", dest, addr);
-    }
-
-    public final void emitLea(Value dest, HSAILAddress addr) {
-        String prefix = getArgType(dest);
-        emitString(String.format("add_%s %s, $%s, 0x%s;", prefix, HSAIL.mapRegister(dest), addr.getBase().name, Long.toHexString(addr.getDisplacement())));
-    }
-
-    public final void emitLoadKernelArg(Value dest, String kernArgName, String argTypeStr) {
-        emitString("ld_kernarg_" + argTypeStr + " " + HSAIL.mapRegister(dest) + ", [" + kernArgName + "];");
-    }
-
-    public final void emitStore(Kind kind, Value src, HSAILAddress addr) {
-        emitStore(src, addr, getArgTypeFromKind(kind));
-    }
-
-    public final void emitStore(Value dest, HSAILAddress addr, String argTypeStr) {
-        emitAddrOp("st_global_" + argTypeStr, dest, addr);
-    }
-
-    private void storeImmediateImpl(String storeType, String value, HSAILAddress addr) {
-        emitString("st_global_" + storeType + " " + value + ", " + mapAddress(addr) + ";");
-    }
-
-    public final void emitStoreImmediate(Kind kind, long src, HSAILAddress addr) {
-        assert (kind != Kind.Float && kind != Kind.Double);
-        storeImmediateImpl(getArgTypeFromKind(kind), Long.toString(src), addr);
-    }
-
-    public final void emitStoreImmediate(float src, HSAILAddress addr) {
-        storeImmediateImpl("f32", floatToString(src), addr);
-    }
-
-    public final void emitStoreImmediate(double src, HSAILAddress addr) {
-        storeImmediateImpl("f64", doubleToString(src), addr);
-    }
-
-    public final void emitSpillLoad(Kind kind, Value dest, Value src) {
-        emitString("ld_spill_" + getArgTypeFromKind(kind) + " " + HSAIL.mapRegister(dest) + ", " + mapStackSlot(src, getArgSizeFromKind(kind)) + ";");
-    }
-
-    public final void emitStore(Value src, HSAILAddress addr) {
-        emitString("st_global_" + getArgType(src) + " " + HSAIL.mapRegister(src) + ", " + mapAddress(addr) + ";");
-    }
-
-    public final void emitSpillStore(Kind kind, Value src, Value dest) {
-        int sizestored = getArgSizeFromKind(kind);
-        if (maxDataTypeSize < sizestored) {
-            maxDataTypeSize = sizestored;
-        }
-        int stackoffset = HSAIL.getStackOffset(dest);
-        if (maxStackOffset < stackoffset) {
-            maxStackOffset = stackoffset;
-        }
-        emitString("st_spill_" + getArgTypeFromKind(kind) + " " + HSAIL.mapRegister(src) + ", " + mapStackSlot(dest, getArgSizeFromKind(kind)) + ";");
-    }
-
-    public static String mapStackSlot(Value reg, int argSize) {
-        long startOffset = HSAIL.getStackOffsetStart(reg, argSize);
-        return "[%spillseg]" + "[" + startOffset + "]";
-    }
-
-    public void cbr(String target1) {
-        emitString("cbr " + "$c0" + ", " + target1 + ";");
-    }
-
-    public int getArgSize(Value src) {
-        return getArgSizeFromKind(src.getKind());
-    }
-
-    private static int getArgSizeFromKind(Kind kind) {
-        switch (kind) {
-            case Int:
-            case Float:
-                return 32;
-            case Double:
-            case Long:
-            case Object:
-                return 64;
-            default:
-                throw GraalInternalError.shouldNotReachHere();
-        }
-    }
-
-    private static String getArgType(Value src) {
-        return getArgTypeFromKind(src.getKind());
-    }
-
-    private static String getArgTypeFromKind(Kind kind) {
-        String prefix = "";
-        switch (kind) {
-            case Float:
-                prefix = "f32";
-                break;
-            case Double:
-                prefix = "f64";
-                break;
-            case Int:
-                prefix = "s32";
-                break;
-            case Long:
-                prefix = "s64";
-                break;
-            case Object:
-                prefix = "u64";
-                break;
-            case Char:
-                prefix = "u16";
-                break;
-            case Short:
-                prefix = "s16";
-                break;
-            case Byte:
-                prefix = "s8";
-                break;
-            case Boolean:
-                prefix = "u8";
-                break;
-            default:
-                throw GraalInternalError.shouldNotReachHere();
-        }
-        return prefix;
-    }
-
-    public static final String getArgTypeForceUnsigned(Value src) {
-        return getArgTypeForceUnsignedKind(src.getKind());
-    }
-
-    public static final String getArgTypeForceUnsignedKind(Kind kind) {
-        switch (kind) {
-            case Int:
-                return "u32";
-            case Long:
-            case Object:
-                return "u64";
-            default:
-                throw GraalInternalError.shouldNotReachHere();
-        }
-    }
-
-    public static final String getArgTypeBitwiseLogical(Value src) {
-        String length = getArgType(src);
-        String prefix = "_b" + (length.endsWith("64") ? "64" : "32");
-        return prefix;
-    }
-
-    /**
-     * Emits a compare instruction.
-     *
-     * @param src0 - the first source register
-     * @param src1 - the second source register
-     * @param condition - the compare condition i.e., eq, ne, lt, gt
-     * @param unordered - flag specifying if this is an unordered compare. This only applies to
-     *            float compares.
-     * @param isUnsignedCompare - flag specifying if this is a compare of unsigned values.
-     */
-    public void emitCompare(Kind compareKind, Value src0, Value src1, String condition, boolean unordered, boolean isUnsignedCompare) {
-        // Formulate the prefix of the instruction.
-        // if unordered is true, it should be ignored unless the src type is f32 or f64
-        String argType = getArgTypeFromKind(compareKind);
-        String unorderedPrefix = (argType.startsWith("f") && unordered ? "u" : "");
-        String prefix = "cmp_" + condition + unorderedPrefix + "_b1_" + (isUnsignedCompare ? getArgTypeForceUnsigned(src1) : argType);
-        // Generate a comment for debugging purposes
-        String comment = (isConstant(src1) && (src1.getKind() == Kind.Object) && (asConstant(src1).isNull()) ? " // null test " : "");
-        // Emit the instruction.
-        emitString(prefix + " $c0, " + mapRegOrConstToString(src0) + ", " + mapRegOrConstToString(src1) + ";" + comment);
-    }
-
-    public void emitConvert(Value dest, Value src, String destType, String srcType) {
-        String prefix = "cvt_";
-        if (destType.equals("f32") && srcType.equals("f64")) {
-            prefix = "cvt_near_";
-        } else if (srcType.startsWith("f") && (destType.startsWith("s") || destType.startsWith("u"))) {
-            prefix = "cvt_zeroi_sat_";
-        }
-        emitString(prefix + destType + "_" + srcType + " " + HSAIL.mapRegister(dest) + ", " + HSAIL.mapRegister(src) + ";");
-    }
-
-    public void emitConvert(Value dest, Value src, Kind destKind, Kind srcKind) {
-        String destType = getArgTypeFromKind(destKind);
-        String srcType = getArgTypeFromKind(srcKind);
-        emitConvert(dest, src, destType, srcType);
-    }
-
-    /**
-     * Emits a convert instruction that uses unsigned prefix, regardless of the type of dest and
-     * src.
-     *
-     * @param dest the destination operand
-     * @param src the source operand
-     */
-    public void emitConvertForceUnsigned(Value dest, Value src) {
-        emitString("cvt_" + getArgTypeForceUnsigned(dest) + "_" + getArgTypeForceUnsigned(src) + " " + HSAIL.mapRegister(dest) + ", " + HSAIL.mapRegister(src) + ";");
-    }
-
-    public static String mapAddress(HSAILAddress addr) {
-        if (addr.getBase().encoding() < 0) {
-            return "[0x" + Long.toHexString(addr.getDisplacement()) + "]";
-        } else {
-            return "[$d" + addr.getBase().encoding() + " + " + addr.getDisplacement() + "]";
-        }
-    }
-
-    private static String doubleToString(double dval) {
-        long lval = Double.doubleToRawLongBits(dval);
-        long lvalIgnoreSign = lval & 0x7fffffffffffffffL;
-        if (lvalIgnoreSign >= 0x7ff0000000000000L) {
-            return "0D" + String.format("%16x", lval);
-        } else {
-            return Double.toString(dval);
-        }
-    }
-
-    private static String floatToString(float fval) {
-        int ival = Float.floatToRawIntBits(fval);
-        int ivalIgnoreSign = ival & 0x7fffffff;
-        if (ivalIgnoreSign >= 0x7f800000) {
-            return "0F" + String.format("%8x", ival);
-        } else {
-            return Float.toString(fval) + "f";
-        }
-    }
-
-    private static String mapRegOrConstToString(Value src) {
-        if (!isConstant(src)) {
-            return HSAIL.mapRegister(src);
-        } else {
-            JavaConstant consrc = asConstant(src);
-            switch (src.getKind()) {
-                case Boolean:
-                case Int:
-                    return Integer.toString(consrc.asInt());
-                case Float:
-                    return floatToString(consrc.asFloat());
-                case Double:
-                    return doubleToString(consrc.asDouble());
-                case Long:
-                    return "0x" + Long.toHexString(consrc.asLong());
-                case Object:
-                    if (consrc.isNull()) {
-                        return "0";
-                    } else {
-                        throw GraalInternalError.shouldNotReachHere("unknown type: " + src);
-                    }
-                default:
-                    throw GraalInternalError.shouldNotReachHere("unknown type: " + src);
-            }
-        }
-
-    }
-
-    /**
-     * Emits an instruction.
-     *
-     * @param mnemonic the instruction mnemonic
-     * @param dest the destination operand
-     * @param sources the source operands
-     */
-    public final void emit(String mnemonic, Value dest, Value... sources) {
-        String prefix = getArgType(dest);
-        emitTextFormattedInstruction(mnemonic + "_" + prefix, dest, sources);
-    }
-
-    /**
-     * Emits an unsigned instruction.
-     *
-     * @param mnemonic the instruction mnemonic
-     * @param dest the destination argument
-     * @param sources the source arguments
-     *
-     */
-    public final void emitForceUnsigned(String mnemonic, Value dest, Value... sources) {
-        String prefix = getArgTypeForceUnsigned(dest);
-        emitTextFormattedInstruction(mnemonic + "_" + prefix, dest, sources);
-    }
-
-    public final void emitForceUnsignedKind(String mnemonic, Kind kind, Value dest, Value... sources) {
-        String prefix = getArgTypeForceUnsignedKind(kind);
-        emitTextFormattedInstruction(mnemonic + "_" + prefix, dest, sources);
-    }
-
-    /**
-     * Emits an instruction for a bitwise logical operation.
-     *
-     * @param mnemonic the instruction mnemonic
-     * @param dest the destination
-     * @param sources the source operands
-     */
-    public final void emitForceBitwise(String mnemonic, Value dest, Value... sources) {
-        String prefix = getArgTypeBitwiseLogical(dest);
-        emitTextFormattedInstruction(mnemonic + prefix, dest, sources);
-    }
-
-    /**
-     * Central helper routine that emits a text formatted HSAIL instruction via call to
-     * AbstractAssembler.emitString. All the emit routines in the assembler end up calling this one.
-     *
-     * @param instr the full instruction mnenomics including any prefixes
-     * @param dest the destination operand
-     * @param sources the source operand
-     */
-    private void emitTextFormattedInstruction(String instr, Value dest, Value... sources) {
-        /**
-         * Destination can't be a constant and no instruction has > 3 source operands.
-         */
-        assert (!isConstant(dest) && sources.length <= 3);
-        switch (sources.length) {
-            case 3:
-                // Emit an instruction with three source operands.
-                emitString(String.format("%s %s, %s, %s, %s;", instr, HSAIL.mapRegister(dest), mapRegOrConstToString(sources[0]), mapRegOrConstToString(sources[1]), mapRegOrConstToString(sources[2])));
-                break;
-            case 2:
-                // Emit an instruction with two source operands.
-                emitString(String.format("%s %s, %s, %s;", instr, HSAIL.mapRegister(dest), mapRegOrConstToString(sources[0]), mapRegOrConstToString(sources[1])));
-                break;
-            case 1:
-                // Emit an instruction with one source operand.
-                emitString(String.format("%s %s, %s;", instr, HSAIL.mapRegister(dest), mapRegOrConstToString(sources[0])));
-                break;
-            default:
-                // Emit an instruction with one source operand.
-                emitString(String.format("%s %s;", instr, HSAIL.mapRegister(dest)));
-                break;
-        }
-    }
-
-    /**
-     * Emits a conditional move instruction.
-     *
-     * @param dest the destination operand storing result of the move
-     * @param trueReg the register that should be copied to dest if the condition is true
-     * @param falseReg the register that should be copied to dest if the condition is false
-     * @param width the width of the instruction (32 or 64 bits)
-     */
-    public final void emitConditionalMove(Value dest, Value trueReg, Value falseReg, int width) {
-        assert (!isConstant(dest));
-        String instr = (width == 32 ? "cmov_b32" : "cmov_b64");
-        emitString(String.format("%s %s, %s%s, %s;", instr, HSAIL.mapRegister(dest), "$c0, ", mapRegOrConstToString(trueReg), mapRegOrConstToString(falseReg)));
-    }
-
-    /**
-     * Emits code to build a 64-bit pointer from a compressed value and the associated base and
-     * shift. The compressed value could represent either a normal oop or a klass ptr. If the
-     * compressed value is 0, the uncompressed must also be 0. We only emit this if base and shift
-     * are not both zero.
-     *
-     * @param result the register containing the compressed value on input and the uncompressed ptr
-     *            on output
-     * @param base the amount to be added to the compressed value
-     * @param shift the number of bits to shift left the compressed value
-     * @param testForNull true if the compressed value might be null
-     */
-    public void emitCompressedOopDecode(Value result, long base, int shift, boolean testForNull) {
-        assert (base != 0 || shift != 0);
-        assert (!isConstant(result));
-        if (base == 0) {
-            // we don't have to test for null if shl is the only operation
-            emitForceUnsignedKind("shl", Kind.Long, result, result, JavaConstant.forInt(shift));
-        } else if (shift == 0) {
-            // only use add if result is not starting as null (test only if testForNull is true)
-            emitWithOptionalTestForNull(testForNull, "add", result, result, JavaConstant.forLong(base));
-        } else {
-            // only use mad if result is not starting as null (test only if testForNull is true)
-            emitWithOptionalTestForNull(testForNull, "mad", result, result, JavaConstant.forInt(1 << shift), JavaConstant.forLong(base));
-        }
-    }
-
-    /**
-     * Emits code to build a compressed value from a full 64-bit pointer using the associated base
-     * and shift. The compressed value could represent either a normal oop or a klass ptr. If the
-     * ptr is 0, the compressed value must also be 0. We only emit this if base and shift are not
-     * both zero.
-     *
-     * @param result the register containing the 64-bit pointer on input and the compressed value on
-     *            output
-     * @param base the amount to be subtracted from the 64-bit pointer
-     * @param shift the number of bits to shift right the 64-bit pointer
-     * @param testForNull true if the 64-bit pointer might be null
-     */
-    public void emitCompressedOopEncode(Value result, long base, int shift, boolean testForNull) {
-        assert (base != 0 || shift != 0);
-        assert (!isConstant(result));
-        if (base != 0) {
-            // only use sub if result is not starting as null (test only if testForNull is true)
-            emitWithOptionalTestForNull(testForNull, "sub", result, result, JavaConstant.forLong(base));
-        }
-        if (shift != 0) {
-            // note that the shr can still be done even if the result is null
-            emitForceUnsignedKind("shr", Kind.Long, result, result, JavaConstant.forInt(shift));
-        }
-    }
-
-    /**
-     * Emits code for the requested mnemonic on the result and sources. In addition, if testForNull
-     * is true, surrounds the instruction with code that will guarantee that if the result starts as
-     * 0, it will remain 0.
-     *
-     * @param testForNull true if we want to add the code to check for and preserve null
-     * @param mnemonic the instruction to be applied (without size prefix)
-     * @param result the register which is both an input and the final output
-     * @param sources the sources for the mnemonic instruction
-     */
-    private void emitWithOptionalTestForNull(boolean testForNull, String mnemonic, Value result, Value... sources) {
-        if (testForNull) {
-            emitCompare(Kind.Long, result, JavaConstant.forLong(0), "eq", false, true);
-        }
-        emitForceUnsigned(mnemonic, result, sources);
-        if (testForNull) {
-            emitConditionalMove(result, JavaConstant.forLong(0), result, 64);
-        }
-    }
-
-    /**
-     * Emits an atomic_cas_global instruction.
-     *
-     * @param result result operand that gets the original contents of the memory location
-     * @param address the memory location
-     * @param cmpValue the value that will be compared against the memory location
-     * @param newValue the new value that will be written to the memory location if the cmpValue
-     *            comparison matches
-     */
-    public void emitAtomicCas(Kind accessKind, AllocatableValue result, HSAILAddress address, Value cmpValue, Value newValue) {
-        emitString(String.format("atomic_cas_global_b%d   %s, %s, %s, %s;", getArgSizeFromKind(accessKind), HSAIL.mapRegister(result), mapAddress(address), mapRegOrConstToString(cmpValue),
-                        mapRegOrConstToString(newValue)));
-    }
-
-    /**
-     * Emits an atomic_add_global instruction.
-     *
-     * @param result result operand that gets the original contents of the memory location
-     * @param address the memory location
-     * @param delta the amount to add
-     */
-    public void emitAtomicAdd(AllocatableValue result, HSAILAddress address, Value delta) {
-        // ensure result and delta agree (this should probably be at some higher level)
-        Value mydelta = delta;
-        if (!isConstant(delta) && (getArgSize(result) != getArgSize(delta))) {
-            emitConvert(result, delta, result.getKind(), delta.getKind());
-            mydelta = result;
-        }
-        String prefix = getArgTypeForceUnsigned(result);
-        emitString(String.format("atomic_add_global_%s   %s, %s, %s;", prefix, HSAIL.mapRegister(result), mapAddress(address), mapRegOrConstToString(mydelta)));
-    }
-
-    /**
-     * Emits an atomic_exch_global instruction.
-     *
-     * @param result result operand that gets the original contents of the memory location
-     * @param address the memory location
-     * @param newValue the new value to write to the memory location
-     */
-    public void emitAtomicExch(Kind accessKind, AllocatableValue result, HSAILAddress address, Value newValue) {
-        emitString(String.format("atomic_exch_global_b%d   %s, %s, %s;", getArgSizeFromKind(accessKind), HSAIL.mapRegister(result), mapAddress(address), mapRegOrConstToString(newValue)));
-    }
-
-    /**
-     * Emits a comment. Useful for debugging purposes.
-     *
-     * @param comment
-     */
-    public void emitComment(String comment) {
-        emitString(comment);
-    }
-
-    public String getDeoptInfoName() {
-        return "%_deoptInfo";
-    }
-
-    public String getDeoptLabelName() {
-        return "@L_Deopt";
-    }
-
-    public void emitWorkItemAbsId(Value dest) {
-        emitString(String.format("workitemabsid_u32 %s, 0;", HSAIL.mapRegister(dest)));
-    }
-
-    public void emitCuId(Value dest) {
-        emitString(String.format("cuid_u32 %s;", HSAIL.mapRegister(dest)));
-    }
-
-    public void emitLaneId(Value dest) {
-        emitString(String.format("laneid_u32 %s;", HSAIL.mapRegister(dest)));
-    }
-
-    public void emitWaveId(Value dest) {
-        emitString(String.format("waveid_u32 %s;", HSAIL.mapRegister(dest)));
-    }
-
-    public void emitMaxWaveId(Value dest) {
-        // emitString(String.format("maxwaveid_u32 %s;", HSAIL.mapRegister(dest)));
-        int hardCodedMaxWaveId = 36;
-        emitComment("// Hard-coded maxwaveid=" + hardCodedMaxWaveId + " until it works");
-        emitMov(Kind.Int, dest, JavaConstant.forInt(hardCodedMaxWaveId));
-    }
-
-    public void emitMultiplyByWavesize(Value dest) {
-        String regName = HSAIL.mapRegister(dest);
-        emitString(String.format("mul_u%d %s, %s, WAVESIZE;", getArgSize(dest), regName, regName));
-    }
-
-    public void emitGetWavesize(Value dest) {
-        String regName = HSAIL.mapRegister(dest);
-        emitString(String.format("mov_b%d %s, WAVESIZE;", getArgSize(dest), regName));
-    }
-
-    public void emitLoadAcquire(Value dest, HSAILAddress address) {
-        emitString(String.format("ld_global_acq_u%d %s, %s;", getArgSize(dest), HSAIL.mapRegister(dest), mapAddress(address)));
-    }
-
-    public void emitStoreRelease(Value src, HSAILAddress address) {
-        emitString(String.format("st_global_rel_u%d %s, %s;", getArgSize(src), HSAIL.mapRegister(src), mapAddress(address)));
-    }
-}

--- a/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/AbstractPTXAssembler.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.ptx;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.asm.*;
-
-/**
- * The platform-dependent base class for the PTX assembler.
- */
-public abstract class AbstractPTXAssembler extends Assembler {
-
-    public AbstractPTXAssembler(TargetDescription target) {
-        super(target);
-    }
-
-    @Override
-    public final void bind(Label l) {
-        super.bind(l);
-        emitString0(nameOf(l) + ":\n");
-    }
-
-    @Override
-    public void align(int modulus) {
-        // Nothing to do
-    }
-
-    @Override
-    public void jmp(Label l) {
-        // Nothing to do
-    }
-
-    @Override
-    protected void patchJumpTarget(int branch, int jumpTarget) {
-        // Nothing to do. All branches already point to the right label.
-    }
-
-}

--- a/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/PTXAddress.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.ptx;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.lir.*;
-
-/**
- * Represents an address in target machine memory, specified via some combination of a base register
- * and a displacement.
- */
-public final class PTXAddress extends AbstractAddress {
-
-    private final Variable base;
-    private final long displacement;
-
-    /**
-     * Creates an {@link PTXAddress} with given base register and no displacement.
-     * 
-     * @param base the base register
-     */
-    public PTXAddress(Variable base) {
-        this(base, 0);
-    }
-
-    /**
-     * Creates an {@link PTXAddress} with given base register and a displacement. This is the most
-     * general constructor.
-     * 
-     * @param base the base register
-     * @param displacement the displacement
-     */
-    public PTXAddress(Variable base, long displacement) {
-        this.base = base;
-        this.displacement = displacement;
-    }
-
-    /**
-     * @return Base register that defines the start of the address computation. If not present, is
-     *         denoted by {@link Value#ILLEGAL}.
-     */
-    public Variable getBase() {
-        return base;
-    }
-
-    /**
-     * @return Optional additive displacement.
-     */
-    public long getDisplacement() {
-        return displacement;
-    }
-}

--- a/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/PTXAsmOptions.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.ptx;
-
-public class PTXAsmOptions {
-    // Nothing for now
-}

--- a/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/PTXAssembler.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,712 +0,0 @@
-/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.ptx;
-
-import static com.oracle.graal.api.code.ValueUtil.*;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.asm.*;
-import com.oracle.graal.compiler.common.*;
-import com.oracle.graal.compiler.common.calc.*;
-import com.oracle.graal.lir.*;
-
-public class PTXAssembler extends AbstractPTXAssembler {
-
-    public PTXAssembler(TargetDescription target, @SuppressWarnings("unused") RegisterConfig registerConfig) {
-        super(target);
-    }
-
-    public enum ConditionOperator {
-        // @formatter:off
-
-        // Signed integer operators
-        S_EQ("eq"),
-        S_NE("ne"),
-        S_LT("lt"),
-        S_LE("le"),
-        S_GT("gt"),
-        S_GE("ge"),
-
-        // Unsigned integer operators
-        U_EQ("eq"),
-        U_NE("ne"),
-        U_LO("lo"),
-        U_LS("ls"),
-        U_HI("hi"),
-        U_HS("hs"),
-
-        // Bit-size integer operators
-        B_EQ("eq"),
-        B_NE("ne"),
-
-        // Floating-point operators
-        F_EQ("eq"),
-        F_NE("ne"),
-        F_LT("lt"),
-        F_LE("le"),
-        F_GT("gt"),
-        F_GE("ge"),
-
-        // Floating-point operators accepting NaN
-        F_EQU("equ"),
-        F_NEU("neu"),
-        F_LTU("ltu"),
-        F_LEU("leu"),
-        F_GTU("gtu"),
-        F_GEU("geu"),
-
-        // Floating-point operators testing for NaN
-        F_NUM("num"),
-        F_NAN("nan");
-
-        // @formatter:on
-
-        private final String operator;
-
-        private ConditionOperator(String op) {
-            this.operator = op;
-        }
-
-        public String getOperator() {
-            return operator;
-        }
-    }
-
-    public static class StandardFormat {
-
-        // Type of destination value
-        protected Kind valueKind;
-        protected Variable dest;
-        protected Value source1;
-        protected Value source2;
-
-        public StandardFormat(Variable dst, Value src1, Value src2) {
-            setDestination(dst);
-            setSource1(src1);
-            setSource2(src2);
-            setKind(dst.getKind());
-        }
-
-        public void setKind(Kind k) {
-            valueKind = k;
-        }
-
-        public void setDestination(Variable var) {
-            assert var != null;
-            dest = var;
-            setKind(var.getKind());
-        }
-
-        public void setSource1(Value val) {
-            assert val != null;
-            source1 = val;
-        }
-
-        public void setSource2(Value val) {
-            assert val != null;
-            source2 = val;
-        }
-
-        public String typeForKind(Kind k) {
-            switch (k.getTypeChar()) {
-            // Boolean
-                case 'z':
-                    return "u8";
-                    // Byte
-                case 'b':
-                    return "b8";
-                    // Short
-                case 's':
-                    return "s16";
-                case 'c':
-                    return "u16";
-                case 'i':
-                    return "s32";
-                case 'f':
-                    return "f32";
-                case 'j':
-                    return "s64";
-                case 'd':
-                    return "f64";
-                case 'a':
-                    return "u64";
-                case '-':
-                    return "u32";
-                default:
-                    throw GraalInternalError.shouldNotReachHere();
-            }
-        }
-
-        public String emit() {
-            return (typeForKind(valueKind) + emitRegister(dest, true) + emitValue(source1, true) + emitValue(source2, false) + ";");
-        }
-
-        public String emitValue(Value v, boolean comma) {
-            assert v != null;
-
-            if (isConstant(v)) {
-                return (emitConstant(v, comma));
-            } else {
-                return (emitRegister((Variable) v, comma));
-            }
-        }
-
-        public String emitRegister(Variable v, boolean comma) {
-            return (" %r" + v.index + (comma ? "," : ""));
-        }
-
-        public String emitConstant(Value v, boolean comma) {
-            JavaConstant constant = (JavaConstant) v;
-            String str = null;
-
-            switch (v.getKind().getTypeChar()) {
-                case 'i':
-                    str = String.valueOf((int) constant.asLong());
-                    break;
-                case 'f':
-                    str = String.valueOf(constant.asFloat());
-                    break;
-                case 'j':
-                    str = String.valueOf(constant.asLong());
-                    break;
-                case 'd':
-                    str = String.valueOf(constant.asDouble());
-                    break;
-                default:
-                    throw GraalInternalError.shouldNotReachHere();
-            }
-            if (comma) {
-                return (str + ",");
-            } else {
-                return str;
-            }
-        }
-    }
-
-    public static class LogicInstructionFormat extends StandardFormat {
-        public LogicInstructionFormat(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        @Override
-        public String emit() {
-            String kindStr;
-            switch (valueKind.getTypeChar()) {
-                case 's':
-                    kindStr = "b16";
-                    break;
-                case 'i':
-                    kindStr = "b32";
-                    break;
-                case 'j':
-                    kindStr = "b64";
-                    break;
-                default:
-                    throw GraalInternalError.shouldNotReachHere();
-            }
-
-            return (kindStr + emitRegister(dest, true) + emitValue(source1, true) + emitValue(source2, false) + ";");
-        }
-    }
-
-    public static class SingleOperandFormat {
-
-        protected Variable dest;
-        protected Value source;
-
-        public SingleOperandFormat(Variable dst, Value src) {
-            setDestination(dst);
-            setSource(src);
-        }
-
-        public void setDestination(Variable var) {
-            dest = var;
-        }
-
-        public void setSource(Value var) {
-            source = var;
-        }
-
-        public String typeForKind(Kind k) {
-            switch (k.getTypeChar()) {
-                case 'z':
-                    return "u8";
-                case 'b':
-                    return "s8";
-                case 's':
-                    return "s16";
-                case 'c':
-                    return "u16";
-                case 'i':
-                    return "s32";
-                case 'f':
-                    return "f32";
-                case 'j':
-                    return "s64";
-                case 'd':
-                    return "f64";
-                case 'a':
-                    return "u64";
-                default:
-                    throw GraalInternalError.shouldNotReachHere();
-            }
-        }
-
-        public String emit() {
-            return (typeForKind(dest.getKind()) + " " + emitVariable(dest) + ", " + emitValue(source) + ";");
-        }
-
-        public String emitValue(Value v) {
-            assert v != null;
-
-            if (isConstant(v)) {
-                return (emitConstant(v));
-            } else {
-                return (emitVariable((Variable) v));
-            }
-        }
-
-        public String emitConstant(Value v) {
-            JavaConstant constant = (JavaConstant) v;
-
-            switch (v.getKind().getTypeChar()) {
-                case 'i':
-                    return (String.valueOf((int) constant.asLong()));
-                case 'f':
-                    return (String.valueOf(constant.asFloat()));
-                case 'j':
-                    return (String.valueOf(constant.asLong()));
-                case 'd':
-                    return (String.valueOf(constant.asDouble()));
-                default:
-                    throw GraalInternalError.shouldNotReachHere();
-            }
-        }
-
-        public String emitVariable(Variable v) {
-            String name = v.getName();
-
-            if (name == null) {
-                return (" %r" + v.index);
-            } else {
-                return name;
-            }
-        }
-    }
-
-    public static class BinarySingleOperandFormat extends SingleOperandFormat {
-
-        public BinarySingleOperandFormat(Variable dst, Value src) {
-            super(dst, src);
-        }
-
-        @Override
-        public String typeForKind(Kind k) {
-            switch (k.getTypeChar()) {
-                case 's':
-                    return "b16";
-                case 'i':
-                    return "b32";
-                case 'j':
-                    return "b64";
-                default:
-                    throw GraalInternalError.shouldNotReachHere();
-            }
-        }
-    }
-
-    public static class ConversionFormat extends SingleOperandFormat {
-
-        private final Kind dstKind;
-        private final Kind srcKind;
-
-        public ConversionFormat(Variable dst, Value src, Kind dstKind, Kind srcKind) {
-            super(dst, src);
-            this.dstKind = dstKind;
-            this.srcKind = srcKind;
-        }
-
-        @Override
-        public String emit() {
-            return (typeForKind(dstKind) + "." + typeForKind(srcKind) + " " + emitVariable(dest) + ", " + emitValue(source) + ";");
-        }
-    }
-
-    public static class LoadStoreFormat extends StandardFormat {
-
-        protected PTXStateSpace space;
-
-        public LoadStoreFormat(PTXStateSpace space, Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-            setStateSpace(space);
-        }
-
-        public void setStateSpace(PTXStateSpace ss) {
-            space = ss;
-        }
-
-        public String emitAddress(Value var, Value val) {
-            assert var instanceof Variable;
-            assert val instanceof JavaConstant;
-            JavaConstant constant = (JavaConstant) val;
-            return ("[" + ((space == PTXStateSpace.Parameter) ? emitParameter((Variable) var) : emitRegister((Variable) var, false)) + " + " + constant.toValueString() + "]");
-        }
-
-        @Override
-        public String emitRegister(Variable var, boolean comma) {
-            return ("%r" + var.index);
-        }
-
-        public String emitParameter(Variable v) {
-            return ("param" + v.index);
-        }
-
-        public String emit(boolean isLoad) {
-            if (isLoad) {
-                return (space.getStateName() + "." + typeForKind(valueKind) + " " + emitRegister(dest, false) + ", " + emitAddress(source1, source2) + ";");
-            } else {
-                return (space.getStateName() + "." + typeForKind(valueKind) + " " + emitAddress(source1, source2) + ", " + emitRegister(dest, false) + ";");
-            }
-        }
-    }
-
-    // Checkstyle: stop method name check
-    /*
-     * Emit conditional branch to target 'tgt' guarded by predicate register 'pred' whose state is
-     * tested to be 'predCheck'.
-     */
-    public final void bra(String tgt, int pred, boolean predCheck) {
-        assert pred >= 0;
-
-        if (tgt.equals("?")) {
-            Thread.dumpStack();
-        }
-        emitString("@" + (predCheck ? "%p" : "!%p") + pred + " " + "bra" + " " + tgt + ";");
-    }
-
-    public final void bra(String src) {
-        emitString("bra " + src + ";");
-    }
-
-    public final void bra_uni(String tgt) {
-        emitString("bra.uni" + " " + tgt + ";" + "");
-    }
-
-    public final void exit() {
-        emitString("exit;" + " " + "");
-    }
-
-    public static class Global {
-
-        private Kind kind;
-        private String name;
-        private LabelRef[] targets;
-
-        public Global(Value val, String name, LabelRef[] targets) {
-            this.kind = val.getKind();
-            this.name = name;
-            this.targets = targets;
-        }
-
-        private static String valueForKind(Kind k) {
-            switch (k.getTypeChar()) {
-                case 'i':
-                    return "s32";
-                case 'j':
-                    return "s64";
-                default:
-                    throw GraalInternalError.shouldNotReachHere();
-            }
-        }
-
-        private static String emitTargets(PTXAssembler asm, LabelRef[] refs) {
-            StringBuffer sb = new StringBuffer();
-
-            for (int i = 0; i < refs.length; i++) {
-                sb.append(asm.nameOf(refs[i].label()));
-                if (i < (refs.length - 1)) {
-                    sb.append(", ");
-                }
-            }
-
-            return sb.toString();
-        }
-
-        public void emit(PTXAssembler asm) {
-            asm.emitString(".global ." + valueForKind(kind) + " " + name + "[" + targets.length + "] = " + "{ " + emitTargets(asm, targets) + " };");
-        }
-    }
-
-    public final void popc_b32(Register d, Register a) {
-        emitString("popc.b32" + " " + "%r" + d.encoding() + ", %r" + a.encoding() + ";" + "");
-    }
-
-    public final void popc_b64(Register d, Register a) {
-        emitString("popc.b64" + " " + "%r" + d.encoding() + ", %r" + a.encoding() + ";" + "");
-    }
-
-    public final void ret() {
-        emitString("ret;" + " " + "");
-    }
-
-    public final void ret_uni() {
-        emitString("ret.uni;" + " " + "");
-    }
-
-    public enum BooleanOperator {
-        AND("and"),
-        OR("or"),
-        XOR("xor");
-
-        private final String output;
-
-        private BooleanOperator(String out) {
-            this.output = out;
-        }
-
-        public String getOperator() {
-            return output + ".";
-        }
-    }
-
-    public static class Setp {
-
-        private BooleanOperator booleanOperator;
-        private ConditionOperator operator;
-        private Value first, second;
-        private Kind kind;
-        private int predicate;
-
-        public Setp(Condition condition, Value first, Value second, int predicateRegisterNumber) {
-            setFirst(first);
-            setSecond(second);
-            setPredicate(predicateRegisterNumber);
-            setKind();
-            setConditionOperator(operatorForConditon(condition));
-        }
-
-        public Setp(Condition condition, BooleanOperator operator, Value first, Value second, int predicateRegisterNumber) {
-            setFirst(first);
-            setSecond(second);
-            setPredicate(predicateRegisterNumber);
-            setKind();
-            setConditionOperator(operatorForConditon(condition));
-            setBooleanOperator(operator);
-        }
-
-        public void setFirst(Value v) {
-            first = v;
-        }
-
-        public void setSecond(Value v) {
-            second = v;
-        }
-
-        public void setPredicate(int p) {
-            predicate = p;
-        }
-
-        public void setConditionOperator(ConditionOperator co) {
-            operator = co;
-        }
-
-        public void setBooleanOperator(BooleanOperator bo) {
-            booleanOperator = bo;
-        }
-
-        private ConditionOperator operatorForConditon(Condition condition) {
-            char typeChar = kind.getTypeChar();
-
-            switch (typeChar) {
-                case 'z':
-                case 'c':
-                case 'a':
-                    // unsigned
-                    switch (condition) {
-                        case EQ:
-                            return ConditionOperator.U_EQ;
-                        case NE:
-                            return ConditionOperator.U_NE;
-                        case LT:
-                            return ConditionOperator.U_LO;
-                        case LE:
-                            return ConditionOperator.U_LS;
-                        case GT:
-                            return ConditionOperator.U_HI;
-                        case GE:
-                            return ConditionOperator.U_HS;
-                        default:
-                            throw GraalInternalError.shouldNotReachHere();
-                    }
-                case 'b':
-                case 's':
-                case 'i':
-                case 'j':
-                    // signed
-                    switch (condition) {
-                        case EQ:
-                            return ConditionOperator.S_EQ;
-                        case NE:
-                            return ConditionOperator.S_NE;
-                        case LT:
-                            return ConditionOperator.S_LT;
-                        case LE:
-                            return ConditionOperator.S_LE;
-                        case GT:
-                            return ConditionOperator.S_GT;
-                        case GE:
-                        case AE:
-                            return ConditionOperator.S_GE;
-                        default:
-                            throw GraalInternalError.shouldNotReachHere();
-                    }
-                case 'f':
-                case 'd':
-                    // floating point - do these need to accept NaN??
-                    switch (condition) {
-                        case EQ:
-                            return ConditionOperator.F_EQ;
-                        case NE:
-                            return ConditionOperator.F_NE;
-                        case LT:
-                            return ConditionOperator.F_LT;
-                        case LE:
-                            return ConditionOperator.F_LE;
-                        case GT:
-                            return ConditionOperator.F_GT;
-                        case GE:
-                            return ConditionOperator.F_GE;
-                        default:
-                            throw GraalInternalError.shouldNotReachHere();
-                    }
-                default:
-                    throw GraalInternalError.shouldNotReachHere();
-            }
-        }
-
-        public void setKind() {
-            // assert isConstant(first) && isConstant(second) == false;
-
-            if (isConstant(first)) {
-                kind = second.getKind();
-            } else {
-                kind = first.getKind();
-            }
-        }
-
-        public String emitValue(Value v) {
-            assert v != null;
-
-            if (isConstant(v)) {
-                return (", " + emitConstant(v));
-            } else {
-                return (", " + emitVariable((Variable) v));
-            }
-        }
-
-        public String typeForKind(Kind k) {
-            switch (k.getTypeChar()) {
-                case 'z':
-                    return "u8";
-                case 'b':
-                    return "s8";
-                case 's':
-                    return "s16";
-                case 'c':
-                    return "u16";
-                case 'i':
-                    return "s32";
-                case 'f':
-                    return "f32";
-                case 'j':
-                    return "s64";
-                case 'd':
-                    return "f64";
-                case 'a':
-                    return "u64";
-                default:
-                    throw GraalInternalError.shouldNotReachHere();
-            }
-        }
-
-        public String emitConstant(Value v) {
-            JavaConstant constant = (JavaConstant) v;
-
-            switch (v.getKind().getTypeChar()) {
-                case 'i':
-                    return (String.valueOf((int) constant.asLong()));
-                case 'f':
-                    return (String.valueOf(constant.asFloat()));
-                case 'j':
-                    return (String.valueOf(constant.asLong()));
-                case 'd':
-                    return (String.valueOf(constant.asDouble()));
-                default:
-                    throw GraalInternalError.shouldNotReachHere();
-            }
-        }
-
-        public String emitVariable(Variable v) {
-            return ("%r" + v.index);
-        }
-
-        public void emit(PTXAssembler asm) {
-
-            if (booleanOperator != null) {
-                // Predicates need to be objects
-                asm.emitString("setp." + operator.getOperator() + "." + booleanOperator.getOperator() + typeForKind(kind) + " %p" + predicate + emitValue(first) + emitValue(second) + ", %r;");
-            } else {
-                asm.emitString("setp." + operator.getOperator() + "." + typeForKind(kind) + " %p" + predicate + emitValue(first) + emitValue(second) + ";");
-            }
-        }
-    }
-
-    @Override
-    public PTXAddress makeAddress(Register base, int displacement) {
-        throw GraalInternalError.shouldNotReachHere();
-    }
-
-    @Override
-    public PTXAddress getPlaceholder() {
-        return null;
-    }
-
-    @Override
-    public final void ensureUniquePC() {
-        throw GraalInternalError.unimplemented();
-    }
-
-    @Override
-    public void jmp(Label l) {
-        String str = nameOf(l);
-        bra(str);
-    }
-
-    /**
-     * @param r
-     */
-    public void nullCheck(Register r) {
-        // setp(....);
-    }
-}

--- a/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/PTXMacroAssembler.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,322 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.ptx;
-
-import sun.misc.*;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.compiler.common.*;
-import com.oracle.graal.lir.*;
-
-public class PTXMacroAssembler extends PTXAssembler {
-
-    public PTXMacroAssembler(TargetDescription target, RegisterConfig registerConfig) {
-        super(target, registerConfig);
-    }
-
-    public static class LoadAddr extends LoadStoreFormat {
-
-        public LoadAddr(PTXStateSpace space, Variable dst, Variable src1, Value src2) {
-            super(space, dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler masm) {
-            String ldAddrStr = "ld." + space.getStateName();
-            if (Unsafe.ADDRESS_SIZE == 8) {
-                ldAddrStr = ldAddrStr + ".u64";
-            } else {
-                ldAddrStr = ldAddrStr + ".u32";
-            }
-            masm.emitString(ldAddrStr + " " + emitRegister(dest, false) + ", " + emitAddress(source1, source2) + ";");
-        }
-    }
-
-    public static class Ld extends LoadStoreFormat {
-
-        public Ld(PTXStateSpace space, Variable dst, Variable src1, Value src2) {
-            super(space, dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("ld." + super.emit(true));
-        }
-    }
-
-    public static class St extends LoadStoreFormat {
-
-        public St(PTXStateSpace space, Variable dst, Variable src1, Value src2) {
-            super(space, dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("st." + super.emit(false));
-        }
-    }
-
-    public static class LoadParam extends Ld {
-        // Type of the operation is dependent on src1's type.
-        public LoadParam(PTXStateSpace space, Variable dst, Variable src1, Value src2) {
-            super(space, dst, src1, src2);
-            setKind(src1.getKind());
-        }
-    }
-
-    public static class Add extends StandardFormat {
-
-        public Add(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("add." + super.emit());
-        }
-    }
-
-    public static class And extends LogicInstructionFormat {
-
-        public And(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("and." + super.emit());
-        }
-    }
-
-    public static class Div extends StandardFormat {
-
-        public Div(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("div." + super.emit());
-        }
-    }
-
-    public static class Mul extends StandardFormat {
-
-        public Mul(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("mul.lo." + super.emit());
-        }
-    }
-
-    public static class Or extends LogicInstructionFormat {
-
-        public Or(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("or." + super.emit());
-        }
-    }
-
-    public static class Rem extends StandardFormat {
-
-        public Rem(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("rem." + super.emit());
-        }
-    }
-
-    public static class Shl extends LogicInstructionFormat {
-
-        public Shl(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("shl." + super.emit());
-        }
-    }
-
-    public static class Shr extends StandardFormat {
-
-        public Shr(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("shr." + super.emit());
-        }
-    }
-
-    public static class Sub extends StandardFormat {
-
-        public Sub(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("sub." + super.emit());
-        }
-    }
-
-    public static class Ushr extends StandardFormat {
-
-        public Ushr(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-            setKind(Kind.Illegal);  // get around not having an Unsigned Kind
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("shr." + super.emit());
-        }
-    }
-
-    public static class Xor extends LogicInstructionFormat {
-
-        public Xor(Variable dst, Value src1, Value src2) {
-            super(dst, src1, src2);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("xor." + super.emit());
-        }
-    }
-
-    public static class Cvt extends ConversionFormat {
-
-        public Cvt(Variable dst, Variable src, Kind dstKind, Kind srcKind) {
-            super(dst, src, dstKind, srcKind);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            if (dest.getKind() == Kind.Float || dest.getKind() == Kind.Double) {
-                // round-to-zero - might not be right
-                asm.emitString("cvt.rz." + super.emit());
-            } else {
-                asm.emitString("cvt." + super.emit());
-            }
-        }
-    }
-
-    public static class Mov extends SingleOperandFormat {
-
-        private int predicateRegisterNumber = -1;
-
-        public Mov(Variable dst, Value src) {
-            super(dst, src);
-        }
-
-        public Mov(Variable dst, Value src, int predicate) {
-            super(dst, src);
-            this.predicateRegisterNumber = predicate;
-        }
-
-        /*
-         * public Mov(Variable dst, AbstractAddress src) { throw
-         * GraalInternalError.unimplemented("AbstractAddress Mov"); }
-         */
-
-        public void emit(PTXMacroAssembler asm) {
-            if (predicateRegisterNumber >= 0) {
-                asm.emitString("@%p" + String.valueOf(predicateRegisterNumber) + " mov." + super.emit());
-            } else {
-                asm.emitString("mov." + super.emit());
-            }
-        }
-    }
-
-    public static class Neg extends SingleOperandFormat {
-
-        public Neg(Variable dst, Variable src) {
-            super(dst, src);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("neg." + super.emit());
-        }
-    }
-
-    public static class Not extends BinarySingleOperandFormat {
-
-        public Not(Variable dst, Variable src) {
-            super(dst, src);
-        }
-
-        public void emit(PTXMacroAssembler asm) {
-            asm.emitString("not." + super.emit());
-        }
-    }
-
-    public static class Param extends SingleOperandFormat {
-        boolean isReturnParameter;
-
-        public Param(Variable d, boolean isRet) {
-            super(d, null);
-            isReturnParameter = isRet;
-        }
-
-        public String emitParameter(Variable v) {
-            return (" param" + v.index);
-        }
-
-        public void emit(PTXMacroAssembler asm, boolean isLastParam) {
-            asm.emitString(".param ." + paramForKind(dest.getKind()) + emitParameter(dest) + (isLastParam ? "" : ","));
-        }
-
-        public String paramForKind(Kind k) {
-            if (isReturnParameter) {
-                if (Unsafe.ADDRESS_SIZE == 8) {
-                    return "u64";
-                } else {
-                    return "u32";
-                }
-            } else {
-                switch (k.getTypeChar()) {
-                    case 'z':
-                    case 'f':
-                        return "s32";
-                    case 'b':
-                        return "b8";
-                    case 's':
-                        return "s16";
-                    case 'c':
-                        return "u16";
-                    case 'i':
-                        return "s32";
-                    case 'j':
-                        return "s64";
-                    case 'd':
-                        return "f64";
-                    case 'a':
-                        return "u64";
-                    default:
-                        throw GraalInternalError.shouldNotReachHere();
-                }
-            }
-        }
-
-    }
-
-}

--- a/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/PTXStateSpace.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.asm.ptx;
-
-/**
- * Represents the various PTX state spaces.
- */
-public enum PTXStateSpace {
-
-    Parameter("param"),
-
-    Shared("shared"),
-
-    Local("local"),
-
-    Global("global"),
-
-    Const("const");
-
-    private final String stateName;
-
-    private PTXStateSpace(String name) {
-        this.stateName = name;
-    }
-
-    public String getStateName() {
-        return stateName;
-    }
-}

--- a/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/ForceDeoptSubstitutions.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.compiler.hsail.test.infra;
-
-import com.oracle.graal.api.replacements.*;
-import com.oracle.graal.nodes.*;
-import com.oracle.graal.api.meta.*;
-
-@ClassSubstitution(GraalKernelTester.class)
-class ForceDeoptSubstitutions {
-
-    /**
-     * Allows us to force a non-exception throwing deopt from java code.
-     */
-    @MethodSubstitution
-    public static int forceDeopt(int x) {
-        DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
-        // will never get here but keep the compiler happy
-        return x * x;
-    }
-
-    @MethodSubstitution
-    public static double forceDeopt(double x) {
-        DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
-        // will never get here but keep the compiler happy
-        return x * x;
-    }
-}

--- a/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/GraalKernelTester.java	Thu Jan 22 23:16:17 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.oracle.graal.compiler.hsail.test.infra;
-
-/**
- * This class extends KernelTester and provides a base class
- * for which the HSAIL code comes from the Graal compiler.
- */
-import static com.oracle.graal.compiler.common.GraalOptions.*;
-import static com.oracle.graal.hotspot.HotSpotGraalRuntime.*;
-import static org.junit.Assume.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-
-import org.junit.*;
-
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.api.meta.*;
-import com.oracle.graal.compiler.common.*;
-import com.oracle.graal.compiler.target.*;
-import com.oracle.graal.debug.*;
-import com.oracle.graal.gpu.*;
-import com.oracle.graal.hotspot.hsail.*;
-import com.oracle.graal.hotspot.meta.*;
-import com.oracle.graal.hsail.*;
-import com.oracle.graal.options.*;
-import com.oracle.graal.options.OptionValue.OverrideScope;
-
-public abstract class GraalKernelTester extends KernelTester {
-
-    private static boolean substitutionsInstalled;
-
-    private static synchronized void installSubstitutions() {
-        if (!substitutionsInstalled) {
-            getHSAILBackend().getProviders().getReplacements().registerSubstitutions(GraalKernelTester.class, ForceDeoptSubstitutions.class);
-            substitutionsInstalled = true;
-        }
-    }
-
-    public GraalKernelTester() {
-        super(getHSAILBackend().isDeviceInitialized());
-        installSubstitutions();
-    }
-
-    protected static HSAILHotSpotBackend getHSAILBackend() {
-        Backend backend = runtime().getBackend(HSAIL.class);
-        Assume.assumeTrue("No HSAIL backend, skipping test!", backend instanceof HSAILHotSpotBackend);
-        return (HSAILHotSpotBackend) backend;
-    }
-
-    ExternalCompilationResult hsailCode;
-    private boolean showHsailSource = false;
-    private boolean saveInFile = false;
-
-    @Override
-    public String getCompiledHSAILSource(Method method) {
-        if (hsailCode == null) {
-            HSAILHotSpotBackend backend = getHSAILBackend();
-            ResolvedJavaMethod javaMethod = backend.getProviders().getMetaAccess().lookupJavaMethod(method);
-            hsailCode = backend.compileKernel(javaMethod, false);
-        }
-        String hsailSource = hsailCode.getCodeString();
-        if (showHsailSource) {
-            logger.severe(hsailSource);
-        }
-        if (saveInFile) {
-            try {
-                File fout = File.createTempFile("tmp", ".hsail");
-                logger.fine("creating " + fout.getCanonicalPath());
-                FileWriter fw = new FileWriter(fout);
-                BufferedWriter bw = new BufferedWriter(fw);
-                bw.write(hsailSource);
-                bw.close();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return hsailSource;
-    }
-
-    public boolean aggressiveInliningEnabled() {
-        return (InlineEverything.getValue());
-    }
-
-    public boolean canHandleHSAILMethodCalls() {
-        // needs 2 things, backend needs to be able to generate such calls, and target needs to be
-        // able to run them
-        boolean canGenerateCalls = false;   // not implemented yet
-        boolean canExecuteCalls = runningOnSimulator();
-        return (canGenerateCalls && canExecuteCalls);
-    }
-
-    private static boolean supportsObjectAllocation() {
-        return true;
-    }
-
-    /**
-     * Determines if the runtime supports object allocation in HSAIL code.
-     */
-    public boolean canHandleObjectAllocation() {
-        return supportsObjectAllocation() && canDeoptimize();
-    }
-
-    /**
-     * Determines if the runtime supports deoptimization in HSAIL code.
-     */
-    public boolean canDeoptimize() {
-        return getHSAILBackend().getRuntime().getConfig().useHSAILDeoptimization;
-    }
-
-    /**
-     * Determines if we are running CQE tests (via a -D flag).
-     */
-    public boolean runningCQETests() {
-        return Boolean.getBoolean("com.amd.CQE");
-    }
-
-    /**
-     * Determines if the JVM supports the required typeProfileWidth.
-     */
-    public boolean typeProfileWidthAtLeast(int val) {
-        return (getHSAILBackend().getRuntime().getConfig().typeProfileWidth >= val);
-    }
-
-    /**
-     * Determines if the runtime supports {@link VirtualObject}s in {@link DebugInfo} associated
-     * with HSAIL code.
-     */
-    public boolean canHandleDeoptVirtualObjects() {
-        return true;
-    }
-
-    /**
-     * Determines if the runtime has the capabilities required by this test.
-     */
-    protected boolean supportsRequiredCapabilities() {
-        return true;
-    }
-
-    HotSpotNmethod installedCode;
-
-    @Override
-    protected void dispatchKernelOkra(int range, Object... args) {
-        HSAILHotSpotBackend backend = getHSAILBackend();
-        if (backend.isDeviceInitialized()) {
-            try {
-                if (installedCode == null) {
-                    installedCode = backend.compileAndInstallKernel(testMethod);
-                }
-                backend.executeKernel(installedCode, range, args);
-            } catch (InvalidInstalledCodeException e) {
-                Debug.log("WARNING:Invalid installed code: " + e);
-                e.printStackTrace();
-            }
-        } else {
-            super.dispatchKernelOkra(range, args);
-        }
-    }
-
-    public static OptionValue<?> getOptionFromField(Class<?> declaringClass, String fieldName) {
-        try {
-            Field f = declaringClass.getDeclaredField(fieldName);
-            f.setAccessible(true);
-            return (OptionValue<?>) f.get(null);
-        } catch (Exception e) {
-            throw new GraalInternalError(e);
-        }
-    }
-
-    private OptionValue<?> accessibleRemoveNeverExecutedCode = getOptionFromField(GraalOptions.class, "RemoveNeverExecutedCode");
-
-    // Special overrides for the testGeneratedxxx routines which set
-    // required graal options that we need to run any junit test
-
-    private OverrideScope getOverrideScope() {
-        return OptionValue.override(GraalOptions.InlineEverything, true, accessibleRemoveNeverExecutedCode, false);
-    }
-
-    @Override
-    public void testGeneratedHsail() {
-        try (OverrideScope s = getOverrideScope()) {
-            assumeTrue("Orka environment not initialized or unsupported!", supportsRequiredCapabilities() && okraEnvIsInitialized());
-            super.testGeneratedHsail();
-        }
-    }
-
-    @Override
-    public void testGeneratedHsailUsingLambdaMethod() {
-        try (OverrideScope s = getOverrideScope()) {
-            assumeTrue("Orka environment not initialized or unsupported!", supportsRequiredCapabilities() && okraEnvIsInitialized());
-            super.testGeneratedHsailUsingLambdaMethod();
-        }
-    }
-
-    // used for forcing a deoptimization
-    public static int forceDeopt(int x) {
-        return x * x;
-    }
-
-    public static double forceDeopt(double x) {
-        return x * x;
-    }
-
-}