stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8156159: replace CompilerToVM.readUncompressedOop with Unsafe.getUncompressedObject

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Christian Thalinger 2016-05-11 10:23:59 -10:00
parent c0c3e64713
commit 3c0ef9eadc
5 changed files with 2 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
View File

@ -422,20 +422,6 @@ final class CompilerToVM {
*/
native long getLocalVariableTableStart(HotSpotResolvedJavaMethodImpl method);
/**
* Reads an object pointer within a VM data structure. That is, any {@link HotSpotVMField} whose
* {@link HotSpotVMField#type() type} is {@code "oop"} (e.g.,
* {@code ArrayKlass::_component_mirror}, {@code Klass::_java_mirror},
* {@code JavaThread::_threadObj}).
*
* Note that {@link Unsafe#getObject(Object, long)} cannot be used for this since it does a
* {@code narrowOop} read if the VM is using compressed oops whereas oops within VM data
* structures are (currently) always uncompressed.
*
* @param address address of an oop field within a VM data structure
*/
native Object readUncompressedOop(long address);
/**
* Determines if {@code method} should not be inlined or compiled.
*/

2
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java
View File

@ -135,7 +135,7 @@ class HotSpotMemoryAccessProviderImpl implements HotSpotMemoryAccessProvider, Ho
if (base == null) {
assert !compressed;
displacement += asRawPointer(baseConstant);
ret = runtime.getCompilerToVM().readUncompressedOop(displacement);
ret = UNSAFE.getUncompressedObject(displacement);
} else {
assert runtime.getConfig().useCompressedOops == compressed;
ret = UNSAFE.getObject(base, displacement);

6
hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
View File

@ -1008,11 +1008,6 @@ C2V_VMENTRY(void, invalidateInstalledCode, (JNIEnv*, jobject, jobject installed_
nmethod::invalidate_installed_code(installed_code_handle, CHECK);
C2V_END
C2V_VMENTRY(jobject, readUncompressedOop, (JNIEnv*, jobject, jlong addr))
oop ret = oopDesc::load_decode_heap_oop((oop*)(address)addr);
return JNIHandles::make_local(THREAD, ret);
C2V_END
C2V_VMENTRY(jlongArray, collectCounters, (JNIEnv*, jobject))
typeArrayOop arrayOop = oopFactory::new_longArray(JVMCICounterSize, CHECK_NULL);
JavaThread::collect_counters(arrayOop);
@ -1469,7 +1464,6 @@ JNINativeMethod CompilerToVM::methods[] = {
{CC "getLocalVariableTableLength", CC "(" HS_RESOLVED_METHOD ")I", FN_PTR(getLocalVariableTableLength)},
{CC "reprofile", CC "(" HS_RESOLVED_METHOD ")V", FN_PTR(reprofile)},
{CC "invalidateInstalledCode", CC "(" INSTALLED_CODE ")V", FN_PTR(invalidateInstalledCode)},
{CC "readUncompressedOop", CC "(J)" OBJECT, FN_PTR(readUncompressedOop)},
{CC "collectCounters", CC "()[J", FN_PTR(collectCounters)},
{CC "allocateCompileId", CC "(" HS_RESOLVED_METHOD "I)I", FN_PTR(allocateCompileId)},
{CC "isMature", CC "(" METASPACE_METHOD_DATA ")Z", FN_PTR(isMature)},

6
hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2016, 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
@ -207,10 +207,6 @@ public class CompilerToVMHelper {
return CTVM.getLocalVariableTableStart((HotSpotResolvedJavaMethodImpl)method);
}
public static Object readUncompressedOop(long address) {
return CTVM.readUncompressedOop(address);
}
public static void doNotInlineOrCompile(HotSpotResolvedJavaMethod method) {
CTVM.doNotInlineOrCompile((HotSpotResolvedJavaMethodImpl)method);
}

91
hotspot/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java
View File

@ -1,91 +0,0 @@
/*
* Copyright (c) 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
* 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.
*/
/*
* @test
* @bug 8136421
* @ignore 8155216
* @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
* @library / /testlibrary /test/lib/
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @build compiler.jvmci.compilerToVM.ReadUncompressedOopTest
* @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller
* sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* -XX:-UseCompressedOops
* compiler.jvmci.compilerToVM.ReadUncompressedOopTest
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* -XX:+UseCompressedOops
* compiler.jvmci.compilerToVM.ReadUncompressedOopTest
*/
package compiler.jvmci.compilerToVM;
import jdk.vm.ci.hotspot.CompilerToVMHelper;
import jdk.test.lib.Asserts;
import jdk.test.lib.Utils;
import sun.hotspot.WhiteBox;
import jdk.internal.misc.Unsafe;
import java.lang.reflect.Field;
public class ReadUncompressedOopTest {
public static void main(String args[]) {
new ReadUncompressedOopTest().runTest();
}
private void runTest() {
long ptr = getPtr();
System.out.printf("calling readUncompressedOop(0x%x)%n", ptr);
Asserts.assertEQ(getClass(),
CompilerToVMHelper.readUncompressedOop(ptr),
String.format("unexpected class returned for 0x%x", ptr));
}
private static final Unsafe UNSAFE = Utils.getUnsafe();
private static final WhiteBox WB = WhiteBox.getWhiteBox();
private static final Class<?> CLASS = ReadUncompressedOopTest.class;
private static final long PTR = WB.getObjectAddress(CLASS);
private static long getPtr() {
Field field;
try {
field = CLASS.getDeclaredField("PTR");
} catch (NoSuchFieldException nsfe) {
throw new Error("TESTBUG : " + nsfe, nsfe);
}
Object base = UNSAFE.staticFieldBase(field);
return WB.getObjectAddress(base) + UNSAFE.staticFieldOffset(field);
}
}