JIT: Update class for Unsafe.As<>() - #85954

Merged
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type
May 9, 2023
Merged

JIT: Update class for Unsafe.As<>()#85954
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type

Conversation

@EgorBo

@EgorBoEgorBo commented May 8, 2023

Copy link
Copy Markdown
Member

We used to import T Unsafe.As<T>(object o) where T : class as a no-op and didn't benefit from a more exact T hint.

Closes#84377 (cc @stephentoub)
Closes#85906 (cc @MichalStrehovsky) - checked that it also devirtualizes the interface call

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3

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

ghost commented May 8, 2023

Copy link
Copy Markdown

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

Issue Details

We used to import T Unsafe.As<T>(object o) where T : class as no-op basically and ignored T.

Closes #84377 (cc @stephentoub)
Closes #85906 (cc @MichalStrehovsky)

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3
Author:EgorBo
Assignees:-
Labels:

area-CodeGen-coreclr

Milestone:-

Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think you want to check for CORINFO_FLG_SHAREDINST flag here.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared 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.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared case.

Thanks, I was wondering about that too. I though that since I only need it here I can request that on demand, will change the original sig.

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.

@jkotas it seems that we're losing the exact sig due to this line of getCallInfo:

pTargetMD = pTargetMD->GetWrappedMethodDesc();

this wrapped pMD is then used for getMethodSigInternal does it look correct to you?

@EgorBoEgorBoMay 9, 2023

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.

Myabe it should be here if (pTargetMD->IsWrapperStub()) ?

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.

Does it work with the last update, or do you still need help with this?

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.

Does it work with the last update, or do you still need help with this?

Still need help, the current impl doesn't work since we always have System._Canon as methodInst[0], I just prepared the code to pick up a fix in the getCallInfo

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.

getCallInfo implementation is correct. getCallInfo returns information about how the method should be called. Unsafe.As<object> should be called as Unsafe.As<Canon> with hidden argument, so it is that's what getCallInfo returns, including signature for Unsafe.As<Canon>. "Fixing" getCallInfo to return some kind of different signature would require reviewing all places that use the signature returned by getCallInfo and making sure that they behave correctly.

I think you want to take the method handle from CORINFO_RESOLVED_TOKEN and call getMethodSig on that. It should return what you are looking for.

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

Yes - to fix the issues that you have linked.

A similar approach can be probably used to improve the type precision in other places, but that can be left for future.

@EgorBo
EgorBoforce-pushed the unsafe-update-type branch from 7b941e4 to 8baf567CompareMay 9, 2023 00:37
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
const CORINFO_CLASS_HANDLE inst = sig->sigInst.methInst[0];
assert(inst != nullptr);

if ((info.compCompHnd->getClassAttribs(inst) & CORINFO_FLG_SHAREDINST) == 0)

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.

This is going to make us skip e.g. Unsafe.As<List<Canon>>. We do not want that.

Delete this early out and just depend on isMoreSpecificType to see whether the type is more exact.

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.

Thanks, addressed

@EgorBo
EgorBo marked this pull request as ready for review May 9, 2023 14:48
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
@EgorBo

Copy link
Copy Markdown
MemberAuthor

Failure is #35066

@EgorBo
EgorBo merged commit 7f35658 into dotnet:mainMay 9, 2023
@EgorBo
EgorBo deleted the unsafe-update-type branch May 9, 2023 21:42
@ghostghost locked as resolved and limited conversation to collaborators Jun 9, 2023
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.

[NativeAOT] Missed devirtualization opportunities due to Unsafe.As Unsafe.As doesn't update type information in JIT

3 participants

@EgorBo@jkotas@SingleAccretion
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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: Update class for Unsafe.As<>() - #85954

Merged
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type
May 9, 2023
Merged

JIT: Update class for Unsafe.As<>()#85954
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type

Conversation

@EgorBo

@EgorBoEgorBo commented May 8, 2023

Copy link
Copy Markdown
Member

We used to import T Unsafe.As<T>(object o) where T : class as a no-op and didn't benefit from a more exact T hint.

Closes#84377 (cc @stephentoub)
Closes#85906 (cc @MichalStrehovsky) - checked that it also devirtualizes the interface call

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3

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

ghost commented May 8, 2023

Copy link
Copy Markdown

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

Issue Details

