Fix CoreRT frozen strings handling. - #45095

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT
Nov 24, 2020
Merged

Fix CoreRT frozen strings handling.#45095
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT

Conversation

@sandreenko

Copy link
Copy Markdown
Contributor

Fix asserts about const non-zero refs that are possible on CoreRT, in the past they were always hidden with GT_NOP but it was creating other issues.

It should fix failures seen in dotnet/runtimelab#374 (comment) introduced by #44398.

With the changes the tests results are:

src\tests\run.cmd runnativeaottests Checked
Total tests run : 2578
Total passing tests: 2565
Total failed tests : 13
Total skipped tests: 0

the 13 failing tests are failing without the change as well, so they are probably preexisting, PTAL @jkotas :

JIT\Directed\tailcall\mutual_recursion\mutual_recursion.cmd [FAIL]	Line 271: JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd [FAIL]
JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd [FAIL]
JIT\Regression\JitBlue\devdiv_902271\DevDiv_902271\DevDiv_902271.cmd [FAIL]
JIT\Regression\JitBlue\GitHub_27924\GitHub_27924\GitHub_27924.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858\b353858.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71120\b71120\b71120.cmd [FAIL]
JIT\Stress\ABI\pinvokes_d\pinvokes_d.cmd [FAIL]
JIT\Stress\ABI\tailcalls_d\tailcalls_d.cmd [FAIL]
JIT\Stress\ABI\stubs_do\stubs_do.cmd [FAIL]
JIT\Stress\ABI\pinvokes_do\pinvokes_do.cmd [FAIL]
JIT\Stress\ABI\tailcalls_do\tailcalls_do.cmd [FAIL]
Loader\classloader\MethodImpl\CovariantReturns\UnitTest\OverrideMoreDerivedReturn\OverrideMoreDerivedReturn.cmd [FAIL]

before the fix there were 90 failures including this 13.

PTAL @dotnet/jit-contrib

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 23, 2020
break;
case O1K_LCLVAR:
assert((lvaTable[assertion->op1.lcl.lclNum].lvType != TYP_REF) || (assertion->op2.u1.iconVal == 0));
if (!IsTargetAbi(CORINFO_CORERT_ABI)) // CoreRT allows non-zero const refs for frozen strings.

@jkotasjkotasNov 23, 2020

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 frozen strings are not really inherent part of CoreRT ABI. Nothing prevents them from being used with CoreCLR as well, we just happen to not do that currently.

It would be better to have a bool frozenObjectsUsed; flag that gets set whenever the JIT/EE interface returns a frozen object, and use this flag for these asserts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

good idea, thank you, fixed.

@jkotas

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Comment threadsrc/coreclr/src/jit/importer.cpp Outdated
Comment threadsrc/coreclr/src/jit/gentree.cpp Outdated

@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. Thanks!

@MichalStrehovsky

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Nope but we're not running the tests very often and the runs have been very noisy ever since we picked up the regression this and the previous pull request is fixing.

I'll take a look once this is mirrored over.

Maybe we should make Pri0 runs mandatory in the CI.

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

Currently you have a broad permissive check. Should we instead do more surgical fine-grained checks by instead asserting that any nonzero TYP_REF integer must be a string handle?

I'm surprised we don't hit asserts elsewhere.

noway_assert(!"unreachable IAT_VALUE case in gtNewStringLiteralNode");
}

setMethodHasFrozenString();

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.

We only see these on CoreRT, so should we keep part of the old assertion check?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

#45095 (comment) there was a discussion about it

