Skip to content

Commit 271417a

Browse files
Gergö BaranyDoug Simon
Gergö Barany
authored and
Doug Simon
committed
8312579: [JVMCI] JVMCI support for virtual Vector API objects
Reviewed-by: dnsimon, never
1 parent 44576a7 commit 271417a

File tree

7 files changed

+49
-15
lines changed

7 files changed

+49
-15
lines changed

‎src/hotspot/share/classfile/modules.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
453453
ClassLoader::add_to_exploded_build_list(THREAD, module_symbol);
454454
}
455455

456-
#ifdef COMPILER2
456+
#if COMPILER2_OR_JVMCI
457457
// Special handling of jdk.incubator.vector
458458
if (strcmp(module_name, "jdk.incubator.vector") == 0) {
459459
if (FLAG_IS_DEFAULT(EnableVectorSupport)) {
@@ -473,7 +473,7 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
473473
log_info(compilation)("EnableVectorAggressiveReboxing=%s", (EnableVectorAggressiveReboxing ? "true" : "false"));
474474
log_info(compilation)("UseVectorStubs=%s", (UseVectorStubs ? "true" : "false"));
475475
}
476-
#endif // COMPILER2
476+
#endif // COMPILER2_OR_JVMCI
477477
}
478478

479479
#if INCLUDE_CDS_JAVA_HEAP

