Skip to content

[GR-71495] Ristretto add basic support for branch profiles. #12679

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

Merged
graalvmbot merged 18 commits into from
Dec 9, 2025
Merged

[GR-71495] Ristretto add basic support for branch profiles. #12679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b55902f
update owners
davleopo Dec 2, 2025
9899bc2
ristretto: expand profiles and add first prototype of branch profiles
davleopo Nov 21, 2025
13d472d
address review comments
davleopo Dec 4, 2025
dd3d9eb
address review comments
davleopo Dec 4, 2025
4bc87ca
ristretto: ensure object is allocated before barrier
davleopo Dec 4, 2025
a1874c0
ristretto: early return on last index, then check next index contributed
davleopo Dec 4, 2025
d2d773c
ristretto: style fixes
davleopo Dec 4, 2025
ef3e1bf
ristretto: do not spin during branch profiling if state is currently
davleopo Dec 4, 2025
299df18
ristretto: profileMethodCall refactor loop to avoid second read upon
davleopo Dec 4, 2025
1d25b85
ristretto: move profile get into interpreter to only query (and
davleopo Dec 5, 2025
f27f6ae
ristretto:getBranchTakenProbability add more assertions and clamping
davleopo Dec 5, 2025
8db1a59
ristretto: check non recorded before assertion logic
davleopo Dec 5, 2025
65e7249
ristretto: checkstyle fixes
davleopo Dec 9, 2025
b669793
ristretto: make it clear goto and jsr are not considered binary if
davleopo Dec 9, 2025
f10d4c4
ristretto: pause on other thread init profile
davleopo Dec 9, 2025
e175b0e
ristretto: address review comments
davleopo Dec 9, 2025
f5ef369
ristretto: fix typo
davleopo Dec 9, 2025
cbff6cd
ristretto: do not use GraalError in profile code that is called from the
davleopo Dec 9, 2025
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
1 change: 1 addition & 0 deletions substratevm/src/com.oracle.svm.interpreter.metadata/OWNERS.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ files = "*"
all = [
"bernhard.urban-forster@oracle.com",
"gilles.m.duboscq@oracle.com",
"david.leopoldseder@oracle.com"
]
85 changes: 60 additions & 25 deletions ...om.oracle.svm.interpreter.metadata/src/com/oracle/svm/interpreter/metadata/Bytecodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@
import static com.oracle.svm.interpreter.metadata.Bytecodes.Flags.FALL_THROUGH;
import static com.oracle.svm.interpreter.metadata.Bytecodes.Flags.FIELD_READ;
import static com.oracle.svm.interpreter.metadata.Bytecodes.Flags.FIELD_WRITE;
import static com.oracle.svm.interpreter.metadata.Bytecodes.Flags.IF_BRANCH_PROFILED;
import static com.oracle.svm.interpreter.metadata.Bytecodes.Flags.INVOKE;
import static com.oracle.svm.interpreter.metadata.Bytecodes.Flags.LOAD;
import static com.oracle.svm.interpreter.metadata.Bytecodes.Flags.STOP;
import static com.oracle.svm.interpreter.metadata.Bytecodes.Flags.STORE;
import static com.oracle.svm.interpreter.metadata.Bytecodes.Flags.TRAP;
import static com.oracle.svm.interpreter.metadata.Bytecodes.Flags.TYPE_PROFILED;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
Expand Down Expand Up @@ -325,6 +327,14 @@ static class Flags {
* Denotes the 4 INVOKE* instructions.
*/
static final int INVOKE = 0x00001000;
/**
* Denotes all binary branches that are subject to branch profiling.
*/
static final int IF_BRANCH_PROFILED = 0x00002000;
/**
* Denotes all instructions that are subject to type profiling.
*/
static final int TYPE_PROFILED = 0x00004000;
}

// Performs a sanity check that none of the flags overlap.
Expand Down Expand Up @@ -423,7 +433,7 @@ static class Flags {
def(LALOAD , "laload" , "b" , 0, TRAP);
def(FALOAD , "faload" , "b" , -1, TRAP);
def(DALOAD , "daload" , "b" , 0, TRAP);
def(AALOAD , "aaload" , "b" , -1, TRAP);
def(AALOAD , "aaload" , "b" , -1, TRAP | TYPE_PROFILED);
def(BALOAD , "baload" , "b" , -1, TRAP);
def(CALOAD , "caload" , "b" , -1, TRAP);
def(SALOAD , "saload" , "b" , -1, TRAP);
Expand Down Expand Up @@ -456,7 +466,7 @@ static class Flags {
def(LASTORE , "lastore" , "b" , -4, TRAP);
def(FASTORE , "fastore" , "b" , -3, TRAP);
def(DASTORE , "dastore" , "b" , -4, TRAP);
def(AASTORE , "aastore" , "b" , -3, TRAP);
def(AASTORE , "aastore" , "b" , -3, TRAP | TYPE_PROFILED);
def(BASTORE , "bastore" , "b" , -3, TRAP);
def(CASTORE , "castore" , "b" , -3, TRAP);
def(SASTORE , "sastore" , "b" , -3, TRAP);
Expand Down Expand Up @@ -526,20 +536,20 @@ static class Flags {
def(FCMPG , "fcmpg" , "b" , -1);
def(DCMPL , "dcmpl" , "b" , -3);
def(DCMPG , "dcmpg" , "b" , -3);
def(IFEQ , "ifeq" , "boo" , -1, FALL_THROUGH | BRANCH);
def(IFNE , "ifne" , "boo" , -1, FALL_THROUGH | BRANCH);
def(IFLT , "iflt" , "boo" , -1, FALL_THROUGH | BRANCH);
def(IFGE , "ifge" , "boo" , -1, FALL_THROUGH | BRANCH);
def(IFGT , "ifgt" , "boo" , -1, FALL_THROUGH | BRANCH);
def(IFLE , "ifle" , "boo" , -1, FALL_THROUGH | BRANCH);
def(IF_ICMPEQ , "if_icmpeq" , "boo" , -2, COMMUTATIVE | FALL_THROUGH | BRANCH);
def(IF_ICMPNE , "if_icmpne" , "boo" , -2, COMMUTATIVE | FALL_THROUGH | BRANCH);
def(IF_ICMPLT , "if_icmplt" , "boo" , -2, FALL_THROUGH | BRANCH);
def(IF_ICMPGE , "if_icmpge" , "boo" , -2, FALL_THROUGH | BRANCH);
def(IF_ICMPGT , "if_icmpgt" , "boo" , -2, FALL_THROUGH | BRANCH);
def(IF_ICMPLE , "if_icmple" , "boo" , -2, FALL_THROUGH | BRANCH);
def(IF_ACMPEQ , "if_acmpeq" , "boo" , -2, COMMUTATIVE | FALL_THROUGH | BRANCH);
def(IF_ACMPNE , "if_acmpne" , "boo" , -2, COMMUTATIVE | FALL_THROUGH | BRANCH);
def(IFEQ , "ifeq" , "boo" , -1, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IFNE , "ifne" , "boo" , -1, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IFLT , "iflt" , "boo" , -1, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IFGE , "ifge" , "boo" , -1, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IFGT , "ifgt" , "boo" , -1, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IFLE , "ifle" , "boo" , -1, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IF_ICMPEQ , "if_icmpeq" , "boo" , -2, COMMUTATIVE | FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IF_ICMPNE , "if_icmpne" , "boo" , -2, COMMUTATIVE | FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IF_ICMPLT , "if_icmplt" , "boo" , -2, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IF_ICMPGE , "if_icmpge" , "boo" , -2, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IF_ICMPGT , "if_icmpgt" , "boo" , -2, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IF_ICMPLE , "if_icmple" , "boo" , -2, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IF_ACMPEQ , "if_acmpeq" , "boo" , -2, COMMUTATIVE | FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IF_ACMPNE , "if_acmpne" , "boo" , -2, COMMUTATIVE | FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(GOTO , "goto" , "boo" , 0, STOP | BRANCH);
def(JSR , "jsr" , "boo" , 0, STOP | BRANCH);
def(RET , "ret" , "bi" , 0, STOP);
Expand All @@ -555,24 +565,24 @@ static class Flags {
def(PUTSTATIC , "putstatic" , "bjj" , -1, TRAP | FIELD_WRITE);
def(GETFIELD , "getfield" , "bjj" , 0, TRAP | FIELD_READ);
def(PUTFIELD , "putfield" , "bjj" , -2, TRAP | FIELD_WRITE);
def(INVOKEVIRTUAL , "invokevirtual" , "bjj" , -1, TRAP | INVOKE);
def(INVOKESPECIAL , "invokespecial" , "bjj" , -1, TRAP | INVOKE);
def(INVOKESTATIC , "invokestatic" , "bjj" , 0, TRAP | INVOKE);
def(INVOKEINTERFACE , "invokeinterface" , "bjja_", -1, TRAP | INVOKE);
def(INVOKEDYNAMIC , "invokedynamic" , "bjjjj", 0, TRAP | INVOKE);
def(INVOKEVIRTUAL , "invokevirtual" , "bjj" , -1, TRAP | INVOKE | TYPE_PROFILED);
def(INVOKESPECIAL , "invokespecial" , "bjj" , -1, TRAP | INVOKE | TYPE_PROFILED);
def(INVOKESTATIC , "invokestatic" , "bjj" , 0, TRAP | INVOKE | TYPE_PROFILED);
def(INVOKEINTERFACE , "invokeinterface" , "bjja_", -1, TRAP | INVOKE | TYPE_PROFILED);
def(INVOKEDYNAMIC , "invokedynamic" , "bjjjj", 0, TRAP | INVOKE | TYPE_PROFILED);
def(NEW , "new" , "bii" , 1, TRAP);
def(NEWARRAY , "newarray" , "bc" , 0, TRAP);
def(ANEWARRAY , "anewarray" , "bii" , 0, TRAP);
def(ARRAYLENGTH , "arraylength" , "b" , 0, TRAP);
def(ATHROW , "athrow" , "b" , -1, TRAP | STOP);
def(CHECKCAST , "checkcast" , "bii" , 0, TRAP);
def(INSTANCEOF , "instanceof" , "bii" , 0, TRAP);
def(CHECKCAST , "checkcast" , "bii" , 0, TRAP | TYPE_PROFILED);
def(INSTANCEOF , "instanceof" , "bii" , 0, TRAP | TYPE_PROFILED);
def(MONITORENTER , "monitorenter" , "b" , -1, TRAP);
def(MONITOREXIT , "monitorexit" , "b" , -1, TRAP);
def(WIDE , "wide" , "" , 0);
def(MULTIANEWARRAY , "multianewarray" , "biic" , 1, TRAP);
def(IFNULL , "ifnull" , "boo" , -1, FALL_THROUGH | BRANCH);
def(IFNONNULL , "ifnonnull" , "boo" , -1, FALL_THROUGH | BRANCH);
def(IFNULL , "ifnull" , "boo" , -1, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(IFNONNULL , "ifnonnull" , "boo" , -1, FALL_THROUGH | BRANCH | IF_BRANCH_PROFILED);
def(GOTO_W , "goto_w" , "boooo", 0, STOP | BRANCH);
def(JSR_W , "jsr_w" , "boooo", 0, STOP | BRANCH);
def(BREAKPOINT , "breakpoint" , "b" , 0, TRAP);
Expand Down Expand Up @@ -648,6 +658,31 @@ public static boolean isBranch(int opcode) {
return (flagsArray[opcode & 0xff] & BRANCH) != 0;
}

/**
* Determines if a given opcode is an instruction that is subject to binary branch profiling in
* the interpreter. Binary branches are instructions that have 2 successors - the taken and not
* taken successor.
*
* Note that {@link #GOTO} and {@link #JSR} are not considered a profiled if branch
*
* @param opcode an opcode to test
* @return {@code true} iff {@code opcode} is a binary branch instruction that is profiled
*/
public static boolean isProfiledIfBranch(int opcode) {
return (flagsArray[opcode & 0xff] & IF_BRANCH_PROFILED) != 0;
}

/**
* Determines if a given opcode is an instruction that is subject to type profiling. This covers
* all instructions that deal with objects of a dynamic type.
*
* @param opcode an opcode to test
* @return {@code true} iff {@code opcode} is a type profiled branch instruction
*/
public static boolean isTypeProfiled(int opcode) {
return (flagsArray[opcode & 0xff] & TYPE_PROFILED) != 0;
}

/**
* Determines if a given opcode denotes a conditional branch.
*
Expand Down
Loading