@sandreenko
sandreenko marked this pull request as draft November 23, 2020 23:27
@sandreenko
sandreenko marked this pull request as ready for review November 23, 2020 23:50
assert(obj->IsIconHandle(GTF_ICON_STR_HDL));
if (!doesMethodHaveFrozenString())
{
assert(compIsForInlining());

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I have pushed additional changes for a case where we inline a method and pass such string there(as an argument), the inlinee doesn't have a frozen string flag so the check was failing.

@sandreenko
sandreenko merged commit 1fa2054 into dotnet:masterNov 24, 2020
@sandreenko
sandreenko deleted the fixCoreRT branch November 24, 2020 02:42
@jkotas

Copy link
Copy Markdown
Member

Thank you!

@ghostghost locked as resolved and limited conversation to collaborators Dec 24, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix CoreRT frozen strings handling. - #45095

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT
Nov 24, 2020
Merged

Fix CoreRT frozen strings handling.#45095
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT

Conversation

@sandreenko

Copy link
Copy Markdown
Contributor

Fix asserts about const non-zero refs that are possible on CoreRT, in the past they were always hidden with GT_NOP but it was creating other issues.

It should fix failures seen in dotnet/runtimelab#374 (comment) introduced by #44398.

With the changes the tests results are:

src\tests\run.cmd runnativeaottests Checked
Total tests run : 2578
Total passing tests: 2565
Total failed tests : 13
Total skipped tests: 0

the 13 failing tests are failing without the change as well, so they are probably preexisting, PTAL @jkotas :

JIT\Directed\tailcall\mutual_recursion\mutual_recursion.cmd [FAIL]	Line 271: JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd [FAIL]
JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd [FAIL]
JIT\Regression\JitBlue\devdiv_902271\DevDiv_902271\DevDiv_902271.cmd [FAIL]
JIT\Regression\JitBlue\GitHub_27924\GitHub_27924\GitHub_27924.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858\b353858.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71120\b71120\b71120.cmd [FAIL]
JIT\Stress\ABI\pinvokes_d\pinvokes_d.cmd [FAIL]
JIT\Stress\ABI\tailcalls_d\tailcalls_d.cmd [FAIL]
JIT\Stress\ABI\stubs_do\stubs_do.cmd [FAIL]
JIT\Stress\ABI\pinvokes_do\pinvokes_do.cmd [FAIL]
JIT\Stress\ABI\tailcalls_do\tailcalls_do.cmd [FAIL]
Loader\classloader\MethodImpl\CovariantReturns\UnitTest\OverrideMoreDerivedReturn\OverrideMoreDerivedReturn.cmd [FAIL]

before the fix there were 90 failures including this 13.

PTAL @dotnet/jit-contrib

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 23, 2020
break;
case O1K_LCLVAR:
assert((lvaTable[assertion->op1.lcl.lclNum].lvType != TYP_REF) || (assertion->op2.u1.iconVal == 0));
if (!IsTargetAbi(CORINFO_CORERT_ABI)) // CoreRT allows non-zero const refs for frozen strings.

@jkotasjkotasNov 23, 2020

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 frozen strings are not really inherent part of CoreRT ABI. Nothing prevents them from being used with CoreCLR as well, we just happen to not do that currently.

It would be better to have a bool frozenObjectsUsed; flag that gets set whenever the JIT/EE interface returns a frozen object, and use this flag for these asserts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

good idea, thank you, fixed.

@jkotas

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Comment threadsrc/coreclr/src/jit/importer.cpp Outdated
Comment threadsrc/coreclr/src/jit/gentree.cpp Outdated

@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. Thanks!

@MichalStrehovsky

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Nope but we're not running the tests very often and the runs have been very noisy ever since we picked up the regression this and the previous pull request is fixing.

I'll take a look once this is mirrored over.

Maybe we should make Pri0 runs mandatory in the CI.

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

Currently you have a broad permissive check. Should we instead do more surgical fine-grained checks by instead asserting that any nonzero TYP_REF integer must be a string handle?

I'm surprised we don't hit asserts elsewhere.

noway_assert(!"unreachable IAT_VALUE case in gtNewStringLiteralNode");
}

setMethodHasFrozenString();

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.

We only see these on CoreRT, so should we keep part of the old assertion check?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

#45095 (comment) there was a discussion about it

