Revert potential UB due to aliasing + more WB removals - #111733

Merged
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub
Jan 26, 2025
Merged

Revert potential UB due to aliasing + more WB removals#111733
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub

Conversation

@EgorBo

Copy link
Copy Markdown
Member

Remove potential UB from #111576 (move it to importer) + enable more cases where we eliminate write barriers, e.g. this:

publicrefstructTestS{publicMyStructs1;publicMyStructs2;publicvoidTest(){s1=s2;// no barrier needed, but we generate (two)}}publicstructMyStruct// Not byref-like{publicstringA;publicstringB;}

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jan 23, 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.

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

Some regressions with barrier-free code e.g. https://www.diffchecker.com/Sz7TI32G/

(when we save a nonbyref-like struct with gc pointers to a field of byreflike struct)

flagsToPropagate |= GTF_IND_TGT_NOT_HEAP | GTF_IND_TGT_HEAP;
addr = m_store->AsIndir()->Addr();
indirFlags = m_store->gtFlags & GTF_IND_COPYABLE_FLAGS;
indirFlags = m_store->gtFlags & flagsToPropagate;

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.

Is there any benefit to adding something like

if (m_store->AsBlk()->GetLayout()->IsStackOnly())
indirFlags |= GTF_IND_TGT_NOT_HEAP;

here (and in morphblock.cpp)? Or will m_store already have this flag set for this case?

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.

@jakobbotsch I don't see diffs, but this PR already produces too many missing contexts 🙂
Presumably, this is not enough, because some GT_STORE_BLK have this flag without its layout being IsStackOnly. E.g. when we store a non-byreflike struct to byreflike-struct's field

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.

Yeah, it makes sense to me to propagate the flags, but it also makes sense to me to set the flags anew here, since the decomposition is "losing" the information at this point. I will leave it up to you.

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.

Added. Looks like MihuBot found a few diffs with it

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

PTAL @jakobbotsch Diffs: MihuBot/runtime-utils#932 (SPMI diffs report missing contexts: https://dev.azure.com/dnceng-public/public/_build/results?buildId=926588&view=ms.vss-build-web.run-extensions-tab)

There are a few regressions where WB is lighter than no-WB (e.g. https://www.diffchecker.com/Sz7TI32G/)
And there are some regressions where previous VN based code could detect more opportunities (mostly, mixed with inlining). I managed to create a minimal repro:

[InlineArray(4)]internalstructArgumentData<T>{privateT_arg0;}[StructLayout(LayoutKind.Sequential)]internalrefstructTest{[MethodImpl(MethodImplOptions.NoInlining)]publicTest(objecta){_args[1]=a;}internalArgumentData<object?>_args;}

here we end up with:

 [000011] -ACXG------ * STOREIND ref [000009] --C-------- +--* RET_EXPR byref (for [000007])
[000010] ----------- \--* LCL_VAR ref V01 arg1 

and we can't extract class info easily (stind.ref opcode doesn't contain any class token nor we can extract it from ops).

I might look into this and more cases separately (overall it's a regression only for previously merged PR)

@EgorBo
EgorBo marked this pull request as ready for review January 23, 2025 14:36
@EgorBo
EgorBo merged commit 0f0753d into dotnet:mainJan 26, 2025
@EgorBo
EgorBo deleted the revert-aliased-ub branch January 26, 2025 14:47
grendello added a commit to grendello/runtime that referenced this pull request Jan 27, 2025
* main: (22 commits)
Clean up Stopwatch a bit (dotnet#111834)
JIT: Fix embedded broadcast simd size (dotnet#111638)
Revert potential UB due to aliasing + more WB removals (dotnet#111733)
re-enable acceleration of Vector512<long>.op_Multiply (dotnet#111832)
Handle OSSL 3.4 change to SAN:othername formatting
JIT: Fix stack allocated arrays for NativeAOT (dotnet#111827)
JIT: enhance RBO inference for similar compares to constants (dotnet#111766)
JIT: Don't run optSetBlockWeights when we have PGO data (dotnet#111764)
[Android] Make sure RuntimeFlavor=CoreCLR when clr subset is specified (dotnet#111821)
Change empty subject test certificate to include a critical SAN.
Fix reversed code offsets in GcInfo (dotnet#111792)
Swap some libraries areas between leads (dotnet#111816)
Add left-handed spherical and cylindrical billboards (dotnet#109605)
JIT: revise `optRelopImpliesRelop` to always set `reverseSense` (dotnet#111803)
Fix Zip64ExtraField handling (dotnet#111802)
Add build support for Android+CoreCLR (dotnet#110471)
arm64: Add bic(s) compact encoding (dotnet#111452)
JIT: Ensure `BBF_PROF_WEIGHT` flag is set when we have PGO data (dotnet#111780)
Add support for AVX10.2, Add AVX10.2 API surface and template tests (dotnet#111209)
JIT: Preliminary for enabling inlining late devirted calls (dotnet#111782)
...
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.

2 participants

@EgorBo@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

Revert potential UB due to aliasing + more WB removals - #111733

Merged
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub
Jan 26, 2025
Merged

Revert potential UB due to aliasing + more WB removals#111733
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub

Conversation

@EgorBo

Copy link
Copy Markdown
Member

Remove potential UB from #111576 (move it to importer) + enable more cases where we eliminate write barriers, e.g. this:

publicrefstructTestS{publicMyStructs1;publicMyStructs2;publicvoidTest(){s1=s2;// no barrier needed, but we generate (two)}}publicstructMyStruct// Not byref-like{publicstringA;publicstringB;}

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jan 23, 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.

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

Some regressions with barrier-free code e.g. https://www.diffchecker.com/Sz7TI32G/

(when we save a nonbyref-like struct with gc pointers to a field of byreflike struct)

flagsToPropagate |= GTF_IND_TGT_NOT_HEAP | GTF_IND_TGT_HEAP;
addr = m_store->AsIndir()->Addr();
indirFlags = m_store->gtFlags & GTF_IND_COPYABLE_FLAGS;
indirFlags = m_store->gtFlags & flagsToPropagate;

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.

Is there any benefit to adding something like

if (m_store->AsBlk()->GetLayout()->IsStackOnly())
indirFlags |= GTF_IND_TGT_NOT_HEAP;

here (and in morphblock.cpp)? Or will m_store already have this flag set for this case?

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.

@jakobbotsch I don't see diffs, but this PR already produces too many missing contexts 🙂
Presumably, this is not enough, because some GT_STORE_BLK have this flag without its layout being IsStackOnly. E.g. when we store a non-byreflike struct to byreflike-struct's field

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.

Yeah, it makes sense to me to propagate the flags, but it also makes sense to me to set the flags anew here, since the decomposition is "losing" the information at this point. I will leave it up to you.

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.

Added. Looks like MihuBot found a few diffs with it

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

PTAL @jakobbotsch Diffs: MihuBot/runtime-utils#932 (SPMI diffs report missing contexts: https://dev.azure.com/dnceng-public/public/_build/results?buildId=926588&view=ms.vss-build-web.run-extensions-tab)

There are a few regressions where WB is lighter than no-WB (e.g. https://www.diffchecker.com/Sz7TI32G/)
And there are some regressions where previous VN based code could detect more opportunities (mostly, mixed with inlining). I managed to create a minimal repro:

[InlineArray(4)]internalstructArgumentData<T>{privateT_arg0;}[StructLayout(LayoutKind.Sequential)]internalrefstructTest{[MethodImpl(MethodImplOptions.NoInlining)]publicTest(objecta){_args[1]=a;}internalArgumentData<object?>_args;}

here we end up with:

 [000011] -ACXG------ * STOREIND ref [000009] --C-------- +--* RET_EXPR byref (for [000007])
[000010] ----------- \--* LCL_VAR ref V01 arg1 

and we can't extract class info easily (stind.ref opcode doesn't contain any class token nor we can extract it from ops).

I might look into this and more cases separately (overall it's a regression only for previously merged PR)

@EgorBo
EgorBo marked this pull request as ready for review January 23, 2025 14:36
@EgorBo
EgorBo merged commit 0f0753d into dotnet:mainJan 26, 2025
@EgorBo
EgorBo deleted the revert-aliased-ub branch January 26, 2025 14:47
grendello added a commit to grendello/runtime that referenced this pull request Jan 27, 2025
* main: (22 commits)
Clean up Stopwatch a bit (dotnet#111834)
JIT: Fix embedded broadcast simd size (dotnet#111638)
Revert potential UB due to aliasing + more WB removals (dotnet#111733)
re-enable acceleration of Vector512<long>.op_Multiply (dotnet#111832)
Handle OSSL 3.4 change to SAN:othername formatting
JIT: Fix stack allocated arrays for NativeAOT (dotnet#111827)
JIT: enhance RBO inference for similar compares to constants (dotnet#111766)
JIT: Don't run optSetBlockWeights when we have PGO data (dotnet#111764)
[Android] Make sure RuntimeFlavor=CoreCLR when clr subset is specified (dotnet#111821)
Change empty subject test certificate to include a critical SAN.
Fix reversed code offsets in GcInfo (dotnet#111792)
Swap some libraries areas between leads (dotnet#111816)
Add left-handed spherical and cylindrical billboards (dotnet#109605)
JIT: revise `optRelopImpliesRelop` to always set `reverseSense` (dotnet#111803)
Fix Zip64ExtraField handling (dotnet#111802)
Add build support for Android+CoreCLR (dotnet#110471)
arm64: Add bic(s) compact encoding (dotnet#111452)
JIT: Ensure `BBF_PROF_WEIGHT` flag is set when we have PGO data (dotnet#111780)
Add support for AVX10.2, Add AVX10.2 API surface and template tests (dotnet#111209)
JIT: Preliminary for enabling inlining late devirted calls (dotnet#111782)
...
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.

2 participants

@EgorBo@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

Revert potential UB due to aliasing + more WB removals - #111733

Merged
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub
Jan 26, 2025
Merged

Revert potential UB due to aliasing + more WB removals#111733
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub

Conversation

@EgorBo

Copy link
Copy Markdown
Member

Remove potential UB from #111576 (move it to importer) + enable more cases where we eliminate write barriers, e.g. this:

publicrefstructTestS{publicMyStructs1;publicMyStructs2;publicvoidTest(){s1=s2;// no barrier needed, but we generate (two)}}publicstructMyStruct// Not byref-like{publicstringA;publicstringB;}

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jan 23, 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.

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

Some regressions with barrier-free code e.g. https://www.diffchecker.com/Sz7TI32G/

(when we save a nonbyref-like struct with gc pointers to a field of byreflike struct)

flagsToPropagate |= GTF_IND_TGT_NOT_HEAP | GTF_IND_TGT_HEAP;
addr = m_store->AsIndir()->Addr();
indirFlags = m_store->gtFlags & GTF_IND_COPYABLE_FLAGS;
indirFlags = m_store->gtFlags & flagsToPropagate;

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.

Is there any benefit to adding something like

if (m_store->AsBlk()->GetLayout()->IsStackOnly())
indirFlags |= GTF_IND_TGT_NOT_HEAP;

here (and in morphblock.cpp)? Or will m_store already have this flag set for this case?

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.

@jakobbotsch I don't see diffs, but this PR already produces too many missing contexts 🙂
Presumably, this is not enough, because some GT_STORE_BLK have this flag without its layout being IsStackOnly. E.g. when we store a non-byreflike struct to byreflike-struct's field

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.

Yeah, it makes sense to me to propagate the flags, but it also makes sense to me to set the flags anew here, since the decomposition is "losing" the information at this point. I will leave it up to you.

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.

Added. Looks like MihuBot found a few diffs with it

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

PTAL @jakobbotsch Diffs: MihuBot/runtime-utils#932 (SPMI diffs report missing contexts: https://dev.azure.com/dnceng-public/public/_build/results?buildId=926588&view=ms.vss-build-web.run-extensions-tab)

There are a few regressions where WB is lighter than no-WB (e.g. https://www.diffchecker.com/Sz7TI32G/)
And there are some regressions where previous VN based code could detect more opportunities (mostly, mixed with inlining). I managed to create a minimal repro:

[InlineArray(4)]internalstructArgumentData<T>{privateT_arg0;}[StructLayout(LayoutKind.Sequential)]internalrefstructTest{[MethodImpl(MethodImplOptions.NoInlining)]publicTest(objecta){_args[1]=a;}internalArgumentData<object?>_args;}

here we end up with:

 [000011] -ACXG------ * STOREIND ref [000009] --C-------- +--* RET_EXPR byref (for [000007])
[000010] ----------- \--* LCL_VAR ref V01 arg1 

and we can't extract class info easily (stind.ref opcode doesn't contain any class token nor we can extract it from ops).

I might look into this and more cases separately (overall it's a regression only for previously merged PR)

@EgorBo
EgorBo marked this pull request as ready for review January 23, 2025 14:36
@EgorBo
EgorBo merged commit 0f0753d into dotnet:mainJan 26, 2025
@EgorBo
EgorBo deleted the revert-aliased-ub branch January 26, 2025 14:47
grendello added a commit to grendello/runtime that referenced this pull request Jan 27, 2025
* main: (22 commits)
Clean up Stopwatch a bit (dotnet#111834)
JIT: Fix embedded broadcast simd size (dotnet#111638)
Revert potential UB due to aliasing + more WB removals (dotnet#111733)
re-enable acceleration of Vector512<long>.op_Multiply (dotnet#111832)
Handle OSSL 3.4 change to SAN:othername formatting
JIT: Fix stack allocated arrays for NativeAOT (dotnet#111827)
JIT: enhance RBO inference for similar compares to constants (dotnet#111766)
JIT: Don't run optSetBlockWeights when we have PGO data (dotnet#111764)
[Android] Make sure RuntimeFlavor=CoreCLR when clr subset is specified (dotnet#111821)
Change empty subject test certificate to include a critical SAN.
Fix reversed code offsets in GcInfo (dotnet#111792)
Swap some libraries areas between leads (dotnet#111816)
Add left-handed spherical and cylindrical billboards (dotnet#109605)
JIT: revise `optRelopImpliesRelop` to always set `reverseSense` (dotnet#111803)
Fix Zip64ExtraField handling (dotnet#111802)
Add build support for Android+CoreCLR (dotnet#110471)
arm64: Add bic(s) compact encoding (dotnet#111452)
JIT: Ensure `BBF_PROF_WEIGHT` flag is set when we have PGO data (dotnet#111780)
Add support for AVX10.2, Add AVX10.2 API surface and template tests (dotnet#111209)
JIT: Preliminary for enabling inlining late devirted calls (dotnet#111782)
...
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.

2 participants

@EgorBo@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

Revert potential UB due to aliasing + more WB removals - #111733

Merged
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub
Jan 26, 2025
Merged

Revert potential UB due to aliasing + more WB removals#111733
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub

Conversation

@EgorBo

Copy link
Copy Markdown
Member

Remove potential UB from #111576 (move it to importer) + enable more cases where we eliminate write barriers, e.g. this:

publicrefstructTestS{publicMyStructs1;publicMyStructs2;publicvoidTest(){s1=s2;// no barrier needed, but we generate (two)}}publicstructMyStruct// Not byref-like{publicstringA;publicstringB;}

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jan 23, 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.

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

Some regressions with barrier-free code e.g. https://www.diffchecker.com/Sz7TI32G/

(when we save a nonbyref-like struct with gc pointers to a field of byreflike struct)

flagsToPropagate |= GTF_IND_TGT_NOT_HEAP | GTF_IND_TGT_HEAP;
addr = m_store->AsIndir()->Addr();
indirFlags = m_store->gtFlags & GTF_IND_COPYABLE_FLAGS;
indirFlags = m_store->gtFlags & flagsToPropagate;

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.

Is there any benefit to adding something like

if (m_store->AsBlk()->GetLayout()->IsStackOnly())
indirFlags |= GTF_IND_TGT_NOT_HEAP;

here (and in morphblock.cpp)? Or will m_store already have this flag set for this case?

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.

@jakobbotsch I don't see diffs, but this PR already produces too many missing contexts 🙂
Presumably, this is not enough, because some GT_STORE_BLK have this flag without its layout being IsStackOnly. E.g. when we store a non-byreflike struct to byreflike-struct's field

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.

Yeah, it makes sense to me to propagate the flags, but it also makes sense to me to set the flags anew here, since the decomposition is "losing" the information at this point. I will leave it up to you.

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.

Added. Looks like MihuBot found a few diffs with it

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

PTAL @jakobbotsch Diffs: MihuBot/runtime-utils#932 (SPMI diffs report missing contexts: https://dev.azure.com/dnceng-public/public/_build/results?buildId=926588&view=ms.vss-build-web.run-extensions-tab)

There are a few regressions where WB is lighter than no-WB (e.g. https://www.diffchecker.com/Sz7TI32G/)
And there are some regressions where previous VN based code could detect more opportunities (mostly, mixed with inlining). I managed to create a minimal repro:

[InlineArray(4)]internalstructArgumentData<T>{privateT_arg0;}[StructLayout(LayoutKind.Sequential)]internalrefstructTest{[MethodImpl(MethodImplOptions.NoInlining)]publicTest(objecta){_args[1]=a;}internalArgumentData<object?>_args;}

here we end up with:

 [000011] -ACXG------ * STOREIND ref [000009] --C-------- +--* RET_EXPR byref (for [000007])
[000010] ----------- \--* LCL_VAR ref V01 arg1 

and we can't extract class info easily (stind.ref opcode doesn't contain any class token nor we can extract it from ops).

I might look into this and more cases separately (overall it's a regression only for previously merged PR)

@EgorBo
EgorBo marked this pull request as ready for review January 23, 2025 14:36
@EgorBo
EgorBo merged commit 0f0753d into dotnet:mainJan 26, 2025
@EgorBo
EgorBo deleted the revert-aliased-ub branch January 26, 2025 14:47
grendello added a commit to grendello/runtime that referenced this pull request Jan 27, 2025
* main: (22 commits)
Clean up Stopwatch a bit (dotnet#111834)
JIT: Fix embedded broadcast simd size (dotnet#111638)
Revert potential UB due to aliasing + more WB removals (dotnet#111733)
re-enable acceleration of Vector512<long>.op_Multiply (dotnet#111832)
Handle OSSL 3.4 change to SAN:othername formatting
JIT: Fix stack allocated arrays for NativeAOT (dotnet#111827)
JIT: enhance RBO inference for similar compares to constants (dotnet#111766)
JIT: Don't run optSetBlockWeights when we have PGO data (dotnet#111764)
[Android] Make sure RuntimeFlavor=CoreCLR when clr subset is specified (dotnet#111821)
Change empty subject test certificate to include a critical SAN.
Fix reversed code offsets in GcInfo (dotnet#111792)
Swap some libraries areas between leads (dotnet#111816)
Add left-handed spherical and cylindrical billboards (dotnet#109605)
JIT: revise `optRelopImpliesRelop` to always set `reverseSense` (dotnet#111803)
Fix Zip64ExtraField handling (dotnet#111802)
Add build support for Android+CoreCLR (dotnet#110471)
arm64: Add bic(s) compact encoding (dotnet#111452)
JIT: Ensure `BBF_PROF_WEIGHT` flag is set when we have PGO data (dotnet#111780)
Add support for AVX10.2, Add AVX10.2 API surface and template tests (dotnet#111209)
JIT: Preliminary for enabling inlining late devirted calls (dotnet#111782)
...
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.

2 participants

@EgorBo@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

Revert potential UB due to aliasing + more WB removals - #111733

Merged
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub
Jan 26, 2025
Merged

Revert potential UB due to aliasing + more WB removals#111733
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub

Conversation

@EgorBo

Copy link
Copy Markdown
Member

Remove potential UB from #111576 (move it to importer) + enable more cases where we eliminate write barriers, e.g. this:

publicrefstructTestS{publicMyStructs1;publicMyStructs2;publicvoidTest(){s1=s2;// no barrier needed, but we generate (two)}}publicstructMyStruct// Not byref-like{publicstringA;publicstringB;}

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jan 23, 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.

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

Some regressions with barrier-free code e.g. https://www.diffchecker.com/Sz7TI32G/

(when we save a nonbyref-like struct with gc pointers to a field of byreflike struct)

flagsToPropagate |= GTF_IND_TGT_NOT_HEAP | GTF_IND_TGT_HEAP;
addr = m_store->AsIndir()->Addr();
indirFlags = m_store->gtFlags & GTF_IND_COPYABLE_FLAGS;
indirFlags = m_store->gtFlags & flagsToPropagate;

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.

Is there any benefit to adding something like

if (m_store->AsBlk()->GetLayout()->IsStackOnly())
indirFlags |= GTF_IND_TGT_NOT_HEAP;

here (and in morphblock.cpp)? Or will m_store already have this flag set for this case?

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.

@jakobbotsch I don't see diffs, but this PR already produces too many missing contexts 🙂
Presumably, this is not enough, because some GT_STORE_BLK have this flag without its layout being IsStackOnly. E.g. when we store a non-byreflike struct to byreflike-struct's field

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.

Yeah, it makes sense to me to propagate the flags, but it also makes sense to me to set the flags anew here, since the decomposition is "losing" the information at this point. I will leave it up to you.

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.

Added. Looks like MihuBot found a few diffs with it

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

PTAL @jakobbotsch Diffs: MihuBot/runtime-utils#932 (SPMI diffs report missing contexts: https://dev.azure.com/dnceng-public/public/_build/results?buildId=926588&view=ms.vss-build-web.run-extensions-tab)

There are a few regressions where WB is lighter than no-WB (e.g. https://www.diffchecker.com/Sz7TI32G/)
And there are some regressions where previous VN based code could detect more opportunities (mostly, mixed with inlining). I managed to create a minimal repro:

[InlineArray(4)]internalstructArgumentData<T>{privateT_arg0;}[StructLayout(LayoutKind.Sequential)]internalrefstructTest{[MethodImpl(MethodImplOptions.NoInlining)]publicTest(objecta){_args[1]=a;}internalArgumentData<object?>_args;}

here we end up with:

 [000011] -ACXG------ * STOREIND ref [000009] --C-------- +--* RET_EXPR byref (for [000007])
[000010] ----------- \--* LCL_VAR ref V01 arg1 

and we can't extract class info easily (stind.ref opcode doesn't contain any class token nor we can extract it from ops).

I might look into this and more cases separately (overall it's a regression only for previously merged PR)

@EgorBo
EgorBo marked this pull request as ready for review January 23, 2025 14:36
@EgorBo
EgorBo merged commit 0f0753d into dotnet:mainJan 26, 2025
@EgorBo
EgorBo deleted the revert-aliased-ub branch January 26, 2025 14:47
grendello added a commit to grendello/runtime that referenced this pull request Jan 27, 2025
* main: (22 commits)
Clean up Stopwatch a bit (dotnet#111834)
JIT: Fix embedded broadcast simd size (dotnet#111638)
Revert potential UB due to aliasing + more WB removals (dotnet#111733)
re-enable acceleration of Vector512<long>.op_Multiply (dotnet#111832)
Handle OSSL 3.4 change to SAN:othername formatting
JIT: Fix stack allocated arrays for NativeAOT (dotnet#111827)
JIT: enhance RBO inference for similar compares to constants (dotnet#111766)
JIT: Don't run optSetBlockWeights when we have PGO data (dotnet#111764)
[Android] Make sure RuntimeFlavor=CoreCLR when clr subset is specified (dotnet#111821)
Change empty subject test certificate to include a critical SAN.
Fix reversed code offsets in GcInfo (dotnet#111792)
Swap some libraries areas between leads (dotnet#111816)
Add left-handed spherical and cylindrical billboards (dotnet#109605)
JIT: revise `optRelopImpliesRelop` to always set `reverseSense` (dotnet#111803)
Fix Zip64ExtraField handling (dotnet#111802)
Add build support for Android+CoreCLR (dotnet#110471)
arm64: Add bic(s) compact encoding (dotnet#111452)
JIT: Ensure `BBF_PROF_WEIGHT` flag is set when we have PGO data (dotnet#111780)
Add support for AVX10.2, Add AVX10.2 API surface and template tests (dotnet#111209)
JIT: Preliminary for enabling inlining late devirted calls (dotnet#111782)
...
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.

2 participants

@EgorBo@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

Revert potential UB due to aliasing + more WB removals - #111733

Merged
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub
Jan 26, 2025
Merged

Revert potential UB due to aliasing + more WB removals#111733
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub

Conversation

@EgorBo

Copy link
Copy Markdown
Member

Remove potential UB from #111576 (move it to importer) + enable more cases where we eliminate write barriers, e.g. this:

publicrefstructTestS{publicMyStructs1;publicMyStructs2;publicvoidTest(){s1=s2;// no barrier needed, but we generate (two)}}publicstructMyStruct// Not byref-like{publicstringA;publicstringB;}

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jan 23, 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.

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

Some regressions with barrier-free code e.g. https://www.diffchecker.com/Sz7TI32G/

(when we save a nonbyref-like struct with gc pointers to a field of byreflike struct)

flagsToPropagate |= GTF_IND_TGT_NOT_HEAP | GTF_IND_TGT_HEAP;
addr = m_store->AsIndir()->Addr();
indirFlags = m_store->gtFlags & GTF_IND_COPYABLE_FLAGS;
indirFlags = m_store->gtFlags & flagsToPropagate;

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.

Is there any benefit to adding something like

if (m_store->AsBlk()->GetLayout()->IsStackOnly())
indirFlags |= GTF_IND_TGT_NOT_HEAP;

here (and in morphblock.cpp)? Or will m_store already have this flag set for this case?

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.

@jakobbotsch I don't see diffs, but this PR already produces too many missing contexts 🙂
Presumably, this is not enough, because some GT_STORE_BLK have this flag without its layout being IsStackOnly. E.g. when we store a non-byreflike struct to byreflike-struct's field

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.

Yeah, it makes sense to me to propagate the flags, but it also makes sense to me to set the flags anew here, since the decomposition is "losing" the information at this point. I will leave it up to you.

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.

Added. Looks like MihuBot found a few diffs with it

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

PTAL @jakobbotsch Diffs: MihuBot/runtime-utils#932 (SPMI diffs report missing contexts: https://dev.azure.com/dnceng-public/public/_build/results?buildId=926588&view=ms.vss-build-web.run-extensions-tab)

There are a few regressions where WB is lighter than no-WB (e.g. https://www.diffchecker.com/Sz7TI32G/)
And there are some regressions where previous VN based code could detect more opportunities (mostly, mixed with inlining). I managed to create a minimal repro:

[InlineArray(4)]internalstructArgumentData<T>{privateT_arg0;}[StructLayout(LayoutKind.Sequential)]internalrefstructTest{[MethodImpl(MethodImplOptions.NoInlining)]publicTest(objecta){_args[1]=a;}internalArgumentData<object?>_args;}

here we end up with:

 [000011] -ACXG------ * STOREIND ref [000009] --C-------- +--* RET_EXPR byref (for [000007])
[000010] ----------- \--* LCL_VAR ref V01 arg1 

and we can't extract class info easily (stind.ref opcode doesn't contain any class token nor we can extract it from ops).

I might look into this and more cases separately (overall it's a regression only for previously merged PR)

@EgorBo
EgorBo marked this pull request as ready for review January 23, 2025 14:36
@EgorBo
EgorBo merged commit 0f0753d into dotnet:mainJan 26, 2025
@EgorBo
EgorBo deleted the revert-aliased-ub branch January 26, 2025 14:47
grendello added a commit to grendello/runtime that referenced this pull request Jan 27, 2025
* main: (22 commits)
Clean up Stopwatch a bit (dotnet#111834)
JIT: Fix embedded broadcast simd size (dotnet#111638)
Revert potential UB due to aliasing + more WB removals (dotnet#111733)
re-enable acceleration of Vector512<long>.op_Multiply (dotnet#111832)
Handle OSSL 3.4 change to SAN:othername formatting
JIT: Fix stack allocated arrays for NativeAOT (dotnet#111827)
JIT: enhance RBO inference for similar compares to constants (dotnet#111766)
JIT: Don't run optSetBlockWeights when we have PGO data (dotnet#111764)
[Android] Make sure RuntimeFlavor=CoreCLR when clr subset is specified (dotnet#111821)
Change empty subject test certificate to include a critical SAN.
Fix reversed code offsets in GcInfo (dotnet#111792)
Swap some libraries areas between leads (dotnet#111816)
Add left-handed spherical and cylindrical billboards (dotnet#109605)
JIT: revise `optRelopImpliesRelop` to always set `reverseSense` (dotnet#111803)
Fix Zip64ExtraField handling (dotnet#111802)
Add build support for Android+CoreCLR (dotnet#110471)
arm64: Add bic(s) compact encoding (dotnet#111452)
JIT: Ensure `BBF_PROF_WEIGHT` flag is set when we have PGO data (dotnet#111780)
Add support for AVX10.2, Add AVX10.2 API surface and template tests (dotnet#111209)
JIT: Preliminary for enabling inlining late devirted calls (dotnet#111782)
...
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.

2 participants

@EgorBo@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

Revert potential UB due to aliasing + more WB removals - #111733

Merged
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub
Jan 26, 2025
Merged

Revert potential UB due to aliasing + more WB removals#111733
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub

Conversation

@EgorBo

Copy link
Copy Markdown
Member

Remove potential UB from #111576 (move it to importer) + enable more cases where we eliminate write barriers, e.g. this:

publicrefstructTestS{publicMyStructs1;publicMyStructs2;publicvoidTest(){s1=s2;// no barrier needed, but we generate (two)}}publicstructMyStruct// Not byref-like{publicstringA;publicstringB;}

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jan 23, 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.

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

Some regressions with barrier-free code e.g. https://www.diffchecker.com/Sz7TI32G/

(when we save a nonbyref-like struct with gc pointers to a field of byreflike struct)

flagsToPropagate |= GTF_IND_TGT_NOT_HEAP | GTF_IND_TGT_HEAP;
addr = m_store->AsIndir()->Addr();
indirFlags = m_store->gtFlags & GTF_IND_COPYABLE_FLAGS;
indirFlags = m_store->gtFlags & flagsToPropagate;

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.

Is there any benefit to adding something like

if (m_store->AsBlk()->GetLayout()->IsStackOnly())
indirFlags |= GTF_IND_TGT_NOT_HEAP;

here (and in morphblock.cpp)? Or will m_store already have this flag set for this case?

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.

@jakobbotsch I don't see diffs, but this PR already produces too many missing contexts 🙂
Presumably, this is not enough, because some GT_STORE_BLK have this flag without its layout being IsStackOnly. E.g. when we store a non-byreflike struct to byreflike-struct's field

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.

Yeah, it makes sense to me to propagate the flags, but it also makes sense to me to set the flags anew here, since the decomposition is "losing" the information at this point. I will leave it up to you.

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.

Added. Looks like MihuBot found a few diffs with it

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

PTAL @jakobbotsch Diffs: MihuBot/runtime-utils#932 (SPMI diffs report missing contexts: https://dev.azure.com/dnceng-public/public/_build/results?buildId=926588&view=ms.vss-build-web.run-extensions-tab)

There are a few regressions where WB is lighter than no-WB (e.g. https://www.diffchecker.com/Sz7TI32G/)
And there are some regressions where previous VN based code could detect more opportunities (mostly, mixed with inlining). I managed to create a minimal repro:

[InlineArray(4)]internalstructArgumentData<T>{privateT_arg0;}[StructLayout(LayoutKind.Sequential)]internalrefstructTest{[MethodImpl(MethodImplOptions.NoInlining)]publicTest(objecta){_args[1]=a;}internalArgumentData<object?>_args;}

here we end up with:

 [000011] -ACXG------ * STOREIND ref [000009] --C-------- +--* RET_EXPR byref (for [000007])
[000010] ----------- \--* LCL_VAR ref V01 arg1 

and we can't extract class info easily (stind.ref opcode doesn't contain any class token nor we can extract it from ops).

I might look into this and more cases separately (overall it's a regression only for previously merged PR)

@EgorBo
EgorBo marked this pull request as ready for review January 23, 2025 14:36
@EgorBo
EgorBo merged commit 0f0753d into dotnet:mainJan 26, 2025
@EgorBo
EgorBo deleted the revert-aliased-ub branch January 26, 2025 14:47
grendello added a commit to grendello/runtime that referenced this pull request Jan 27, 2025
* main: (22 commits)
Clean up Stopwatch a bit (dotnet#111834)
JIT: Fix embedded broadcast simd size (dotnet#111638)
Revert potential UB due to aliasing + more WB removals (dotnet#111733)
re-enable acceleration of Vector512<long>.op_Multiply (dotnet#111832)
Handle OSSL 3.4 change to SAN:othername formatting
JIT: Fix stack allocated arrays for NativeAOT (dotnet#111827)
JIT: enhance RBO inference for similar compares to constants (dotnet#111766)
JIT: Don't run optSetBlockWeights when we have PGO data (dotnet#111764)
[Android] Make sure RuntimeFlavor=CoreCLR when clr subset is specified (dotnet#111821)
Change empty subject test certificate to include a critical SAN.
Fix reversed code offsets in GcInfo (dotnet#111792)
Swap some libraries areas between leads (dotnet#111816)
Add left-handed spherical and cylindrical billboards (dotnet#109605)
JIT: revise `optRelopImpliesRelop` to always set `reverseSense` (dotnet#111803)
Fix Zip64ExtraField handling (dotnet#111802)
Add build support for Android+CoreCLR (dotnet#110471)
arm64: Add bic(s) compact encoding (dotnet#111452)
JIT: Ensure `BBF_PROF_WEIGHT` flag is set when we have PGO data (dotnet#111780)
Add support for AVX10.2, Add AVX10.2 API surface and template tests (dotnet#111209)
JIT: Preliminary for enabling inlining late devirted calls (dotnet#111782)
...
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.

2 participants

@EgorBo@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

Revert potential UB due to aliasing + more WB removals - #111733

Merged
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub
Jan 26, 2025
Merged

Revert potential UB due to aliasing + more WB removals#111733
EgorBo merged 3 commits into
dotnet:mainfrom
EgorBo:revert-aliased-ub

Conversation

@EgorBo

Copy link
Copy Markdown
Member

Remove potential UB from #111576 (move it to importer) + enable more cases where we eliminate write barriers, e.g. this:

publicrefstructTestS{publicMyStructs1;publicMyStructs2;publicvoidTest(){s1=s2;// no barrier needed, but we generate (two)}}publicstructMyStruct// Not byref-like{publicstringA;publicstringB;}

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Jan 23, 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.

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

Some regressions with barrier-free code e.g. https://www.diffchecker.com/Sz7TI32G/

(when we save a nonbyref-like struct with gc pointers to a field of byreflike struct)

flagsToPropagate |= GTF_IND_TGT_NOT_HEAP | GTF_IND_TGT_HEAP;
addr = m_store->AsIndir()->Addr();
indirFlags = m_store->gtFlags & GTF_IND_COPYABLE_FLAGS;
indirFlags = m_store->gtFlags & flagsToPropagate;

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.

Is there any benefit to adding something like

if (m_store->AsBlk()->GetLayout()->IsStackOnly())
indirFlags |= GTF_IND_TGT_NOT_HEAP;

here (and in morphblock.cpp)? Or will m_store already have this flag set for this case?

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.

@jakobbotsch I don't see diffs, but this PR already produces too many missing contexts 🙂
Presumably, this is not enough, because some GT_STORE_BLK have this flag without its layout being IsStackOnly. E.g. when we store a non-byreflike struct to byreflike-struct's field

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.

Yeah, it makes sense to me to propagate the flags, but it also makes sense to me to set the flags anew here, since the decomposition is "losing" the information at this point. I will leave it up to you.

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.

Added. Looks like MihuBot found a few diffs with it

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

Copy link
Copy Markdown
MemberAuthor

@MihuBot

@EgorBo

EgorBo commented Jan 23, 2025

Copy link
Copy Markdown
MemberAuthor

PTAL @jakobbotsch Diffs: MihuBot/runtime-utils#932 (SPMI diffs report missing contexts: https://dev.azure.com/dnceng-public/public/_build/results?buildId=926588&view=ms.vss-build-web.run-extensions-tab)

There are a few regressions where WB is lighter than no-WB (e.g. https://www.diffchecker.com/Sz7TI32G/)
And there are some regressions where previous VN based code could detect more opportunities (mostly, mixed with inlining). I managed to create a minimal repro:

[InlineArray(4)]internalstructArgumentData<T>{privateT_arg0;}[StructLayout(LayoutKind.Sequential)]internalrefstructTest{[MethodImpl(MethodImplOptions.NoInlining)]publicTest(objecta){_args[1]=a;}internalArgumentData<object?>_args;}

here we end up with:

 [000011] -ACXG------ * STOREIND ref [000009] --C-------- +--* RET_EXPR byref (for [000007])
[000010] ----------- \--* LCL_VAR ref V01 arg1 

and we can't extract class info easily (stind.ref opcode doesn't contain any class token nor we can extract it from ops).

I might look into this and more cases separately (overall it's a regression only for previously merged PR)

@EgorBo
EgorBo marked this pull request as ready for review January 23, 2025 14:36
@EgorBo
EgorBo merged commit 0f0753d into dotnet:mainJan 26, 2025
@EgorBo
EgorBo deleted the revert-aliased-ub branch January 26, 2025 14:47
grendello added a commit to grendello/runtime that referenced this pull request Jan 27, 2025
* main: (22 commits)
Clean up Stopwatch a bit (dotnet#111834)
JIT: Fix embedded broadcast simd size (dotnet#111638)
Revert potential UB due to aliasing + more WB removals (dotnet#111733)
re-enable acceleration of Vector512<long>.op_Multiply (dotnet#111832)
Handle OSSL 3.4 change to SAN:othername formatting
JIT: Fix stack allocated arrays for NativeAOT (dotnet#111827)
JIT: enhance RBO inference for similar compares to constants (dotnet#111766)
JIT: Don't run optSetBlockWeights when we have PGO data (dotnet#111764)
[Android] Make sure RuntimeFlavor=CoreCLR when clr subset is specified (dotnet#111821)
Change empty subject test certificate to include a critical SAN.
Fix reversed code offsets in GcInfo (dotnet#111792)
Swap some libraries areas between leads (dotnet#111816)
Add left-handed spherical and cylindrical billboards (dotnet#109605)
JIT: revise `optRelopImpliesRelop` to always set `reverseSense` (dotnet#111803)
Fix Zip64ExtraField handling (dotnet#111802)
Add build support for Android+CoreCLR (dotnet#110471)
arm64: Add bic(s) compact encoding (dotnet#111452)
JIT: Ensure `BBF_PROF_WEIGHT` flag is set when we have PGO data (dotnet#111780)
Add support for AVX10.2, Add AVX10.2 API surface and template tests (dotnet#111209)
JIT: Preliminary for enabling inlining late devirted calls (dotnet#111782)
...
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.

2 participants

@EgorBo@jakobbotsch