JIT: Fix cross crossgen comparison failures - #112078

Merged
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972
Feb 3, 2025
Merged

JIT: Fix cross crossgen comparison failures#112078
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972

Conversation

@AndyAyersMS

@AndyAyersMSAndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
Member

Fix a couple of issues that were causing cross-crossgen tests to fail

  • address mode formation was sensitive to the size of a constant handle
  • value histogram processing was always using 64 bit value sizes
  • transformation for down-counted loops was using host-sized -1.

Fixes the jit-related issues in #111972

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 3, 2025
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS

AndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
MemberAuthor

cross crossgen results

Looks like xarch is now ok. OSX arm64 has a type layout verification failure. So maybe the jit side of things is in good shape.

20:20:39.940 Running test: JIT/opt/Devirtualization/Comparer_get_Default/Comparer_get_Default.dll
Assert failure(PID 13022 [0x000032de], Thread: 4596379 [0x46229b]): Verify_TypeLayout 'DoubleEnum' failed to verify type layout
File: /Users/runner/work/1/s/src/coreclr/vm/jitinterface.cpp:13800
Image: /private/tmp/helix/working/97380862/p/corerun

@AndyAyersMSAndyAyersMS changed the title Fix111972Fix111972 -- Cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS
AndyAyersMS marked this pull request as ready for review February 3, 2025 15:29
@AndyAyersMSAndyAyersMS changed the title Fix111972 -- Cross crossgen comparison failuresJIT: Fix cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

@dotnet/jit-contrib PTAL

@EgorBo

Copy link
Copy Markdown
Member

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Comment threadsrc/coreclr/jit/scev.cpp Outdated
else
{
*result = m_comp->gtNewIconNode((ssize_t)cns->Value, scev->Type);
*result = m_comp->gtNewIconNode((target_ssize_t)cns->Value, scev->Type);

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.

Can you make ScevConstant's constructor apply the sign extension for the genTypeSize(type) == 4 case instead? It better matches how GenTreeIntCon works (the constant is always stored sign extended).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure I did what you expected, so take a look. My local setup got messed up so it will be a while before I can tell if this works.

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.

That looks good to me

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

@jkotas

Copy link
Copy Markdown
Member

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

Spot checked some diffs, and yeah, looks like histogram computations were off before (always using host pointer sized bits to tabulate the histogram, then projecting to the low 32 bits). Typically value histograms on x64 were more "washed out" than they should have been).

It was likely hard to spot this during testing as it required histograms with mixtures of sizes and a good idea what the actual final %s should have looked like (eg the old interpretation is approximately correct, especially when the % of the dominant entry is high).

image

So the general sharpening in histogram % usually leads us to do some unrolling and so increase sizes (on x64 anyways).

Note the only x86 diffs are in the crossgen collection; when jitting it was reading the histograms properly.

@EgorBo

Copy link
Copy Markdown
Member