@sandreenko
sandreenko marked this pull request as draft November 23, 2020 23:27
@sandreenko
sandreenko marked this pull request as ready for review November 23, 2020 23:50
assert(obj->IsIconHandle(GTF_ICON_STR_HDL));
if (!doesMethodHaveFrozenString())
{
assert(compIsForInlining());

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I have pushed additional changes for a case where we inline a method and pass such string there(as an argument), the inlinee doesn't have a frozen string flag so the check was failing.

@sandreenko
sandreenko merged commit 1fa2054 into dotnet:masterNov 24, 2020
@sandreenko
sandreenko deleted the fixCoreRT branch November 24, 2020 02:42
@jkotas

Copy link
Copy Markdown
Member

Thank you!

@ghostghost locked as resolved and limited conversation to collaborators Dec 24, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix CoreRT frozen strings handling. - #45095

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT
Nov 24, 2020
Merged

Fix CoreRT frozen strings handling.#45095
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT

Conversation

@sandreenko

Copy link
Copy Markdown
Contributor

Fix asserts about const non-zero refs that are possible on CoreRT, in the past they were always hidden with GT_NOP but it was creating other issues.

It should fix failures seen in dotnet/runtimelab#374 (comment) introduced by #44398.

With the changes the tests results are:

src\tests\run.cmd runnativeaottests Checked
Total tests run : 2578
Total passing tests: 2565
Total failed tests : 13
Total skipped tests: 0

the 13 failing tests are failing without the change as well, so they are probably preexisting, PTAL @jkotas :

JIT\Directed\tailcall\mutual_recursion\mutual_recursion.cmd [FAIL]	Line 271: JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd [FAIL]
JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd [FAIL]
JIT\Regression\JitBlue\devdiv_902271\DevDiv_902271\DevDiv_902271.cmd [FAIL]
JIT\Regression\JitBlue\GitHub_27924\GitHub_27924\GitHub_27924.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858\b353858.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71120\b71120\b71120.cmd [FAIL]
JIT\Stress\ABI\pinvokes_d\pinvokes_d.cmd [FAIL]
JIT\Stress\ABI\tailcalls_d\tailcalls_d.cmd [FAIL]
JIT\Stress\ABI\stubs_do\stubs_do.cmd [FAIL]
JIT\Stress\ABI\pinvokes_do\pinvokes_do.cmd [FAIL]
JIT\Stress\ABI\tailcalls_do\tailcalls_do.cmd [FAIL]
Loader\classloader\MethodImpl\CovariantReturns\UnitTest\OverrideMoreDerivedReturn\OverrideMoreDerivedReturn.cmd [FAIL]

before the fix there were 90 failures including this 13.

PTAL @dotnet/jit-contrib

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 23, 2020
break;
case O1K_LCLVAR:
assert((lvaTable[assertion->op1.lcl.lclNum].lvType != TYP_REF) || (assertion->op2.u1.iconVal == 0));
if (!IsTargetAbi(CORINFO_CORERT_ABI)) // CoreRT allows non-zero const refs for frozen strings.

@jkotasjkotasNov 23, 2020

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 frozen strings are not really inherent part of CoreRT ABI. Nothing prevents them from being used with CoreCLR as well, we just happen to not do that currently.

It would be better to have a bool frozenObjectsUsed; flag that gets set whenever the JIT/EE interface returns a frozen object, and use this flag for these asserts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

good idea, thank you, fixed.

@jkotas

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Comment threadsrc/coreclr/src/jit/importer.cpp Outdated
Comment threadsrc/coreclr/src/jit/gentree.cpp Outdated

@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. Thanks!

@MichalStrehovsky

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Nope but we're not running the tests very often and the runs have been very noisy ever since we picked up the regression this and the previous pull request is fixing.

I'll take a look once this is mirrored over.

Maybe we should make Pri0 runs mandatory in the CI.

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

Currently you have a broad permissive check. Should we instead do more surgical fine-grained checks by instead asserting that any nonzero TYP_REF integer must be a string handle?

I'm surprised we don't hit asserts elsewhere.

noway_assert(!"unreachable IAT_VALUE case in gtNewStringLiteralNode");
}

setMethodHasFrozenString();

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.

We only see these on CoreRT, so should we keep part of the old assertion check?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

#45095 (comment) there was a discussion about it

