Skip to content

8340079: Modify rearrange/selectFrom Vector API methods to perform wrapIndexes instead of checkIndexes #20634

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 9 commits into from
Closed

8340079: Modify rearrange/selectFrom Vector API methods to perform wrapIndexes instead of checkIndexes #20634

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b224593
Wrap shuffle on rearrange
sviswa7 Aug 1, 2024
c5c4933
Optionally partial wrap shuffles during construction
sviswa7 Aug 13, 2024
d7cd161
Initial feedback
sviswa7 Aug 21, 2024
8d73dd6
Some small fixes
sviswa7 Aug 22, 2024
f67d14a
Some cleanup
sviswa7 Sep 12, 2024
694aceb
Merge branch 'master' of https://git.openjdk.java.net/jdk into rearra…
sviswa7 Sep 12, 2024
428f228
Address review comments
sviswa7 Sep 13, 2024
87e103e
Change method name
sviswa7 Sep 18, 2024
f8e67fb
Implement review comments
sviswa7 Sep 19, 2024
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
37 changes: 19 additions & 18 deletions src/hotspot/share/opto/vectorIntrinsics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,12 +768,12 @@ bool LibraryCallKit::inline_vector_wrap_shuffle_indexes() {
Node* shuffle = argument(2);
const TypeInt* vlen = gvn().type(argument(3))->isa_int();

if (elem_klass == nullptr || shuffle_klass == nullptr || shuffle->is_top() || vlen == nullptr) {
return false; // dead code
}
if (!vlen->is_con() || shuffle_klass->const_oop() == nullptr) {
return false; // not enough info for intrinsification
if (elem_klass == nullptr || shuffle_klass == nullptr || shuffle->is_top() || vlen == nullptr ||
!vlen->is_con() || shuffle_klass->const_oop() == nullptr) {
// not enough info for intrinsification
return false;
}

if (!is_klass_initialized(shuffle_klass)) {
log_if_needed(" ** klass argument not initialized");
return false;
Expand All @@ -787,9 +787,10 @@ bool LibraryCallKit::inline_vector_wrap_shuffle_indexes() {

// Shuffles use byte array based backing storage
BasicType shuffle_bt = T_BYTE;

if (!arch_supports_vector(Op_AndV, num_elem, shuffle_bt, VecMaskNotUsed) ||
!arch_supports_vector(Op_Replicate, num_elem, shuffle_bt, VecMaskNotUsed)) {
log_if_needed(" ** not supported: op=wrapShuffleIndexes vlen=%d etype=%s",
num_elem, type2name(shuffle_bt));
return false;
}

Expand All @@ -802,10 +803,8 @@ bool LibraryCallKit::inline_vector_wrap_shuffle_indexes() {

const TypeVect* vt = TypeVect::make(shuffle_bt, num_elem);
const Type* shuffle_type_bt = Type::get_const_basic_type(shuffle_bt);

Node* mod_mask = gvn().makecon(TypeInt::make(num_elem-1));
Node* bcast_mod_mask = gvn().transform(VectorNode::scalar2vector(mod_mask, num_elem, shuffle_type_bt));

// Wrap the indices greater than lane count.
Node* res = gvn().transform(VectorNode::make(Op_AndV, shuffle_vec, bcast_mod_mask, vt));

Expand Down Expand Up @@ -2116,10 +2115,8 @@ bool LibraryCallKit::inline_vector_select_from() {
const TypeInstPtr* elem_klass = gvn().type(argument(2))->isa_instptr();
const TypeInt* vlen = gvn().type(argument(3))->isa_int();

if (vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr) {
return false; // dead code
}
if (vector_klass->const_oop() == nullptr ||
if (vector_klass == nullptr || elem_klass == nullptr || vlen == nullptr ||
vector_klass->const_oop() == nullptr ||
elem_klass->const_oop() == nullptr ||
!vlen->is_con()) {
log_if_needed(" ** missing constant: vclass=%s etype=%s vlen=%s",
Expand All @@ -2138,10 +2135,9 @@ bool LibraryCallKit::inline_vector_select_from() {
return false; // should be primitive type
}
BasicType elem_bt = elem_type->basic_type();

int num_elem = vlen->get_con();
if ((num_elem < 4) || !is_power_of_2(num_elem)) {
log_if_needed(" ** vlen < 4 or not power of two=%d", num_elem);
if (!is_power_of_2(num_elem)) {
log_if_needed(" ** vlen not power of two=%d", num_elem);
return false;
}

Expand Down Expand Up @@ -2184,7 +2180,13 @@ bool LibraryCallKit::inline_vector_select_from() {
// v2 is the vector being rearranged
Node* v2 = unbox_vector(argument(5), vbox_type, elem_bt, num_elem);

if (v1 == nullptr || v2 == nullptr) {
if (v1 == nullptr) {
log_if_needed(" ** unbox failed v1=%s", NodeClassNames[argument(4)->Opcode()]);
return false; // operand unboxing failed
}

if (v2 == nullptr) {
log_if_needed(" ** unbox failed v2=%s", NodeClassNames[argument(5)->Opcode()]);
return false; // operand unboxing failed
}

Expand All @@ -2194,8 +2196,7 @@ bool LibraryCallKit::inline_vector_select_from() {
const TypeInstPtr* mbox_type = TypeInstPtr::make_exact(TypePtr::NotNull, mbox_klass);
mask = unbox_vector(argument(6), mbox_type, elem_bt, num_elem);
if (mask == nullptr) {
log_if_needed(" ** not supported: op=selectFrom vlen=%d etype=%s is_masked_op=1",
num_elem, type2name(elem_bt));
log_if_needed(" ** unbox failed mask=%s", NodeClassNames[argument(6)->Opcode()]);
return false;
}
}
Expand Down