Mercurial > hg > graal-jvmci-8
changeset 22640:3abba3d4aef1
Register and PlatformKind declarations for AVX512.
| author | Roland Schatz <roland.schatz@oracle.com> |
|---|---|
| date | Wed, 30 Sep 2015 13:54:56 +0200 |
| parents | 5d6bb2cb3b9d |
| children | 461dc858dc61 |
| files | jvmci/jdk.internal.jvmci.amd64/src/jdk/internal/jvmci/amd64/AMD64.java jvmci/jdk.internal.jvmci.amd64/src/jdk/internal/jvmci/amd64/AMD64Kind.java jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/Architecture.java jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CodeUtil.java jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/Register.java jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotRegisterConfig.java |
| diffstat | 6 files changed, 182 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/jvmci/jdk.internal.jvmci.amd64/src/jdk/internal/jvmci/amd64/AMD64.java Wed Sep 30 11:29:19 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.amd64/src/jdk/internal/jvmci/amd64/AMD64.java Wed Sep 30 13:54:56 2015 +0200 @@ -82,8 +82,8 @@ public static final Register xmm6 = new Register(22, 6, "xmm6", XMM); public static final Register xmm7 = new Register(23, 7, "xmm7", XMM); - public static final Register xmm8 = new Register(24, 8, "xmm8", XMM); - public static final Register xmm9 = new Register(25, 9, "xmm9", XMM); + public static final Register xmm8 = new Register(24, 8, "xmm8", XMM); + public static final Register xmm9 = new Register(25, 9, "xmm9", XMM); public static final Register xmm10 = new Register(26, 10, "xmm10", XMM); public static final Register xmm11 = new Register(27, 11, "xmm11", XMM); public static final Register xmm12 = new Register(28, 12, "xmm12", XMM); @@ -91,28 +91,77 @@ public static final Register xmm14 = new Register(30, 14, "xmm14", XMM); public static final Register xmm15 = new Register(31, 15, "xmm15", XMM); - public static final Register[] xmmRegisters = { + public static final Register xmm16 = new Register(32, 16, "xmm16", XMM); + public static final Register xmm17 = new Register(33, 17, "xmm17", XMM); + public static final Register xmm18 = new Register(34, 18, "xmm18", XMM); + public static final Register xmm19 = new Register(35, 19, "xmm19", XMM); + public static final Register xmm20 = new Register(36, 20, "xmm20", XMM); + public static final Register xmm21 = new Register(37, 21, "xmm21", XMM); + public static final Register xmm22 = new Register(38, 22, "xmm22", XMM); + public static final Register xmm23 = new Register(39, 23, "xmm23", XMM); + + public static final Register xmm24 = new Register(40, 24, "xmm24", XMM); + public static final Register xmm25 = new Register(41, 25, "xmm25", XMM); + public static final Register xmm26 = new Register(42, 26, "xmm26", XMM); + public static final Register xmm27 = new Register(43, 27, "xmm27", XMM); + public static final Register xmm28 = new Register(44, 28, "xmm28", XMM); + public static final Register xmm29 = new Register(45, 29, "xmm29", XMM); + public static final Register xmm30 = new Register(46, 30, "xmm30", XMM); + public static final Register xmm31 = new Register(47, 31, "xmm31", XMM); + + public static final Register[] xmmRegistersSSE = { xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15 }; - public static final Register[] cpuxmmRegisters = { + public static final Register[] xmmRegistersAVX512 = { + xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, + xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15, + xmm16, xmm17, xmm18, xmm19, xmm20, xmm21, xmm22, xmm23, + xmm24, xmm25, xmm26, xmm27, xmm28, xmm29, xmm30, xmm31 + }; + + public static final RegisterCategory MASK = new RegisterCategory("MASK", false); + + public static final Register k0 = new Register(48, 0, "k0", MASK); + public static final Register k1 = new Register(49, 1, "k1", MASK); + public static final Register k2 = new Register(50, 2, "k2", MASK); + public static final Register k3 = new Register(51, 3, "k3", MASK); + public static final Register k4 = new Register(52, 4, "k4", MASK); + public static final Register k5 = new Register(53, 5, "k5", MASK); + public static final Register k6 = new Register(54, 6, "k6", MASK); + public static final Register k7 = new Register(55, 7, "k7", MASK); + + public static final Register[] valueRegistersSSE = { rax, rcx, rdx, rbx, rsp, rbp, rsi, rdi, r8, r9, r10, r11, r12, r13, r14, r15, xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15 }; + public static final Register[] valueRegistersAVX512 = { + rax, rcx, rdx, rbx, rsp, rbp, rsi, rdi, + r8, r9, r10, r11, r12, r13, r14, r15, + xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, + xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15, + xmm16, xmm17, xmm18, xmm19, xmm20, xmm21, xmm22, xmm23, + xmm24, xmm25, xmm26, xmm27, xmm28, xmm29, xmm30, xmm31, + k0, k1, k2, k3, k4, k5, k6, k7 + }; + /** * Register used to construct an instruction-relative address. */ - public static final Register rip = new Register(32, -1, "rip", SPECIAL); + public static final Register rip = new Register(56, -1, "rip", SPECIAL); public static final Register[] allRegisters = { rax, rcx, rdx, rbx, rsp, rbp, rsi, rdi, r8, r9, r10, r11, r12, r13, r14, r15, xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15, + xmm16, xmm17, xmm18, xmm19, xmm20, xmm21, xmm22, xmm23, + xmm24, xmm25, xmm26, xmm27, xmm28, xmm29, xmm30, xmm31, + k0, k1, k2, k3, k4, k5, k6, k7, rip }; @@ -172,12 +221,15 @@ private final AMD64Kind largestKind; public AMD64(EnumSet<CPUFeature> features, EnumSet<Flag> flags) { - super("AMD64", AMD64Kind.QWORD, ByteOrder.LITTLE_ENDIAN, true, allRegisters, LOAD_STORE | STORE_STORE, 1, cpuRegisters.length + (xmmRegisters.length << XMM_REFERENCE_MAP_SHIFT), 8); + super("AMD64", AMD64Kind.QWORD, ByteOrder.LITTLE_ENDIAN, true, allRegisters, LOAD_STORE | STORE_STORE, 1, cpuRegisters.length + + ((features.contains(CPUFeature.AVX512F) ? xmmRegistersAVX512 : xmmRegistersSSE).length << XMM_REFERENCE_MAP_SHIFT), 8); this.features = features; this.flags = flags; assert features.contains(CPUFeature.SSE2) : "minimum config for x64"; - if (features.contains(CPUFeature.AVX)) { + if (features.contains(CPUFeature.AVX512F)) { + largestKind = AMD64Kind.V512_QWORD; + } else if (features.contains(CPUFeature.AVX)) { largestKind = AMD64Kind.V256_QWORD; } else { largestKind = AMD64Kind.V128_QWORD; @@ -193,6 +245,15 @@ } @Override + public Register[] getAvailableValueRegisters() { + if (features.contains(CPUFeature.AVX512F)) { + return valueRegistersAVX512; + } else { + return valueRegistersSSE; + } + } + + @Override public PlatformKind getPlatformKind(JavaKind javaKind) { switch (javaKind) { case Boolean: @@ -220,9 +281,11 @@ AMD64Kind kind = (AMD64Kind) platformKind; if (kind.isInteger()) { return category.equals(CPU); + } else if (kind.isXMM()) { + return category.equals(XMM); } else { - assert kind.isXMM(); - return category.equals(XMM); + assert kind.isMask(); + return category.equals(MASK); } } @@ -232,6 +295,8 @@ return AMD64Kind.QWORD; } else if (category.equals(XMM)) { return largestKind; + } else if (category.equals(MASK)) { + return AMD64Kind.MASK64; } else { return null; }
--- a/jvmci/jdk.internal.jvmci.amd64/src/jdk/internal/jvmci/amd64/AMD64Kind.java Wed Sep 30 11:29:19 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.amd64/src/jdk/internal/jvmci/amd64/AMD64Kind.java Wed Sep 30 13:54:56 2015 +0200 @@ -53,7 +53,20 @@ V256_DWORD(32, DWORD), V256_QWORD(32, QWORD), V256_SINGLE(32, SINGLE), - V256_DOUBLE(32, DOUBLE); + V256_DOUBLE(32, DOUBLE), + + // AVX512 + V512_BYTE(64, BYTE), + V512_WORD(64, WORD), + V512_DWORD(64, DWORD), + V512_QWORD(64, QWORD), + V512_SINGLE(64, SINGLE), + V512_DOUBLE(64, DOUBLE), + + MASK8(1), + MASK16(2), + MASK32(4), + MASK64(8); private final int size; private final int vectorLength; @@ -104,7 +117,48 @@ } public boolean isXMM() { - return !isInteger(); + switch (this) { + case SINGLE: + case DOUBLE: + case V32_BYTE: + case V32_WORD: + case V64_BYTE: + case V64_WORD: + case V64_DWORD: + case V128_BYTE: + case V128_WORD: + case V128_DWORD: + case V128_QWORD: + case V128_SINGLE: + case V128_DOUBLE: + case V256_BYTE: + case V256_WORD: + case V256_DWORD: + case V256_QWORD: + case V256_SINGLE: + case V256_DOUBLE: + case V512_BYTE: + case V512_WORD: + case V512_DWORD: + case V512_QWORD: + case V512_SINGLE: + case V512_DOUBLE: + return true; + default: + return false; + } + } + + public boolean isMask() { + switch (this) { + case MASK8: + case MASK16: + case MASK32: + case MASK64: + return true; + default: + return false; + } } public char getTypeChar() { @@ -141,6 +195,18 @@ case V256_SINGLE: case V256_DOUBLE: return 'y'; + case V512_BYTE: + case V512_WORD: + case V512_DWORD: + case V512_QWORD: + case V512_SINGLE: + case V512_DOUBLE: + return 'z'; + case MASK8: + case MASK16: + case MASK32: + case MASK64: + return 'k'; default: return '-'; }
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/Architecture.java Wed Sep 30 11:29:19 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/Architecture.java Wed Sep 30 13:54:56 2015 +0200 @@ -132,13 +132,23 @@ } /** - * Gets an array of all available registers on this architecture. The index of each register in - * this array is equal to its {@linkplain Register#number number}. + * Gets an array of all registers that exist on this architecture. This contains all registers + * that exist in the specification of this architecture. Not all of them may be available on + * this particular architecture instance. The index of each register in this array is equal to + * its {@linkplain Register#number number}. */ public Register[] getRegisters() { return registers.clone(); } + /** + * Gets an array of all registers available for storing values on this architecture. This may be + * a subset of {@link #getRegisters()}, depending on the capabilities of this particular CPU. + */ + public Register[] getAvailableValueRegisters() { + return getRegisters(); + } + public ByteOrder getByteOrder() { return byteOrder; }
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CodeUtil.java Wed Sep 30 11:29:19 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/CodeUtil.java Wed Sep 30 13:54:56 2015 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2015, 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 @@ -343,8 +343,9 @@ public DefaultRegFormatter(Architecture arch) { registers = new Register[arch.getRegisterReferenceMapSize()]; - for (Register r : arch.getRegisters()) { + for (Register r : arch.getAvailableValueRegisters()) { if (r.getReferenceMapIndex() >= 0) { + assert registers[r.getReferenceMapIndex()] == null : "overlapping registers " + r + " and " + registers[r.getReferenceMapIndex()] + " in reference map"; registers[r.getReferenceMapIndex()] = r; } }
--- a/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/Register.java Wed Sep 30 11:29:19 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.code/src/jdk/internal/jvmci/code/Register.java Wed Sep 30 13:54:56 2015 +0200 @@ -89,6 +89,10 @@ this(name, 0, 0); } + public RegisterCategory(String name, boolean mayContainReference) { + this(name, mayContainReference ? 0 : Integer.MIN_VALUE, 0); + } + public RegisterCategory(String name, int referenceMapOffset) { this(name, referenceMapOffset, 0); }
--- a/jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotRegisterConfig.java Wed Sep 30 11:29:19 2015 +0200 +++ b/jvmci/jdk.internal.jvmci.hotspot.amd64/src/jdk/internal/jvmci/hotspot/amd64/AMD64HotSpotRegisterConfig.java Wed Sep 30 13:54:56 2015 +0200 @@ -22,16 +22,11 @@ */ package jdk.internal.jvmci.hotspot.amd64; -import static jdk.internal.jvmci.amd64.AMD64.r10; -import static jdk.internal.jvmci.amd64.AMD64.r11; import static jdk.internal.jvmci.amd64.AMD64.r12; -import static jdk.internal.jvmci.amd64.AMD64.r13; -import static jdk.internal.jvmci.amd64.AMD64.r14; +import static jdk.internal.jvmci.amd64.AMD64.r15; import static jdk.internal.jvmci.amd64.AMD64.r8; import static jdk.internal.jvmci.amd64.AMD64.r9; import static jdk.internal.jvmci.amd64.AMD64.rax; -import static jdk.internal.jvmci.amd64.AMD64.rbp; -import static jdk.internal.jvmci.amd64.AMD64.rbx; import static jdk.internal.jvmci.amd64.AMD64.rcx; import static jdk.internal.jvmci.amd64.AMD64.rdi; import static jdk.internal.jvmci.amd64.AMD64.rdx; @@ -39,20 +34,12 @@ import static jdk.internal.jvmci.amd64.AMD64.rsp; import static jdk.internal.jvmci.amd64.AMD64.xmm0; import static jdk.internal.jvmci.amd64.AMD64.xmm1; -import static jdk.internal.jvmci.amd64.AMD64.xmm10; -import static jdk.internal.jvmci.amd64.AMD64.xmm11; -import static jdk.internal.jvmci.amd64.AMD64.xmm12; -import static jdk.internal.jvmci.amd64.AMD64.xmm13; -import static jdk.internal.jvmci.amd64.AMD64.xmm14; -import static jdk.internal.jvmci.amd64.AMD64.xmm15; import static jdk.internal.jvmci.amd64.AMD64.xmm2; import static jdk.internal.jvmci.amd64.AMD64.xmm3; import static jdk.internal.jvmci.amd64.AMD64.xmm4; import static jdk.internal.jvmci.amd64.AMD64.xmm5; import static jdk.internal.jvmci.amd64.AMD64.xmm6; import static jdk.internal.jvmci.amd64.AMD64.xmm7; -import static jdk.internal.jvmci.amd64.AMD64.xmm8; -import static jdk.internal.jvmci.amd64.AMD64.xmm9; import java.util.ArrayList; import java.util.Arrays; @@ -60,7 +47,6 @@ import java.util.HashSet; import java.util.Set; -import jdk.internal.jvmci.amd64.AMD64; import jdk.internal.jvmci.code.Architecture; import jdk.internal.jvmci.code.CallingConvention; import jdk.internal.jvmci.code.CallingConvention.Type; @@ -131,28 +117,30 @@ */ private final boolean needsNativeStackHomeSpace; - private static Register[] initAllocatable(boolean reserveForHeapBase) { - Register[] registers = null; - // @formatter:off - if (reserveForHeapBase) { - registers = new Register[] { - rax, rbx, rcx, rdx, /*rsp,*/ rbp, rsi, rdi, r8, r9, r10, r11, /*r12,*/ r13, r14, /*r15, */ - xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, - xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15 - }; - } else { - registers = new Register[] { - rax, rbx, rcx, rdx, /*rsp,*/ rbp, rsi, rdi, r8, r9, r10, r11, r12, r13, r14, /*r15, */ - xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, - xmm8, xmm9, xmm10, xmm11, xmm12, xmm13, xmm14, xmm15 - }; + private static Register[] initAllocatable(Architecture arch, boolean reserveForHeapBase) { + Register[] allRegisters = arch.getAvailableValueRegisters(); + Register[] registers = new Register[allRegisters.length - (reserveForHeapBase ? 3 : 2)]; + + int idx = 0; + for (Register reg : allRegisters) { + if (reg.equals(rsp) || reg.equals(r12)) { + // skip stack pointer and thread register + continue; + } + if (reserveForHeapBase && reg.equals(r15)) { + // skip heap base register + continue; + } + + registers[idx++] = reg; } - // @formatter:on + + assert idx == registers.length; return registers; } public AMD64HotSpotRegisterConfig(Architecture architecture, HotSpotVMConfig config) { - this(architecture, config, initAllocatable(config.useCompressedOops)); + this(architecture, config, initAllocatable(architecture, config.useCompressedOops)); assert callerSaved.length >= allocatable.length; } @@ -179,7 +167,7 @@ callerSaved = callerSaveSet.toArray(new Register[callerSaveSet.size()]); allAllocatableAreCallerSaved = true; - attributesMap = RegisterAttributes.createMap(this, AMD64.allRegisters); + attributesMap = RegisterAttributes.createMap(this, architecture.getRegisters()); } @Override