@sandreenko
sandreenko marked this pull request as draft November 23, 2020 23:27
@sandreenko
sandreenko marked this pull request as ready for review November 23, 2020 23:50
assert(obj->IsIconHandle(GTF_ICON_STR_HDL));
if (!doesMethodHaveFrozenString())
{
assert(compIsForInlining());

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I have pushed additional changes for a case where we inline a method and pass such string there(as an argument), the inlinee doesn't have a frozen string flag so the check was failing.

@sandreenko
sandreenko merged commit 1fa2054 into dotnet:masterNov 24, 2020
@sandreenko
sandreenko deleted the fixCoreRT branch November 24, 2020 02:42
@jkotas

Copy link
Copy Markdown
Member

Thank you!

@ghostghost locked as resolved and limited conversation to collaborators Dec 24, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix CoreRT frozen strings handling. - #45095

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT
Nov 24, 2020
Merged

Fix CoreRT frozen strings handling.#45095
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT

Conversation

@sandreenko

Copy link
Copy Markdown
Contributor

Fix asserts about const non-zero refs that are possible on CoreRT, in the past they were always hidden with GT_NOP but it was creating other issues.

It should fix failures seen in dotnet/runtimelab#374 (comment) introduced by #44398.

With the changes the tests results are:

src\tests\run.cmd runnativeaottests Checked
Total tests run : 2578
Total passing tests: 2565
Total failed tests : 13
Total skipped tests: 0

the 13 failing tests are failing without the change as well, so they are probably preexisting, PTAL @jkotas :

JIT\Directed\tailcall\mutual_recursion\mutual_recursion.cmd [FAIL]	Line 271: JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd [FAIL]
JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd [FAIL]
JIT\Regression\JitBlue\devdiv_902271\DevDiv_902271\DevDiv_902271.cmd [FAIL]
JIT\Regression\JitBlue\GitHub_27924\GitHub_27924\GitHub_27924.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858\b353858.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71120\b71120\b71120.cmd [FAIL]
JIT\Stress\ABI\pinvokes_d\pinvokes_d.cmd [FAIL]
JIT\Stress\ABI\tailcalls_d\tailcalls_d.cmd [FAIL]
JIT\Stress\ABI\stubs_do\stubs_do.cmd [FAIL]
JIT\Stress\ABI\pinvokes_do\pinvokes_do.cmd [FAIL]
JIT\Stress\ABI\tailcalls_do\tailcalls_do.cmd [FAIL]
Loader\classloader\MethodImpl\CovariantReturns\UnitTest\OverrideMoreDerivedReturn\OverrideMoreDerivedReturn.cmd [FAIL]

before the fix there were 90 failures including this 13.

PTAL @dotnet/jit-contrib

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 23, 2020
break;
case O1K_LCLVAR:
assert((lvaTable[assertion->op1.lcl.lclNum].lvType != TYP_REF) || (assertion->op2.u1.iconVal == 0));
if (!IsTargetAbi(CORINFO_CORERT_ABI)) // CoreRT allows non-zero const refs for frozen strings.

@jkotasjkotasNov 23, 2020

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 frozen strings are not really inherent part of CoreRT ABI. Nothing prevents them from being used with CoreCLR as well, we just happen to not do that currently.

It would be better to have a bool frozenObjectsUsed; flag that gets set whenever the JIT/EE interface returns a frozen object, and use this flag for these asserts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

good idea, thank you, fixed.

@jkotas

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Comment threadsrc/coreclr/src/jit/importer.cpp Outdated
Comment threadsrc/coreclr/src/jit/gentree.cpp Outdated

@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. Thanks!

@MichalStrehovsky

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Nope but we're not running the tests very often and the runs have been very noisy ever since we picked up the regression this and the previous pull request is fixing.

I'll take a look once this is mirrored over.

Maybe we should make Pri0 runs mandatory in the CI.

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

Currently you have a broad permissive check. Should we instead do more surgical fine-grained checks by instead asserting that any nonzero TYP_REF integer must be a string handle?

I'm surprised we don't hit asserts elsewhere.

noway_assert(!"unreachable IAT_VALUE case in gtNewStringLiteralNode");
}

setMethodHasFrozenString();

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.

We only see these on CoreRT, so should we keep part of the old assertion check?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

#45095 (comment) there was a discussion about it

