JIT: more fixes for VN loop dependence tracking - #56184

Merged
AndyAyersMS merged 1 commit into
dotnet:mainfrom
AndyAyersMS:LoopMemoryDependenceVNFixes
Jul 27, 2021
Merged

JIT: more fixes for VN loop dependence tracking#56184
AndyAyersMS merged 1 commit into
dotnet:mainfrom
AndyAyersMS:LoopMemoryDependenceVNFixes

Conversation

@AndyAyersMS

@AndyAyersMSAndyAyersMS commented Jul 22, 2021

Copy link
Copy Markdown
Member

Specify Overwrite when setting loop dependence map entries, as we may
refine the initial result.

Fixes#56174.

Extract loop dependence of VNF_PhiMemoryDef.

Fixes new case noted in #55936, and 13/16 or so other cases Jakob sent
me privately. Also update a comment and fix tests to work better with
jitstress per other notes on that PR.

@AndyAyersMS
JIT: more fixes for VN loop dependence tracking
3ece4fc
Specify `Overwrite` when setting loop dependence map entries, as we may
refine the initial result.
Fixesdotnet#56174.
Extract loop dependence of `VNF_PhiMemoryDef`.
Fixes new case noted in dotnet#55936, and 13/16 or so other cases Jakob sent
me privately. Also update a comment and fix tests to work better with
jitstress per other notes on that PR.
@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jul 22, 2021
@AndyAyersMS

AndyAyersMS commented Jul 22, 2021

Copy link
Copy Markdown
MemberAuthor

cc @jakobbotsch @dotnet/jit-contrib

No spmi diffs.

@AndyAyersMSAndyAyersMS mentioned this pull request Jul 22, 2021
Merged
briansull
briansull approved these changes Jul 22, 2021
View reviewed changes

@briansullbriansull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good

@AndyAyersMS

AndyAyersMS commented Jul 23, 2021•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

@jakobbotsch by my accounting this fixes all the test cases you sent me except for these 3:

11656046881568048475.cs
2692166044414030864.cs 11738605779775786426.cs (hits jit assert)

The first two look like cases that should be handled by my fixes, so I will need to dig into them to see what is going wrong. In both cases the write/read sequence happens after a nested loop.

@AndyAyersMS
AndyAyersMS merged commit b18ff29 into dotnet:mainJul 27, 2021
@AndyAyersMS
AndyAyersMS deleted the LoopMemoryDependenceVNFixes branch July 27, 2021 17:53
@AndyAyersMSAndyAyersMS mentioned this pull request Jul 27, 2021
Closed
AndyAyersMS added a commit to AndyAyersMS/runtime that referenced this pull request Jul 27, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed
9651edf
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in dotnet#55936 and dotnet#56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of dotnet#54118.
@AndyAyersMSAndyAyersMS mentioned this pull request Jul 27, 2021
Merged
AndyAyersMS added a commit that referenced this pull request Jul 28, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed (#…
b25bd29
…56436)
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in #55936 and #56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of #54118.
@AndyAyersMS

AndyAyersMS commented Jul 28, 2021

Copy link
Copy Markdown
MemberAuthor

The assert in that other test:

corerun.exe 11738605779775786426.exe
Assert failure(PID 20200 [0x00004ee8], Thread: 24136 [0x5e48]): Assertion failed 'i < BitSetTraits::GetSize(env)' in 'Program:Main()' during 'Compute blocks reachability' (IL size 41)

@AndyAyersMS

AndyAyersMS commented Jul 28, 2021

Copy link
Copy Markdown
MemberAuthor

Looks like a flow opts bug, we end up not updating the pred list for BB08 properly and this ultimately leaves a dangling reference from BB07 to BB08 which causes the assert above.

*************** In fgUpdateFlowGraph()
Before updating the flow graph:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB04 (always) keep i bwd BB04 [0009] 1 BB03 1 [???..???)-> BB06 (always) i internal BB05 [0010] 0 1 [???..???)-> BB09 (always) i internal BB06 [0003] 1 BB04 1 [010..013)-> BB09 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB09 ( cond ) i bwd BB08 [0005] 1 BB07 1 [01A..020) i bwd BB09 [0006] 4 BB05,BB06,BB07,BB08 1 [020..024) i bwd BB10 [0007] 2 BB01,BB09 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Removing unconditional jump to next block (BB03 -> BB04) (converted BB03 to fall-through)
Compacting blocks BB03 and BB04:
*************** In fgDebugCheckBBlist
Optimizing a jump to an unconditional jump (BB03 -> BB06 -> BB09)
Setting edge weights for BB03 -> BB09 to [0 .. 3.402823e+38]
fgRemoveBlock BB05
Removing unreachable BB05
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

@AndyAyersMS

AndyAyersMS commented Jul 28, 2021

Copy link
Copy Markdown
MemberAuthor

The bug is here:

runtime/src/coreclr/jit/fgopt.cpp

Lines 5620 to 5629 in eb1e55e

// Add fall through fixup block, if needed.
//
if ((bDest->bbJumpKind == BBJ_NONE) || (bDest->bbJumpKind == BBJ_COND))
{
BasicBlock* const bFixup = fgNewBBafter(BBJ_ALWAYS, bDest, true);
bFixup->inheritWeight(bDestNext);
bFixup->bbJumpDest = bDestNext;
fgReplacePred(bDestNext, bDest, bFixup);
fgAddRefPred(bFixup, bDest);
}