We used to import T Unsafe.As<T>(object o) where T : class as no-op basically and ignored T.

Closes #84377 (cc @stephentoub)
Closes #85906 (cc @MichalStrehovsky)

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3
Author:EgorBo
Assignees:-
Labels:

area-CodeGen-coreclr

Milestone:-

Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think you want to check for CORINFO_FLG_SHAREDINST flag here.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared 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.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared case.

Thanks, I was wondering about that too. I though that since I only need it here I can request that on demand, will change the original sig.

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.

@jkotas it seems that we're losing the exact sig due to this line of getCallInfo:

pTargetMD = pTargetMD->GetWrappedMethodDesc();

this wrapped pMD is then used for getMethodSigInternal does it look correct to you?

@EgorBoEgorBoMay 9, 2023

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.

Myabe it should be here if (pTargetMD->IsWrapperStub()) ?

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.

Does it work with the last update, or do you still need help with this?

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.

Does it work with the last update, or do you still need help with this?

Still need help, the current impl doesn't work since we always have System._Canon as methodInst[0], I just prepared the code to pick up a fix in the getCallInfo

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.

getCallInfo implementation is correct. getCallInfo returns information about how the method should be called. Unsafe.As<object> should be called as Unsafe.As<Canon> with hidden argument, so it is that's what getCallInfo returns, including signature for Unsafe.As<Canon>. "Fixing" getCallInfo to return some kind of different signature would require reviewing all places that use the signature returned by getCallInfo and making sure that they behave correctly.

I think you want to take the method handle from CORINFO_RESOLVED_TOKEN and call getMethodSig on that. It should return what you are looking for.

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

Yes - to fix the issues that you have linked.

A similar approach can be probably used to improve the type precision in other places, but that can be left for future.

@EgorBo
EgorBoforce-pushed the unsafe-update-type branch from 7b941e4 to 8baf567CompareMay 9, 2023 00:37
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
const CORINFO_CLASS_HANDLE inst = sig->sigInst.methInst[0];
assert(inst != nullptr);

if ((info.compCompHnd->getClassAttribs(inst) & CORINFO_FLG_SHAREDINST) == 0)

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.

This is going to make us skip e.g. Unsafe.As<List<Canon>>. We do not want that.

Delete this early out and just depend on isMoreSpecificType to see whether the type is more exact.

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.

Thanks, addressed

@EgorBo
EgorBo marked this pull request as ready for review May 9, 2023 14:48
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
@EgorBo

Copy link
Copy Markdown
MemberAuthor

Failure is #35066

@EgorBo
EgorBo merged commit 7f35658 into dotnet:mainMay 9, 2023
@EgorBo
EgorBo deleted the unsafe-update-type branch May 9, 2023 21:42
@ghostghost locked as resolved and limited conversation to collaborators Jun 9, 2023
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.

[NativeAOT] Missed devirtualization opportunities due to Unsafe.As Unsafe.As doesn't update type information in JIT

3 participants

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

JIT: Update class for Unsafe.As<>() - #85954

Merged
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type
May 9, 2023
Merged

JIT: Update class for Unsafe.As<>()#85954
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type

Conversation

@EgorBo

@EgorBoEgorBo commented May 8, 2023

Copy link
Copy Markdown
Member

We used to import T Unsafe.As<T>(object o) where T : class as a no-op and didn't benefit from a more exact T hint.

Closes#84377 (cc @stephentoub)
Closes#85906 (cc @MichalStrehovsky) - checked that it also devirtualizes the interface call

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3

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

ghost commented May 8, 2023

Copy link
Copy Markdown

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

Issue Details

We used to import T Unsafe.As<T>(object o) where T : class as no-op basically and ignored T.

Closes #84377 (cc @stephentoub)
Closes #85906 (cc @MichalStrehovsky)

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3
Author:EgorBo
Assignees:-
Labels:

area-CodeGen-coreclr

Milestone:-

Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think you want to check for CORINFO_FLG_SHAREDINST flag here.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared 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.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared case.

Thanks, I was wondering about that too. I though that since I only need it here I can request that on demand, will change the original sig.

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.

@jkotas it seems that we're losing the exact sig due to this line of getCallInfo:

pTargetMD = pTargetMD->GetWrappedMethodDesc();

