JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64 - #106314

Merged
jakobbotsch merged 11 commits into
dotnet:mainfrom
jakobbotsch:fix-101046-2
Aug 14, 2024
Merged

JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64#106314
jakobbotsch merged 11 commits into
dotnet:mainfrom
jakobbotsch:fix-101046-2

Conversation

@jakobbotsch

@jakobbotschjakobbotsch commented Aug 13, 2024•
edited
Loading

Copy link
Copy Markdown
Member

Fix#101046

Alternative to #106312 that keeps the behavior as is for the managed calling convention and only changes it for pinvokes. This requires changing fcalls in the VM to access small primitive typed arguments without assumptions about normalization.

@ghostghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Aug 13, 2024
@build-analysisbuild-analysisBot mentioned this pull request Aug 13, 2024
Closed
This was referenced Aug 13, 2024
Closed
Closed
@jakobbotschjakobbotsch mentioned this pull request Aug 13, 2024
Closed
jkotas
jkotas reviewed Aug 13, 2024
View reviewed changes
Comment threadsrc/coreclr/nativeaot/Runtime/CommonMacros.h
@@ -293,14 +293,11 @@ typedef uint8_t CODE_LOCATION;

typedef bool CLR_BOOL;

@jkotasjkotasAug 13, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Delete?

@jakobbotschjakobbotschAug 14, 2024

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.

Looks like it's still used as the return value for HandleTableRestrictedCallbackFunction.

@jkotasjkotasAug 14, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

And TryGetTaggedMemoryCallback.

These correspond to the following managed methods:

CLR_BOOL is not quite right for neither of these, but I do not think that this mismatch is going to cause any real problem. It would be nice to clean this up in a follow up.

@build-analysisbuild-analysisBot mentioned this pull request Aug 14, 2024
Closed
@jakobbotschjakobbotsch mentioned this pull request Aug 14, 2024
Open
jakobbotsch
jakobbotsch commented Aug 14, 2024
View reviewed changes
Comment threadsrc/tests/issues.targets Outdated
@jakobbotschjakobbotsch added this to the 9.0.0 milestone Aug 14, 2024
@JulieLeeMSFT

JulieLeeMSFT commented Aug 14, 2024

Copy link
Copy Markdown
Member

@AndyAyersMS, PTAL. This is for RC1 snap.

@jakobbotsch
jakobbotsch marked this pull request as ready for review August 14, 2024 18:17
@jakobbotsch

jakobbotsch commented Aug 14, 2024

Copy link
Copy Markdown
MemberAuthor

cc @dotnet/jit-contrib PTAL @AndyAyersMS@jkotas

Minor diffs

AndyAyersMS
AndyAyersMS approved these changes Aug 14, 2024
View reviewed changes

@AndyAyersMSAndyAyersMS left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Jit changes LGTM.

jkotas
jkotas reviewed Aug 14, 2024
View reviewed changes
Comment threadsrc/coreclr/vm/fcall.h
typedef INT32 FC_INT16_RET;
typedef UINT32 FC_UINT16_RET;

// Small primitive args are not widened.

@jkotasjkotasAug 14, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The comment around line 150 in this file still mentions CLR_BOOL.

@jakobbotschjakobbotschAug 14, 2024

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.

Mind if I update that in a separate change tomorrow?

@jkotasjkotasAug 14, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Fine with me

@jakobbotschjakobbotschAug 14, 2024

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.

Nevermind, updated it as well now due to those other places I missed the conversion.

@jkotas

jkotas commented Aug 14, 2024

Copy link
Copy Markdown
Member

These places are missing the CLR_BOOL -> FC_BOOL_ARG conversion:

\runtime\src\coreclr\vm\comutilnative.h(43):static FCDECL3(StringObject *, StripFileInfo, Object *orefExcepUNSAFE, StringObject *orefStrUNSAFE, CLR_BOOL isRemoteStackTrace); - dead code, shoul be deleted
\runtime\src\coreclr\vm\debugdebugger.cpp(236):CLR_BOOL fNeedFileInfo,
\runtime\src\coreclr\vm\debugdebugger.h(155):CLR_BOOL fNeedFileInfo,

jkotas
jkotas approved these changes Aug 14, 2024
View reviewed changes

@jkotasjkotas left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM otherwise. Thanks!

@JulieLeeMSFT

JulieLeeMSFT commented Aug 14, 2024•
edited
Loading

Copy link
Copy Markdown
Member

cc @carlossanlop to include this in RC1 snap if CI tests pass.

@carlossanlop

carlossanlop commented Aug 14, 2024