fgReplacePred will replace all pred uses, when we only wanted to replace one of them

Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB08 [0005] 4 BB03,BB06,BB07(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB03,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

This is new code that I added, I'll open a fresh issue for this...

@AndyAyersMSAndyAyersMS mentioned this pull request Jul 28, 2021
Closed
@ghostghost locked as resolved and limited conversation to collaborators Aug 27, 2021
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jakobbotschjakobbotschjakobbotsch approved these changes
+2 more reviewers
@BruceForstallBruceForstallBruceForstall approved these changes
@briansullbriansullbriansull approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

kind == Overwrite assert in jitstress

4 participants

@AndyAyersMS@jakobbotsch@BruceForstall@briansull
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
JIT: more fixes for VN loop dependence tracking - #56184
Merged
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Jul 27, 2021
Merged
JIT: more fixes for VN loop dependence tracking#56184
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Conversation
@AndyAyersMS
@AndyAyersMSAndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

Member
Specify Overwrite when setting loop dependence map entries, as we may

refine the initial result.
Fixes#56174.
Extract loop dependence of VNF_PhiMemoryDef.
Fixes new case noted in #55936, and 13/16 or so other cases Jakob sent

me privately. Also update a comment and fix tests to work better with

jitstress per other notes on that PR.
@AndyAyersMS
JIT: more fixes for VN loop dependence tracking
3ece4fc
Specify `Overwrite` when setting loop dependence map entries, as we may
refine the initial result.
Fixesdotnet#56174.
Extract loop dependence of `VNF_PhiMemoryDef`.
Fixes new case noted in dotnet#55936, and 13/16 or so other cases Jakob sent
me privately. Also update a comment and fix tests to work better with
jitstress per other notes on that PR.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Jul 22, 2021
@AndyAyersMS
AndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

MemberAuthor
cc @jakobbotsch @dotnet/jit-contrib
No spmi diffs.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 22, 2021
 Merged

briansull
briansull
approved these changes
Jul 22, 2021
View reviewed changes
@briansullbriansull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good
@AndyAyersMS
AndyAyersMS
commented
Jul 23, 2021•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
@jakobbotsch by my accounting this fixes all the test cases you sent me except for these 3:
11656046881568048475.cs
2692166044414030864.cs 11738605779775786426.cs (hits jit assert)

The first two look like cases that should be handled by my fixes, so I will need to dig into them to see what is going wrong. In both cases the write/read sequence happens after a nested loop.
@AndyAyersMS
AndyAyersMS
merged commit b18ff29
into
dotnet:mainJul 27, 2021
@AndyAyersMS
AndyAyersMS
deleted the

LoopMemoryDependenceVNFixes

branch
July 27, 2021 17:53
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021

Closed

AndyAyersMS added a commit
to AndyAyersMS/runtime
that referenced
this pull request
Jul 27, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed
9651edf
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in dotnet#55936 and dotnet#56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of dotnet#54118.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021
 Merged

AndyAyersMS added a commit
that referenced
this pull request
Jul 28, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed (#…
b25bd29
…56436)
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in #55936 and #56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of #54118.
@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The assert in that other test:
corerun.exe 11738605779775786426.exe
Assert failure(PID 20200 [0x00004ee8], Thread: 24136 [0x5e48]): Assertion failed 'i < BitSetTraits::GetSize(env)' in 'Program:Main()' during 'Compute blocks reachability' (IL size 41)

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
Looks like a flow opts bug, we end up not updating the pred list for BB08 properly and this ultimately leaves a dangling reference from BB07 to BB08 which causes the assert above.
*************** In fgUpdateFlowGraph()
Before updating the flow graph:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB04 (always) keep i bwd BB04 [0009] 1 BB03 1 [???..???)-> BB06 (always) i internal BB05 [0010] 0 1 [???..???)-> BB09 (always) i internal BB06 [0003] 1 BB04 1 [010..013)-> BB09 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB09 ( cond ) i bwd BB08 [0005] 1 BB07 1 [01A..020) i bwd BB09 [0006] 4 BB05,BB06,BB07,BB08 1 [020..024) i bwd BB10 [0007] 2 BB01,BB09 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Removing unconditional jump to next block (BB03 -> BB04) (converted BB03 to fall-through)
Compacting blocks BB03 and BB04:
*************** In fgDebugCheckBBlist
Optimizing a jump to an unconditional jump (BB03 -> BB06 -> BB09)
Setting edge weights for BB03 -> BB09 to [0 .. 3.402823e+38]
fgRemoveBlock BB05
Removing unreachable BB05
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The bug is here:
runtime/src/coreclr/jit/fgopt.cpp

Lines 5620 to 5629
in
eb1e55e
// Add fall through fixup block, if needed.
//
if ((bDest->bbJumpKind == BBJ_NONE) || (bDest->bbJumpKind == BBJ_COND)) 
 { 
 BasicBlock* const bFixup = fgNewBBafter(BBJ_ALWAYS, bDest, true); 
 bFixup->inheritWeight(bDestNext); 
 bFixup->bbJumpDest = bDestNext; 
fgReplacePred(bDestNext, bDest, bFixup); 
fgAddRefPred(bFixup, bDest); 
 } 
fgReplacePred will replace all pred uses, when we only wanted to replace one of them
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB08 [0005] 4 BB03,BB06,BB07(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB03,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

This is new code that I added, I'll open a fresh issue for this...
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 28, 2021

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Aug 27, 2021
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jakobbotschjakobbotschjakobbotsch approved these changes

+2 more reviewers

@BruceForstallBruceForstallBruceForstall approved these changes
@briansullbriansullbriansull approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.
kind == Overwrite assert in jitstress


4 participants

@AndyAyersMS@jakobbotsch@BruceForstall@briansull

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: more fixes for VN loop dependence tracking - #56184
Merged
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Jul 27, 2021
Merged
JIT: more fixes for VN loop dependence tracking#56184
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Conversation
@AndyAyersMS
@AndyAyersMSAndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

Member
Specify Overwrite when setting loop dependence map entries, as we may

refine the initial result.
Fixes#56174.
Extract loop dependence of VNF_PhiMemoryDef.
Fixes new case noted in #55936, and 13/16 or so other cases Jakob sent

me privately. Also update a comment and fix tests to work better with

jitstress per other notes on that PR.
@AndyAyersMS
JIT: more fixes for VN loop dependence tracking
3ece4fc
Specify `Overwrite` when setting loop dependence map entries, as we may
refine the initial result.
Fixesdotnet#56174.
Extract loop dependence of `VNF_PhiMemoryDef`.
Fixes new case noted in dotnet#55936, and 13/16 or so other cases Jakob sent
me privately. Also update a comment and fix tests to work better with
jitstress per other notes on that PR.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Jul 22, 2021
@AndyAyersMS
AndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

MemberAuthor
cc @jakobbotsch @dotnet/jit-contrib
No spmi diffs.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 22, 2021
 Merged

briansull
briansull
approved these changes
Jul 22, 2021
View reviewed changes
@briansullbriansull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good
@AndyAyersMS
AndyAyersMS
commented
Jul 23, 2021•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
@jakobbotsch by my accounting this fixes all the test cases you sent me except for these 3:
11656046881568048475.cs
2692166044414030864.cs 11738605779775786426.cs (hits jit assert)

The first two look like cases that should be handled by my fixes, so I will need to dig into them to see what is going wrong. In both cases the write/read sequence happens after a nested loop.
@AndyAyersMS
AndyAyersMS
merged commit b18ff29
into
dotnet:mainJul 27, 2021
@AndyAyersMS
AndyAyersMS
deleted the

LoopMemoryDependenceVNFixes

branch
July 27, 2021 17:53
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021

Closed

AndyAyersMS added a commit
to AndyAyersMS/runtime
that referenced
this pull request
Jul 27, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed
9651edf
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in dotnet#55936 and dotnet#56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of dotnet#54118.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021
 Merged

AndyAyersMS added a commit
that referenced
this pull request
Jul 28, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed (#…
b25bd29
…56436)
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in #55936 and #56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of #54118.
@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The assert in that other test:
corerun.exe 11738605779775786426.exe
Assert failure(PID 20200 [0x00004ee8], Thread: 24136 [0x5e48]): Assertion failed 'i < BitSetTraits::GetSize(env)' in 'Program:Main()' during 'Compute blocks reachability' (IL size 41)

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
Looks like a flow opts bug, we end up not updating the pred list for BB08 properly and this ultimately leaves a dangling reference from BB07 to BB08 which causes the assert above.
*************** In fgUpdateFlowGraph()
Before updating the flow graph:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB04 (always) keep i bwd BB04 [0009] 1 BB03 1 [???..???)-> BB06 (always) i internal BB05 [0010] 0 1 [???..???)-> BB09 (always) i internal BB06 [0003] 1 BB04 1 [010..013)-> BB09 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB09 ( cond ) i bwd BB08 [0005] 1 BB07 1 [01A..020) i bwd BB09 [0006] 4 BB05,BB06,BB07,BB08 1 [020..024) i bwd BB10 [0007] 2 BB01,BB09 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Removing unconditional jump to next block (BB03 -> BB04) (converted BB03 to fall-through)
Compacting blocks BB03 and BB04:
*************** In fgDebugCheckBBlist
Optimizing a jump to an unconditional jump (BB03 -> BB06 -> BB09)
Setting edge weights for BB03 -> BB09 to [0 .. 3.402823e+38]
fgRemoveBlock BB05
Removing unreachable BB05
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The bug is here:
runtime/src/coreclr/jit/fgopt.cpp

Lines 5620 to 5629
in
eb1e55e
// Add fall through fixup block, if needed.
//
if ((bDest->bbJumpKind == BBJ_NONE) || (bDest->bbJumpKind == BBJ_COND)) 
 { 
 BasicBlock* const bFixup = fgNewBBafter(BBJ_ALWAYS, bDest, true); 
 bFixup->inheritWeight(bDestNext); 
 bFixup->bbJumpDest = bDestNext; 
fgReplacePred(bDestNext, bDest, bFixup); 
fgAddRefPred(bFixup, bDest); 
 } 
fgReplacePred will replace all pred uses, when we only wanted to replace one of them
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB08 [0005] 4 BB03,BB06,BB07(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB03,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

This is new code that I added, I'll open a fresh issue for this...
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 28, 2021

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Aug 27, 2021
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jakobbotschjakobbotschjakobbotsch approved these changes

+2 more reviewers

@BruceForstallBruceForstallBruceForstall approved these changes
@briansullbriansullbriansull approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.
kind == Overwrite assert in jitstress


4 participants

@AndyAyersMS@jakobbotsch@BruceForstall@briansull

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: more fixes for VN loop dependence tracking - #56184
Merged
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Jul 27, 2021
Merged
JIT: more fixes for VN loop dependence tracking#56184
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Conversation
@AndyAyersMS
@AndyAyersMSAndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

Member
Specify Overwrite when setting loop dependence map entries, as we may

refine the initial result.
Fixes#56174.
Extract loop dependence of VNF_PhiMemoryDef.
Fixes new case noted in #55936, and 13/16 or so other cases Jakob sent

me privately. Also update a comment and fix tests to work better with

jitstress per other notes on that PR.
@AndyAyersMS
JIT: more fixes for VN loop dependence tracking
3ece4fc
Specify `Overwrite` when setting loop dependence map entries, as we may
refine the initial result.
Fixesdotnet#56174.
Extract loop dependence of `VNF_PhiMemoryDef`.
Fixes new case noted in dotnet#55936, and 13/16 or so other cases Jakob sent
me privately. Also update a comment and fix tests to work better with
jitstress per other notes on that PR.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Jul 22, 2021
@AndyAyersMS
AndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

MemberAuthor
cc @jakobbotsch @dotnet/jit-contrib
No spmi diffs.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 22, 2021
 Merged

briansull
briansull
approved these changes
Jul 22, 2021
View reviewed changes
@briansullbriansull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good
@AndyAyersMS
AndyAyersMS
commented
Jul 23, 2021•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
@jakobbotsch by my accounting this fixes all the test cases you sent me except for these 3:
11656046881568048475.cs
2692166044414030864.cs 11738605779775786426.cs (hits jit assert)

The first two look like cases that should be handled by my fixes, so I will need to dig into them to see what is going wrong. In both cases the write/read sequence happens after a nested loop.
@AndyAyersMS
AndyAyersMS
merged commit b18ff29
into
dotnet:mainJul 27, 2021
@AndyAyersMS
AndyAyersMS
deleted the

LoopMemoryDependenceVNFixes

branch
July 27, 2021 17:53
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021

Closed

AndyAyersMS added a commit
to AndyAyersMS/runtime
that referenced
this pull request
Jul 27, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed
9651edf
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in dotnet#55936 and dotnet#56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of dotnet#54118.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021
 Merged

AndyAyersMS added a commit
that referenced
this pull request
Jul 28, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed (#…
b25bd29
…56436)
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in #55936 and #56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of #54118.
@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The assert in that other test:
corerun.exe 11738605779775786426.exe
Assert failure(PID 20200 [0x00004ee8], Thread: 24136 [0x5e48]): Assertion failed 'i < BitSetTraits::GetSize(env)' in 'Program:Main()' during 'Compute blocks reachability' (IL size 41)

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
Looks like a flow opts bug, we end up not updating the pred list for BB08 properly and this ultimately leaves a dangling reference from BB07 to BB08 which causes the assert above.
*************** In fgUpdateFlowGraph()
Before updating the flow graph:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB04 (always) keep i bwd BB04 [0009] 1 BB03 1 [???..???)-> BB06 (always) i internal BB05 [0010] 0 1 [???..???)-> BB09 (always) i internal BB06 [0003] 1 BB04 1 [010..013)-> BB09 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB09 ( cond ) i bwd BB08 [0005] 1 BB07 1 [01A..020) i bwd BB09 [0006] 4 BB05,BB06,BB07,BB08 1 [020..024) i bwd BB10 [0007] 2 BB01,BB09 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Removing unconditional jump to next block (BB03 -> BB04) (converted BB03 to fall-through)
Compacting blocks BB03 and BB04:
*************** In fgDebugCheckBBlist
Optimizing a jump to an unconditional jump (BB03 -> BB06 -> BB09)
Setting edge weights for BB03 -> BB09 to [0 .. 3.402823e+38]
fgRemoveBlock BB05
Removing unreachable BB05
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The bug is here:
runtime/src/coreclr/jit/fgopt.cpp

Lines 5620 to 5629
in
eb1e55e
// Add fall through fixup block, if needed.
//
if ((bDest->bbJumpKind == BBJ_NONE) || (bDest->bbJumpKind == BBJ_COND)) 
 { 
 BasicBlock* const bFixup = fgNewBBafter(BBJ_ALWAYS, bDest, true); 
 bFixup->inheritWeight(bDestNext); 
 bFixup->bbJumpDest = bDestNext; 
fgReplacePred(bDestNext, bDest, bFixup); 
fgAddRefPred(bFixup, bDest); 
 } 
fgReplacePred will replace all pred uses, when we only wanted to replace one of them
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB08 [0005] 4 BB03,BB06,BB07(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB03,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

This is new code that I added, I'll open a fresh issue for this...
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 28, 2021

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Aug 27, 2021
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jakobbotschjakobbotschjakobbotsch approved these changes

+2 more reviewers

@BruceForstallBruceForstallBruceForstall approved these changes
@briansullbriansullbriansull approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.
kind == Overwrite assert in jitstress


4 participants

@AndyAyersMS@jakobbotsch@BruceForstall@briansull

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
JIT: more fixes for VN loop dependence tracking - #56184
Merged
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Jul 27, 2021
Merged
JIT: more fixes for VN loop dependence tracking#56184
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Conversation
@AndyAyersMS
@AndyAyersMSAndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

Member
Specify Overwrite when setting loop dependence map entries, as we may

refine the initial result.
Fixes#56174.
Extract loop dependence of VNF_PhiMemoryDef.
Fixes new case noted in #55936, and 13/16 or so other cases Jakob sent

me privately. Also update a comment and fix tests to work better with

jitstress per other notes on that PR.
@AndyAyersMS
JIT: more fixes for VN loop dependence tracking
3ece4fc
Specify `Overwrite` when setting loop dependence map entries, as we may
refine the initial result.
Fixesdotnet#56174.
Extract loop dependence of `VNF_PhiMemoryDef`.
Fixes new case noted in dotnet#55936, and 13/16 or so other cases Jakob sent
me privately. Also update a comment and fix tests to work better with
jitstress per other notes on that PR.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Jul 22, 2021
@AndyAyersMS
AndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

MemberAuthor
cc @jakobbotsch @dotnet/jit-contrib
No spmi diffs.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 22, 2021
 Merged

briansull
briansull
approved these changes
Jul 22, 2021
View reviewed changes
@briansullbriansull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good
@AndyAyersMS
AndyAyersMS
commented
Jul 23, 2021•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
@jakobbotsch by my accounting this fixes all the test cases you sent me except for these 3:
11656046881568048475.cs
2692166044414030864.cs 11738605779775786426.cs (hits jit assert)

The first two look like cases that should be handled by my fixes, so I will need to dig into them to see what is going wrong. In both cases the write/read sequence happens after a nested loop.
@AndyAyersMS
AndyAyersMS
merged commit b18ff29
into
dotnet:mainJul 27, 2021
@AndyAyersMS
AndyAyersMS
deleted the

LoopMemoryDependenceVNFixes

branch
July 27, 2021 17:53
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021

Closed

AndyAyersMS added a commit
to AndyAyersMS/runtime
that referenced
this pull request
Jul 27, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed
9651edf
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in dotnet#55936 and dotnet#56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of dotnet#54118.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021
 Merged

AndyAyersMS added a commit
that referenced
this pull request
Jul 28, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed (#…
b25bd29
…56436)
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in #55936 and #56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of #54118.
@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The assert in that other test:
corerun.exe 11738605779775786426.exe
Assert failure(PID 20200 [0x00004ee8], Thread: 24136 [0x5e48]): Assertion failed 'i < BitSetTraits::GetSize(env)' in 'Program:Main()' during 'Compute blocks reachability' (IL size 41)

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
Looks like a flow opts bug, we end up not updating the pred list for BB08 properly and this ultimately leaves a dangling reference from BB07 to BB08 which causes the assert above.
*************** In fgUpdateFlowGraph()
Before updating the flow graph:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB04 (always) keep i bwd BB04 [0009] 1 BB03 1 [???..???)-> BB06 (always) i internal BB05 [0010] 0 1 [???..???)-> BB09 (always) i internal BB06 [0003] 1 BB04 1 [010..013)-> BB09 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB09 ( cond ) i bwd BB08 [0005] 1 BB07 1 [01A..020) i bwd BB09 [0006] 4 BB05,BB06,BB07,BB08 1 [020..024) i bwd BB10 [0007] 2 BB01,BB09 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Removing unconditional jump to next block (BB03 -> BB04) (converted BB03 to fall-through)
Compacting blocks BB03 and BB04:
*************** In fgDebugCheckBBlist
Optimizing a jump to an unconditional jump (BB03 -> BB06 -> BB09)
Setting edge weights for BB03 -> BB09 to [0 .. 3.402823e+38]
fgRemoveBlock BB05
Removing unreachable BB05
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The bug is here:
runtime/src/coreclr/jit/fgopt.cpp

Lines 5620 to 5629
in
eb1e55e
// Add fall through fixup block, if needed.
//
if ((bDest->bbJumpKind == BBJ_NONE) || (bDest->bbJumpKind == BBJ_COND)) 
 { 
 BasicBlock* const bFixup = fgNewBBafter(BBJ_ALWAYS, bDest, true); 
 bFixup->inheritWeight(bDestNext); 
 bFixup->bbJumpDest = bDestNext; 
fgReplacePred(bDestNext, bDest, bFixup); 
fgAddRefPred(bFixup, bDest); 
 } 
fgReplacePred will replace all pred uses, when we only wanted to replace one of them
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB08 [0005] 4 BB03,BB06,BB07(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB03,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

This is new code that I added, I'll open a fresh issue for this...
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 28, 2021

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Aug 27, 2021
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jakobbotschjakobbotschjakobbotsch approved these changes

+2 more reviewers

@BruceForstallBruceForstallBruceForstall approved these changes
@briansullbriansullbriansull approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.
kind == Overwrite assert in jitstress


4 participants

@AndyAyersMS@jakobbotsch@BruceForstall@briansull

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: more fixes for VN loop dependence tracking - #56184
Merged
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Jul 27, 2021
Merged
JIT: more fixes for VN loop dependence tracking#56184
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Conversation
@AndyAyersMS
@AndyAyersMSAndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

Member
Specify Overwrite when setting loop dependence map entries, as we may

refine the initial result.
Fixes#56174.
Extract loop dependence of VNF_PhiMemoryDef.
Fixes new case noted in #55936, and 13/16 or so other cases Jakob sent

me privately. Also update a comment and fix tests to work better with

jitstress per other notes on that PR.
@AndyAyersMS
JIT: more fixes for VN loop dependence tracking
3ece4fc
Specify `Overwrite` when setting loop dependence map entries, as we may
refine the initial result.
Fixesdotnet#56174.
Extract loop dependence of `VNF_PhiMemoryDef`.
Fixes new case noted in dotnet#55936, and 13/16 or so other cases Jakob sent
me privately. Also update a comment and fix tests to work better with
jitstress per other notes on that PR.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Jul 22, 2021
@AndyAyersMS
AndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

MemberAuthor
cc @jakobbotsch @dotnet/jit-contrib
No spmi diffs.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 22, 2021
 Merged

briansull
briansull
approved these changes
Jul 22, 2021
View reviewed changes
@briansullbriansull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good
@AndyAyersMS
AndyAyersMS
commented
Jul 23, 2021•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
@jakobbotsch by my accounting this fixes all the test cases you sent me except for these 3:
11656046881568048475.cs
2692166044414030864.cs 11738605779775786426.cs (hits jit assert)

The first two look like cases that should be handled by my fixes, so I will need to dig into them to see what is going wrong. In both cases the write/read sequence happens after a nested loop.
@AndyAyersMS
AndyAyersMS
merged commit b18ff29
into
dotnet:mainJul 27, 2021
@AndyAyersMS
AndyAyersMS
deleted the

LoopMemoryDependenceVNFixes

branch
July 27, 2021 17:53
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021

Closed

AndyAyersMS added a commit
to AndyAyersMS/runtime
that referenced
this pull request
Jul 27, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed
9651edf
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in dotnet#55936 and dotnet#56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of dotnet#54118.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021
 Merged

AndyAyersMS added a commit
that referenced
this pull request
Jul 28, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed (#…
b25bd29
…56436)
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in #55936 and #56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of #54118.
@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The assert in that other test:
corerun.exe 11738605779775786426.exe
Assert failure(PID 20200 [0x00004ee8], Thread: 24136 [0x5e48]): Assertion failed 'i < BitSetTraits::GetSize(env)' in 'Program:Main()' during 'Compute blocks reachability' (IL size 41)

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
Looks like a flow opts bug, we end up not updating the pred list for BB08 properly and this ultimately leaves a dangling reference from BB07 to BB08 which causes the assert above.
*************** In fgUpdateFlowGraph()
Before updating the flow graph:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB04 (always) keep i bwd BB04 [0009] 1 BB03 1 [???..???)-> BB06 (always) i internal BB05 [0010] 0 1 [???..???)-> BB09 (always) i internal BB06 [0003] 1 BB04 1 [010..013)-> BB09 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB09 ( cond ) i bwd BB08 [0005] 1 BB07 1 [01A..020) i bwd BB09 [0006] 4 BB05,BB06,BB07,BB08 1 [020..024) i bwd BB10 [0007] 2 BB01,BB09 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Removing unconditional jump to next block (BB03 -> BB04) (converted BB03 to fall-through)
Compacting blocks BB03 and BB04:
*************** In fgDebugCheckBBlist
Optimizing a jump to an unconditional jump (BB03 -> BB06 -> BB09)
Setting edge weights for BB03 -> BB09 to [0 .. 3.402823e+38]
fgRemoveBlock BB05
Removing unreachable BB05
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The bug is here:
runtime/src/coreclr/jit/fgopt.cpp

Lines 5620 to 5629
in
eb1e55e
// Add fall through fixup block, if needed.
//
if ((bDest->bbJumpKind == BBJ_NONE) || (bDest->bbJumpKind == BBJ_COND)) 
 { 
 BasicBlock* const bFixup = fgNewBBafter(BBJ_ALWAYS, bDest, true); 
 bFixup->inheritWeight(bDestNext); 
 bFixup->bbJumpDest = bDestNext; 
fgReplacePred(bDestNext, bDest, bFixup); 
fgAddRefPred(bFixup, bDest); 
 } 
fgReplacePred will replace all pred uses, when we only wanted to replace one of them
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB08 [0005] 4 BB03,BB06,BB07(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB03,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

This is new code that I added, I'll open a fresh issue for this...
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 28, 2021

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Aug 27, 2021
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jakobbotschjakobbotschjakobbotsch approved these changes

+2 more reviewers

@BruceForstallBruceForstallBruceForstall approved these changes
@briansullbriansullbriansull approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.
kind == Overwrite assert in jitstress


4 participants

@AndyAyersMS@jakobbotsch@BruceForstall@briansull

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
JIT: more fixes for VN loop dependence tracking - #56184
Merged
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Jul 27, 2021
Merged
JIT: more fixes for VN loop dependence tracking#56184
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Conversation
@AndyAyersMS
@AndyAyersMSAndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

Member
Specify Overwrite when setting loop dependence map entries, as we may

refine the initial result.
Fixes#56174.
Extract loop dependence of VNF_PhiMemoryDef.
Fixes new case noted in #55936, and 13/16 or so other cases Jakob sent

me privately. Also update a comment and fix tests to work better with

jitstress per other notes on that PR.
@AndyAyersMS
JIT: more fixes for VN loop dependence tracking
3ece4fc
Specify `Overwrite` when setting loop dependence map entries, as we may
refine the initial result.
Fixesdotnet#56174.
Extract loop dependence of `VNF_PhiMemoryDef`.
Fixes new case noted in dotnet#55936, and 13/16 or so other cases Jakob sent
me privately. Also update a comment and fix tests to work better with
jitstress per other notes on that PR.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Jul 22, 2021
@AndyAyersMS
AndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

MemberAuthor
cc @jakobbotsch @dotnet/jit-contrib
No spmi diffs.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 22, 2021
 Merged

briansull
briansull
approved these changes
Jul 22, 2021
View reviewed changes
@briansullbriansull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good
@AndyAyersMS
AndyAyersMS
commented
Jul 23, 2021•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
@jakobbotsch by my accounting this fixes all the test cases you sent me except for these 3:
11656046881568048475.cs
2692166044414030864.cs 11738605779775786426.cs (hits jit assert)

The first two look like cases that should be handled by my fixes, so I will need to dig into them to see what is going wrong. In both cases the write/read sequence happens after a nested loop.
@AndyAyersMS
AndyAyersMS
merged commit b18ff29
into
dotnet:mainJul 27, 2021
@AndyAyersMS
AndyAyersMS
deleted the

LoopMemoryDependenceVNFixes

branch
July 27, 2021 17:53
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021

Closed

AndyAyersMS added a commit
to AndyAyersMS/runtime
that referenced
this pull request
Jul 27, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed
9651edf
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in dotnet#55936 and dotnet#56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of dotnet#54118.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021
 Merged

AndyAyersMS added a commit
that referenced
this pull request
Jul 28, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed (#…
b25bd29
…56436)
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in #55936 and #56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of #54118.
@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The assert in that other test:
corerun.exe 11738605779775786426.exe
Assert failure(PID 20200 [0x00004ee8], Thread: 24136 [0x5e48]): Assertion failed 'i < BitSetTraits::GetSize(env)' in 'Program:Main()' during 'Compute blocks reachability' (IL size 41)

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
Looks like a flow opts bug, we end up not updating the pred list for BB08 properly and this ultimately leaves a dangling reference from BB07 to BB08 which causes the assert above.
*************** In fgUpdateFlowGraph()
Before updating the flow graph:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB04 (always) keep i bwd BB04 [0009] 1 BB03 1 [???..???)-> BB06 (always) i internal BB05 [0010] 0 1 [???..???)-> BB09 (always) i internal BB06 [0003] 1 BB04 1 [010..013)-> BB09 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB09 ( cond ) i bwd BB08 [0005] 1 BB07 1 [01A..020) i bwd BB09 [0006] 4 BB05,BB06,BB07,BB08 1 [020..024) i bwd BB10 [0007] 2 BB01,BB09 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Removing unconditional jump to next block (BB03 -> BB04) (converted BB03 to fall-through)
Compacting blocks BB03 and BB04:
*************** In fgDebugCheckBBlist
Optimizing a jump to an unconditional jump (BB03 -> BB06 -> BB09)
Setting edge weights for BB03 -> BB09 to [0 .. 3.402823e+38]
fgRemoveBlock BB05
Removing unreachable BB05
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The bug is here:
runtime/src/coreclr/jit/fgopt.cpp

Lines 5620 to 5629
in
eb1e55e
// Add fall through fixup block, if needed.
//
if ((bDest->bbJumpKind == BBJ_NONE) || (bDest->bbJumpKind == BBJ_COND)) 
 { 
 BasicBlock* const bFixup = fgNewBBafter(BBJ_ALWAYS, bDest, true); 
 bFixup->inheritWeight(bDestNext); 
 bFixup->bbJumpDest = bDestNext; 
fgReplacePred(bDestNext, bDest, bFixup); 
fgAddRefPred(bFixup, bDest); 
 } 
fgReplacePred will replace all pred uses, when we only wanted to replace one of them
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB08 [0005] 4 BB03,BB06,BB07(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB03,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

This is new code that I added, I'll open a fresh issue for this...
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 28, 2021

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Aug 27, 2021
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jakobbotschjakobbotschjakobbotsch approved these changes

+2 more reviewers

@BruceForstallBruceForstallBruceForstall approved these changes
@briansullbriansullbriansull approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.
kind == Overwrite assert in jitstress


4 participants

@AndyAyersMS@jakobbotsch@BruceForstall@briansull

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
JIT: more fixes for VN loop dependence tracking - #56184
Merged
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Jul 27, 2021
Merged
JIT: more fixes for VN loop dependence tracking#56184
AndyAyersMS merged 1 commit into
dotnet:mainfrom 
AndyAyersMS:LoopMemoryDependenceVNFixes
Conversation
@AndyAyersMS
@AndyAyersMSAndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

Member
Specify Overwrite when setting loop dependence map entries, as we may

refine the initial result.
Fixes#56174.
Extract loop dependence of VNF_PhiMemoryDef.
Fixes new case noted in #55936, and 13/16 or so other cases Jakob sent

me privately. Also update a comment and fix tests to work better with

jitstress per other notes on that PR.
@AndyAyersMS
JIT: more fixes for VN loop dependence tracking
3ece4fc
Specify `Overwrite` when setting loop dependence map entries, as we may
refine the initial result.
Fixesdotnet#56174.
Extract loop dependence of `VNF_PhiMemoryDef`.
Fixes new case noted in dotnet#55936, and 13/16 or so other cases Jakob sent
me privately. Also update a comment and fix tests to work better with
jitstress per other notes on that PR.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Jul 22, 2021
@AndyAyersMS
AndyAyersMS
commented
Jul 22, 2021

Copy link


Copy Markdown

MemberAuthor
cc @jakobbotsch @dotnet/jit-contrib
No spmi diffs.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 22, 2021
 Merged

briansull
briansull
approved these changes
Jul 22, 2021
View reviewed changes
@briansullbriansull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good
@AndyAyersMS
AndyAyersMS
commented
Jul 23, 2021•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
@jakobbotsch by my accounting this fixes all the test cases you sent me except for these 3:
11656046881568048475.cs
2692166044414030864.cs 11738605779775786426.cs (hits jit assert)

The first two look like cases that should be handled by my fixes, so I will need to dig into them to see what is going wrong. In both cases the write/read sequence happens after a nested loop.
@AndyAyersMS
AndyAyersMS
merged commit b18ff29
into
dotnet:mainJul 27, 2021
@AndyAyersMS
AndyAyersMS
deleted the

LoopMemoryDependenceVNFixes

branch
July 27, 2021 17:53
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021

Closed

AndyAyersMS added a commit
to AndyAyersMS/runtime
that referenced
this pull request
Jul 27, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed
9651edf
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in dotnet#55936 and dotnet#56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of dotnet#54118.
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 27, 2021
 Merged

AndyAyersMS added a commit
that referenced
this pull request
Jul 28, 2021
@AndyAyersMS
JIT: properly update loop memory dependence when loops are removed (#…
b25bd29
…56436)
If a loop is removed (because of unrolling) then the loop dependence
tracking introduced in #55936 and #56184 may not properly update.
So when a loop is removed, walk up the chain of parent loops looking
for one that is not removed, and record the dependence on that parent.
Addresses last part of #54118.
@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The assert in that other test:
corerun.exe 11738605779775786426.exe
Assert failure(PID 20200 [0x00004ee8], Thread: 24136 [0x5e48]): Assertion failed 'i < BitSetTraits::GetSize(env)' in 'Program:Main()' during 'Compute blocks reachability' (IL size 41)

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
Looks like a flow opts bug, we end up not updating the pred list for BB08 properly and this ultimately leaves a dangling reference from BB07 to BB08 which causes the assert above.
*************** In fgUpdateFlowGraph()
Before updating the flow graph:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB04 (always) keep i bwd BB04 [0009] 1 BB03 1 [???..???)-> BB06 (always) i internal BB05 [0010] 0 1 [???..???)-> BB09 (always) i internal BB06 [0003] 1 BB04 1 [010..013)-> BB09 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB09 ( cond ) i bwd BB08 [0005] 1 BB07 1 [01A..020) i bwd BB09 [0006] 4 BB05,BB06,BB07,BB08 1 [020..024) i bwd BB10 [0007] 2 BB01,BB09 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Removing unconditional jump to next block (BB03 -> BB04) (converted BB03 to fall-through)
Compacting blocks BB03 and BB04:
*************** In fgDebugCheckBBlist
Optimizing a jump to an unconditional jump (BB03 -> BB06 -> BB09)
Setting edge weights for BB03 -> BB09 to [0 .. 3.402823e+38]
fgRemoveBlock BB05
Removing unreachable BB05
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

@AndyAyersMS
AndyAyersMS
commented
Jul 28, 2021

Copy link


Copy Markdown

MemberAuthor
The bug is here:
runtime/src/coreclr/jit/fgopt.cpp

Lines 5620 to 5629
in
eb1e55e
// Add fall through fixup block, if needed.
//
if ((bDest->bbJumpKind == BBJ_NONE) || (bDest->bbJumpKind == BBJ_COND)) 
 { 
 BasicBlock* const bFixup = fgNewBBafter(BBJ_ALWAYS, bDest, true); 
 bFixup->inheritWeight(bDestNext); 
 bFixup->bbJumpDest = bDestNext; 
fgReplacePred(bDestNext, bDest, bFixup); 
fgAddRefPred(bFixup, bDest); 
 } 
fgReplacePred will replace all pred uses, when we only wanted to replace one of them
Compacting blocks BB08 and BB09:
Second block has multiple incoming edges
Setting edge weights for BB03 -> BB08 to [0 .. 3.402823e+38]
Setting edge weights for BB06 -> BB08 to [0 .. 3.402823e+38]
*************** In fgDebugCheckBBlist
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB08 [0005] 4 BB03,BB06,BB07(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Moving BB07 after BB03 to enable reversal
New Basic Block BB12 [0011] created.
Setting edge weights for BB07 -> BB12 to [0 .. 3.402823e+38]
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB07 ( cond ) i bwd bwd-target BB03 [0002] 1 BB02 1 [00E..010)-> BB08 (always) keep i bwd BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB03,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------
Reversing a conditional jump around an unconditional jump (BB02 -> BB07, BB03 -> BB08)
Setting edge weights for BB02 -> BB08 to [0 .. 3.402823e+38]
After reversing the jump:
-----------------------------------------------------------------------------------------------------------------------------------------
BBnum BBid ref try hnd preds weight lp [IL range] [jump] [EH region] [flags]
-----------------------------------------------------------------------------------------------------------------------------------------
BB01 [0000] 1 1 [000..007)-> BB10 (always) i BB02 [0001] 1 BB10 1 [007..00E)-> BB08 ( cond ) i bwd bwd-target BB07 [0004] 1 BB02 1 [013..01A)-> BB08 ( cond ) i bwd BB12 [0011] 1 BB07 1 [???..???)-> BB08 (always) internal BB06 [0003] 0 1 [010..013)-> BB08 (always) keep i bwd BB08 [0005] 4 BB02,BB06,BB12(2) 1 [01A..024) i bwd BB10 [0007] 2 BB01,BB08 1 [024..028)-> BB02 ( cond ) i bwd BB11 [0008] 1 BB10 1 [028..029) (return) i -----------------------------------------------------------------------------------------------------------------------------------------

This is new code that I added, I'll open a fresh issue for this...
@AndyAyersMSAndyAyersMS
mentioned this pull request
Jul 28, 2021

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Aug 27, 2021
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jakobbotschjakobbotschjakobbotsch approved these changes

+2 more reviewers

@BruceForstallBruceForstallBruceForstall approved these changes
@briansullbriansullbriansull approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

area-CodeGen-coreclrCLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.
kind == Overwrite assert in jitstress


4 participants

@AndyAyersMS@jakobbotsch@BruceForstall@briansull