ah, so some regressions are actually more value-probe driven intrinsic expanded? That explains some diffs I've looked into

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS
AndyAyersMS merged commit 6f7c6fb into dotnet:mainFeb 3, 2025
grendello added a commit to grendello/runtime that referenced this pull request Feb 4, 2025
* main: (30 commits)
JIT: Optimize bit-wise AND with a constant mask in combination with a left shift in a compare (dotnet#111979)
Change how we build the cross-OS DAC to support building in the VMR (dotnet#111927)
Add Windows Server 2025 to test configurations (dotnet#111938)
[PERF] Move performance testing YAML from dotnet/runtime to dotnet/performance (dotnet#111454)
arm64: Add support for Bitwise OR NOT & XOR NOT (dotnet#111893)
JIT: Fix cross crossgen comparison failures (dotnet#112078)
Bump `StyleCop.Analyzers` to `1.2.0-beta.556` (dotnet#111278)
Remove `RequiresProcessIsolation` on InterfaceFolding tests (dotnet#112098)
Use hardlinks in helixpublishwitharcade (dotnet#112091)
Update breaking change rules regarding byref/objref fields. (dotnet#112087)
[daccess] Do not use USE_DAC_TABLE_RVA on Apple platforms (dotnet#112076)
use collection syntax in illink (dotnet#108458)
Include PDB for all TfmRuntimeSpecificPackageFile (dotnet#111879)
[main] Update dependencies from dotnet/emsdk (dotnet#111690)
Enable Mono tests (dotnet#111981)
Let the debugger knows DATAS is on (dotnet#107115)
Tests ran counter (dotnet#111145)
Some System.Decimal performance improvements (dotnet#99212)
[mono][mini] Remove support for the Xamarin.iOS and Xamarin.Mac assemblies in the AOT compiler. (dotnet#108886)
Remove one usage of `Unsafe.AsPointer`. (dotnet#112079)
...
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.

4 participants

@AndyAyersMS@EgorBo@jkotas@jakobbotsch
, '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: Fix cross crossgen comparison failures - #112078

Merged
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972
Feb 3, 2025
Merged

JIT: Fix cross crossgen comparison failures#112078
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972

Conversation

@AndyAyersMS

@AndyAyersMSAndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
Member

Fix a couple of issues that were causing cross-crossgen tests to fail

  • address mode formation was sensitive to the size of a constant handle
  • value histogram processing was always using 64 bit value sizes
  • transformation for down-counted loops was using host-sized -1.

Fixes the jit-related issues in #111972

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 3, 2025
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS

AndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
MemberAuthor

cross crossgen results

Looks like xarch is now ok. OSX arm64 has a type layout verification failure. So maybe the jit side of things is in good shape.

20:20:39.940 Running test: JIT/opt/Devirtualization/Comparer_get_Default/Comparer_get_Default.dll
Assert failure(PID 13022 [0x000032de], Thread: 4596379 [0x46229b]): Verify_TypeLayout 'DoubleEnum' failed to verify type layout
File: /Users/runner/work/1/s/src/coreclr/vm/jitinterface.cpp:13800
Image: /private/tmp/helix/working/97380862/p/corerun

@AndyAyersMSAndyAyersMS changed the title Fix111972Fix111972 -- Cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS
AndyAyersMS marked this pull request as ready for review February 3, 2025 15:29
@AndyAyersMSAndyAyersMS changed the title Fix111972 -- Cross crossgen comparison failuresJIT: Fix cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

@dotnet/jit-contrib PTAL

@EgorBo

Copy link
Copy Markdown
Member

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Comment threadsrc/coreclr/jit/scev.cpp Outdated
else
{
*result = m_comp->gtNewIconNode((ssize_t)cns->Value, scev->Type);
*result = m_comp->gtNewIconNode((target_ssize_t)cns->Value, scev->Type);

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.

Can you make ScevConstant's constructor apply the sign extension for the genTypeSize(type) == 4 case instead? It better matches how GenTreeIntCon works (the constant is always stored sign extended).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure I did what you expected, so take a look. My local setup got messed up so it will be a while before I can tell if this works.

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.

That looks good to me

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

@jkotas

Copy link
Copy Markdown
Member

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

Spot checked some diffs, and yeah, looks like histogram computations were off before (always using host pointer sized bits to tabulate the histogram, then projecting to the low 32 bits). Typically value histograms on x64 were more "washed out" than they should have been).

It was likely hard to spot this during testing as it required histograms with mixtures of sizes and a good idea what the actual final %s should have looked like (eg the old interpretation is approximately correct, especially when the % of the dominant entry is high).

image

So the general sharpening in histogram % usually leads us to do some unrolling and so increase sizes (on x64 anyways).

Note the only x86 diffs are in the crossgen collection; when jitting it was reading the histograms properly.

@EgorBo

Copy link
Copy Markdown
Member

ah, so some regressions are actually more value-probe driven intrinsic expanded? That explains some diffs I've looked into

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS
AndyAyersMS merged commit 6f7c6fb into dotnet:mainFeb 3, 2025
grendello added a commit to grendello/runtime that referenced this pull request Feb 4, 2025
* main: (30 commits)
JIT: Optimize bit-wise AND with a constant mask in combination with a left shift in a compare (dotnet#111979)
Change how we build the cross-OS DAC to support building in the VMR (dotnet#111927)
Add Windows Server 2025 to test configurations (dotnet#111938)
[PERF] Move performance testing YAML from dotnet/runtime to dotnet/performance (dotnet#111454)
arm64: Add support for Bitwise OR NOT & XOR NOT (dotnet#111893)
JIT: Fix cross crossgen comparison failures (dotnet#112078)
Bump `StyleCop.Analyzers` to `1.2.0-beta.556` (dotnet#111278)
Remove `RequiresProcessIsolation` on InterfaceFolding tests (dotnet#112098)
Use hardlinks in helixpublishwitharcade (dotnet#112091)
Update breaking change rules regarding byref/objref fields. (dotnet#112087)
[daccess] Do not use USE_DAC_TABLE_RVA on Apple platforms (dotnet#112076)
use collection syntax in illink (dotnet#108458)
Include PDB for all TfmRuntimeSpecificPackageFile (dotnet#111879)
[main] Update dependencies from dotnet/emsdk (dotnet#111690)
Enable Mono tests (dotnet#111981)
Let the debugger knows DATAS is on (dotnet#107115)
Tests ran counter (dotnet#111145)
Some System.Decimal performance improvements (dotnet#99212)
[mono][mini] Remove support for the Xamarin.iOS and Xamarin.Mac assemblies in the AOT compiler. (dotnet#108886)
Remove one usage of `Unsafe.AsPointer`. (dotnet#112079)
...
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.

4 participants

@AndyAyersMS@EgorBo@jkotas@jakobbotsch
, '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: Fix cross crossgen comparison failures - #112078

Merged
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972
Feb 3, 2025
Merged

JIT: Fix cross crossgen comparison failures#112078
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972

Conversation

@AndyAyersMS

@AndyAyersMSAndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
Member

Fix a couple of issues that were causing cross-crossgen tests to fail

  • address mode formation was sensitive to the size of a constant handle
  • value histogram processing was always using 64 bit value sizes
  • transformation for down-counted loops was using host-sized -1.

Fixes the jit-related issues in #111972

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 3, 2025
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS

AndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
MemberAuthor

cross crossgen results

Looks like xarch is now ok. OSX arm64 has a type layout verification failure. So maybe the jit side of things is in good shape.

20:20:39.940 Running test: JIT/opt/Devirtualization/Comparer_get_Default/Comparer_get_Default.dll
Assert failure(PID 13022 [0x000032de], Thread: 4596379 [0x46229b]): Verify_TypeLayout 'DoubleEnum' failed to verify type layout
File: /Users/runner/work/1/s/src/coreclr/vm/jitinterface.cpp:13800
Image: /private/tmp/helix/working/97380862/p/corerun

@AndyAyersMSAndyAyersMS changed the title Fix111972Fix111972 -- Cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS
AndyAyersMS marked this pull request as ready for review February 3, 2025 15:29
@AndyAyersMSAndyAyersMS changed the title Fix111972 -- Cross crossgen comparison failuresJIT: Fix cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

@dotnet/jit-contrib PTAL

@EgorBo

Copy link
Copy Markdown
Member

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Comment threadsrc/coreclr/jit/scev.cpp Outdated
else
{
*result = m_comp->gtNewIconNode((ssize_t)cns->Value, scev->Type);
*result = m_comp->gtNewIconNode((target_ssize_t)cns->Value, scev->Type);

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.

Can you make ScevConstant's constructor apply the sign extension for the genTypeSize(type) == 4 case instead? It better matches how GenTreeIntCon works (the constant is always stored sign extended).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure I did what you expected, so take a look. My local setup got messed up so it will be a while before I can tell if this works.

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.

That looks good to me

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

@jkotas

Copy link
Copy Markdown
Member

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

Spot checked some diffs, and yeah, looks like histogram computations were off before (always using host pointer sized bits to tabulate the histogram, then projecting to the low 32 bits). Typically value histograms on x64 were more "washed out" than they should have been).

It was likely hard to spot this during testing as it required histograms with mixtures of sizes and a good idea what the actual final %s should have looked like (eg the old interpretation is approximately correct, especially when the % of the dominant entry is high).

image

So the general sharpening in histogram % usually leads us to do some unrolling and so increase sizes (on x64 anyways).

Note the only x86 diffs are in the crossgen collection; when jitting it was reading the histograms properly.

@EgorBo

Copy link
Copy Markdown
Member

ah, so some regressions are actually more value-probe driven intrinsic expanded? That explains some diffs I've looked into

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS
AndyAyersMS merged commit 6f7c6fb into dotnet:mainFeb 3, 2025
grendello added a commit to grendello/runtime that referenced this pull request Feb 4, 2025
* main: (30 commits)
JIT: Optimize bit-wise AND with a constant mask in combination with a left shift in a compare (dotnet#111979)
Change how we build the cross-OS DAC to support building in the VMR (dotnet#111927)
Add Windows Server 2025 to test configurations (dotnet#111938)
[PERF] Move performance testing YAML from dotnet/runtime to dotnet/performance (dotnet#111454)
arm64: Add support for Bitwise OR NOT & XOR NOT (dotnet#111893)
JIT: Fix cross crossgen comparison failures (dotnet#112078)
Bump `StyleCop.Analyzers` to `1.2.0-beta.556` (dotnet#111278)
Remove `RequiresProcessIsolation` on InterfaceFolding tests (dotnet#112098)
Use hardlinks in helixpublishwitharcade (dotnet#112091)
Update breaking change rules regarding byref/objref fields. (dotnet#112087)
[daccess] Do not use USE_DAC_TABLE_RVA on Apple platforms (dotnet#112076)
use collection syntax in illink (dotnet#108458)
Include PDB for all TfmRuntimeSpecificPackageFile (dotnet#111879)
[main] Update dependencies from dotnet/emsdk (dotnet#111690)
Enable Mono tests (dotnet#111981)
Let the debugger knows DATAS is on (dotnet#107115)
Tests ran counter (dotnet#111145)
Some System.Decimal performance improvements (dotnet#99212)
[mono][mini] Remove support for the Xamarin.iOS and Xamarin.Mac assemblies in the AOT compiler. (dotnet#108886)
Remove one usage of `Unsafe.AsPointer`. (dotnet#112079)
...
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.

4 participants

@AndyAyersMS@EgorBo@jkotas@jakobbotsch
, '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: Fix cross crossgen comparison failures - #112078

Merged
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972
Feb 3, 2025
Merged

JIT: Fix cross crossgen comparison failures#112078
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972

Conversation

@AndyAyersMS

@AndyAyersMSAndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
Member

Fix a couple of issues that were causing cross-crossgen tests to fail

  • address mode formation was sensitive to the size of a constant handle
  • value histogram processing was always using 64 bit value sizes
  • transformation for down-counted loops was using host-sized -1.

Fixes the jit-related issues in #111972

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 3, 2025
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS

AndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
MemberAuthor

cross crossgen results

Looks like xarch is now ok. OSX arm64 has a type layout verification failure. So maybe the jit side of things is in good shape.

20:20:39.940 Running test: JIT/opt/Devirtualization/Comparer_get_Default/Comparer_get_Default.dll
Assert failure(PID 13022 [0x000032de], Thread: 4596379 [0x46229b]): Verify_TypeLayout 'DoubleEnum' failed to verify type layout
File: /Users/runner/work/1/s/src/coreclr/vm/jitinterface.cpp:13800
Image: /private/tmp/helix/working/97380862/p/corerun

@AndyAyersMSAndyAyersMS changed the title Fix111972Fix111972 -- Cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS
AndyAyersMS marked this pull request as ready for review February 3, 2025 15:29
@AndyAyersMSAndyAyersMS changed the title Fix111972 -- Cross crossgen comparison failuresJIT: Fix cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

@dotnet/jit-contrib PTAL

@EgorBo

Copy link
Copy Markdown
Member

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Comment threadsrc/coreclr/jit/scev.cpp Outdated
else
{
*result = m_comp->gtNewIconNode((ssize_t)cns->Value, scev->Type);
*result = m_comp->gtNewIconNode((target_ssize_t)cns->Value, scev->Type);

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.

Can you make ScevConstant's constructor apply the sign extension for the genTypeSize(type) == 4 case instead? It better matches how GenTreeIntCon works (the constant is always stored sign extended).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure I did what you expected, so take a look. My local setup got messed up so it will be a while before I can tell if this works.

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.

That looks good to me

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

@jkotas

Copy link
Copy Markdown
Member

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

Spot checked some diffs, and yeah, looks like histogram computations were off before (always using host pointer sized bits to tabulate the histogram, then projecting to the low 32 bits). Typically value histograms on x64 were more "washed out" than they should have been).

It was likely hard to spot this during testing as it required histograms with mixtures of sizes and a good idea what the actual final %s should have looked like (eg the old interpretation is approximately correct, especially when the % of the dominant entry is high).

image

So the general sharpening in histogram % usually leads us to do some unrolling and so increase sizes (on x64 anyways).

Note the only x86 diffs are in the crossgen collection; when jitting it was reading the histograms properly.

@EgorBo

Copy link
Copy Markdown
Member

ah, so some regressions are actually more value-probe driven intrinsic expanded? That explains some diffs I've looked into

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS
AndyAyersMS merged commit 6f7c6fb into dotnet:mainFeb 3, 2025
grendello added a commit to grendello/runtime that referenced this pull request Feb 4, 2025
* main: (30 commits)
JIT: Optimize bit-wise AND with a constant mask in combination with a left shift in a compare (dotnet#111979)
Change how we build the cross-OS DAC to support building in the VMR (dotnet#111927)
Add Windows Server 2025 to test configurations (dotnet#111938)
[PERF] Move performance testing YAML from dotnet/runtime to dotnet/performance (dotnet#111454)
arm64: Add support for Bitwise OR NOT & XOR NOT (dotnet#111893)
JIT: Fix cross crossgen comparison failures (dotnet#112078)
Bump `StyleCop.Analyzers` to `1.2.0-beta.556` (dotnet#111278)
Remove `RequiresProcessIsolation` on InterfaceFolding tests (dotnet#112098)
Use hardlinks in helixpublishwitharcade (dotnet#112091)
Update breaking change rules regarding byref/objref fields. (dotnet#112087)
[daccess] Do not use USE_DAC_TABLE_RVA on Apple platforms (dotnet#112076)
use collection syntax in illink (dotnet#108458)
Include PDB for all TfmRuntimeSpecificPackageFile (dotnet#111879)
[main] Update dependencies from dotnet/emsdk (dotnet#111690)
Enable Mono tests (dotnet#111981)
Let the debugger knows DATAS is on (dotnet#107115)
Tests ran counter (dotnet#111145)
Some System.Decimal performance improvements (dotnet#99212)
[mono][mini] Remove support for the Xamarin.iOS and Xamarin.Mac assemblies in the AOT compiler. (dotnet#108886)
Remove one usage of `Unsafe.AsPointer`. (dotnet#112079)
...
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.

4 participants

@AndyAyersMS@EgorBo@jkotas@jakobbotsch
, '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: Fix cross crossgen comparison failures - #112078

Merged
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972
Feb 3, 2025
Merged

JIT: Fix cross crossgen comparison failures#112078
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972

Conversation

@AndyAyersMS

@AndyAyersMSAndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
Member

Fix a couple of issues that were causing cross-crossgen tests to fail

  • address mode formation was sensitive to the size of a constant handle
  • value histogram processing was always using 64 bit value sizes
  • transformation for down-counted loops was using host-sized -1.

Fixes the jit-related issues in #111972

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 3, 2025
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS

AndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
MemberAuthor

cross crossgen results

Looks like xarch is now ok. OSX arm64 has a type layout verification failure. So maybe the jit side of things is in good shape.

20:20:39.940 Running test: JIT/opt/Devirtualization/Comparer_get_Default/Comparer_get_Default.dll
Assert failure(PID 13022 [0x000032de], Thread: 4596379 [0x46229b]): Verify_TypeLayout 'DoubleEnum' failed to verify type layout
File: /Users/runner/work/1/s/src/coreclr/vm/jitinterface.cpp:13800
Image: /private/tmp/helix/working/97380862/p/corerun

@AndyAyersMSAndyAyersMS changed the title Fix111972Fix111972 -- Cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS
AndyAyersMS marked this pull request as ready for review February 3, 2025 15:29
@AndyAyersMSAndyAyersMS changed the title Fix111972 -- Cross crossgen comparison failuresJIT: Fix cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

@dotnet/jit-contrib PTAL

@EgorBo

Copy link
Copy Markdown
Member

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Comment threadsrc/coreclr/jit/scev.cpp Outdated
else
{
*result = m_comp->gtNewIconNode((ssize_t)cns->Value, scev->Type);
*result = m_comp->gtNewIconNode((target_ssize_t)cns->Value, scev->Type);

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.

Can you make ScevConstant's constructor apply the sign extension for the genTypeSize(type) == 4 case instead? It better matches how GenTreeIntCon works (the constant is always stored sign extended).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure I did what you expected, so take a look. My local setup got messed up so it will be a while before I can tell if this works.

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.

That looks good to me

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

@jkotas

Copy link
Copy Markdown
Member

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

Spot checked some diffs, and yeah, looks like histogram computations were off before (always using host pointer sized bits to tabulate the histogram, then projecting to the low 32 bits). Typically value histograms on x64 were more "washed out" than they should have been).

It was likely hard to spot this during testing as it required histograms with mixtures of sizes and a good idea what the actual final %s should have looked like (eg the old interpretation is approximately correct, especially when the % of the dominant entry is high).

image

So the general sharpening in histogram % usually leads us to do some unrolling and so increase sizes (on x64 anyways).

Note the only x86 diffs are in the crossgen collection; when jitting it was reading the histograms properly.

@EgorBo

Copy link
Copy Markdown
Member

ah, so some regressions are actually more value-probe driven intrinsic expanded? That explains some diffs I've looked into

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS
AndyAyersMS merged commit 6f7c6fb into dotnet:mainFeb 3, 2025
grendello added a commit to grendello/runtime that referenced this pull request Feb 4, 2025
* main: (30 commits)
JIT: Optimize bit-wise AND with a constant mask in combination with a left shift in a compare (dotnet#111979)
Change how we build the cross-OS DAC to support building in the VMR (dotnet#111927)
Add Windows Server 2025 to test configurations (dotnet#111938)
[PERF] Move performance testing YAML from dotnet/runtime to dotnet/performance (dotnet#111454)
arm64: Add support for Bitwise OR NOT & XOR NOT (dotnet#111893)
JIT: Fix cross crossgen comparison failures (dotnet#112078)
Bump `StyleCop.Analyzers` to `1.2.0-beta.556` (dotnet#111278)
Remove `RequiresProcessIsolation` on InterfaceFolding tests (dotnet#112098)
Use hardlinks in helixpublishwitharcade (dotnet#112091)
Update breaking change rules regarding byref/objref fields. (dotnet#112087)
[daccess] Do not use USE_DAC_TABLE_RVA on Apple platforms (dotnet#112076)
use collection syntax in illink (dotnet#108458)
Include PDB for all TfmRuntimeSpecificPackageFile (dotnet#111879)
[main] Update dependencies from dotnet/emsdk (dotnet#111690)
Enable Mono tests (dotnet#111981)
Let the debugger knows DATAS is on (dotnet#107115)
Tests ran counter (dotnet#111145)
Some System.Decimal performance improvements (dotnet#99212)
[mono][mini] Remove support for the Xamarin.iOS and Xamarin.Mac assemblies in the AOT compiler. (dotnet#108886)
Remove one usage of `Unsafe.AsPointer`. (dotnet#112079)
...
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.

4 participants

@AndyAyersMS@EgorBo@jkotas@jakobbotsch
, '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: Fix cross crossgen comparison failures - #112078

Merged
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972
Feb 3, 2025
Merged

JIT: Fix cross crossgen comparison failures#112078
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972

Conversation

@AndyAyersMS

@AndyAyersMSAndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
Member

Fix a couple of issues that were causing cross-crossgen tests to fail

  • address mode formation was sensitive to the size of a constant handle
  • value histogram processing was always using 64 bit value sizes
  • transformation for down-counted loops was using host-sized -1.

Fixes the jit-related issues in #111972

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 3, 2025
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS

AndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
MemberAuthor

cross crossgen results

Looks like xarch is now ok. OSX arm64 has a type layout verification failure. So maybe the jit side of things is in good shape.

20:20:39.940 Running test: JIT/opt/Devirtualization/Comparer_get_Default/Comparer_get_Default.dll
Assert failure(PID 13022 [0x000032de], Thread: 4596379 [0x46229b]): Verify_TypeLayout 'DoubleEnum' failed to verify type layout
File: /Users/runner/work/1/s/src/coreclr/vm/jitinterface.cpp:13800
Image: /private/tmp/helix/working/97380862/p/corerun

@AndyAyersMSAndyAyersMS changed the title Fix111972Fix111972 -- Cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS
AndyAyersMS marked this pull request as ready for review February 3, 2025 15:29
@AndyAyersMSAndyAyersMS changed the title Fix111972 -- Cross crossgen comparison failuresJIT: Fix cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

@dotnet/jit-contrib PTAL

@EgorBo

Copy link
Copy Markdown
Member

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Comment threadsrc/coreclr/jit/scev.cpp Outdated
else
{
*result = m_comp->gtNewIconNode((ssize_t)cns->Value, scev->Type);
*result = m_comp->gtNewIconNode((target_ssize_t)cns->Value, scev->Type);

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.

Can you make ScevConstant's constructor apply the sign extension for the genTypeSize(type) == 4 case instead? It better matches how GenTreeIntCon works (the constant is always stored sign extended).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure I did what you expected, so take a look. My local setup got messed up so it will be a while before I can tell if this works.

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.

That looks good to me

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

@jkotas

Copy link
Copy Markdown
Member

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

Spot checked some diffs, and yeah, looks like histogram computations were off before (always using host pointer sized bits to tabulate the histogram, then projecting to the low 32 bits). Typically value histograms on x64 were more "washed out" than they should have been).

It was likely hard to spot this during testing as it required histograms with mixtures of sizes and a good idea what the actual final %s should have looked like (eg the old interpretation is approximately correct, especially when the % of the dominant entry is high).

image

So the general sharpening in histogram % usually leads us to do some unrolling and so increase sizes (on x64 anyways).

Note the only x86 diffs are in the crossgen collection; when jitting it was reading the histograms properly.

@EgorBo

Copy link
Copy Markdown
Member

ah, so some regressions are actually more value-probe driven intrinsic expanded? That explains some diffs I've looked into

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS
AndyAyersMS merged commit 6f7c6fb into dotnet:mainFeb 3, 2025
grendello added a commit to grendello/runtime that referenced this pull request Feb 4, 2025
* main: (30 commits)
JIT: Optimize bit-wise AND with a constant mask in combination with a left shift in a compare (dotnet#111979)
Change how we build the cross-OS DAC to support building in the VMR (dotnet#111927)
Add Windows Server 2025 to test configurations (dotnet#111938)
[PERF] Move performance testing YAML from dotnet/runtime to dotnet/performance (dotnet#111454)
arm64: Add support for Bitwise OR NOT & XOR NOT (dotnet#111893)
JIT: Fix cross crossgen comparison failures (dotnet#112078)
Bump `StyleCop.Analyzers` to `1.2.0-beta.556` (dotnet#111278)
Remove `RequiresProcessIsolation` on InterfaceFolding tests (dotnet#112098)
Use hardlinks in helixpublishwitharcade (dotnet#112091)
Update breaking change rules regarding byref/objref fields. (dotnet#112087)
[daccess] Do not use USE_DAC_TABLE_RVA on Apple platforms (dotnet#112076)
use collection syntax in illink (dotnet#108458)
Include PDB for all TfmRuntimeSpecificPackageFile (dotnet#111879)
[main] Update dependencies from dotnet/emsdk (dotnet#111690)
Enable Mono tests (dotnet#111981)
Let the debugger knows DATAS is on (dotnet#107115)
Tests ran counter (dotnet#111145)
Some System.Decimal performance improvements (dotnet#99212)
[mono][mini] Remove support for the Xamarin.iOS and Xamarin.Mac assemblies in the AOT compiler. (dotnet#108886)
Remove one usage of `Unsafe.AsPointer`. (dotnet#112079)
...
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.

4 participants

@AndyAyersMS@EgorBo@jkotas@jakobbotsch
, '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: Fix cross crossgen comparison failures - #112078

Merged
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972
Feb 3, 2025
Merged

JIT: Fix cross crossgen comparison failures#112078
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972

Conversation

@AndyAyersMS

@AndyAyersMSAndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
Member

Fix a couple of issues that were causing cross-crossgen tests to fail

  • address mode formation was sensitive to the size of a constant handle
  • value histogram processing was always using 64 bit value sizes
  • transformation for down-counted loops was using host-sized -1.

Fixes the jit-related issues in #111972

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 3, 2025
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS

AndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
MemberAuthor

cross crossgen results

Looks like xarch is now ok. OSX arm64 has a type layout verification failure. So maybe the jit side of things is in good shape.

20:20:39.940 Running test: JIT/opt/Devirtualization/Comparer_get_Default/Comparer_get_Default.dll
Assert failure(PID 13022 [0x000032de], Thread: 4596379 [0x46229b]): Verify_TypeLayout 'DoubleEnum' failed to verify type layout
File: /Users/runner/work/1/s/src/coreclr/vm/jitinterface.cpp:13800
Image: /private/tmp/helix/working/97380862/p/corerun

@AndyAyersMSAndyAyersMS changed the title Fix111972Fix111972 -- Cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS
AndyAyersMS marked this pull request as ready for review February 3, 2025 15:29
@AndyAyersMSAndyAyersMS changed the title Fix111972 -- Cross crossgen comparison failuresJIT: Fix cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

@dotnet/jit-contrib PTAL

@EgorBo

Copy link
Copy Markdown
Member

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Comment threadsrc/coreclr/jit/scev.cpp Outdated
else
{
*result = m_comp->gtNewIconNode((ssize_t)cns->Value, scev->Type);
*result = m_comp->gtNewIconNode((target_ssize_t)cns->Value, scev->Type);

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.

Can you make ScevConstant's constructor apply the sign extension for the genTypeSize(type) == 4 case instead? It better matches how GenTreeIntCon works (the constant is always stored sign extended).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure I did what you expected, so take a look. My local setup got messed up so it will be a while before I can tell if this works.

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.

That looks good to me

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

@jkotas

Copy link
Copy Markdown
Member

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

Spot checked some diffs, and yeah, looks like histogram computations were off before (always using host pointer sized bits to tabulate the histogram, then projecting to the low 32 bits). Typically value histograms on x64 were more "washed out" than they should have been).

It was likely hard to spot this during testing as it required histograms with mixtures of sizes and a good idea what the actual final %s should have looked like (eg the old interpretation is approximately correct, especially when the % of the dominant entry is high).

image

So the general sharpening in histogram % usually leads us to do some unrolling and so increase sizes (on x64 anyways).

Note the only x86 diffs are in the crossgen collection; when jitting it was reading the histograms properly.

@EgorBo

Copy link
Copy Markdown
Member

ah, so some regressions are actually more value-probe driven intrinsic expanded? That explains some diffs I've looked into

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS
AndyAyersMS merged commit 6f7c6fb into dotnet:mainFeb 3, 2025
grendello added a commit to grendello/runtime that referenced this pull request Feb 4, 2025
* main: (30 commits)
JIT: Optimize bit-wise AND with a constant mask in combination with a left shift in a compare (dotnet#111979)
Change how we build the cross-OS DAC to support building in the VMR (dotnet#111927)
Add Windows Server 2025 to test configurations (dotnet#111938)
[PERF] Move performance testing YAML from dotnet/runtime to dotnet/performance (dotnet#111454)
arm64: Add support for Bitwise OR NOT & XOR NOT (dotnet#111893)
JIT: Fix cross crossgen comparison failures (dotnet#112078)
Bump `StyleCop.Analyzers` to `1.2.0-beta.556` (dotnet#111278)
Remove `RequiresProcessIsolation` on InterfaceFolding tests (dotnet#112098)
Use hardlinks in helixpublishwitharcade (dotnet#112091)
Update breaking change rules regarding byref/objref fields. (dotnet#112087)
[daccess] Do not use USE_DAC_TABLE_RVA on Apple platforms (dotnet#112076)
use collection syntax in illink (dotnet#108458)
Include PDB for all TfmRuntimeSpecificPackageFile (dotnet#111879)
[main] Update dependencies from dotnet/emsdk (dotnet#111690)
Enable Mono tests (dotnet#111981)
Let the debugger knows DATAS is on (dotnet#107115)
Tests ran counter (dotnet#111145)
Some System.Decimal performance improvements (dotnet#99212)
[mono][mini] Remove support for the Xamarin.iOS and Xamarin.Mac assemblies in the AOT compiler. (dotnet#108886)
Remove one usage of `Unsafe.AsPointer`. (dotnet#112079)
...
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.

4 participants

@AndyAyersMS@EgorBo@jkotas@jakobbotsch
, '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: Fix cross crossgen comparison failures - #112078

Merged
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972
Feb 3, 2025
Merged

JIT: Fix cross crossgen comparison failures#112078
AndyAyersMS merged 5 commits into
dotnet:mainfrom
AndyAyersMS:Fix111972

Conversation

@AndyAyersMS

@AndyAyersMSAndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
Member

Fix a couple of issues that were causing cross-crossgen tests to fail

  • address mode formation was sensitive to the size of a constant handle
  • value histogram processing was always using 64 bit value sizes
  • transformation for down-counted loops was using host-sized -1.

Fixes the jit-related issues in #111972

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 3, 2025
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

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

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS

AndyAyersMS commented Feb 3, 2025

Copy link
Copy Markdown
MemberAuthor

cross crossgen results

Looks like xarch is now ok. OSX arm64 has a type layout verification failure. So maybe the jit side of things is in good shape.

20:20:39.940 Running test: JIT/opt/Devirtualization/Comparer_get_Default/Comparer_get_Default.dll
Assert failure(PID 13022 [0x000032de], Thread: 4596379 [0x46229b]): Verify_TypeLayout 'DoubleEnum' failed to verify type layout
File: /Users/runner/work/1/s/src/coreclr/vm/jitinterface.cpp:13800
Image: /private/tmp/helix/working/97380862/p/corerun

@AndyAyersMSAndyAyersMS changed the title Fix111972Fix111972 -- Cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS
AndyAyersMS marked this pull request as ready for review February 3, 2025 15:29
@AndyAyersMSAndyAyersMS changed the title Fix111972 -- Cross crossgen comparison failuresJIT: Fix cross crossgen comparison failuresFeb 3, 2025
@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

@dotnet/jit-contrib PTAL

@EgorBo

Copy link
Copy Markdown
Member

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Comment threadsrc/coreclr/jit/scev.cpp Outdated
else
{
*result = m_comp->gtNewIconNode((ssize_t)cns->Value, scev->Type);
*result = m_comp->gtNewIconNode((target_ssize_t)cns->Value, scev->Type);

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.

Can you make ScevConstant's constructor apply the sign extension for the genTypeSize(type) == 4 case instead? It better matches how GenTreeIntCon works (the constant is always stored sign extended).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure I did what you expected, so take a look. My local setup got messed up so it will be a while before I can tell if this works.

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.

That looks good to me

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

@jkotas

Copy link
Copy Markdown
Member

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

Previous commit's diffs have regressions, is it because of the addressing modes or PGO-related changes?

Ah, I hadn't looked at those. Would guess it is the PGO change, but let me verify.

Spot checked some diffs, and yeah, looks like histogram computations were off before (always using host pointer sized bits to tabulate the histogram, then projecting to the low 32 bits). Typically value histograms on x64 were more "washed out" than they should have been).

It was likely hard to spot this during testing as it required histograms with mixtures of sizes and a good idea what the actual final %s should have looked like (eg the old interpretation is approximately correct, especially when the % of the dominant entry is high).

image

So the general sharpening in histogram % usually leads us to do some unrolling and so increase sizes (on x64 anyways).

Note the only x86 diffs are in the crossgen collection; when jitting it was reading the histograms properly.

@EgorBo

Copy link
Copy Markdown
Member

ah, so some regressions are actually more value-probe driven intrinsic expanded? That explains some diffs I've looked into

@AndyAyersMS

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-coreclr crossgen2 outerloop

@azure-pipelines

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

@AndyAyersMS
AndyAyersMS merged commit 6f7c6fb into dotnet:mainFeb 3, 2025
grendello added a commit to grendello/runtime that referenced this pull request Feb 4, 2025
* main: (30 commits)
JIT: Optimize bit-wise AND with a constant mask in combination with a left shift in a compare (dotnet#111979)
Change how we build the cross-OS DAC to support building in the VMR (dotnet#111927)
Add Windows Server 2025 to test configurations (dotnet#111938)
[PERF] Move performance testing YAML from dotnet/runtime to dotnet/performance (dotnet#111454)
arm64: Add support for Bitwise OR NOT & XOR NOT (dotnet#111893)
JIT: Fix cross crossgen comparison failures (dotnet#112078)
Bump `StyleCop.Analyzers` to `1.2.0-beta.556` (dotnet#111278)
Remove `RequiresProcessIsolation` on InterfaceFolding tests (dotnet#112098)
Use hardlinks in helixpublishwitharcade (dotnet#112091)
Update breaking change rules regarding byref/objref fields. (dotnet#112087)
[daccess] Do not use USE_DAC_TABLE_RVA on Apple platforms (dotnet#112076)
use collection syntax in illink (dotnet#108458)
Include PDB for all TfmRuntimeSpecificPackageFile (dotnet#111879)
[main] Update dependencies from dotnet/emsdk (dotnet#111690)
Enable Mono tests (dotnet#111981)
Let the debugger knows DATAS is on (dotnet#107115)
Tests ran counter (dotnet#111145)
Some System.Decimal performance improvements (dotnet#99212)
[mono][mini] Remove support for the Xamarin.iOS and Xamarin.Mac assemblies in the AOT compiler. (dotnet#108886)
Remove one usage of `Unsafe.AsPointer`. (dotnet#112079)
...
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.

4 participants

@AndyAyersMS@EgorBo@jkotas@jakobbotsch