@sandreenko
sandreenko marked this pull request as draft November 23, 2020 23:27
@sandreenko
sandreenko marked this pull request as ready for review November 23, 2020 23:50
assert(obj->IsIconHandle(GTF_ICON_STR_HDL));
if (!doesMethodHaveFrozenString())
{
assert(compIsForInlining());

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I have pushed additional changes for a case where we inline a method and pass such string there(as an argument), the inlinee doesn't have a frozen string flag so the check was failing.

@sandreenko
sandreenko merged commit 1fa2054 into dotnet:masterNov 24, 2020
@sandreenko
sandreenko deleted the fixCoreRT branch November 24, 2020 02:42
@jkotas

Copy link
Copy Markdown
Member

Thank you!

@ghostghost locked as resolved and limited conversation to collaborators Dec 24, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix CoreRT frozen strings handling. - #45095

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT
Nov 24, 2020
Merged

Fix CoreRT frozen strings handling.#45095
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT

Conversation

@sandreenko

Copy link
Copy Markdown
Contributor

Fix asserts about const non-zero refs that are possible on CoreRT, in the past they were always hidden with GT_NOP but it was creating other issues.

It should fix failures seen in dotnet/runtimelab#374 (comment) introduced by #44398.

With the changes the tests results are:

src\tests\run.cmd runnativeaottests Checked
Total tests run : 2578
Total passing tests: 2565
Total failed tests : 13
Total skipped tests: 0

the 13 failing tests are failing without the change as well, so they are probably preexisting, PTAL @jkotas :

JIT\Directed\tailcall\mutual_recursion\mutual_recursion.cmd [FAIL]	Line 271: JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd [FAIL]
JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd [FAIL]
JIT\Regression\JitBlue\devdiv_902271\DevDiv_902271\DevDiv_902271.cmd [FAIL]
JIT\Regression\JitBlue\GitHub_27924\GitHub_27924\GitHub_27924.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858\b353858.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71120\b71120\b71120.cmd [FAIL]
JIT\Stress\ABI\pinvokes_d\pinvokes_d.cmd [FAIL]
JIT\Stress\ABI\tailcalls_d\tailcalls_d.cmd [FAIL]
JIT\Stress\ABI\stubs_do\stubs_do.cmd [FAIL]
JIT\Stress\ABI\pinvokes_do\pinvokes_do.cmd [FAIL]
JIT\Stress\ABI\tailcalls_do\tailcalls_do.cmd [FAIL]
Loader\classloader\MethodImpl\CovariantReturns\UnitTest\OverrideMoreDerivedReturn\OverrideMoreDerivedReturn.cmd [FAIL]

before the fix there were 90 failures including this 13.

PTAL @dotnet/jit-contrib

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 23, 2020
break;
case O1K_LCLVAR:
assert((lvaTable[assertion->op1.lcl.lclNum].lvType != TYP_REF) || (assertion->op2.u1.iconVal == 0));
if (!IsTargetAbi(CORINFO_CORERT_ABI)) // CoreRT allows non-zero const refs for frozen strings.

@jkotasjkotasNov 23, 2020

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 frozen strings are not really inherent part of CoreRT ABI. Nothing prevents them from being used with CoreCLR as well, we just happen to not do that currently.

It would be better to have a bool frozenObjectsUsed; flag that gets set whenever the JIT/EE interface returns a frozen object, and use this flag for these asserts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

good idea, thank you, fixed.

@jkotas

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Comment threadsrc/coreclr/src/jit/importer.cpp Outdated
Comment threadsrc/coreclr/src/jit/gentree.cpp Outdated

@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. Thanks!

@MichalStrehovsky

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Nope but we're not running the tests very often and the runs have been very noisy ever since we picked up the regression this and the previous pull request is fixing.

I'll take a look once this is mirrored over.

Maybe we should make Pri0 runs mandatory in the CI.

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

Currently you have a broad permissive check. Should we instead do more surgical fine-grained checks by instead asserting that any nonzero TYP_REF integer must be a string handle?

I'm surprised we don't hit asserts elsewhere.

noway_assert(!"unreachable IAT_VALUE case in gtNewStringLiteralNode");
}

setMethodHasFrozenString();

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.

We only see these on CoreRT, so should we keep part of the old assertion check?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

#45095 (comment) there was a discussion about it