this wrapped pMD is then used for getMethodSigInternal does it look correct to you?

@EgorBoEgorBoMay 9, 2023

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.

Myabe it should be here if (pTargetMD->IsWrapperStub()) ?

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.

Does it work with the last update, or do you still need help with this?

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.

Does it work with the last update, or do you still need help with this?

Still need help, the current impl doesn't work since we always have System._Canon as methodInst[0], I just prepared the code to pick up a fix in the getCallInfo

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.

getCallInfo implementation is correct. getCallInfo returns information about how the method should be called. Unsafe.As<object> should be called as Unsafe.As<Canon> with hidden argument, so it is that's what getCallInfo returns, including signature for Unsafe.As<Canon>. "Fixing" getCallInfo to return some kind of different signature would require reviewing all places that use the signature returned by getCallInfo and making sure that they behave correctly.

I think you want to take the method handle from CORINFO_RESOLVED_TOKEN and call getMethodSig on that. It should return what you are looking for.

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

Yes - to fix the issues that you have linked.

A similar approach can be probably used to improve the type precision in other places, but that can be left for future.

@EgorBo
EgorBoforce-pushed the unsafe-update-type branch from 7b941e4 to 8baf567CompareMay 9, 2023 00:37
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
const CORINFO_CLASS_HANDLE inst = sig->sigInst.methInst[0];
assert(inst != nullptr);

if ((info.compCompHnd->getClassAttribs(inst) & CORINFO_FLG_SHAREDINST) == 0)

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.

This is going to make us skip e.g. Unsafe.As<List<Canon>>. We do not want that.

Delete this early out and just depend on isMoreSpecificType to see whether the type is more exact.

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.

Thanks, addressed

@EgorBo
EgorBo marked this pull request as ready for review May 9, 2023 14:48
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
@EgorBo

Copy link
Copy Markdown
MemberAuthor

Failure is #35066

@EgorBo
EgorBo merged commit 7f35658 into dotnet:mainMay 9, 2023
@EgorBo
EgorBo deleted the unsafe-update-type branch May 9, 2023 21:42
@ghostghost locked as resolved and limited conversation to collaborators Jun 9, 2023
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.

[NativeAOT] Missed devirtualization opportunities due to Unsafe.As Unsafe.As doesn't update type information in JIT

3 participants

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

JIT: Update class for Unsafe.As<>() - #85954

Merged
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type
May 9, 2023
Merged

JIT: Update class for Unsafe.As<>()#85954
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type

Conversation

@EgorBo

@EgorBoEgorBo commented May 8, 2023

Copy link
Copy Markdown
Member

We used to import T Unsafe.As<T>(object o) where T : class as a no-op and didn't benefit from a more exact T hint.

Closes#84377 (cc @stephentoub)
Closes#85906 (cc @MichalStrehovsky) - checked that it also devirtualizes the interface call

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3

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

ghost commented May 8, 2023

Copy link
Copy Markdown

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

Issue Details

We used to import T Unsafe.As<T>(object o) where T : class as no-op basically and ignored T.

Closes #84377 (cc @stephentoub)
Closes #85906 (cc @MichalStrehovsky)

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3
Author:EgorBo
Assignees:-
Labels:

area-CodeGen-coreclr

Milestone:-

Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think you want to check for CORINFO_FLG_SHAREDINST flag here.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared 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.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared case.

Thanks, I was wondering about that too. I though that since I only need it here I can request that on demand, will change the original sig.

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.

@jkotas it seems that we're losing the exact sig due to this line of getCallInfo:

pTargetMD = pTargetMD->GetWrappedMethodDesc();

this wrapped pMD is then used for getMethodSigInternal does it look correct to you?

@EgorBoEgorBoMay 9, 2023

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.

Myabe it should be here if (pTargetMD->IsWrapperStub()) ?

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.

Does it work with the last update, or do you still need help with this?

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.

Does it work with the last update, or do you still need help with this?

Still need help, the current impl doesn't work since we always have System._Canon as methodInst[0], I just prepared the code to pick up a fix in the getCallInfo

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.

getCallInfo implementation is correct. getCallInfo returns information about how the method should be called. Unsafe.As<object> should be called as Unsafe.As<Canon> with hidden argument, so it is that's what getCallInfo returns, including signature for Unsafe.As<Canon>. "Fixing" getCallInfo to return some kind of different signature would require reviewing all places that use the signature returned by getCallInfo and making sure that they behave correctly.

