-
Notifications
You must be signed in to change notification settings - Fork 6.3k
8382332: Large regression (~50%) in SPECjbb2015 when using JFR after JEP 500 #30922
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.
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
Open
mgronlun
wants to merge
9
commits into
openjdk:master
Choose a base branch
from
mgronlun:8382332
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
2b09a97
downthrottler
mgronlun 6b369a4
test
mgronlun 44a92da
macros
mgronlun 8ce984b
make slot field non-final + sample descriptions
mgronlun c958f4a
more general event description
mgronlun b69b58d
be explicit about final
mgronlun 3a3a944
intrinsics
mgronlun 055c8ca
Remove increment of actual in loop
mgronlun b43a33c
Update copyright year in unsigned5.hpp
mgronlun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
src/java.base/share/classes/jdk/internal/event/JfrEpochGeneration.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
| package jdk.internal.event; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import jdk.internal.misc.Unsafe; | ||
|
|
||
| class JfrEpochGeneration { | ||
| private static final Unsafe U; | ||
| private static final long EPOCH_GENERATION_OFFSET; | ||
|
|
||
| /** | ||
| * The JFR epoch generation is the range [1-32767],i.e. 15 bits. | ||
| * | ||
| * These constants are useful when operating on a field where | ||
| * the most significant bits are used to store a JFR epoch value. | ||
| */ | ||
| static final int EPOCH_SHIFT_INT = 17; | ||
| static final int VALUE_MASK_INT = (1 << EPOCH_SHIFT_INT) - 1; | ||
| static final int EPOCH_SHIFT_LONG = 49; | ||
| static final long VALUE_MASK_LONG = (1L << EPOCH_SHIFT_LONG) - 1; | ||
|
|
||
| static { | ||
| U = Unsafe.getUnsafe(); | ||
| EPOCH_GENERATION_OFFSET = getJfrEpochGenerationOffset(); | ||
| } | ||
|
|
||
| private static native long getJfrEpochGenerationOffset(); | ||
|
|
||
| /** | ||
| * The JFR epoch generation is the range [1-32767],i.e. 15 bits. | ||
| */ | ||
| static short getCurrentEpoch() { | ||
| return U.getShort(EPOCH_GENERATION_OFFSET); | ||
| } | ||
|
|
||
| /** | ||
| * Get the address of a field to be used in cas operations. | ||
| */ | ||
| static long getFieldOffset(Class<?> clazz, String fieldName) { | ||
| return U.objectFieldOffset(clazz, fieldName); | ||
| } | ||
|
|
||
| static long getFieldOffset(Field field) { | ||
| return U.objectFieldOffset(field); | ||
| } | ||
|
|
||
| static long getStaticFielddOffset(Field field) { | ||
| return U.staticFieldOffset(field); | ||
| } | ||
|
|
||
| /** | ||
| * An epoch generation can be stored atomically into a field, | ||
| * perhaps together with some other value (use the shift and mask constants). | ||
| * Can be useful sometimes when committing events, to ensure only | ||
| * the setter will send an event, so as to limit events per epoch. | ||
| */ | ||
| static boolean compareAndExchange(Object o, long offset, int c, int v) { | ||
| return U.compareAndExchangeInt(o, offset, c, v) == c; | ||
| } | ||
|
|
||
| static boolean compareAndExchange(Object o, long offset, long c, long v) { | ||
| return U.compareAndExchangeLong(o, offset, c, v) == c; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| #include "jni.h" | ||
| #include "jvm.h" | ||
|
|
||
| #include "jdk_internal_event_JfrEpochGeneration.h" | ||
|
|
||
| JNIEXPORT jlong JNICALL | ||
| Java_jdk_internal_event_JfrEpochGeneration_getJfrEpochGenerationOffset(JNIEnv* env, jclass jfrEpochGen) { | ||
| return JVM_GetJfrEpochGenerationOffset(env, jfrEpochGen); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Drive-by-comment: Can you make
slotnon-final? I'm afraid there is a chance the JIT will not produce correct code for accesses into this field if it lies about its finality. See JDK-8379875.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will leave the
slotfinal, and instead inject a dedicated field for the epoch value.