Skip to content

JIT: enable cross-block local assertion prop #94689

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
merged 8 commits into from
Nov 28, 2023
Merged

JIT: enable cross-block local assertion prop #94689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3dbc503
JIT: enable cross-block local assertion prop
AndyAyersMS Nov 14, 2023
7757407
Merge remote-tracking branch 'upstream/main' into EnableCrossBlock2
AndyAyersMS Nov 15, 2023
30c13fc
fix test case
AndyAyersMS Nov 15, 2023
bf43a27
fix bug; add range enable
AndyAyersMS Nov 16, 2023
f942eda
avoid jtrue assertions involving floating types
AndyAyersMS Nov 17, 2023
fecb706
Merge branch 'main' into EnableCrossBlock2
AndyAyersMS Nov 27, 2023
8e30f81
Merge branch 'main' into EnableCrossBlock2
AndyAyersMS Nov 27, 2023
3882492
fix osr stress issue
AndyAyersMS Nov 28, 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
7 changes: 7 additions & 0 deletions src/coreclr/jit/fgopt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2888,6 +2888,13 @@ bool Compiler::fgOptimizeEmptyBlock(BasicBlock* block)
}
}

// Don't remove the fgEntryBB
//
if (opts.IsOSR() && (block == fgEntryBB))
{
break;
}

#if defined(FEATURE_EH_FUNCLETS)
/* Don't remove an empty block that is in a different EH region
* from its successor block, if the block is the target of a
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/jitconfigvalues.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ CONFIG_INTEGER(JitEnableHeadTailMerge, W("JitEnableHeadTailMerge"), 1)
CONFIG_INTEGER(JitEnablePhysicalPromotion, W("JitEnablePhysicalPromotion"), 1)

// Enable cross-block local assertion prop
CONFIG_INTEGER(JitEnableCrossBlockLocalAssertionProp, W("JitEnableCrossBlockLocalAssertionProp"), 0)
CONFIG_INTEGER(JitEnableCrossBlockLocalAssertionProp, W("JitEnableCrossBlockLocalAssertionProp"), 1)

#if defined(DEBUG)
// JitFunctionFile: Name of a file that contains a list of functions. If the currently compiled function is in the
Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/Directed/debugging/debuginfo/tester.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<!-- These expectedly interfere with debug info -->
<CLRTestEnvironmentVariable Include="DOTNET_JitNoForwardSub" Value="1" />
<CLRTestEnvironmentVariable Include="DOTNET_JitEnableHeadTailMerge" Value="0" />
<CLRTestEnvironmentVariable Include="DOTNET_JitEnableCrossBlockLocalAssertionProp" Value="0" />

<ProjectReference Include="tests_d.ilproj" Aliases="tests_d" />
<ProjectReference Include="tests_r.ilproj" Aliases="tests_r" />
Expand Down