Fix JitOptRepeat - #94250

Merged
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat
Apr 1, 2024
Merged

Fix JitOptRepeat#94250
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat

Conversation

@BruceForstall

@BruceForstallBruceForstall commented Nov 1, 2023

Copy link
Copy Markdown
Contributor

Many individual fixes have already been merged. This change adds two more fixes, updates the disabling of OptRepeat for one test, and enables OptRepeat in JitStress.

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 1, 2023
@ghost

ghost commented Nov 1, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:BruceForstall
Assignees:BruceForstall
Labels:

area-CodeGen-coreclr

Milestone:-

@ghost

Copy link
Copy Markdown

Draft Pull Request was automatically closed for 30 days of inactivity. Please let us know if you'd like to reopen it.

@ghostghost closed this Dec 18, 2023
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from 9a0d871 to 7127941CompareJanuary 23, 2024 07:45
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from aeda642 to e28e362CompareFebruary 16, 2024 00:01
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Mar 29, 2024
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@BruceForstall
BruceForstall marked this pull request as ready for review March 29, 2024 22:42
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

@AndyAyersMS @dotnet/jit-contrib PTAL

@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

There may be additional JitOptRepeat failures exposed by enabling 4 iterations and enabling it for all functions (instead of just for stress): see #100447. These will be investigated as part of continuing work.

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we shouldn't create such assertions in the first places rather than relaxing this requirement.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@EgorBoEgorBoMar 30, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok to me to merge if it's blocking, my concern that we're effectively allowing arbitary constants for these assertions - from a quick look, users of O1K_EXACT_TYPE/O1K_SUBTYPE assume it's always a valid handle we can pass to VM, etc. (I guess they need to use HasIconFlag too then)

Another concern that we try to avoid generating not-useful assertions since we run out of assertion limit farily often

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can generate an assertion for:

N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
N009 ( 16, 23) [000031] JA---O-N--- \--* EQ int $282
N002 ( 3, 2) [000030] #----O----- +--* IND long $103
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1 $82
N008 ( 12, 20) [000202] -A--------- \--* COMMA long $1c5
N004 ( 7, 15) [000198] DA--------- +--* STORE_LCL_VAR long V14 tmp10 d:1 $VN.Void
N003 ( 3, 12) [000197] ----------- | \--* CNS_INT long 0x1237f0098 $1c3
N007 ( 5, 5) [000201] -------N--- \--* ADD long $1c5
N005 ( 3, 2) [000199] ----------- +--* LCL_VAR long V14 tmp10 u:1 $1c3
N006 ( 1, 2) [000200] ----------- \--* CNS_INT long 0x768 $1c4

namely,

GenTreeNode creates assertion:
N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
In BB04 New Global Type Assertion: ($82,$1c5) V02.01 is Exact Type MT(0x0x1237f0800 <unknown class>)

