Skip to content

8312579: [JVMCI] JVMCI support for virtual Vector API objects #15003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

8312579: [JVMCI] JVMCI support for virtual Vector API objects #15003

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f183c2
8312579: [JVMCI] JVMCI support for virtual Vector API objects
gergo- Jul 5, 2023
e2c6201
Rewrite nested ternary expressions
gergo- Jul 25, 2023
87f8110
Improve parameter naming
gergo- Jul 25, 2023
3172dfe
Enable Vector API support code when JVMCI is defined
gergo- Jul 26, 2023
bd9f0c8
Fix #ifdef/#if mixup
gergo- Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/hotspot/share/classfile/modules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ void Modules::define_module(Handle module, jboolean is_open, jstring version,
ClassLoader::add_to_exploded_build_list(THREAD, module_symbol);
}

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

#if INCLUDE_CDS_JAVA_HEAP
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/arguments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4041,7 +4041,7 @@ jint Arguments::apply_ergo() {
JVMFlag::printSetFlags(tty);
}

#ifdef COMPILER2
#ifdef COMPILER2_OR_JVMCI
if (!FLAG_IS_DEFAULT(EnableVectorSupport) && !EnableVectorSupport) {
if (!FLAG_IS_DEFAULT(EnableVectorReboxing) && EnableVectorReboxing) {
warning("Disabling EnableVectorReboxing since EnableVectorSupport is turned off.");
Expand All @@ -4062,7 +4062,7 @@ jint Arguments::apply_ergo() {
}
FLAG_SET_DEFAULT(UseVectorStubs, false);
}
#endif // COMPILER2
#endif // COMPILER2_OR_JVMCI

if (FLAG_IS_CMDLINE(DiagnoseSyncOnValueBasedClasses)) {
if (DiagnoseSyncOnValueBasedClasses == ObjectSynchronizer::LOG_WARNING && !log_is_enabled(Info, valuebasedclasses)) {
Expand Down
8 changes: 4 additions & 4 deletions src/hotspot/share/runtime/deoptimization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,15 +1235,15 @@ bool Deoptimization::realloc_objects(JavaThread* thread, frame* fr, RegisterMap*

InstanceKlass* ik = InstanceKlass::cast(k);
if (obj == nullptr && !cache_init_error) {
#ifdef COMPILER2
#if COMPILER2_OR_JVMCI
if (EnableVectorSupport && VectorSupport::is_vector(ik)) {
obj = VectorSupport::allocate_vector(ik, fr, reg_map, sv, THREAD);
} else {
obj = ik->allocate_instance(THREAD);
}
#else
obj = ik->allocate_instance(THREAD);
#endif // COMPILER2
#endif // COMPILER2_OR_JVMCI
}
} else if (k->is_typeArray_klass()) {
TypeArrayKlass* ak = TypeArrayKlass::cast(k);
Expand Down Expand Up @@ -1585,7 +1585,7 @@ void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableAr
continue;
}
#endif // INCLUDE_JVMCI
#ifdef COMPILER2
#ifdef COMPILER2_OR_JVMCI
if (EnableVectorSupport && VectorSupport::is_vector(k)) {
assert(sv->field_size() == 1, "%s not a vector", k->name()->as_C_string());
ScopeValue* payload = sv->field_at(0);
Expand All @@ -1605,7 +1605,7 @@ void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableAr
// Else fall-through to do assignment for scalar-replaced boxed vector representation
// which could be restored after vector object allocation.
}
#endif /* !COMPILER2 */
#endif /* !COMPILER2_OR_JVMCI */
if (k->is_instance_klass()) {
InstanceKlass* ik = InstanceKlass::cast(k);
reassign_fields_by_klass(ik, fr, reg_map, sv, 0, obj(), skip_internal);
Expand Down