@sandreenko
sandreenko marked this pull request as draft November 23, 2020 23:27
@sandreenko
sandreenko marked this pull request as ready for review November 23, 2020 23:50
assert(obj->IsIconHandle(GTF_ICON_STR_HDL));
if (!doesMethodHaveFrozenString())
{
assert(compIsForInlining());

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I have pushed additional changes for a case where we inline a method and pass such string there(as an argument), the inlinee doesn't have a frozen string flag so the check was failing.

@sandreenko
sandreenko merged commit 1fa2054 into dotnet:masterNov 24, 2020
@sandreenko
sandreenko deleted the fixCoreRT branch November 24, 2020 02:42
@jkotas

Copy link
Copy Markdown
Member

Thank you!

@ghostghost locked as resolved and limited conversation to collaborators Dec 24, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix CoreRT frozen strings handling. - #45095

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT
Nov 24, 2020
Merged

Fix CoreRT frozen strings handling.#45095
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT

Conversation

@sandreenko

Copy link
Copy Markdown
Contributor

Fix asserts about const non-zero refs that are possible on CoreRT, in the past they were always hidden with GT_NOP but it was creating other issues.

It should fix failures seen in dotnet/runtimelab#374 (comment) introduced by #44398.

With the changes the tests results are:

src\tests\run.cmd runnativeaottests Checked
Total tests run : 2578
Total passing tests: 2565
Total failed tests : 13
Total skipped tests: 0

the 13 failing tests are failing without the change as well, so they are probably preexisting, PTAL @jkotas :

JIT\Directed\tailcall\mutual_recursion\mutual_recursion.cmd [FAIL]	Line 271: JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd [FAIL]
JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd [FAIL]
JIT\Regression\JitBlue\devdiv_902271\DevDiv_902271\DevDiv_902271.cmd [FAIL]
JIT\Regression\JitBlue\GitHub_27924\GitHub_27924\GitHub_27924.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858\b353858.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71120\b71120\b71120.cmd [FAIL]
JIT\Stress\ABI\pinvokes_d\pinvokes_d.cmd [FAIL]
JIT\Stress\ABI\tailcalls_d\tailcalls_d.cmd [FAIL]
JIT\Stress\ABI\stubs_do\stubs_do.cmd [FAIL]
JIT\Stress\ABI\pinvokes_do\pinvokes_do.cmd [FAIL]
JIT\Stress\ABI\tailcalls_do\tailcalls_do.cmd [FAIL]
Loader\classloader\MethodImpl\CovariantReturns\UnitTest\OverrideMoreDerivedReturn\OverrideMoreDerivedReturn.cmd [FAIL]

before the fix there were 90 failures including this 13.

PTAL @dotnet/jit-contrib

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 23, 2020
break;
case O1K_LCLVAR:
assert((lvaTable[assertion->op1.lcl.lclNum].lvType != TYP_REF) || (assertion->op2.u1.iconVal == 0));
if (!IsTargetAbi(CORINFO_CORERT_ABI)) // CoreRT allows non-zero const refs for frozen strings.

@jkotasjkotasNov 23, 2020

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 frozen strings are not really inherent part of CoreRT ABI. Nothing prevents them from being used with CoreCLR as well, we just happen to not do that currently.

It would be better to have a bool frozenObjectsUsed; flag that gets set whenever the JIT/EE interface returns a frozen object, and use this flag for these asserts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

good idea, thank you, fixed.

@jkotas

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Comment threadsrc/coreclr/src/jit/importer.cpp Outdated
Comment threadsrc/coreclr/src/jit/gentree.cpp Outdated

@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. Thanks!

@MichalStrehovsky

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Nope but we're not running the tests very often and the runs have been very noisy ever since we picked up the regression this and the previous pull request is fixing.

I'll take a look once this is mirrored over.

Maybe we should make Pri0 runs mandatory in the CI.

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

Currently you have a broad permissive check. Should we instead do more surgical fine-grained checks by instead asserting that any nonzero TYP_REF integer must be a string handle?

I'm surprised we don't hit asserts elsewhere.

noway_assert(!"unreachable IAT_VALUE case in gtNewStringLiteralNode");
}

setMethodHasFrozenString();

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.

We only see these on CoreRT, so should we keep part of the old assertion check?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

#45095 (comment) there was a discussion about it