I think you want to take the method handle from CORINFO_RESOLVED_TOKEN and call getMethodSig on that. It should return what you are looking for.

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

Yes - to fix the issues that you have linked.

A similar approach can be probably used to improve the type precision in other places, but that can be left for future.

@EgorBo
EgorBoforce-pushed the unsafe-update-type branch from 7b941e4 to 8baf567CompareMay 9, 2023 00:37
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
const CORINFO_CLASS_HANDLE inst = sig->sigInst.methInst[0];
assert(inst != nullptr);

if ((info.compCompHnd->getClassAttribs(inst) & CORINFO_FLG_SHAREDINST) == 0)

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.

This is going to make us skip e.g. Unsafe.As<List<Canon>>. We do not want that.

Delete this early out and just depend on isMoreSpecificType to see whether the type is more exact.

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.

Thanks, addressed

@EgorBo
EgorBo marked this pull request as ready for review May 9, 2023 14:48
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
@EgorBo

Copy link
Copy Markdown
MemberAuthor

Failure is #35066

@EgorBo
EgorBo merged commit 7f35658 into dotnet:mainMay 9, 2023
@EgorBo
EgorBo deleted the unsafe-update-type branch May 9, 2023 21:42
@ghostghost locked as resolved and limited conversation to collaborators Jun 9, 2023
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.

[NativeAOT] Missed devirtualization opportunities due to Unsafe.As Unsafe.As doesn't update type information in JIT

3 participants

@EgorBo@jkotas@SingleAccretion
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } 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: Update class for Unsafe.As<>() - #85954

Merged
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type
May 9, 2023
Merged

JIT: Update class for Unsafe.As<>()#85954
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type

Conversation

@EgorBo

@EgorBoEgorBo commented May 8, 2023

Copy link
Copy Markdown
Member

We used to import T Unsafe.As<T>(object o) where T : class as a no-op and didn't benefit from a more exact T hint.

Closes#84377 (cc @stephentoub)
Closes#85906 (cc @MichalStrehovsky) - checked that it also devirtualizes the interface call

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3

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

ghost commented May 8, 2023

Copy link
Copy Markdown

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

Issue Details

We used to import T Unsafe.As<T>(object o) where T : class as no-op basically and ignored T.

Closes #84377 (cc @stephentoub)
Closes #85906 (cc @MichalStrehovsky)

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3
Author:EgorBo
Assignees:-
Labels:

area-CodeGen-coreclr

Milestone:-

Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think you want to check for CORINFO_FLG_SHAREDINST flag here.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared 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.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared case.

Thanks, I was wondering about that too. I though that since I only need it here I can request that on demand, will change the original sig.

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.

@jkotas it seems that we're losing the exact sig due to this line of getCallInfo:

pTargetMD = pTargetMD->GetWrappedMethodDesc();

this wrapped pMD is then used for getMethodSigInternal does it look correct to you?

@EgorBoEgorBoMay 9, 2023

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.

Myabe it should be here if (pTargetMD->IsWrapperStub()) ?

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.

Does it work with the last update, or do you still need help with this?

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.

Does it work with the last update, or do you still need help with this?

Still need help, the current impl doesn't work since we always have System._Canon as methodInst[0], I just prepared the code to pick up a fix in the getCallInfo

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.

getCallInfo implementation is correct. getCallInfo returns information about how the method should be called. Unsafe.As<object> should be called as Unsafe.As<Canon> with hidden argument, so it is that's what getCallInfo returns, including signature for Unsafe.As<Canon>. "Fixing" getCallInfo to return some kind of different signature would require reviewing all places that use the signature returned by getCallInfo and making sure that they behave correctly.

I think you want to take the method handle from CORINFO_RESOLVED_TOKEN and call getMethodSig on that. It should return what you are looking for.

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

Yes - to fix the issues that you have linked.

A similar approach can be probably used to improve the type precision in other places, but that can be left for future.

@EgorBo
EgorBoforce-pushed the unsafe-update-type branch from 7b941e4 to 8baf567CompareMay 9, 2023 00:37
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
const CORINFO_CLASS_HANDLE inst = sig->sigInst.methInst[0];
assert(inst != nullptr);

