Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 4 additions & 0 deletions make/GenerateLinkOptData.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,21 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
-Xlog:cds=off \
-Duser.language=en -Duser.country=US \
-cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
build.tools.classlist.HelloClasslist $(LOG_DEBUG)
$(GREP) -v HelloClasslist $@.raw > $@.interim
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -Xshare:dump \
-Xlog:cds=off \
-XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \
-Xmx128M -Xms128M $(LOG_INFO)
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw.2 \
-XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \
-Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
-Duser.language=en -Duser.country=US \
--module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \
-Xlog:cds=off \
-cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
build.tools.classlist.HelloClasslist \
2> $(LINK_OPT_DIR)/stderr > $(JLI_TRACE_FILE) \
Expand All @@ -90,6 +93,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
)
$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
-Xlog:cds=off \
-cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
build.tools.classlist.SortClasslist $@.raw.3 > $@

Expand Down
22 changes: 11 additions & 11 deletions src/hotspot/cpu/x86/stubGenerator_x86_64_dilithium.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025, Intel Corporation. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
Expand Down Expand Up @@ -255,7 +255,7 @@ static auto whole_shuffle(Register scratch, KRegister mergeMask1, KRegister merg
// swap the second operand (zetas) since the odd slots contain the same number
// as the corresponding even one. This is indicated by input2NeedsShuffle=false)
//
// The registers to be multiplied are in input1[] and inputs2[]. The results go
// The registers to be multiplied are in input1[] and input2[]. The results go
// into output[]. Two scratch[] register arrays are expected. input1[] can
// overlap with either output[] or scratch1[]
// - If AVX512, all register arrays are of length 4
Expand All @@ -280,7 +280,7 @@ static auto whole_montMul(XMMRegister montQInvModR, XMMRegister dilithium_q,
// If so, use output:
const XMMRegister* scratch = scratch1 == input1 ? output: scratch1;

// scratch = input1_even * intput2_even
// scratch = input1_even * input2_even
for (int i = 0; i < regCnt; i++) {
__ vpmuldq(scratch[i], input1[i], input2[i], vector_len);
}
Expand Down Expand Up @@ -309,7 +309,7 @@ static auto whole_montMul(XMMRegister montQInvModR, XMMRegister dilithium_q,
}
}

// scratch1 = input1_even*intput2_even
// scratch1 = input1_even*input2_even
for (int i = 0; i < regCnt; i++) {
__ vpmuldq(scratch1[i], input1[i], input2[i], vector_len);
}
Expand Down Expand Up @@ -417,7 +417,7 @@ static address generate_dilithiumAlmostNtt_avx(StubGenerator *stubgen,
// products will be added to and subtracted from the other half of the
// coefficients. In each level we just shuffle the coefficients that need to
// be multiplied by the zetas in one set, the rest to another set of vector
// registers, then redistribute the addition/substraction results.
// registers, then redistribute the addition/subtraction results.

// For levels 0 and 1 the zetas are not different within the 4 xmm registers
// that we would use for them, so we use only one register.
Expand Down Expand Up @@ -643,7 +643,7 @@ static address generate_dilithiumAlmostNtt_avx(StubGenerator *stubgen,
}

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down Expand Up @@ -882,7 +882,7 @@ static address generate_dilithiumAlmostInverseNtt_avx(StubGenerator *stubgen,
}

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down Expand Up @@ -967,13 +967,13 @@ static address generate_dilithiumNttMult_avx(StubGenerator *stubgen,
__ jcc(Assembler::notEqual, L_loop);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
}

// Dilithium Motgomery multiply an array by a constant.
// Dilithium Montgomery multiply an array by a constant.
// Implements
// static int implDilithiumMontMulByConstant(int[] coeffs, int constant) {}
//
Expand Down Expand Up @@ -1053,7 +1053,7 @@ static address generate_dilithiumMontMulByConstant_avx(StubGenerator *stubgen,
__ jcc(Assembler::notEqual, L_loop);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down Expand Up @@ -1311,7 +1311,7 @@ static address generate_dilithiumDecomposePoly_avx(StubGenerator *stubgen,
__ jcc(Assembler::notEqual, L_loop);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down
44 changes: 22 additions & 22 deletions src/hotspot/cpu/x86/stubGenerator_x86_64_kyber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,13 @@ static void store4regs(Register address, int offset, int sourceRegs[],
}
}

// In all 3 invocations of this function we use the same registers:
// xmm0-xmm7 for the input and the result,
// xmm8-xmm15 as scratch registers and
// xmm16-xmm17 for the constants,
// so we don't pass register arguments.
// This stub helper vectorizes the reduction in implKyberBarrettReduceJava.
// In all invocations of this function we use the same registers:
// Input: xmm0-xmm7 (signed short coefficients)
// xmm16: Barrett multiplier
// xmm17: q
// Scratch: xmm8-xmm15
// Output: xmm0-xmm7 (reduced coefficients each in [0, q])
static void barrettReduce(MacroAssembler *_masm) {
for (int i = 0; i < 8; i++) {
__ evpmulhw(xmm(i + 8), k0, xmm(i), xmm16, false, Assembler::AVX_512bit);
Expand Down Expand Up @@ -484,7 +486,7 @@ address generate_kyberNtt_avx512(StubGenerator *stubgen,
store4regs(coeffs, 256, xmm4_7, _masm);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down Expand Up @@ -606,7 +608,7 @@ address generate_kyberInverseNtt_avx512(StubGenerator *stubgen,
store4regs(coeffs, 256, xmm12_15, _masm);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down Expand Up @@ -726,7 +728,7 @@ address generate_kyberNttMult_avx512(StubGenerator *stubgen,
__ pop(r12);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down Expand Up @@ -770,7 +772,7 @@ address generate_kyberAddPoly_2_avx512(StubGenerator *stubgen,
store4regs(result, 256, xmm4_7, _masm);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down Expand Up @@ -823,7 +825,7 @@ address generate_kyberAddPoly_3_avx512(StubGenerator *stubgen,
store4regs(result, 256, xmm4_7, _masm);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down Expand Up @@ -903,7 +905,7 @@ address generate_kyber12To16_avx512(StubGenerator *stubgen,
__ jcc(Assembler::greater, VBMILoop);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down Expand Up @@ -976,7 +978,7 @@ address generate_kyber12To16_avx512(StubGenerator *stubgen,
__ jcc(Assembler::greater, Loop);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand Down Expand Up @@ -1012,7 +1014,7 @@ address generate_kyberBarrettReduce_avx512(StubGenerator *stubgen,
store4regs(coeffs, 256, xmm4_7, _masm);

__ leave(); // required for proper stackwalking of RuntimeStub frame
__ mov64(rax, 0); // return 0
__ mov64(rax, 0); // Intrinsic returns a value of 0, whereas Java callees return 1
__ ret(0);

return start;
Expand All @@ -1021,14 +1023,12 @@ address generate_kyberBarrettReduce_avx512(StubGenerator *stubgen,
void StubGenerator::generate_kyber_stubs() {
// Generate Kyber intrinsics code
if (UseKyberIntrinsics) {
if (VM_Version::supports_evex()) {
StubRoutines::_kyberNtt = generate_kyberNtt_avx512(this, _masm);
StubRoutines::_kyberInverseNtt = generate_kyberInverseNtt_avx512(this, _masm);
StubRoutines::_kyberNttMult = generate_kyberNttMult_avx512(this, _masm);
StubRoutines::_kyberAddPoly_2 = generate_kyberAddPoly_2_avx512(this, _masm);
StubRoutines::_kyberAddPoly_3 = generate_kyberAddPoly_3_avx512(this, _masm);
StubRoutines::_kyber12To16 = generate_kyber12To16_avx512(this, _masm);
StubRoutines::_kyberBarrettReduce = generate_kyberBarrettReduce_avx512(this, _masm);
}
StubRoutines::_kyberNtt = generate_kyberNtt_avx512(this, _masm);
StubRoutines::_kyberInverseNtt = generate_kyberInverseNtt_avx512(this, _masm);
StubRoutines::_kyberNttMult = generate_kyberNttMult_avx512(this, _masm);
StubRoutines::_kyberAddPoly_2 = generate_kyberAddPoly_2_avx512(this, _masm);
StubRoutines::_kyberAddPoly_3 = generate_kyberAddPoly_3_avx512(this, _masm);
StubRoutines::_kyber12To16 = generate_kyber12To16_avx512(this, _masm);
StubRoutines::_kyberBarrettReduce = generate_kyberBarrettReduce_avx512(this, _masm);
}
}
2 changes: 1 addition & 1 deletion src/hotspot/share/opto/library_call.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7296,7 +7296,7 @@ bool LibraryCallKit::inline_kyberNtt() {
if (!stubAddr) return false;

Node* coeffs = argument(0);
Node* ntt_zetas = argument(1);
Node* ntt_zetas = argument(1);

coeffs = must_be_not_null(coeffs, true);
ntt_zetas = must_be_not_null(ntt_zetas, true);
Expand Down
2 changes: 0 additions & 2 deletions src/hotspot/share/opto/runtime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,6 @@ const TypeFunc* OptoRuntime::kyberAddPoly_2_Type() {
return TypeFunc::make(domain, range);
}


// Kyber add 3 polynomials function
const TypeFunc* OptoRuntime::kyberAddPoly_3_Type() {
int argcnt = 4;
Expand All @@ -1390,7 +1389,6 @@ const TypeFunc* OptoRuntime::kyberAddPoly_3_Type() {
return TypeFunc::make(domain, range);
}


// Kyber XOF output parsing into polynomial coefficients candidates
// or decompress(12,...) function
const TypeFunc* OptoRuntime::kyber12To16_Type() {
Expand Down
13 changes: 6 additions & 7 deletions src/java.desktop/share/legal/harfbuzz.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Harfbuzz v14.2.0
## Harfbuzz v15.0.0

### Harfbuzz License

Expand All @@ -9,16 +9,16 @@ For parts of HarfBuzz that are licensed under different licenses see individual
files names COPYING in subdirectories where applicable.

Copyright © 2010-2024 Google, Inc.
Copyright © 2018-2020 Ebrahim Byagowi
Copyright © 2018-2026 Ebrahim Byagowi
Copyright © 2004-2013 Red Hat, Inc.
Copyright © 2019 Facebook, Inc.
Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com)
Copyright © 2007 Chris Wilson
Copyright © 2018-2019 Adobe Inc.
Copyright © 2018-2024 Adobe Inc.
Copyright © 2006-2025 Behdad Esfahbod
Copyright © 1998-2004 David Turner and Werner Lemberg
Copyright © 2009 Keith Stribley
Copyright © 2018 Khaled Hosny
Copyright © 2018-2026 Khaled Hosny
Copyright © 2016 Elie Roux <elie.roux@telecom-bretagne.eu>
Copyright © 2016 Igalia S.L.
Copyright © 2015 Mozilla Foundation.
Expand Down Expand Up @@ -75,10 +75,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
The below applies to the following file(s):
libharfbuzz/hb-unicode-emoji-table.hh

© 2025 Unicode®, Inc.
© 2026 Unicode®, Inc.

Unicode and the Unicode Logo are registered trademarks of Unicode, Inc.
in the U.S. and other countries.
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
For terms of use and license, see https://www.unicode.org/terms_of_use.html

</pre>
Expand Down
Loading
Loading