Skip to content

JIT: do early block merging in more cases #86157

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
AndyAyersMS merged 4 commits into from
May 13, 2023
Merged

JIT: do early block merging in more cases #86157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd5a270
JIT: do early block merging in more cases
AndyAyersMS May 12, 2023
0df426f
format
AndyAyersMS May 12, 2023
1be0489
revise to not break EnC/Debuggable codegen
AndyAyersMS May 13, 2023
df77d67
Merge branch 'main' into Fix86125
AndyAyersMS May 13, 2023
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
6 changes: 2 additions & 4 deletions src/coreclr/jit/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9387,11 +9387,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
return IsInstrumented() && jitFlags->IsSet(JitFlags::JIT_FLAG_BBOPT);
}

bool CanBeInstrumentedOrIsOptimized() const
bool DoEarlyBlockMerging() const
{
return IsInstrumented() || (jitFlags->IsSet(JitFlags::JIT_FLAG_TIER0) &&
jitFlags->IsSet(JitFlags::JIT_FLAG_BBINSTR_IF_LOOPS)) ||
jitFlags->IsSet(JitFlags::JIT_FLAG_BBOPT);
return IsInstrumented() || jitFlags->IsSet(JitFlags::JIT_FLAG_TIER0) || jitFlags->IsSet(JitFlags::JIT_FLAG_BBOPT);
}

// true if we should use the PINVOKE_{BEGIN,END} helpers instead of generating
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/jit/fgbasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1826,7 +1826,7 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed

if ((jmpDist == 0) &&
(opcode == CEE_LEAVE || opcode == CEE_LEAVE_S || opcode == CEE_BR || opcode == CEE_BR_S) &&
opts.CanBeInstrumentedOrIsOptimized())
opts.DoEarlyBlockMerging())
{
break; /* NOP */
}
Expand Down Expand Up @@ -2975,7 +2975,7 @@ unsigned Compiler::fgMakeBasicBlocks(const BYTE* codeAddr, IL_OFFSET codeSize, F

jmpDist = (sz == 1) ? getI1LittleEndian(codeAddr) : getI4LittleEndian(codeAddr);

if ((jmpDist == 0) && (opcode == CEE_BR || opcode == CEE_BR_S) && opts.CanBeInstrumentedOrIsOptimized())
if ((jmpDist == 0) && (opcode == CEE_BR || opcode == CEE_BR_S) && opts.DoEarlyBlockMerging())
{
continue; /* NOP */
}
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/importer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7475,7 +7475,7 @@ void Compiler::impImportBlockCode(BasicBlock* block)
case CEE_BR_S:
jmpDist = (sz == 1) ? getI1LittleEndian(codeAddr) : getI4LittleEndian(codeAddr);

if ((jmpDist == 0) && opts.CanBeInstrumentedOrIsOptimized())
if ((jmpDist == 0) && opts.DoEarlyBlockMerging())
{
break; /* NOP */
}
Expand Down