if ((info.compCompHnd->getClassAttribs(inst) & CORINFO_FLG_SHAREDINST) == 0)

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.

This is going to make us skip e.g. Unsafe.As<List<Canon>>. We do not want that.

Delete this early out and just depend on isMoreSpecificType to see whether the type is more exact.

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.

Thanks, addressed

@EgorBo
EgorBo marked this pull request as ready for review May 9, 2023 14:48
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
@EgorBo

Copy link
Copy Markdown
MemberAuthor

Failure is #35066

@EgorBo
EgorBo merged commit 7f35658 into dotnet:mainMay 9, 2023
@EgorBo
EgorBo deleted the unsafe-update-type branch May 9, 2023 21:42
@ghostghost locked as resolved and limited conversation to collaborators Jun 9, 2023
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.

[NativeAOT] Missed devirtualization opportunities due to Unsafe.As Unsafe.As doesn't update type information in JIT

3 participants

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

JIT: Update class for Unsafe.As<>() - #85954

Merged
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type
May 9, 2023
Merged

JIT: Update class for Unsafe.As<>()#85954
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type

Conversation

@EgorBo

@EgorBoEgorBo commented May 8, 2023

Copy link
Copy Markdown
Member

We used to import T Unsafe.As<T>(object o) where T : class as a no-op and didn't benefit from a more exact T hint.

Closes#84377 (cc @stephentoub)
Closes#85906 (cc @MichalStrehovsky) - checked that it also devirtualizes the interface call

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3

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

ghost commented May 8, 2023

Copy link
Copy Markdown

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

Issue Details

We used to import T Unsafe.As<T>(object o) where T : class as no-op basically and ignored T.

Closes #84377 (cc @stephentoub)
Closes #85906 (cc @MichalStrehovsky)

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3
Author:EgorBo
Assignees:-
Labels:

area-CodeGen-coreclr

Milestone:-

Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think you want to check for CORINFO_FLG_SHAREDINST flag here.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared 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.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared case.

Thanks, I was wondering about that too. I though that since I only need it here I can request that on demand, will change the original sig.

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.

@jkotas it seems that we're losing the exact sig due to this line of getCallInfo:

pTargetMD = pTargetMD->GetWrappedMethodDesc();

this wrapped pMD is then used for getMethodSigInternal does it look correct to you?

@EgorBoEgorBoMay 9, 2023

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.

Myabe it should be here if (pTargetMD->IsWrapperStub()) ?

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.

Does it work with the last update, or do you still need help with this?

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.

Does it work with the last update, or do you still need help with this?

Still need help, the current impl doesn't work since we always have System._Canon as methodInst[0], I just prepared the code to pick up a fix in the getCallInfo

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.

getCallInfo implementation is correct. getCallInfo returns information about how the method should be called. Unsafe.As<object> should be called as Unsafe.As<Canon> with hidden argument, so it is that's what getCallInfo returns, including signature for Unsafe.As<Canon>. "Fixing" getCallInfo to return some kind of different signature would require reviewing all places that use the signature returned by getCallInfo and making sure that they behave correctly.

I think you want to take the method handle from CORINFO_RESOLVED_TOKEN and call getMethodSig on that. It should return what you are looking for.

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

Yes - to fix the issues that you have linked.

A similar approach can be probably used to improve the type precision in other places, but that can be left for future.

@EgorBo
EgorBoforce-pushed the unsafe-update-type branch from 7b941e4 to 8baf567CompareMay 9, 2023 00:37
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
const CORINFO_CLASS_HANDLE inst = sig->sigInst.methInst[0];
assert(inst != nullptr);

if ((info.compCompHnd->getClassAttribs(inst) & CORINFO_FLG_SHAREDINST) == 0)

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.

This is going to make us skip e.g. Unsafe.As<List<Canon>>. We do not want that.

Delete this early out and just depend on isMoreSpecificType to see whether the type is more exact.

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.

Thanks, addressed

@EgorBo
EgorBo marked this pull request as ready for review May 9, 2023 14:48
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
@EgorBo

Copy link
Copy Markdown
MemberAuthor

Failure is #35066