@sandreenko
sandreenko marked this pull request as draft November 23, 2020 23:27
@sandreenko
sandreenko marked this pull request as ready for review November 23, 2020 23:50
assert(obj->IsIconHandle(GTF_ICON_STR_HDL));
if (!doesMethodHaveFrozenString())
{
assert(compIsForInlining());

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I have pushed additional changes for a case where we inline a method and pass such string there(as an argument), the inlinee doesn't have a frozen string flag so the check was failing.

@sandreenko
sandreenko merged commit 1fa2054 into dotnet:masterNov 24, 2020
@sandreenko
sandreenko deleted the fixCoreRT branch November 24, 2020 02:42
@jkotas

Copy link
Copy Markdown
Member

Thank you!

@ghostghost locked as resolved and limited conversation to collaborators Dec 24, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix CoreRT frozen strings handling. - #45095

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT
Nov 24, 2020
Merged

Fix CoreRT frozen strings handling.#45095
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT

Conversation

@sandreenko

Copy link
Copy Markdown
Contributor

Fix asserts about const non-zero refs that are possible on CoreRT, in the past they were always hidden with GT_NOP but it was creating other issues.

It should fix failures seen in dotnet/runtimelab#374 (comment) introduced by #44398.

With the changes the tests results are:

src\tests\run.cmd runnativeaottests Checked
Total tests run : 2578
Total passing tests: 2565
Total failed tests : 13
Total skipped tests: 0

the 13 failing tests are failing without the change as well, so they are probably preexisting, PTAL @jkotas :

JIT\Directed\tailcall\mutual_recursion\mutual_recursion.cmd [FAIL]	Line 271: JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd [FAIL]
JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd [FAIL]
JIT\Regression\JitBlue\devdiv_902271\DevDiv_902271\DevDiv_902271.cmd [FAIL]
JIT\Regression\JitBlue\GitHub_27924\GitHub_27924\GitHub_27924.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858\b353858.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71120\b71120\b71120.cmd [FAIL]
JIT\Stress\ABI\pinvokes_d\pinvokes_d.cmd [FAIL]
JIT\Stress\ABI\tailcalls_d\tailcalls_d.cmd [FAIL]
JIT\Stress\ABI\stubs_do\stubs_do.cmd [FAIL]
JIT\Stress\ABI\pinvokes_do\pinvokes_do.cmd [FAIL]
JIT\Stress\ABI\tailcalls_do\tailcalls_do.cmd [FAIL]
Loader\classloader\MethodImpl\CovariantReturns\UnitTest\OverrideMoreDerivedReturn\OverrideMoreDerivedReturn.cmd [FAIL]

before the fix there were 90 failures including this 13.

PTAL @dotnet/jit-contrib

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 23, 2020
break;
case O1K_LCLVAR:
assert((lvaTable[assertion->op1.lcl.lclNum].lvType != TYP_REF) || (assertion->op2.u1.iconVal == 0));
if (!IsTargetAbi(CORINFO_CORERT_ABI)) // CoreRT allows non-zero const refs for frozen strings.

@jkotasjkotasNov 23, 2020

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 frozen strings are not really inherent part of CoreRT ABI. Nothing prevents them from being used with CoreCLR as well, we just happen to not do that currently.

It would be better to have a bool frozenObjectsUsed; flag that gets set whenever the JIT/EE interface returns a frozen object, and use this flag for these asserts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

good idea, thank you, fixed.

@jkotas

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Comment threadsrc/coreclr/src/jit/importer.cpp Outdated
Comment threadsrc/coreclr/src/jit/gentree.cpp Outdated

@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. Thanks!

@MichalStrehovsky

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Nope but we're not running the tests very often and the runs have been very noisy ever since we picked up the regression this and the previous pull request is fixing.

I'll take a look once this is mirrored over.

Maybe we should make Pri0 runs mandatory in the CI.

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

Currently you have a broad permissive check. Should we instead do more surgical fine-grained checks by instead asserting that any nonzero TYP_REF integer must be a string handle?

I'm surprised we don't hit asserts elsewhere.

noway_assert(!"unreachable IAT_VALUE case in gtNewStringLiteralNode");
}

setMethodHasFrozenString();

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.

We only see these on CoreRT, so should we keep part of the old assertion check?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

#45095 (comment) there was a discussion about it