‎src/hotspot/share/jvmci/jvmciCodeInstaller.cpp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,8 @@ ScopeValue* CodeInstaller::get_scope_value(HotSpotCompiledCodeStream* stream, u1
396396
}
397397
case REGISTER_PRIMITIVE:
398398
case REGISTER_NARROW_OOP:
399-
case REGISTER_OOP: {
399+
case REGISTER_OOP:
400+
case REGISTER_VECTOR: {
400401
u2 number = stream->read_u2("register");
401402
VMReg hotspotRegister = get_hotspot_reg(number, JVMCI_CHECK_NULL);
402403
if (is_general_purpose_reg(hotspotRegister)) {
@@ -422,6 +423,8 @@ ScopeValue* CodeInstaller::get_scope_value(HotSpotCompiledCodeStream* stream, u1
422423
locationType = Location::normal;
423424
} else if (type == T_DOUBLE) {
424425
locationType = Location::dbl;
426+
} else if (type == T_OBJECT && tag == REGISTER_VECTOR) {
427+
locationType = Location::vector;
425428
} else {
426429
JVMCI_ERROR_NULL("unexpected type %s in floating point register%s", basictype_to_str(type), stream->context());
427430
}
@@ -434,14 +437,15 @@ ScopeValue* CodeInstaller::get_scope_value(HotSpotCompiledCodeStream* stream, u1
434437
}
435438
case STACK_SLOT_PRIMITIVE:
436439
case STACK_SLOT_NARROW_OOP:
437-
case STACK_SLOT_OOP: {
440+
case STACK_SLOT_OOP:
441+
case STACK_SLOT_VECTOR: {
438442
jint offset = (jshort) stream->read_s2("offset");
439443
if (stream->read_bool("addRawFrameSize")) {
440444
offset += _total_frame_size;
441445
}
442446
Location::Type locationType;
443447
if (type == T_OBJECT) {
444-
locationType = tag == STACK_SLOT_NARROW_OOP ? Location::narrowoop : Location::oop;
448+
locationType = tag == STACK_SLOT_VECTOR ? Location::vector : tag == STACK_SLOT_NARROW_OOP ? Location::narrowoop : Location::oop;
445449
} else if (type == T_LONG) {
446450
locationType = Location::lng;
447451
} else if (type == T_DOUBLE) {

‎src/hotspot/share/jvmci/jvmciCodeInstaller.hpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -185,9 +185,11 @@ class CodeInstaller : public StackObj {
185185
REGISTER_PRIMITIVE,
186186
REGISTER_OOP,
187187
REGISTER_NARROW_OOP,
188+
REGISTER_VECTOR,
188189
STACK_SLOT_PRIMITIVE,
189190
STACK_SLOT_OOP,
190191
STACK_SLOT_NARROW_OOP,
192+
STACK_SLOT_VECTOR,
191193
VIRTUAL_OBJECT_ID,
192194
VIRTUAL_OBJECT_ID2,
193195
NULL_CONSTANT,

‎src/hotspot/share/jvmci/vmStructs_jvmci.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,11 @@
530530
declare_constant(CodeInstaller::REGISTER_PRIMITIVE) \
531531
declare_constant(CodeInstaller::REGISTER_OOP) \
532532
declare_constant(CodeInstaller::REGISTER_NARROW_OOP) \
533+
declare_constant(CodeInstaller::REGISTER_VECTOR) \
533534
declare_constant(CodeInstaller::STACK_SLOT_PRIMITIVE) \
534535
declare_constant(CodeInstaller::STACK_SLOT_OOP) \
535536
declare_constant(CodeInstaller::STACK_SLOT_NARROW_OOP) \
537+
declare_constant(CodeInstaller::STACK_SLOT_VECTOR) \
536538
declare_constant(CodeInstaller::VIRTUAL_OBJECT_ID) \
537539
declare_constant(CodeInstaller::VIRTUAL_OBJECT_ID2) \
538540
declare_constant(CodeInstaller::NULL_CONSTANT) \

‎src/hotspot/share/runtime/arguments.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4041,7 +4041,7 @@ jint Arguments::apply_ergo() {
40414041
JVMFlag::printSetFlags(tty);
40424042
}
40434043

4044-
#ifdef COMPILER2
4044+
#if COMPILER2_OR_JVMCI
40454045
if (!FLAG_IS_DEFAULT(EnableVectorSupport) && !EnableVectorSupport) {
40464046
if (!FLAG_IS_DEFAULT(EnableVectorReboxing) && EnableVectorReboxing) {
40474047
warning("Disabling EnableVectorReboxing since EnableVectorSupport is turned off.");
@@ -4062,7 +4062,7 @@ jint Arguments::apply_ergo() {
40624062
}
40634063
FLAG_SET_DEFAULT(UseVectorStubs, false);
40644064
}
4065-
#endif // COMPILER2
4065+
#endif // COMPILER2_OR_JVMCI
40664066

40674067
if (FLAG_IS_CMDLINE(DiagnoseSyncOnValueBasedClasses)) {
40684068
if (DiagnoseSyncOnValueBasedClasses == ObjectSynchronizer::LOG_WARNING && !log_is_enabled(Info, valuebasedclasses)) {

‎src/hotspot/share/runtime/deoptimization.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,15 +1235,15 @@ bool Deoptimization::realloc_objects(JavaThread* thread, frame* fr, RegisterMap*
12351235

12361236
InstanceKlass* ik = InstanceKlass::cast(k);
12371237
if (obj == nullptr && !cache_init_error) {
1238-
#ifdef COMPILER2
1238+
#if COMPILER2_OR_JVMCI
12391239
if (EnableVectorSupport && VectorSupport::is_vector(ik)) {
12401240
obj = VectorSupport::allocate_vector(ik, fr, reg_map, sv, THREAD);
12411241
} else {
12421242
obj = ik->allocate_instance(THREAD);
12431243
}
12441244
#else
12451245
obj = ik->allocate_instance(THREAD);
1246-
#endif // COMPILER2
1246+
#endif // COMPILER2_OR_JVMCI
12471247
}
12481248
} else if (k->is_typeArray_klass()) {
12491249
TypeArrayKlass* ak = TypeArrayKlass::cast(k);
@@ -1585,7 +1585,7 @@ void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableAr
15851585
continue;
15861586
}
15871587
#endif // INCLUDE_JVMCI
1588-
#ifdef COMPILER2
1588+
#if COMPILER2_OR_JVMCI
15891589
if (EnableVectorSupport && VectorSupport::is_vector(k)) {
15901590
assert(sv->field_size() == 1, "%s not a vector", k->name()->as_C_string());
15911591
ScopeValue* payload = sv->field_at(0);
@@ -1605,7 +1605,7 @@ void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableAr
16051605
// Else fall-through to do assignment for scalar-replaced boxed vector representation
16061606
// which could be restored after vector object allocation.
16071607
}
1608-
#endif /* !COMPILER2 */
1608+
#endif /* !COMPILER2_OR_JVMCI */
16091609
if (k->is_instance_klass()) {
16101610
InstanceKlass* ik = InstanceKlass::cast(k);
16111611
reassign_fields_by_klass(ik, fr, reg_map, sv, 0, obj(), skip_internal);

‎src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@
4848
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.REGISTER_NARROW_OOP;
4949
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.REGISTER_OOP;
5050
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.REGISTER_PRIMITIVE;
51+
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.REGISTER_VECTOR;
5152
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.SITE_CALL;
5253
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.SITE_DATA_PATCH;
5354
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.SITE_EXCEPTION_HANDLER;
@@ -61,6 +62,7 @@
6162
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT_NARROW_OOP;
6263
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT_OOP;
6364
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT_PRIMITIVE;
65+
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT_VECTOR;
6466
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.VIRTUAL_OBJECT_ID;
6567
import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.VIRTUAL_OBJECT_ID2;
6668

@@ -171,9 +173,11 @@ enum Tag {
171173
REGISTER_PRIMITIVE,
172174
REGISTER_OOP,
173175
REGISTER_NARROW_OOP,
176+
REGISTER_VECTOR,
174177
STACK_SLOT_PRIMITIVE,
175178
STACK_SLOT_OOP,
176179
STACK_SLOT_NARROW_OOP,
180+
STACK_SLOT_VECTOR,
177181
VIRTUAL_OBJECT_ID,
178182
VIRTUAL_OBJECT_ID2,
179183
NULL_CONSTANT,
@@ -1029,6 +1033,10 @@ private boolean isNarrowOop(Value oopValue) {
10291033
return oopValue.getPlatformKind() != runtime.getHostJVMCIBackend().getTarget().arch.getWordKind();
10301034
}
10311035

1036+
private boolean isVector(Value value) {
1037+
return value.getPlatformKind().getVectorLength() > 1;
1038+
}
1039+
10321040
private void writeJavaValue(JavaValue value, JavaKind kind) {
10331041
if (value == Value.ILLEGAL) {
10341042
writeTag(ILLEGAL);
@@ -1039,12 +1047,30 @@ private void writeJavaValue(JavaValue value, JavaKind kind) {
10391047
writeTag(NULL_CONSTANT);
10401048
} else if (value instanceof RegisterValue) {
10411049
RegisterValue reg = (RegisterValue) value;
1042-
Tag tag = kind == JavaKind.Object ? (isNarrowOop(reg) ? REGISTER_NARROW_OOP : REGISTER_OOP) : REGISTER_PRIMITIVE;
1050+
Tag tag;
1051+
if (kind == JavaKind.Object) {
1052+
if (isVector(reg)) {
1053+
tag = REGISTER_VECTOR;
1054+
} else {
1055+
tag = isNarrowOop(reg) ? REGISTER_NARROW_OOP : REGISTER_OOP;
1056+
}
1057+
} else {
1058+
tag = REGISTER_PRIMITIVE;
1059+
}
10431060
writeTag(tag);
10441061
writeRegister(reg.getRegister());
10451062
} else if (value instanceof StackSlot) {
10461063
StackSlot slot = (StackSlot) value;
1047-
Tag tag = kind == JavaKind.Object ? (isNarrowOop(slot) ? STACK_SLOT_NARROW_OOP : STACK_SLOT_OOP) : STACK_SLOT_PRIMITIVE;
1064+
Tag tag;
1065+
if (kind == JavaKind.Object) {
1066+
if (isVector(slot)) {
1067+
tag = STACK_SLOT_VECTOR;
1068+
} else {
1069+
tag = isNarrowOop(slot) ? STACK_SLOT_NARROW_OOP : STACK_SLOT_OOP;
1070+
}
1071+
} else {
1072+
tag = STACK_SLOT_PRIMITIVE;
1073+
}
10481074
writeTag(tag);
10491075
writeS2("offset", slot.getRawOffset());
10501076
writeBoolean("addRawFrameSize", slot.getRawAddFrameSize());

0 commit comments

Comments
 (0)