@EgorBo
EgorBo merged commit 7f35658 into dotnet:mainMay 9, 2023
@EgorBo
EgorBo deleted the unsafe-update-type branch May 9, 2023 21:42
@ghostghost locked as resolved and limited conversation to collaborators Jun 9, 2023
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.

[NativeAOT] Missed devirtualization opportunities due to Unsafe.As Unsafe.As doesn't update type information in JIT

3 participants

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

JIT: Update class for Unsafe.As<>() - #85954

Merged
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type
May 9, 2023
Merged

JIT: Update class for Unsafe.As<>()#85954
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type

Conversation

@EgorBo

@EgorBoEgorBo commented May 8, 2023

Copy link
Copy Markdown
Member

We used to import T Unsafe.As<T>(object o) where T : class as a no-op and didn't benefit from a more exact T hint.

Closes#84377 (cc @stephentoub)
Closes#85906 (cc @MichalStrehovsky) - checked that it also devirtualizes the interface call

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3

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

ghost commented May 8, 2023

Copy link
Copy Markdown

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

Issue Details

We used to import T Unsafe.As<T>(object o) where T : class as no-op basically and ignored T.

Closes #84377 (cc @stephentoub)
Closes #85906 (cc @MichalStrehovsky)

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3
Author:EgorBo
Assignees:-
Labels:

area-CodeGen-coreclr

Milestone:-

Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think you want to check for CORINFO_FLG_SHAREDINST flag here.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared 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.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared case.

Thanks, I was wondering about that too. I though that since I only need it here I can request that on demand, will change the original sig.

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.

@jkotas it seems that we're losing the exact sig due to this line of getCallInfo:

pTargetMD = pTargetMD->GetWrappedMethodDesc();

this wrapped pMD is then used for getMethodSigInternal does it look correct to you?

@EgorBoEgorBoMay 9, 2023

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.

Myabe it should be here if (pTargetMD->IsWrapperStub()) ?

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.

Does it work with the last update, or do you still need help with this?

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.

Does it work with the last update, or do you still need help with this?

Still need help, the current impl doesn't work since we always have System._Canon as methodInst[0], I just prepared the code to pick up a fix in the getCallInfo

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.

getCallInfo implementation is correct. getCallInfo returns information about how the method should be called. Unsafe.As<object> should be called as Unsafe.As<Canon> with hidden argument, so it is that's what getCallInfo returns, including signature for Unsafe.As<Canon>. "Fixing" getCallInfo to return some kind of different signature would require reviewing all places that use the signature returned by getCallInfo and making sure that they behave correctly.

I think you want to take the method handle from CORINFO_RESOLVED_TOKEN and call getMethodSig on that. It should return what you are looking for.

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

Yes - to fix the issues that you have linked.

A similar approach can be probably used to improve the type precision in other places, but that can be left for future.

@EgorBo
EgorBoforce-pushed the unsafe-update-type branch from 7b941e4 to 8baf567CompareMay 9, 2023 00:37
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
const CORINFO_CLASS_HANDLE inst = sig->sigInst.methInst[0];
assert(inst != nullptr);

if ((info.compCompHnd->getClassAttribs(inst) & CORINFO_FLG_SHAREDINST) == 0)

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.

This is going to make us skip e.g. Unsafe.As<List<Canon>>. We do not want that.

Delete this early out and just depend on isMoreSpecificType to see whether the type is more exact.

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.

Thanks, addressed

@EgorBo
EgorBo marked this pull request as ready for review May 9, 2023 14:48
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
@EgorBo

Copy link
Copy Markdown
MemberAuthor

Failure is #35066

@EgorBo
EgorBo merged commit 7f35658 into dotnet:mainMay 9, 2023
@EgorBo
EgorBo deleted the unsafe-update-type branch May 9, 2023 21:42
@ghostghost locked as resolved and limited conversation to collaborators Jun 9, 2023
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.

[NativeAOT] Missed devirtualization opportunities due to Unsafe.As Unsafe.As doesn't update type information in JIT

3 participants

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

JIT: Update class for Unsafe.As<>() - #85954

Merged
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type
May 9, 2023
Merged

JIT: Update class for Unsafe.As<>()#85954
EgorBo merged 12 commits into
dotnet:mainfrom
EgorBo:unsafe-update-type

Conversation

@EgorBo

@EgorBoEgorBo commented May 8, 2023

Copy link
Copy Markdown
Member

