Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
10 changes: 5 additions & 5 deletions src/hotspot/share/classfile/vmIntrinsics.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1007,14 +1007,14 @@ class methodHandle;
"Ljdk/internal/vm/vector/VectorSupport$Vector;") \
do_name(vector_shuffle_to_vector_name, "shuffleToVector") \
\
do_intrinsic(_VectorShuffleWrapIndexes, jdk_internal_vm_vector_VectorSupport, vector_shuffle_wrap_indexes_name, \
vector_shuffle_wrap_indexes_sig, F_S) \
do_signature(vector_shuffle_wrap_indexes_sig, "(Ljava/lang/Class;" \
do_intrinsic(_VectorWrapShuffleIndexes, jdk_internal_vm_vector_VectorSupport, vector_wrap_shuffle_indexes_name, \
vector_wrap_shuffle_indexes_sig, F_S) \
do_signature(vector_wrap_shuffle_indexes_sig, "(Ljava/lang/Class;" \
"Ljava/lang/Class;" \
"Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;" \
"ILjdk/internal/vm/vector/VectorSupport$ShuffleWrapIndexesOperation;)" \
"ILjdk/internal/vm/vector/VectorSupport$WrapShuffleIndexesOperation;)" \
"Ljdk/internal/vm/vector/VectorSupport$VectorShuffle;") \
do_name(vector_shuffle_wrap_indexes_name, "shuffleWrapIndexes") \
do_name(vector_wrap_shuffle_indexes_name, "wrapShuffleIndexes") \
\
do_intrinsic(_VectorLoadOp, jdk_internal_vm_vector_VectorSupport, vector_load_op_name, vector_load_op_sig, F_S) \
do_signature(vector_load_op_sig, "(Ljava/lang/Class;" \
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/opto/c2compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
case vmIntrinsics::_VectorFromBitsCoerced:
case vmIntrinsics::_VectorShuffleIota:
case vmIntrinsics::_VectorShuffleToVector:
case vmIntrinsics::_VectorShuffleWrapIndexes:
case vmIntrinsics::_VectorWrapShuffleIndexes:
case vmIntrinsics::_VectorLoadOp:
case vmIntrinsics::_VectorLoadMaskedOp:
case vmIntrinsics::_VectorStoreOp:
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/opto/library_call.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -716,8 +716,8 @@ bool LibraryCallKit::try_to_inline(int predicate) {
return inline_vector_mask_operation();
case vmIntrinsics::_VectorShuffleToVector:
return inline_vector_shuffle_to_vector();
case vmIntrinsics::_VectorShuffleWrapIndexes:
return inline_vector_shuffle_wrap_indexes();
case vmIntrinsics::_VectorWrapShuffleIndexes:
return inline_vector_wrap_shuffle_indexes();
case vmIntrinsics::_VectorLoadOp:
return inline_vector_mem_operation(/*is_store=*/false);
case vmIntrinsics::_VectorLoadMaskedOp:
Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/share/opto/library_call.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ class LibraryCallKit : public GraphKit {
bool inline_vector_nary_operation(int n);
bool inline_vector_frombits_coerced();
bool inline_vector_shuffle_to_vector();
bool inline_vector_shuffle_wrap_indexes();
bool inline_vector_wrap_shuffle_indexes();
bool inline_vector_shuffle_iota();
Node* partially_wrap_indexes(Node* index_vec, int num_elem, BasicType type_bt);
bool inline_vector_mask_operation();
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/opto/vectorIntrinsics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -760,9 +760,9 @@ bool LibraryCallKit::inline_vector_shuffle_to_vector() {
// public static
// <E,
// SH extends VectorShuffle<E>>
// SH shuffleWrapIndexes(Class<E> eClass, Class<? extends SH> shClass, SH sh, int length,
// SH wrapShuffleIndexes(Class<E> eClass, Class<? extends SH> shClass, SH sh, int length,
// ShuffleWrapIndexesOperation<SH> defaultImpl)
bool LibraryCallKit::inline_vector_shuffle_wrap_indexes() {
bool LibraryCallKit::inline_vector_wrap_shuffle_indexes() {
const TypeInstPtr* elem_klass = gvn().type(argument(0))->isa_instptr();
const TypeInstPtr* shuffle_klass = gvn().type(argument(1))->isa_instptr();
Node* shuffle = argument(2);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,16 +263,16 @@ V shuffleToVector(Class<? extends Vector<E>> vClass, Class<E> eClass, Class<? ex
return defaultImpl.apply(sh);
}

public interface ShuffleWrapIndexesOperation<SH extends VectorShuffle<?>> {
public interface WrapShuffleIndexesOperation<SH extends VectorShuffle<?>> {
SH apply(SH sh);
}

@IntrinsicCandidate
public static
<E,
SH extends VectorShuffle<E>>
SH shuffleWrapIndexes(Class<E> eClass, Class<? extends SH> shClass, SH sh, int length,
ShuffleWrapIndexesOperation<SH> defaultImpl) {
SH wrapShuffleIndexes(Class<E> eClass, Class<? extends SH> shClass, SH sh, int length,
WrapShuffleIndexesOperation<SH> defaultImpl) {
assert isNonCapturingLambda(defaultImpl) : defaultImpl;
return defaultImpl.apply(sh);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Byte128Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Byte128Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Byte128Shuffle.class, this, VLENGTH,
(s) -> ((Byte128Shuffle)(((AbstractShuffle<Byte>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Byte256Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Byte256Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Byte256Shuffle.class, this, VLENGTH,
(s) -> ((Byte256Shuffle)(((AbstractShuffle<Byte>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Byte512Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Byte512Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Byte512Shuffle.class, this, VLENGTH,
(s) -> ((Byte512Shuffle)(((AbstractShuffle<Byte>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Byte64Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Byte64Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Byte64Shuffle.class, this, VLENGTH,
(s) -> ((Byte64Shuffle)(((AbstractShuffle<Byte>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public ByteMaxShuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, ByteMaxShuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, ByteMaxShuffle.class, this, VLENGTH,
(s) -> ((ByteMaxShuffle)(((AbstractShuffle<Byte>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Double128Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Double128Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Double128Shuffle.class, this, VLENGTH,
(s) -> ((Double128Shuffle)(((AbstractShuffle<Double>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Double256Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Double256Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Double256Shuffle.class, this, VLENGTH,
(s) -> ((Double256Shuffle)(((AbstractShuffle<Double>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Double512Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Double512Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Double512Shuffle.class, this, VLENGTH,
(s) -> ((Double512Shuffle)(((AbstractShuffle<Double>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Double64Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Double64Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Double64Shuffle.class, this, VLENGTH,
(s) -> ((Double64Shuffle)(((AbstractShuffle<Double>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public DoubleMaxShuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, DoubleMaxShuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, DoubleMaxShuffle.class, this, VLENGTH,
(s) -> ((DoubleMaxShuffle)(((AbstractShuffle<Double>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Float128Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Float128Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Float128Shuffle.class, this, VLENGTH,
(s) -> ((Float128Shuffle)(((AbstractShuffle<Float>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Float256Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Float256Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Float256Shuffle.class, this, VLENGTH,
(s) -> ((Float256Shuffle)(((AbstractShuffle<Float>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Float512Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Float512Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Float512Shuffle.class, this, VLENGTH,
(s) -> ((Float512Shuffle)(((AbstractShuffle<Float>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Float64Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Float64Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Float64Shuffle.class, this, VLENGTH,
(s) -> ((Float64Shuffle)(((AbstractShuffle<Float>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public FloatMaxShuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, FloatMaxShuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, FloatMaxShuffle.class, this, VLENGTH,
(s) -> ((FloatMaxShuffle)(((AbstractShuffle<Float>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Int128Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Int128Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Int128Shuffle.class, this, VLENGTH,
(s) -> ((Int128Shuffle)(((AbstractShuffle<Integer>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Int256Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Int256Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Int256Shuffle.class, this, VLENGTH,
(s) -> ((Int256Shuffle)(((AbstractShuffle<Integer>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Int512Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Int512Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Int512Shuffle.class, this, VLENGTH,
(s) -> ((Int512Shuffle)(((AbstractShuffle<Integer>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Int64Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Int64Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Int64Shuffle.class, this, VLENGTH,
(s) -> ((Int64Shuffle)(((AbstractShuffle<Integer>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public IntMaxShuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, IntMaxShuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, IntMaxShuffle.class, this, VLENGTH,
(s) -> ((IntMaxShuffle)(((AbstractShuffle<Integer>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Long128Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Long128Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Long128Shuffle.class, this, VLENGTH,
(s) -> ((Long128Shuffle)(((AbstractShuffle<Long>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Long256Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Long256Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Long256Shuffle.class, this, VLENGTH,
(s) -> ((Long256Shuffle)(((AbstractShuffle<Long>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Long512Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Long512Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Long512Shuffle.class, this, VLENGTH,
(s) -> ((Long512Shuffle)(((AbstractShuffle<Long>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Long64Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Long64Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Long64Shuffle.class, this, VLENGTH,
(s) -> ((Long64Shuffle)(((AbstractShuffle<Long>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public LongMaxShuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, LongMaxShuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, LongMaxShuffle.class, this, VLENGTH,
(s) -> ((LongMaxShuffle)(((AbstractShuffle<Long>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Short128Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Short128Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Short128Shuffle.class, this, VLENGTH,
(s) -> ((Short128Shuffle)(((AbstractShuffle<Short>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Short256Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Short256Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Short256Shuffle.class, this, VLENGTH,
(s) -> ((Short256Shuffle)(((AbstractShuffle<Short>)(s)).wrapIndexesTemplate())));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ public <F> VectorShuffle<F> cast(VectorSpecies<F> s) {
@Override
@ForceInline
public Short512Shuffle wrapIndexes() {
return VectorSupport.shuffleWrapIndexes(ETYPE, Short512Shuffle.class, this, VLENGTH,
return VectorSupport.wrapShuffleIndexes(ETYPE, Short512Shuffle.class, this, VLENGTH,
(s) -> ((Short512Shuffle)(((AbstractShuffle<Short>)(s)).wrapIndexesTemplate())));
}

Expand Down
Loading