The actual number is correct, but there is no handle data (it's been lost with shared constant CSE).

Where in the code could this be wrong? I.e., where would we look at this value, pass it the VM, etc.?

I guess in optPrintAssertion we cast the constant to CORINFO_CLASS_HANDLE (for non-R2R/NAOT) and pass it to eeGetClassName. But it would be the same number as when we knew it was a handle.

(The previous iteration, the tree looked like:

N005 ( 9, 17) [000186] -----O----- * JTRUE void
N004 ( 7, 15) [000031] J----O-N--- \--* EQ int
N002 ( 3, 2) [000030] #----O----- +--* IND long
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1
N003 ( 3, 12) [000028] H---------- \--* CNS_INT(h) long 0x1237f0800 class <unknown class>

)

@AndyAyersMSAndyAyersMS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Thanks for keeping at this...

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@BruceForstall
BruceForstall merged commit dc01e99 into dotnet:mainApr 1, 2024
@BruceForstall
BruceForstall deleted the FixOptRepeat branch April 1, 2024 22:19
BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
BruceForstall added a commit that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
#94250
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 2, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@BruceForstall@EgorBo@AndyAyersMS
, '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

Fix JitOptRepeat - #94250

Merged
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat
Apr 1, 2024
Merged

Fix JitOptRepeat#94250
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat

Conversation

@BruceForstall

@BruceForstallBruceForstall commented Nov 1, 2023

Copy link
Copy Markdown
Contributor

Many individual fixes have already been merged. This change adds two more fixes, updates the disabling of OptRepeat for one test, and enables OptRepeat in JitStress.

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 1, 2023
@ghost

ghost commented Nov 1, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:BruceForstall
Assignees:BruceForstall
Labels:

area-CodeGen-coreclr

Milestone:-

@ghost

Copy link
Copy Markdown

Draft Pull Request was automatically closed for 30 days of inactivity. Please let us know if you'd like to reopen it.

@ghostghost closed this Dec 18, 2023
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from 9a0d871 to 7127941CompareJanuary 23, 2024 07:45
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from aeda642 to e28e362CompareFebruary 16, 2024 00:01
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Mar 29, 2024
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@BruceForstall
BruceForstall marked this pull request as ready for review March 29, 2024 22:42
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

@AndyAyersMS @dotnet/jit-contrib PTAL

@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

There may be additional JitOptRepeat failures exposed by enabling 4 iterations and enabling it for all functions (instead of just for stress): see #100447. These will be investigated as part of continuing work.

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we shouldn't create such assertions in the first places rather than relaxing this requirement.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@EgorBoEgorBoMar 30, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok to me to merge if it's blocking, my concern that we're effectively allowing arbitary constants for these assertions - from a quick look, users of O1K_EXACT_TYPE/O1K_SUBTYPE assume it's always a valid handle we can pass to VM, etc. (I guess they need to use HasIconFlag too then)

Another concern that we try to avoid generating not-useful assertions since we run out of assertion limit farily often

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can generate an assertion for:

N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
N009 ( 16, 23) [000031] JA---O-N--- \--* EQ int $282
N002 ( 3, 2) [000030] #----O----- +--* IND long $103
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1 $82
N008 ( 12, 20) [000202] -A--------- \--* COMMA long $1c5
N004 ( 7, 15) [000198] DA--------- +--* STORE_LCL_VAR long V14 tmp10 d:1 $VN.Void
N003 ( 3, 12) [000197] ----------- | \--* CNS_INT long 0x1237f0098 $1c3
N007 ( 5, 5) [000201] -------N--- \--* ADD long $1c5
N005 ( 3, 2) [000199] ----------- +--* LCL_VAR long V14 tmp10 u:1 $1c3
N006 ( 1, 2) [000200] ----------- \--* CNS_INT long 0x768 $1c4

namely,

GenTreeNode creates assertion:
N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
In BB04 New Global Type Assertion: ($82,$1c5) V02.01 is Exact Type MT(0x0x1237f0800 <unknown class>)

The actual number is correct, but there is no handle data (it's been lost with shared constant CSE).

Where in the code could this be wrong? I.e., where would we look at this value, pass it the VM, etc.?

I guess in optPrintAssertion we cast the constant to CORINFO_CLASS_HANDLE (for non-R2R/NAOT) and pass it to eeGetClassName. But it would be the same number as when we knew it was a handle.

(The previous iteration, the tree looked like:

N005 ( 9, 17) [000186] -----O----- * JTRUE void
N004 ( 7, 15) [000031] J----O-N--- \--* EQ int
N002 ( 3, 2) [000030] #----O----- +--* IND long
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1
N003 ( 3, 12) [000028] H---------- \--* CNS_INT(h) long 0x1237f0800 class <unknown class>

)

@AndyAyersMSAndyAyersMS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Thanks for keeping at this...

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@BruceForstall
BruceForstall merged commit dc01e99 into dotnet:mainApr 1, 2024
@BruceForstall
BruceForstall deleted the FixOptRepeat branch April 1, 2024 22:19
BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
BruceForstall added a commit that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
#94250
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 2, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@BruceForstall@EgorBo@AndyAyersMS
, '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

Fix JitOptRepeat - #94250

Merged
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat
Apr 1, 2024
Merged

Fix JitOptRepeat#94250
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat

Conversation

@BruceForstall

@BruceForstallBruceForstall commented Nov 1, 2023

Copy link
Copy Markdown
Contributor

Many individual fixes have already been merged. This change adds two more fixes, updates the disabling of OptRepeat for one test, and enables OptRepeat in JitStress.

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 1, 2023
@ghost

ghost commented Nov 1, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:BruceForstall
Assignees:BruceForstall
Labels:

area-CodeGen-coreclr

Milestone:-

@ghost

Copy link
Copy Markdown

Draft Pull Request was automatically closed for 30 days of inactivity. Please let us know if you'd like to reopen it.

@ghostghost closed this Dec 18, 2023
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from 9a0d871 to 7127941CompareJanuary 23, 2024 07:45
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from aeda642 to e28e362CompareFebruary 16, 2024 00:01
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Mar 29, 2024
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@BruceForstall
BruceForstall marked this pull request as ready for review March 29, 2024 22:42
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

@AndyAyersMS @dotnet/jit-contrib PTAL

@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

There may be additional JitOptRepeat failures exposed by enabling 4 iterations and enabling it for all functions (instead of just for stress): see #100447. These will be investigated as part of continuing work.

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we shouldn't create such assertions in the first places rather than relaxing this requirement.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@EgorBoEgorBoMar 30, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok to me to merge if it's blocking, my concern that we're effectively allowing arbitary constants for these assertions - from a quick look, users of O1K_EXACT_TYPE/O1K_SUBTYPE assume it's always a valid handle we can pass to VM, etc. (I guess they need to use HasIconFlag too then)

Another concern that we try to avoid generating not-useful assertions since we run out of assertion limit farily often

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can generate an assertion for:

N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
N009 ( 16, 23) [000031] JA---O-N--- \--* EQ int $282
N002 ( 3, 2) [000030] #----O----- +--* IND long $103
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1 $82
N008 ( 12, 20) [000202] -A--------- \--* COMMA long $1c5
N004 ( 7, 15) [000198] DA--------- +--* STORE_LCL_VAR long V14 tmp10 d:1 $VN.Void
N003 ( 3, 12) [000197] ----------- | \--* CNS_INT long 0x1237f0098 $1c3
N007 ( 5, 5) [000201] -------N--- \--* ADD long $1c5
N005 ( 3, 2) [000199] ----------- +--* LCL_VAR long V14 tmp10 u:1 $1c3
N006 ( 1, 2) [000200] ----------- \--* CNS_INT long 0x768 $1c4

namely,

GenTreeNode creates assertion:
N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
In BB04 New Global Type Assertion: ($82,$1c5) V02.01 is Exact Type MT(0x0x1237f0800 <unknown class>)

The actual number is correct, but there is no handle data (it's been lost with shared constant CSE).

Where in the code could this be wrong? I.e., where would we look at this value, pass it the VM, etc.?

I guess in optPrintAssertion we cast the constant to CORINFO_CLASS_HANDLE (for non-R2R/NAOT) and pass it to eeGetClassName. But it would be the same number as when we knew it was a handle.

(The previous iteration, the tree looked like:

N005 ( 9, 17) [000186] -----O----- * JTRUE void
N004 ( 7, 15) [000031] J----O-N--- \--* EQ int
N002 ( 3, 2) [000030] #----O----- +--* IND long
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1
N003 ( 3, 12) [000028] H---------- \--* CNS_INT(h) long 0x1237f0800 class <unknown class>

)

@AndyAyersMSAndyAyersMS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Thanks for keeping at this...

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@BruceForstall
BruceForstall merged commit dc01e99 into dotnet:mainApr 1, 2024
@BruceForstall
BruceForstall deleted the FixOptRepeat branch April 1, 2024 22:19
BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
BruceForstall added a commit that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
#94250
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 2, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@BruceForstall@EgorBo@AndyAyersMS
, '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

Fix JitOptRepeat - #94250

Merged
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat
Apr 1, 2024
Merged

Fix JitOptRepeat#94250
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat

Conversation

@BruceForstall

@BruceForstallBruceForstall commented Nov 1, 2023

Copy link
Copy Markdown
Contributor

Many individual fixes have already been merged. This change adds two more fixes, updates the disabling of OptRepeat for one test, and enables OptRepeat in JitStress.

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 1, 2023
@ghost

ghost commented Nov 1, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:BruceForstall
Assignees:BruceForstall
Labels:

area-CodeGen-coreclr

Milestone:-

@ghost

Copy link
Copy Markdown

Draft Pull Request was automatically closed for 30 days of inactivity. Please let us know if you'd like to reopen it.

@ghostghost closed this Dec 18, 2023
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from 9a0d871 to 7127941CompareJanuary 23, 2024 07:45
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from aeda642 to e28e362CompareFebruary 16, 2024 00:01
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Mar 29, 2024
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@BruceForstall
BruceForstall marked this pull request as ready for review March 29, 2024 22:42
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

@AndyAyersMS @dotnet/jit-contrib PTAL

@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

There may be additional JitOptRepeat failures exposed by enabling 4 iterations and enabling it for all functions (instead of just for stress): see #100447. These will be investigated as part of continuing work.

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we shouldn't create such assertions in the first places rather than relaxing this requirement.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@EgorBoEgorBoMar 30, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok to me to merge if it's blocking, my concern that we're effectively allowing arbitary constants for these assertions - from a quick look, users of O1K_EXACT_TYPE/O1K_SUBTYPE assume it's always a valid handle we can pass to VM, etc. (I guess they need to use HasIconFlag too then)

Another concern that we try to avoid generating not-useful assertions since we run out of assertion limit farily often

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can generate an assertion for:

N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
N009 ( 16, 23) [000031] JA---O-N--- \--* EQ int $282
N002 ( 3, 2) [000030] #----O----- +--* IND long $103
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1 $82
N008 ( 12, 20) [000202] -A--------- \--* COMMA long $1c5
N004 ( 7, 15) [000198] DA--------- +--* STORE_LCL_VAR long V14 tmp10 d:1 $VN.Void
N003 ( 3, 12) [000197] ----------- | \--* CNS_INT long 0x1237f0098 $1c3
N007 ( 5, 5) [000201] -------N--- \--* ADD long $1c5
N005 ( 3, 2) [000199] ----------- +--* LCL_VAR long V14 tmp10 u:1 $1c3
N006 ( 1, 2) [000200] ----------- \--* CNS_INT long 0x768 $1c4

namely,

GenTreeNode creates assertion:
N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
In BB04 New Global Type Assertion: ($82,$1c5) V02.01 is Exact Type MT(0x0x1237f0800 <unknown class>)

The actual number is correct, but there is no handle data (it's been lost with shared constant CSE).

Where in the code could this be wrong? I.e., where would we look at this value, pass it the VM, etc.?

I guess in optPrintAssertion we cast the constant to CORINFO_CLASS_HANDLE (for non-R2R/NAOT) and pass it to eeGetClassName. But it would be the same number as when we knew it was a handle.

(The previous iteration, the tree looked like:

N005 ( 9, 17) [000186] -----O----- * JTRUE void
N004 ( 7, 15) [000031] J----O-N--- \--* EQ int
N002 ( 3, 2) [000030] #----O----- +--* IND long
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1
N003 ( 3, 12) [000028] H---------- \--* CNS_INT(h) long 0x1237f0800 class <unknown class>

)

@AndyAyersMSAndyAyersMS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Thanks for keeping at this...

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@BruceForstall
BruceForstall merged commit dc01e99 into dotnet:mainApr 1, 2024
@BruceForstall
BruceForstall deleted the FixOptRepeat branch April 1, 2024 22:19
BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
BruceForstall added a commit that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
#94250
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 2, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@BruceForstall@EgorBo@AndyAyersMS
, '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

Fix JitOptRepeat - #94250

Merged
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat
Apr 1, 2024
Merged

Fix JitOptRepeat#94250
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat

Conversation

@BruceForstall

@BruceForstallBruceForstall commented Nov 1, 2023

Copy link
Copy Markdown
Contributor

Many individual fixes have already been merged. This change adds two more fixes, updates the disabling of OptRepeat for one test, and enables OptRepeat in JitStress.

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 1, 2023
@ghost

ghost commented Nov 1, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:BruceForstall
Assignees:BruceForstall
Labels:

area-CodeGen-coreclr

Milestone:-

@ghost

Copy link
Copy Markdown

Draft Pull Request was automatically closed for 30 days of inactivity. Please let us know if you'd like to reopen it.

@ghostghost closed this Dec 18, 2023
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from 9a0d871 to 7127941CompareJanuary 23, 2024 07:45
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from aeda642 to e28e362CompareFebruary 16, 2024 00:01
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Mar 29, 2024
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@BruceForstall
BruceForstall marked this pull request as ready for review March 29, 2024 22:42
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

@AndyAyersMS @dotnet/jit-contrib PTAL

@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

There may be additional JitOptRepeat failures exposed by enabling 4 iterations and enabling it for all functions (instead of just for stress): see #100447. These will be investigated as part of continuing work.

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we shouldn't create such assertions in the first places rather than relaxing this requirement.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@EgorBoEgorBoMar 30, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok to me to merge if it's blocking, my concern that we're effectively allowing arbitary constants for these assertions - from a quick look, users of O1K_EXACT_TYPE/O1K_SUBTYPE assume it's always a valid handle we can pass to VM, etc. (I guess they need to use HasIconFlag too then)

Another concern that we try to avoid generating not-useful assertions since we run out of assertion limit farily often

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can generate an assertion for:

N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
N009 ( 16, 23) [000031] JA---O-N--- \--* EQ int $282
N002 ( 3, 2) [000030] #----O----- +--* IND long $103
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1 $82
N008 ( 12, 20) [000202] -A--------- \--* COMMA long $1c5
N004 ( 7, 15) [000198] DA--------- +--* STORE_LCL_VAR long V14 tmp10 d:1 $VN.Void
N003 ( 3, 12) [000197] ----------- | \--* CNS_INT long 0x1237f0098 $1c3
N007 ( 5, 5) [000201] -------N--- \--* ADD long $1c5
N005 ( 3, 2) [000199] ----------- +--* LCL_VAR long V14 tmp10 u:1 $1c3
N006 ( 1, 2) [000200] ----------- \--* CNS_INT long 0x768 $1c4

namely,

GenTreeNode creates assertion:
N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
In BB04 New Global Type Assertion: ($82,$1c5) V02.01 is Exact Type MT(0x0x1237f0800 <unknown class>)

The actual number is correct, but there is no handle data (it's been lost with shared constant CSE).

Where in the code could this be wrong? I.e., where would we look at this value, pass it the VM, etc.?

I guess in optPrintAssertion we cast the constant to CORINFO_CLASS_HANDLE (for non-R2R/NAOT) and pass it to eeGetClassName. But it would be the same number as when we knew it was a handle.

(The previous iteration, the tree looked like:

N005 ( 9, 17) [000186] -----O----- * JTRUE void
N004 ( 7, 15) [000031] J----O-N--- \--* EQ int
N002 ( 3, 2) [000030] #----O----- +--* IND long
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1
N003 ( 3, 12) [000028] H---------- \--* CNS_INT(h) long 0x1237f0800 class <unknown class>

)

@AndyAyersMSAndyAyersMS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Thanks for keeping at this...

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@BruceForstall
BruceForstall merged commit dc01e99 into dotnet:mainApr 1, 2024
@BruceForstall
BruceForstall deleted the FixOptRepeat branch April 1, 2024 22:19
BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
BruceForstall added a commit that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
#94250
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 2, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@BruceForstall@EgorBo@AndyAyersMS
, '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

Fix JitOptRepeat - #94250

Merged
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat
Apr 1, 2024
Merged

Fix JitOptRepeat#94250
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat

Conversation

@BruceForstall

@BruceForstallBruceForstall commented Nov 1, 2023

Copy link
Copy Markdown
Contributor

Many individual fixes have already been merged. This change adds two more fixes, updates the disabling of OptRepeat for one test, and enables OptRepeat in JitStress.

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 1, 2023
@ghost

ghost commented Nov 1, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:BruceForstall
Assignees:BruceForstall
Labels:

area-CodeGen-coreclr

Milestone:-

@ghost

Copy link
Copy Markdown

Draft Pull Request was automatically closed for 30 days of inactivity. Please let us know if you'd like to reopen it.

@ghostghost closed this Dec 18, 2023
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from 9a0d871 to 7127941CompareJanuary 23, 2024 07:45
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from aeda642 to e28e362CompareFebruary 16, 2024 00:01
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Mar 29, 2024
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@BruceForstall
BruceForstall marked this pull request as ready for review March 29, 2024 22:42
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

@AndyAyersMS @dotnet/jit-contrib PTAL

@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

There may be additional JitOptRepeat failures exposed by enabling 4 iterations and enabling it for all functions (instead of just for stress): see #100447. These will be investigated as part of continuing work.

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we shouldn't create such assertions in the first places rather than relaxing this requirement.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@EgorBoEgorBoMar 30, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok to me to merge if it's blocking, my concern that we're effectively allowing arbitary constants for these assertions - from a quick look, users of O1K_EXACT_TYPE/O1K_SUBTYPE assume it's always a valid handle we can pass to VM, etc. (I guess they need to use HasIconFlag too then)

Another concern that we try to avoid generating not-useful assertions since we run out of assertion limit farily often

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can generate an assertion for:

N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
N009 ( 16, 23) [000031] JA---O-N--- \--* EQ int $282
N002 ( 3, 2) [000030] #----O----- +--* IND long $103
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1 $82
N008 ( 12, 20) [000202] -A--------- \--* COMMA long $1c5
N004 ( 7, 15) [000198] DA--------- +--* STORE_LCL_VAR long V14 tmp10 d:1 $VN.Void
N003 ( 3, 12) [000197] ----------- | \--* CNS_INT long 0x1237f0098 $1c3
N007 ( 5, 5) [000201] -------N--- \--* ADD long $1c5
N005 ( 3, 2) [000199] ----------- +--* LCL_VAR long V14 tmp10 u:1 $1c3
N006 ( 1, 2) [000200] ----------- \--* CNS_INT long 0x768 $1c4

namely,

GenTreeNode creates assertion:
N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
In BB04 New Global Type Assertion: ($82,$1c5) V02.01 is Exact Type MT(0x0x1237f0800 <unknown class>)

The actual number is correct, but there is no handle data (it's been lost with shared constant CSE).

Where in the code could this be wrong? I.e., where would we look at this value, pass it the VM, etc.?

I guess in optPrintAssertion we cast the constant to CORINFO_CLASS_HANDLE (for non-R2R/NAOT) and pass it to eeGetClassName. But it would be the same number as when we knew it was a handle.

(The previous iteration, the tree looked like:

N005 ( 9, 17) [000186] -----O----- * JTRUE void
N004 ( 7, 15) [000031] J----O-N--- \--* EQ int
N002 ( 3, 2) [000030] #----O----- +--* IND long
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1
N003 ( 3, 12) [000028] H---------- \--* CNS_INT(h) long 0x1237f0800 class <unknown class>

)

@AndyAyersMSAndyAyersMS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Thanks for keeping at this...

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@BruceForstall
BruceForstall merged commit dc01e99 into dotnet:mainApr 1, 2024
@BruceForstall
BruceForstall deleted the FixOptRepeat branch April 1, 2024 22:19
BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
BruceForstall added a commit that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
#94250
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 2, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@BruceForstall@EgorBo@AndyAyersMS
, '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

Fix JitOptRepeat - #94250

Merged
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat
Apr 1, 2024
Merged

Fix JitOptRepeat#94250
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat

Conversation

@BruceForstall

@BruceForstallBruceForstall commented Nov 1, 2023

Copy link
Copy Markdown
Contributor

Many individual fixes have already been merged. This change adds two more fixes, updates the disabling of OptRepeat for one test, and enables OptRepeat in JitStress.

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 1, 2023
@ghost

ghost commented Nov 1, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:BruceForstall
Assignees:BruceForstall
Labels:

area-CodeGen-coreclr

Milestone:-

@ghost

Copy link
Copy Markdown

Draft Pull Request was automatically closed for 30 days of inactivity. Please let us know if you'd like to reopen it.

@ghostghost closed this Dec 18, 2023
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from 9a0d871 to 7127941CompareJanuary 23, 2024 07:45
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from aeda642 to e28e362CompareFebruary 16, 2024 00:01
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Mar 29, 2024
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@BruceForstall
BruceForstall marked this pull request as ready for review March 29, 2024 22:42
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

@AndyAyersMS @dotnet/jit-contrib PTAL

@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

There may be additional JitOptRepeat failures exposed by enabling 4 iterations and enabling it for all functions (instead of just for stress): see #100447. These will be investigated as part of continuing work.

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we shouldn't create such assertions in the first places rather than relaxing this requirement.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@EgorBoEgorBoMar 30, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok to me to merge if it's blocking, my concern that we're effectively allowing arbitary constants for these assertions - from a quick look, users of O1K_EXACT_TYPE/O1K_SUBTYPE assume it's always a valid handle we can pass to VM, etc. (I guess they need to use HasIconFlag too then)

Another concern that we try to avoid generating not-useful assertions since we run out of assertion limit farily often

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can generate an assertion for:

N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
N009 ( 16, 23) [000031] JA---O-N--- \--* EQ int $282
N002 ( 3, 2) [000030] #----O----- +--* IND long $103
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1 $82
N008 ( 12, 20) [000202] -A--------- \--* COMMA long $1c5
N004 ( 7, 15) [000198] DA--------- +--* STORE_LCL_VAR long V14 tmp10 d:1 $VN.Void
N003 ( 3, 12) [000197] ----------- | \--* CNS_INT long 0x1237f0098 $1c3
N007 ( 5, 5) [000201] -------N--- \--* ADD long $1c5
N005 ( 3, 2) [000199] ----------- +--* LCL_VAR long V14 tmp10 u:1 $1c3
N006 ( 1, 2) [000200] ----------- \--* CNS_INT long 0x768 $1c4

namely,

GenTreeNode creates assertion:
N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
In BB04 New Global Type Assertion: ($82,$1c5) V02.01 is Exact Type MT(0x0x1237f0800 <unknown class>)

The actual number is correct, but there is no handle data (it's been lost with shared constant CSE).

Where in the code could this be wrong? I.e., where would we look at this value, pass it the VM, etc.?

I guess in optPrintAssertion we cast the constant to CORINFO_CLASS_HANDLE (for non-R2R/NAOT) and pass it to eeGetClassName. But it would be the same number as when we knew it was a handle.

(The previous iteration, the tree looked like:

N005 ( 9, 17) [000186] -----O----- * JTRUE void
N004 ( 7, 15) [000031] J----O-N--- \--* EQ int
N002 ( 3, 2) [000030] #----O----- +--* IND long
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1
N003 ( 3, 12) [000028] H---------- \--* CNS_INT(h) long 0x1237f0800 class <unknown class>

)

@AndyAyersMSAndyAyersMS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Thanks for keeping at this...

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@BruceForstall
BruceForstall merged commit dc01e99 into dotnet:mainApr 1, 2024
@BruceForstall
BruceForstall deleted the FixOptRepeat branch April 1, 2024 22:19
BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
BruceForstall added a commit that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
#94250
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 2, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@BruceForstall@EgorBo@AndyAyersMS
, '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

Fix JitOptRepeat - #94250

Merged
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat
Apr 1, 2024
Merged

Fix JitOptRepeat#94250
BruceForstall merged 1 commit into
dotnet:mainfrom
BruceForstall:FixOptRepeat

Conversation

@BruceForstall

@BruceForstallBruceForstall commented Nov 1, 2023

Copy link
Copy Markdown
Contributor

Many individual fixes have already been merged. This change adds two more fixes, updates the disabling of OptRepeat for one test, and enables OptRepeat in JitStress.

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 1, 2023
@ghost

ghost commented Nov 1, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author:BruceForstall
Assignees:BruceForstall
Labels:

area-CodeGen-coreclr

Milestone:-

@ghost

Copy link
Copy Markdown

Draft Pull Request was automatically closed for 30 days of inactivity. Please let us know if you'd like to reopen it.

@ghostghost closed this Dec 18, 2023
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from 9a0d871 to 7127941CompareJanuary 23, 2024 07:45
@BruceForstall
BruceForstallforce-pushed the FixOptRepeat branch 2 times, most recently from aeda642 to e28e362CompareFebruary 16, 2024 00:01
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Mar 29, 2024
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

/azp run runtime-coreclr outerloop, runtime-coreclr jitstress, runtime-coreclr libraries-jitstress

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 3 pipeline(s).

@BruceForstall
BruceForstall marked this pull request as ready for review March 29, 2024 22:42
@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

@AndyAyersMS @dotnet/jit-contrib PTAL

@BruceForstall

Copy link
Copy Markdown
ContributorAuthor

There may be additional JitOptRepeat failures exposed by enabling 4 iterations and enabling it for all functions (instead of just for stress): see #100447. These will be investigated as part of continuing work.

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we shouldn't create such assertions in the first places rather than relaxing this requirement.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@EgorBoEgorBoMar 30, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok to me to merge if it's blocking, my concern that we're effectively allowing arbitary constants for these assertions - from a quick look, users of O1K_EXACT_TYPE/O1K_SUBTYPE assume it's always a valid handle we can pass to VM, etc. (I guess they need to use HasIconFlag too then)

Another concern that we try to avoid generating not-useful assertions since we run out of assertion limit farily often

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can generate an assertion for:

N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
N009 ( 16, 23) [000031] JA---O-N--- \--* EQ int $282
N002 ( 3, 2) [000030] #----O----- +--* IND long $103
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1 $82
N008 ( 12, 20) [000202] -A--------- \--* COMMA long $1c5
N004 ( 7, 15) [000198] DA--------- +--* STORE_LCL_VAR long V14 tmp10 d:1 $VN.Void
N003 ( 3, 12) [000197] ----------- | \--* CNS_INT long 0x1237f0098 $1c3
N007 ( 5, 5) [000201] -------N--- \--* ADD long $1c5
N005 ( 3, 2) [000199] ----------- +--* LCL_VAR long V14 tmp10 u:1 $1c3
N006 ( 1, 2) [000200] ----------- \--* CNS_INT long 0x768 $1c4

namely,

GenTreeNode creates assertion:
N010 ( 18, 25) [000186] -A---O----- * JTRUE void $VN.Void
In BB04 New Global Type Assertion: ($82,$1c5) V02.01 is Exact Type MT(0x0x1237f0800 <unknown class>)

The actual number is correct, but there is no handle data (it's been lost with shared constant CSE).

Where in the code could this be wrong? I.e., where would we look at this value, pass it the VM, etc.?

I guess in optPrintAssertion we cast the constant to CORINFO_CLASS_HANDLE (for non-R2R/NAOT) and pass it to eeGetClassName. But it would be the same number as when we knew it was a handle.

(The previous iteration, the tree looked like:

N005 ( 9, 17) [000186] -----O----- * JTRUE void
N004 ( 7, 15) [000031] J----O-N--- \--* EQ int
N002 ( 3, 2) [000030] #----O----- +--* IND long
N001 ( 1, 1) [000029] ----------- | \--* LCL_VAR ref V02 arg2 u:1
N003 ( 3, 12) [000028] H---------- \--* CNS_INT(h) long 0x1237f0800 class <unknown class>

)

@AndyAyersMSAndyAyersMS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Thanks for keeping at this...

{
case O1K_EXACT_TYPE:
case O1K_SUBTYPE:
assert(assertion->op2.HasIconFlag());

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would you be ok taking this and addressing that in a follow-up?

@BruceForstall
BruceForstall merged commit dc01e99 into dotnet:mainApr 1, 2024
@BruceForstall
BruceForstall deleted the FixOptRepeat branch April 1, 2024 22:19
BruceForstall added a commit to BruceForstall/runtime that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
BruceForstall added a commit that referenced this pull request Apr 6, 2024
This test enables JitOptRepeat, which is fixed as of
#94250
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
1. Remove an assertion checking assert that can be invalid under JitOptRepeat, where we might
lose information that a constant was ever a handle.
2. Disable JIT/Directed/debugging/debuginfo/tester.csproj under OptRepeat: optimizations
mess with its debug info expectations.
3. Enable JitOptRepeat under stress
matouskozak pushed a commit to matouskozak/runtime that referenced this pull request Apr 30, 2024
This test enables JitOptRepeat, which is fixed as of
dotnet#94250
@github-actionsgithub-actionsBot locked and limited conversation to collaborators May 2, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@BruceForstall@EgorBo@AndyAyersMS