We used to import T Unsafe.As<T>(object o) where T : class as a no-op and didn't benefit from a more exact T hint.

Closes#84377 (cc @stephentoub)
Closes#85906 (cc @MichalStrehovsky) - checked that it also devirtualizes the interface call

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3

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

ghost commented May 8, 2023

Copy link
Copy Markdown

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

Issue Details

We used to import T Unsafe.As<T>(object o) where T : class as no-op basically and ignored T.

Closes #84377 (cc @stephentoub)
Closes #85906 (cc @MichalStrehovsky)

publicclassClassA{publicvirtualintGetVal()=>1;}publicsealedclassClassB:ClassA{publicoverrideintGetVal()=>42;}voidGetValUnsafe(ClassAtc)=>Unsafe.As<ClassB>(tc).GetVal();

Old codegen:

; Method GetValUnsafe(ClassA):thissubrsp,40movrcx,rdxmovrax, qword ptr [rdx]movrax, qword ptr [rax+48H]call[rax+20H]ClassA:GetVal():int:thisnopaddrsp,40ret; Total bytes of code: 23

New codegen:

; Method GetValUnsafe(ClassB):thiscmp byte ptr [rdx],dlret; Total bytes of code: 3
Author:EgorBo
Assignees:-
Labels:

area-CodeGen-coreclr

Milestone:-

Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think you want to check for CORINFO_FLG_SHAREDINST flag here.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared 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.

I do not think you need to re-resolve the signature when it is not shared. sig->sigInst.methInst[0] should have the exact type for the non-shared case.

Thanks, I was wondering about that too. I though that since I only need it here I can request that on demand, will change the original sig.

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.

@jkotas it seems that we're losing the exact sig due to this line of getCallInfo:

pTargetMD = pTargetMD->GetWrappedMethodDesc();

this wrapped pMD is then used for getMethodSigInternal does it look correct to you?

@EgorBoEgorBoMay 9, 2023

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.

Myabe it should be here if (pTargetMD->IsWrapperStub()) ?

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.

Does it work with the last update, or do you still need help with this?

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.

Does it work with the last update, or do you still need help with this?

Still need help, the current impl doesn't work since we always have System._Canon as methodInst[0], I just prepared the code to pick up a fix in the getCallInfo

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.

getCallInfo implementation is correct. getCallInfo returns information about how the method should be called. Unsafe.As<object> should be called as Unsafe.As<Canon> with hidden argument, so it is that's what getCallInfo returns, including signature for Unsafe.As<Canon>. "Fixing" getCallInfo to return some kind of different signature would require reviewing all places that use the signature returned by getCallInfo and making sure that they behave correctly.

I think you want to take the method handle from CORINFO_RESOLVED_TOKEN and call getMethodSig on that. It should return what you are looking for.

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

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.

Ah I see, thanks! I assume we only need to do that for Unsafe.As?

Yes - to fix the issues that you have linked.

A similar approach can be probably used to improve the type precision in other places, but that can be left for future.

@EgorBo
EgorBoforce-pushed the unsafe-update-type branch from 7b941e4 to 8baf567CompareMay 9, 2023 00:37
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
const CORINFO_CLASS_HANDLE inst = sig->sigInst.methInst[0];
assert(inst != nullptr);

if ((info.compCompHnd->getClassAttribs(inst) & CORINFO_FLG_SHAREDINST) == 0)

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.

This is going to make us skip e.g. Unsafe.As<List<Canon>>. We do not want that.

Delete this early out and just depend on isMoreSpecificType to see whether the type is more exact.

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.

Thanks, addressed

@EgorBo
EgorBo marked this pull request as ready for review May 9, 2023 14:48
Comment threadsrc/coreclr/jit/importercalls.cpp Outdated
@EgorBo

Copy link
Copy Markdown
MemberAuthor

Failure is #35066

@EgorBo
EgorBo merged commit 7f35658 into dotnet:mainMay 9, 2023
@EgorBo
EgorBo deleted the unsafe-update-type branch May 9, 2023 21:42
@ghostghost locked as resolved and limited conversation to collaborators Jun 9, 2023
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.

[NativeAOT] Missed devirtualization opportunities due to Unsafe.As Unsafe.As doesn't update type information in JIT

3 participants

@EgorBo@jkotas@SingleAccretion