@sandreenko
sandreenko marked this pull request as draft November 23, 2020 23:27
@sandreenko
sandreenko marked this pull request as ready for review November 23, 2020 23:50
assert(obj->IsIconHandle(GTF_ICON_STR_HDL));
if (!doesMethodHaveFrozenString())
{
assert(compIsForInlining());

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I have pushed additional changes for a case where we inline a method and pass such string there(as an argument), the inlinee doesn't have a frozen string flag so the check was failing.

@sandreenko
sandreenko merged commit 1fa2054 into dotnet:masterNov 24, 2020
@sandreenko
sandreenko deleted the fixCoreRT branch November 24, 2020 02:42
@jkotas

Copy link
Copy Markdown
Member

Thank you!

@ghostghost locked as resolved and limited conversation to collaborators Dec 24, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Fix CoreRT frozen strings handling. - #45095

Merged
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT
Nov 24, 2020
Merged

Fix CoreRT frozen strings handling.#45095
sandreenko merged 5 commits into
dotnet:masterfrom
sandreenko:fixCoreRT

Conversation

@sandreenko

Copy link
Copy Markdown
Contributor

Fix asserts about const non-zero refs that are possible on CoreRT, in the past they were always hidden with GT_NOP but it was creating other issues.

It should fix failures seen in dotnet/runtimelab#374 (comment) introduced by #44398.

With the changes the tests results are:

src\tests\run.cmd runnativeaottests Checked
Total tests run : 2578
Total passing tests: 2565
Total failed tests : 13
Total skipped tests: 0

the 13 failing tests are failing without the change as well, so they are probably preexisting, PTAL @jkotas :

JIT\Directed\tailcall\mutual_recursion\mutual_recursion.cmd [FAIL]	Line 271: JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd [FAIL]
JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd [FAIL]
JIT\Regression\JitBlue\devdiv_902271\DevDiv_902271\DevDiv_902271.cmd [FAIL]
JIT\Regression\JitBlue\GitHub_27924\GitHub_27924\GitHub_27924.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858\b353858.cmd [FAIL]
JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71120\b71120\b71120.cmd [FAIL]
JIT\Stress\ABI\pinvokes_d\pinvokes_d.cmd [FAIL]
JIT\Stress\ABI\tailcalls_d\tailcalls_d.cmd [FAIL]
JIT\Stress\ABI\stubs_do\stubs_do.cmd [FAIL]
JIT\Stress\ABI\pinvokes_do\pinvokes_do.cmd [FAIL]
JIT\Stress\ABI\tailcalls_do\tailcalls_do.cmd [FAIL]
Loader\classloader\MethodImpl\CovariantReturns\UnitTest\OverrideMoreDerivedReturn\OverrideMoreDerivedReturn.cmd [FAIL]

before the fix there were 90 failures including this 13.

PTAL @dotnet/jit-contrib

@sandreenkosandreenko added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Nov 23, 2020
break;
case O1K_LCLVAR:
assert((lvaTable[assertion->op1.lcl.lclNum].lvType != TYP_REF) || (assertion->op2.u1.iconVal == 0));
if (!IsTargetAbi(CORINFO_CORERT_ABI)) // CoreRT allows non-zero const refs for frozen strings.

@jkotasjkotasNov 23, 2020

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 frozen strings are not really inherent part of CoreRT ABI. Nothing prevents them from being used with CoreCLR as well, we just happen to not do that currently.

It would be better to have a bool frozenObjectsUsed; flag that gets set whenever the JIT/EE interface returns a frozen object, and use this flag for these asserts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

good idea, thank you, fixed.

@jkotas

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Comment threadsrc/coreclr/src/jit/importer.cpp Outdated
Comment threadsrc/coreclr/src/jit/gentree.cpp Outdated

@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. Thanks!

@MichalStrehovsky

Copy link
Copy Markdown
Member

Total failed tests : 13

@MichalStrehovsky Is this known?

Nope but we're not running the tests very often and the runs have been very noisy ever since we picked up the regression this and the previous pull request is fixing.

I'll take a look once this is mirrored over.

Maybe we should make Pri0 runs mandatory in the CI.

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

Currently you have a broad permissive check. Should we instead do more surgical fine-grained checks by instead asserting that any nonzero TYP_REF integer must be a string handle?

I'm surprised we don't hit asserts elsewhere.

noway_assert(!"unreachable IAT_VALUE case in gtNewStringLiteralNode");
}

setMethodHasFrozenString();

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.

We only see these on CoreRT, so should we keep part of the old assertion check?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

#45095 (comment) there was a discussion about it

@sandreenko
sandreenko marked this pull request as draft November 23, 2020 23:27
@sandreenko
sandreenko marked this pull request as ready for review November 23, 2020 23:50
assert(obj->IsIconHandle(GTF_ICON_STR_HDL));
if (!doesMethodHaveFrozenString())
{
assert(compIsForInlining());

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I have pushed additional changes for a case where we inline a method and pass such string there(as an argument), the inlinee doesn't have a frozen string flag so the check was failing.

@sandreenko
sandreenko merged commit 1fa2054 into dotnet:masterNov 24, 2020
@sandreenko
sandreenko deleted the fixCoreRT branch November 24, 2020 02:42
@jkotas

Copy link
Copy Markdown
Member

Thank you!

@ghostghost locked as resolved and limited conversation to collaborators Dec 24, 2020
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@sandreenko@jkotas@MichalStrehovsky@AndyAyersMS