Copy link
Copy Markdown
Contributor

Thanks. I'm aware, it's in my list of PRs to wait. @jakobbotsch reached out earlier.

@jakobbotsch

jakobbotsch commented Aug 14, 2024

Copy link
Copy Markdown
MemberAuthor

The runtime pipeline is done (some of the jobs didn't have their status updates, presumably because of the outage). Build analysis is happy. We can skip waiting for the superpmi jobs – they were green in the previous run and there hasn't been any JIT changes since then.

@jakobbotsch
jakobbotsch merged commit 0c67acb into dotnet:mainAug 14, 2024
@jakobbotsch
jakobbotsch deleted the fix-101046-2 branch August 14, 2024 23:55
This was referenced Aug 15, 2024
Closed
Closed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Sep 14, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jkotasjkotasjkotas approved these changes
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky is a code owner

Assignees

@jakobbotschjakobbotsch

Labels

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

Projects

None yet

Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

JIT: Small primitives on arm32/apple arm64 ABI need explicit normalization to 32 bits

5 participants

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

Skip to content
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64 - #106314
Merged
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Aug 14, 2024
Merged
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64#106314
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Fix#101046
Alternative to #106312 that keeps the behavior as is for the managed calling convention and only changes it for pinvokes. This requires changing fcalls in the VM to access small primitive typed arguments without assumptions about normalization.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Aug 13, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 13, 2024

Closed


This was referenced Aug 13, 2024

Closed


Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 13, 2024
 Closed

jkotas
jkotas
reviewed
Aug 13, 2024
View reviewed changes
Comment threadsrc/coreclr/nativeaot/Runtime/CommonMacros.h
@@ -293,14 +293,11 @@ typedef uint8_t CODE_LOCATION;

typedef bool CLR_BOOL;
@jkotasjkotasAug 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Delete?
@jakobbotschjakobbotschAug 14, 2024

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.

Looks like it's still used as the return value for HandleTableRestrictedCallbackFunction.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

And TryGetTaggedMemoryCallback.
These correspond to the following managed methods:
CLR_BOOL is not quite right for neither of these, but I do not think that this mismatch is going to cause any real problem. It would be nice to clean this up in a follow up.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 14, 2024

Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 14, 2024

Open

jakobbotsch
jakobbotsch
commented
Aug 14, 2024
View reviewed changes
Comment threadsrc/tests/issues.targets
Outdated

@jakobbotschjakobbotsch
added this to the 9.0.0 milestone
Aug 14, 2024
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
@AndyAyersMS, PTAL. This is for RC1 snap.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
August 14, 2024 18:17
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS@jkotas
Minor diffs
AndyAyersMS
AndyAyersMS
approved these changes
Aug 14, 2024
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Jit changes LGTM.
jkotas
jkotas
reviewed
Aug 14, 2024
View reviewed changes
Comment threadsrc/coreclr/vm/fcall.h
typedef INT32 FC_INT16_RET;
typedef UINT32 FC_UINT16_RET;

// Small primitive args are not widened.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The comment around line 150 in this file still mentions CLR_BOOL.
@jakobbotschjakobbotschAug 14, 2024

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.

Mind if I update that in a separate change tomorrow?
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Fine with me
@jakobbotschjakobbotschAug 14, 2024

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.

Nevermind, updated it as well now due to those other places I missed the conversion.
@jkotas
jkotas
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
These places are missing the CLR_BOOL -> FC_BOOL_ARG conversion:
\runtime\src\coreclr\vm\comutilnative.h(43):static FCDECL3(StringObject *, StripFileInfo, Object *orefExcepUNSAFE, StringObject *orefStrUNSAFE, CLR_BOOL isRemoteStackTrace); - dead code, shoul be deleted
\runtime\src\coreclr\vm\debugdebugger.cpp(236):CLR_BOOL fNeedFileInfo,
\runtime\src\coreclr\vm\debugdebugger.h(155):CLR_BOOL fNeedFileInfo,

jkotas
jkotas
approved these changes
Aug 14, 2024
View reviewed changes
@jkotasjkotas
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM otherwise. Thanks!
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024•

edited

Loading

Copy link


Copy Markdown

Member
cc @carlossanlop to include this in RC1 snap if CI tests pass.
@carlossanlop
carlossanlop
commented
Aug 14, 2024

Copy link


Copy Markdown

Contributor
Thanks. I'm aware, it's in my list of PRs to wait. @jakobbotsch reached out earlier.
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
The runtime pipeline is done (some of the jobs didn't have their status updates, presumably because of the outage). Build analysis is happy. We can skip waiting for the superpmi jobs – they were green in the previous run and there hasn't been any JIT changes since then.
@jakobbotsch
jakobbotsch
merged commit 0c67acb
into
dotnet:mainAug 14, 2024
@jakobbotsch
jakobbotsch
deleted the

fix-101046-2

branch
August 14, 2024 23:55

This was referenced Aug 15, 2024

Closed


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Sep 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jkotasjkotasjkotas approved these changes
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky is a code owner

Assignees

@jakobbotschjakobbotsch

Labels

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

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

JIT: Small primitives on arm32/apple arm64 ABI need explicit normalization to 32 bits


5 participants

@jakobbotsch@JulieLeeMSFT@jkotas@carlossanlop@AndyAyersMS

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

Skip to content
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64 - #106314
Merged
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Aug 14, 2024
Merged
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64#106314
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Fix#101046
Alternative to #106312 that keeps the behavior as is for the managed calling convention and only changes it for pinvokes. This requires changing fcalls in the VM to access small primitive typed arguments without assumptions about normalization.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Aug 13, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 13, 2024

Closed


This was referenced Aug 13, 2024

Closed


Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 13, 2024
 Closed

jkotas
jkotas
reviewed
Aug 13, 2024
View reviewed changes
Comment threadsrc/coreclr/nativeaot/Runtime/CommonMacros.h
@@ -293,14 +293,11 @@ typedef uint8_t CODE_LOCATION;

typedef bool CLR_BOOL;
@jkotasjkotasAug 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Delete?
@jakobbotschjakobbotschAug 14, 2024

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.

Looks like it's still used as the return value for HandleTableRestrictedCallbackFunction.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

And TryGetTaggedMemoryCallback.
These correspond to the following managed methods:
CLR_BOOL is not quite right for neither of these, but I do not think that this mismatch is going to cause any real problem. It would be nice to clean this up in a follow up.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 14, 2024

Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 14, 2024

Open

jakobbotsch
jakobbotsch
commented
Aug 14, 2024
View reviewed changes
Comment threadsrc/tests/issues.targets
Outdated

@jakobbotschjakobbotsch
added this to the 9.0.0 milestone
Aug 14, 2024
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
@AndyAyersMS, PTAL. This is for RC1 snap.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
August 14, 2024 18:17
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS@jkotas
Minor diffs
AndyAyersMS
AndyAyersMS
approved these changes
Aug 14, 2024
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Jit changes LGTM.
jkotas
jkotas
reviewed
Aug 14, 2024
View reviewed changes
Comment threadsrc/coreclr/vm/fcall.h
typedef INT32 FC_INT16_RET;
typedef UINT32 FC_UINT16_RET;

// Small primitive args are not widened.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The comment around line 150 in this file still mentions CLR_BOOL.
@jakobbotschjakobbotschAug 14, 2024

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.

Mind if I update that in a separate change tomorrow?
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Fine with me
@jakobbotschjakobbotschAug 14, 2024

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.

Nevermind, updated it as well now due to those other places I missed the conversion.
@jkotas
jkotas
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
These places are missing the CLR_BOOL -> FC_BOOL_ARG conversion:
\runtime\src\coreclr\vm\comutilnative.h(43):static FCDECL3(StringObject *, StripFileInfo, Object *orefExcepUNSAFE, StringObject *orefStrUNSAFE, CLR_BOOL isRemoteStackTrace); - dead code, shoul be deleted
\runtime\src\coreclr\vm\debugdebugger.cpp(236):CLR_BOOL fNeedFileInfo,
\runtime\src\coreclr\vm\debugdebugger.h(155):CLR_BOOL fNeedFileInfo,

jkotas
jkotas
approved these changes
Aug 14, 2024
View reviewed changes
@jkotasjkotas
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM otherwise. Thanks!
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024•

edited

Loading

Copy link


Copy Markdown

Member
cc @carlossanlop to include this in RC1 snap if CI tests pass.
@carlossanlop
carlossanlop
commented
Aug 14, 2024

Copy link


Copy Markdown

Contributor
Thanks. I'm aware, it's in my list of PRs to wait. @jakobbotsch reached out earlier.
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
The runtime pipeline is done (some of the jobs didn't have their status updates, presumably because of the outage). Build analysis is happy. We can skip waiting for the superpmi jobs – they were green in the previous run and there hasn't been any JIT changes since then.
@jakobbotsch
jakobbotsch
merged commit 0c67acb
into
dotnet:mainAug 14, 2024
@jakobbotsch
jakobbotsch
deleted the

fix-101046-2

branch
August 14, 2024 23:55

This was referenced Aug 15, 2024

Closed


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Sep 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jkotasjkotasjkotas approved these changes
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky is a code owner

Assignees

@jakobbotschjakobbotsch

Labels

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

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

JIT: Small primitives on arm32/apple arm64 ABI need explicit normalization to 32 bits


5 participants

@jakobbotsch@JulieLeeMSFT@jkotas@carlossanlop@AndyAyersMS

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

Skip to content
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64 - #106314
Merged
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Aug 14, 2024
Merged
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64#106314
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Fix#101046
Alternative to #106312 that keeps the behavior as is for the managed calling convention and only changes it for pinvokes. This requires changing fcalls in the VM to access small primitive typed arguments without assumptions about normalization.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Aug 13, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 13, 2024

Closed


This was referenced Aug 13, 2024

Closed


Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 13, 2024
 Closed

jkotas
jkotas
reviewed
Aug 13, 2024
View reviewed changes
Comment threadsrc/coreclr/nativeaot/Runtime/CommonMacros.h
@@ -293,14 +293,11 @@ typedef uint8_t CODE_LOCATION;

typedef bool CLR_BOOL;
@jkotasjkotasAug 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Delete?
@jakobbotschjakobbotschAug 14, 2024

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.

Looks like it's still used as the return value for HandleTableRestrictedCallbackFunction.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

And TryGetTaggedMemoryCallback.
These correspond to the following managed methods:
CLR_BOOL is not quite right for neither of these, but I do not think that this mismatch is going to cause any real problem. It would be nice to clean this up in a follow up.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 14, 2024

Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 14, 2024

Open

jakobbotsch
jakobbotsch
commented
Aug 14, 2024
View reviewed changes
Comment threadsrc/tests/issues.targets
Outdated

@jakobbotschjakobbotsch
added this to the 9.0.0 milestone
Aug 14, 2024
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
@AndyAyersMS, PTAL. This is for RC1 snap.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
August 14, 2024 18:17
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS@jkotas
Minor diffs
AndyAyersMS
AndyAyersMS
approved these changes
Aug 14, 2024
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Jit changes LGTM.
jkotas
jkotas
reviewed
Aug 14, 2024
View reviewed changes
Comment threadsrc/coreclr/vm/fcall.h
typedef INT32 FC_INT16_RET;
typedef UINT32 FC_UINT16_RET;

// Small primitive args are not widened.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The comment around line 150 in this file still mentions CLR_BOOL.
@jakobbotschjakobbotschAug 14, 2024

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.

Mind if I update that in a separate change tomorrow?
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Fine with me
@jakobbotschjakobbotschAug 14, 2024

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.

Nevermind, updated it as well now due to those other places I missed the conversion.
@jkotas
jkotas
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
These places are missing the CLR_BOOL -> FC_BOOL_ARG conversion:
\runtime\src\coreclr\vm\comutilnative.h(43):static FCDECL3(StringObject *, StripFileInfo, Object *orefExcepUNSAFE, StringObject *orefStrUNSAFE, CLR_BOOL isRemoteStackTrace); - dead code, shoul be deleted
\runtime\src\coreclr\vm\debugdebugger.cpp(236):CLR_BOOL fNeedFileInfo,
\runtime\src\coreclr\vm\debugdebugger.h(155):CLR_BOOL fNeedFileInfo,

jkotas
jkotas
approved these changes
Aug 14, 2024
View reviewed changes
@jkotasjkotas
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM otherwise. Thanks!
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024•

edited

Loading

Copy link


Copy Markdown

Member
cc @carlossanlop to include this in RC1 snap if CI tests pass.
@carlossanlop
carlossanlop
commented
Aug 14, 2024

Copy link


Copy Markdown

Contributor
Thanks. I'm aware, it's in my list of PRs to wait. @jakobbotsch reached out earlier.
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
The runtime pipeline is done (some of the jobs didn't have their status updates, presumably because of the outage). Build analysis is happy. We can skip waiting for the superpmi jobs – they were green in the previous run and there hasn't been any JIT changes since then.
@jakobbotsch
jakobbotsch
merged commit 0c67acb
into
dotnet:mainAug 14, 2024
@jakobbotsch
jakobbotsch
deleted the

fix-101046-2

branch
August 14, 2024 23:55

This was referenced Aug 15, 2024

Closed


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Sep 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jkotasjkotasjkotas approved these changes
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky is a code owner

Assignees

@jakobbotschjakobbotsch

Labels

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

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

JIT: Small primitives on arm32/apple arm64 ABI need explicit normalization to 32 bits


5 participants

@jakobbotsch@JulieLeeMSFT@jkotas@carlossanlop@AndyAyersMS

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

Skip to content
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64 - #106314
Merged
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Aug 14, 2024
Merged
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64#106314
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Fix#101046
Alternative to #106312 that keeps the behavior as is for the managed calling convention and only changes it for pinvokes. This requires changing fcalls in the VM to access small primitive typed arguments without assumptions about normalization.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Aug 13, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 13, 2024

Closed


This was referenced Aug 13, 2024

Closed


Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 13, 2024
 Closed

jkotas
jkotas
reviewed
Aug 13, 2024
View reviewed changes
Comment threadsrc/coreclr/nativeaot/Runtime/CommonMacros.h
@@ -293,14 +293,11 @@ typedef uint8_t CODE_LOCATION;

typedef bool CLR_BOOL;
@jkotasjkotasAug 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Delete?
@jakobbotschjakobbotschAug 14, 2024

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.

Looks like it's still used as the return value for HandleTableRestrictedCallbackFunction.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

And TryGetTaggedMemoryCallback.
These correspond to the following managed methods:
CLR_BOOL is not quite right for neither of these, but I do not think that this mismatch is going to cause any real problem. It would be nice to clean this up in a follow up.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 14, 2024

Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 14, 2024

Open

jakobbotsch
jakobbotsch
commented
Aug 14, 2024
View reviewed changes
Comment threadsrc/tests/issues.targets
Outdated

@jakobbotschjakobbotsch
added this to the 9.0.0 milestone
Aug 14, 2024
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
@AndyAyersMS, PTAL. This is for RC1 snap.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
August 14, 2024 18:17
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS@jkotas
Minor diffs
AndyAyersMS
AndyAyersMS
approved these changes
Aug 14, 2024
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Jit changes LGTM.
jkotas
jkotas
reviewed
Aug 14, 2024
View reviewed changes
Comment threadsrc/coreclr/vm/fcall.h
typedef INT32 FC_INT16_RET;
typedef UINT32 FC_UINT16_RET;

// Small primitive args are not widened.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The comment around line 150 in this file still mentions CLR_BOOL.
@jakobbotschjakobbotschAug 14, 2024

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.

Mind if I update that in a separate change tomorrow?
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Fine with me
@jakobbotschjakobbotschAug 14, 2024

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.

Nevermind, updated it as well now due to those other places I missed the conversion.
@jkotas
jkotas
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
These places are missing the CLR_BOOL -> FC_BOOL_ARG conversion:
\runtime\src\coreclr\vm\comutilnative.h(43):static FCDECL3(StringObject *, StripFileInfo, Object *orefExcepUNSAFE, StringObject *orefStrUNSAFE, CLR_BOOL isRemoteStackTrace); - dead code, shoul be deleted
\runtime\src\coreclr\vm\debugdebugger.cpp(236):CLR_BOOL fNeedFileInfo,
\runtime\src\coreclr\vm\debugdebugger.h(155):CLR_BOOL fNeedFileInfo,

jkotas
jkotas
approved these changes
Aug 14, 2024
View reviewed changes
@jkotasjkotas
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM otherwise. Thanks!
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024•

edited

Loading

Copy link


Copy Markdown

Member
cc @carlossanlop to include this in RC1 snap if CI tests pass.
@carlossanlop
carlossanlop
commented
Aug 14, 2024

Copy link


Copy Markdown

Contributor
Thanks. I'm aware, it's in my list of PRs to wait. @jakobbotsch reached out earlier.
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
The runtime pipeline is done (some of the jobs didn't have their status updates, presumably because of the outage). Build analysis is happy. We can skip waiting for the superpmi jobs – they were green in the previous run and there hasn't been any JIT changes since then.
@jakobbotsch
jakobbotsch
merged commit 0c67acb
into
dotnet:mainAug 14, 2024
@jakobbotsch
jakobbotsch
deleted the

fix-101046-2

branch
August 14, 2024 23:55

This was referenced Aug 15, 2024

Closed


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Sep 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jkotasjkotasjkotas approved these changes
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky is a code owner

Assignees

@jakobbotschjakobbotsch

Labels

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

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

JIT: Small primitives on arm32/apple arm64 ABI need explicit normalization to 32 bits


5 participants

@jakobbotsch@JulieLeeMSFT@jkotas@carlossanlop@AndyAyersMS

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

Skip to content
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64 - #106314
Merged
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Aug 14, 2024
Merged
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64#106314
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Fix#101046
Alternative to #106312 that keeps the behavior as is for the managed calling convention and only changes it for pinvokes. This requires changing fcalls in the VM to access small primitive typed arguments without assumptions about normalization.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Aug 13, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 13, 2024

Closed


This was referenced Aug 13, 2024

Closed


Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 13, 2024
 Closed

jkotas
jkotas
reviewed
Aug 13, 2024
View reviewed changes
Comment threadsrc/coreclr/nativeaot/Runtime/CommonMacros.h
@@ -293,14 +293,11 @@ typedef uint8_t CODE_LOCATION;

typedef bool CLR_BOOL;
@jkotasjkotasAug 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Delete?
@jakobbotschjakobbotschAug 14, 2024

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.

Looks like it's still used as the return value for HandleTableRestrictedCallbackFunction.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

And TryGetTaggedMemoryCallback.
These correspond to the following managed methods:
CLR_BOOL is not quite right for neither of these, but I do not think that this mismatch is going to cause any real problem. It would be nice to clean this up in a follow up.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 14, 2024

Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 14, 2024

Open

jakobbotsch
jakobbotsch
commented
Aug 14, 2024
View reviewed changes
Comment threadsrc/tests/issues.targets
Outdated

@jakobbotschjakobbotsch
added this to the 9.0.0 milestone
Aug 14, 2024
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
@AndyAyersMS, PTAL. This is for RC1 snap.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
August 14, 2024 18:17
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS@jkotas
Minor diffs
AndyAyersMS
AndyAyersMS
approved these changes
Aug 14, 2024
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Jit changes LGTM.
jkotas
jkotas
reviewed
Aug 14, 2024
View reviewed changes
Comment threadsrc/coreclr/vm/fcall.h
typedef INT32 FC_INT16_RET;
typedef UINT32 FC_UINT16_RET;

// Small primitive args are not widened.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The comment around line 150 in this file still mentions CLR_BOOL.
@jakobbotschjakobbotschAug 14, 2024

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.

Mind if I update that in a separate change tomorrow?
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Fine with me
@jakobbotschjakobbotschAug 14, 2024

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.

Nevermind, updated it as well now due to those other places I missed the conversion.
@jkotas
jkotas
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
These places are missing the CLR_BOOL -> FC_BOOL_ARG conversion:
\runtime\src\coreclr\vm\comutilnative.h(43):static FCDECL3(StringObject *, StripFileInfo, Object *orefExcepUNSAFE, StringObject *orefStrUNSAFE, CLR_BOOL isRemoteStackTrace); - dead code, shoul be deleted
\runtime\src\coreclr\vm\debugdebugger.cpp(236):CLR_BOOL fNeedFileInfo,
\runtime\src\coreclr\vm\debugdebugger.h(155):CLR_BOOL fNeedFileInfo,

jkotas
jkotas
approved these changes
Aug 14, 2024
View reviewed changes
@jkotasjkotas
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM otherwise. Thanks!
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024•

edited

Loading

Copy link


Copy Markdown

Member
cc @carlossanlop to include this in RC1 snap if CI tests pass.
@carlossanlop
carlossanlop
commented
Aug 14, 2024

Copy link


Copy Markdown

Contributor
Thanks. I'm aware, it's in my list of PRs to wait. @jakobbotsch reached out earlier.
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
The runtime pipeline is done (some of the jobs didn't have their status updates, presumably because of the outage). Build analysis is happy. We can skip waiting for the superpmi jobs – they were green in the previous run and there hasn't been any JIT changes since then.
@jakobbotsch
jakobbotsch
merged commit 0c67acb
into
dotnet:mainAug 14, 2024
@jakobbotsch
jakobbotsch
deleted the

fix-101046-2

branch
August 14, 2024 23:55

This was referenced Aug 15, 2024

Closed


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Sep 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jkotasjkotasjkotas approved these changes
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky is a code owner

Assignees

@jakobbotschjakobbotsch

Labels

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

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

JIT: Small primitives on arm32/apple arm64 ABI need explicit normalization to 32 bits


5 participants

@jakobbotsch@JulieLeeMSFT@jkotas@carlossanlop@AndyAyersMS

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

Skip to content
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64 - #106314
Merged
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Aug 14, 2024
Merged
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64#106314
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Fix#101046
Alternative to #106312 that keeps the behavior as is for the managed calling convention and only changes it for pinvokes. This requires changing fcalls in the VM to access small primitive typed arguments without assumptions about normalization.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Aug 13, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 13, 2024

Closed


This was referenced Aug 13, 2024

Closed


Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 13, 2024
 Closed

jkotas
jkotas
reviewed
Aug 13, 2024
View reviewed changes
Comment threadsrc/coreclr/nativeaot/Runtime/CommonMacros.h
@@ -293,14 +293,11 @@ typedef uint8_t CODE_LOCATION;

typedef bool CLR_BOOL;
@jkotasjkotasAug 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Delete?
@jakobbotschjakobbotschAug 14, 2024

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.

Looks like it's still used as the return value for HandleTableRestrictedCallbackFunction.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

And TryGetTaggedMemoryCallback.
These correspond to the following managed methods:
CLR_BOOL is not quite right for neither of these, but I do not think that this mismatch is going to cause any real problem. It would be nice to clean this up in a follow up.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 14, 2024

Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 14, 2024

Open

jakobbotsch
jakobbotsch
commented
Aug 14, 2024
View reviewed changes
Comment threadsrc/tests/issues.targets
Outdated

@jakobbotschjakobbotsch
added this to the 9.0.0 milestone
Aug 14, 2024
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
@AndyAyersMS, PTAL. This is for RC1 snap.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
August 14, 2024 18:17
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS@jkotas
Minor diffs
AndyAyersMS
AndyAyersMS
approved these changes
Aug 14, 2024
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Jit changes LGTM.
jkotas
jkotas
reviewed
Aug 14, 2024
View reviewed changes
Comment threadsrc/coreclr/vm/fcall.h
typedef INT32 FC_INT16_RET;
typedef UINT32 FC_UINT16_RET;

// Small primitive args are not widened.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The comment around line 150 in this file still mentions CLR_BOOL.
@jakobbotschjakobbotschAug 14, 2024

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.

Mind if I update that in a separate change tomorrow?
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Fine with me
@jakobbotschjakobbotschAug 14, 2024

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.

Nevermind, updated it as well now due to those other places I missed the conversion.
@jkotas
jkotas
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
These places are missing the CLR_BOOL -> FC_BOOL_ARG conversion:
\runtime\src\coreclr\vm\comutilnative.h(43):static FCDECL3(StringObject *, StripFileInfo, Object *orefExcepUNSAFE, StringObject *orefStrUNSAFE, CLR_BOOL isRemoteStackTrace); - dead code, shoul be deleted
\runtime\src\coreclr\vm\debugdebugger.cpp(236):CLR_BOOL fNeedFileInfo,
\runtime\src\coreclr\vm\debugdebugger.h(155):CLR_BOOL fNeedFileInfo,

jkotas
jkotas
approved these changes
Aug 14, 2024
View reviewed changes
@jkotasjkotas
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM otherwise. Thanks!
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024•

edited

Loading

Copy link


Copy Markdown

Member
cc @carlossanlop to include this in RC1 snap if CI tests pass.
@carlossanlop
carlossanlop
commented
Aug 14, 2024

Copy link


Copy Markdown

Contributor
Thanks. I'm aware, it's in my list of PRs to wait. @jakobbotsch reached out earlier.
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
The runtime pipeline is done (some of the jobs didn't have their status updates, presumably because of the outage). Build analysis is happy. We can skip waiting for the superpmi jobs – they were green in the previous run and there hasn't been any JIT changes since then.
@jakobbotsch
jakobbotsch
merged commit 0c67acb
into
dotnet:mainAug 14, 2024
@jakobbotsch
jakobbotsch
deleted the

fix-101046-2

branch
August 14, 2024 23:55

This was referenced Aug 15, 2024

Closed


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Sep 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jkotasjkotasjkotas approved these changes
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky is a code owner

Assignees

@jakobbotschjakobbotsch

Labels

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

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

JIT: Small primitives on arm32/apple arm64 ABI need explicit normalization to 32 bits


5 participants

@jakobbotsch@JulieLeeMSFT@jkotas@carlossanlop@AndyAyersMS

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

Skip to content
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64 - #106314
Merged
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Aug 14, 2024
Merged
JIT: Sign/zero-extend small primitive arguments for pinvokes on arm32 and Apple arm64#106314
jakobbotsch merged 11 commits into
dotnet:mainfrom 
jakobbotsch:fix-101046-2
Conversation
@jakobbotsch
@jakobbotschjakobbotsch
commented
Aug 13, 2024•

edited

Loading

Copy link


Copy Markdown

Member
Fix#101046
Alternative to #106312 that keeps the behavior as is for the managed calling convention and only changes it for pinvokes. This requires changing fcalls in the VM to access small primitive typed arguments without assumptions about normalization.
@ghostghost
added
the 
area-CodeGen-coreclr
CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
label
Aug 13, 2024
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 13, 2024

Closed


This was referenced Aug 13, 2024

Closed


Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 13, 2024
 Closed

jkotas
jkotas
reviewed
Aug 13, 2024
View reviewed changes
Comment threadsrc/coreclr/nativeaot/Runtime/CommonMacros.h
@@ -293,14 +293,11 @@ typedef uint8_t CODE_LOCATION;

typedef bool CLR_BOOL;
@jkotasjkotasAug 13, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Delete?
@jakobbotschjakobbotschAug 14, 2024

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.

Looks like it's still used as the return value for HandleTableRestrictedCallbackFunction.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

And TryGetTaggedMemoryCallback.
These correspond to the following managed methods:
CLR_BOOL is not quite right for neither of these, but I do not think that this mismatch is going to cause any real problem. It would be nice to clean this up in a follow up.
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 14, 2024

Closed

@jakobbotschjakobbotsch
mentioned this pull request
Aug 14, 2024

Open

jakobbotsch
jakobbotsch
commented
Aug 14, 2024
View reviewed changes
Comment threadsrc/tests/issues.targets
Outdated

@jakobbotschjakobbotsch
added this to the 9.0.0 milestone
Aug 14, 2024
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
@AndyAyersMS, PTAL. This is for RC1 snap.
@jakobbotsch
jakobbotsch
marked this pull request as ready for review
August 14, 2024 18:17
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dotnet/jit-contrib PTAL @AndyAyersMS@jkotas
Minor diffs
AndyAyersMS
AndyAyersMS
approved these changes
Aug 14, 2024
View reviewed changes
@AndyAyersMSAndyAyersMS
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Jit changes LGTM.
jkotas
jkotas
reviewed
Aug 14, 2024
View reviewed changes
Comment threadsrc/coreclr/vm/fcall.h
typedef INT32 FC_INT16_RET;
typedef UINT32 FC_UINT16_RET;

// Small primitive args are not widened.
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The comment around line 150 in this file still mentions CLR_BOOL.
@jakobbotschjakobbotschAug 14, 2024

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.

Mind if I update that in a separate change tomorrow?
@jkotasjkotasAug 14, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Fine with me
@jakobbotschjakobbotschAug 14, 2024

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.

Nevermind, updated it as well now due to those other places I missed the conversion.
@jkotas
jkotas
commented
Aug 14, 2024

Copy link


Copy Markdown

Member
These places are missing the CLR_BOOL -> FC_BOOL_ARG conversion:
\runtime\src\coreclr\vm\comutilnative.h(43):static FCDECL3(StringObject *, StripFileInfo, Object *orefExcepUNSAFE, StringObject *orefStrUNSAFE, CLR_BOOL isRemoteStackTrace); - dead code, shoul be deleted
\runtime\src\coreclr\vm\debugdebugger.cpp(236):CLR_BOOL fNeedFileInfo,
\runtime\src\coreclr\vm\debugdebugger.h(155):CLR_BOOL fNeedFileInfo,

jkotas
jkotas
approved these changes
Aug 14, 2024
View reviewed changes
@jkotasjkotas
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

LGTM otherwise. Thanks!
@JulieLeeMSFT
JulieLeeMSFT
commented
Aug 14, 2024•

edited

Loading

Copy link


Copy Markdown

Member
cc @carlossanlop to include this in RC1 snap if CI tests pass.
@carlossanlop
carlossanlop
commented
Aug 14, 2024

Copy link


Copy Markdown

Contributor
Thanks. I'm aware, it's in my list of PRs to wait. @jakobbotsch reached out earlier.
@jakobbotsch
jakobbotsch
commented
Aug 14, 2024

Copy link


Copy Markdown

MemberAuthor
The runtime pipeline is done (some of the jobs didn't have their status updates, presumably because of the outage). Build analysis is happy. We can skip waiting for the superpmi jobs – they were green in the previous run and there hasn't been any JIT changes since then.
@jakobbotsch
jakobbotsch
merged commit 0c67acb
into
dotnet:mainAug 14, 2024
@jakobbotsch
jakobbotsch
deleted the

fix-101046-2

branch
August 14, 2024 23:55

This was referenced Aug 15, 2024

Closed


Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Sep 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@jkotasjkotasjkotas approved these changes
@AndyAyersMSAndyAyersMSAndyAyersMS approved these changes
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky is a code owner

Assignees

@jakobbotschjakobbotsch

Labels

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

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

JIT: Small primitives on arm32/apple arm64 ABI need explicit normalization to 32 bits


5 participants

@jakobbotsch@JulieLeeMSFT@jkotas@carlossanlop@AndyAyersMS