') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); tighten sanity checks around Scalar and ScalarPair by RalfJung · Pull Request #96220 · rust-lang/rust · GitHub
Skip to content

tighten sanity checks around Scalar and ScalarPair - #96220

Merged
bors merged 6 commits into
rust-lang:masterfrom
RalfJung:scalar-no-padding
May 11, 2022
Merged

tighten sanity checks around Scalar and ScalarPair#96220
bors merged 6 commits into
rust-lang:masterfrom
RalfJung:scalar-no-padding

Conversation

@RalfJung

@RalfJungRalfJung commented Apr 19, 2022•
edited
Loading

Copy link
Copy Markdown
Member

While investigating #96185 I noticed codegen has tighter sanity checks here than Miri does, so I added some more assertions. Strangely, some of them fail, so I also needed to add a HACK... that is probably worth looking into.

This does not fix that issue, but it changes the ICE messages, making it quite clear that we have a scalar whose size is not the same as that of the surrounding layout.

r? @oli-obk

@rust-highfive

rust-highfive commented Apr 19, 2022

Copy link
Copy Markdown
Contributor

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 19, 2022
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 19, 2022
RalfJung
RalfJung commented Apr 19, 2022
View reviewed changes
Comment threadcompiler/rustc_const_eval/src/interpret/place.rs Outdated

@RalfJungRalfJungApr 19, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I removed all this since I think it is redundant with the scalar size check in to_bits that alloc.write_scalar does.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
RalfJung
RalfJung commented Apr 19, 2022
View reviewed changes
Comment threadcompiler/rustc_const_eval/src/interpret/operand.rs Outdated

@RalfJungRalfJungApr 19, 2022

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.

This is the odd one -- a ScalarPair at Aggregate ABI just doesn't seem right.

I added sanity checking in operand_downcast, and my theory was confirmed: when downcasting std::option::Option<*mut std::ffi::c_void> to variant 1, the ABI changes from ScalarPair to Aggegreate.

Details
downcast to 1 turned ScalarPair layout into non-scalar layout: TyAndLayout {
ty: std::option::Option<*mut std::ffi::c_void>,
layout: Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 0,
},
],
memory_index: [
0,
],
},
variants: Multiple {
tag: Initialized {
value: Int(
I64,
false,
),
valid_range: 0..=1,
},
tag_encoding: Direct,
tag_field: 0,
variants: [
Layout {
fields: Arbitrary {
offsets: [],
memory_index: [],
},
variants: Single {
index: 0,
},
abi: Aggregate {
sized: true,
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 0,
},
pref: Align {
pow2: 3,
},
},
size: Size {
raw: 8,
},
},
Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 8,
},
],
memory_index: [
0,
],
},
variants: Single {
index: 1,
},
abi: Aggregate {
sized: true,
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 3,
},
pref: Align {
pow2: 3,
},
},
size: Size {
raw: 16,
},
},
],
},
abi: ScalarPair(
Initialized {
value: Int(
I64,
false,
),
valid_range: 0..=1,
},
Initialized {
value: Pointer,
valid_range: 0..=18446744073709551615,
},
),
largest_niche: Some(
Niche {
offset: Size {
raw: 0,
},
value: Int(
I64,
false,
),
valid_range: 0..=1,
},
),
align: AbiAndPrefAlign {
abi: Align {
pow2: 3,
},
pref: Align {
pow2: 3,
},
},
size: Size {
raw: 16,
},
},
} to TyAndLayout {
ty: std::option::Option<*mut std::ffi::c_void>,
layout: Layout {
fields: Arbitrary {
offsets: [
Size {
raw: 8,
},
],
memory_index: [
0,
],
},
variants: Single {
index: 1,
},
abi: Aggregate {
sized: true,
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align {
pow2: 3,
},
pref: Align {
pow2: 3,
},
},
size: Size {
raw: 16,
},
},
}

@RalfJungRalfJungApr 19, 2022

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.

Reported as #96221.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung

RalfJung commented Apr 19, 2022

Copy link
Copy Markdown
MemberAuthor

Ah, I guess this is enough to anger const-eval on the runtime version of this example.^^

I guess this is blocked on fixing that enum layout then.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@oli-obkoli-obk added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Apr 20, 2022
@oli-obk

oli-obk commented Apr 20, 2022

Copy link
Copy Markdown
Contributor

Const prop strikes again 🙈

@RalfJung

RalfJung commented Apr 20, 2022

Copy link
Copy Markdown
MemberAuthor

The curious part is that const prop managed to dodge the assertions we had in place before. I guess that goes to show some extra assertions are really needed. ;)

@bors

bors commented May 5, 2022

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #96734) made this pull request unmergeable. Please resolve the merge conflicts.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@RalfJung

RalfJung commented May 10, 2022

Copy link
Copy Markdown
MemberAuthor

I rebased and commented out the things that are broken by #96185. @oli-obk I think this is ready for review.

Also let's ensure this does not cost too much perf.
@bors try @rust-timer queue

@rust-timer

rust-timer commented May 10, 2022

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 10, 2022
@bors

bors commented May 10, 2022

Copy link
Copy Markdown
Collaborator

⌛ Trying commit aef8a93 with merge e20aa27db438b844d57419af48c40860d88dbcda...

@RalfJungRalfJung removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label May 10, 2022
@rust-timer

rust-timer commented May 11, 2022

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 11, 2022
@bors

bors commented May 11, 2022

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 14f6daf with merge bae4e5b81419bd94533a9428d118973194da792b...

@bors

bors commented May 11, 2022

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: bae4e5b81419bd94533a9428d118973194da792b (bae4e5b81419bd94533a9428d118973194da792b)

@rust-timer

rust-timer commented May 11, 2022

Copy link
Copy Markdown
Collaborator

Queued bae4e5b81419bd94533a9428d118973194da792b with parent f296b9a, future comparison URL.

@rust-timer

rust-timer commented May 11, 2022

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (bae4e5b81419bd94533a9428d118973194da792b): comparison url.

Summary:

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
Regressions 😿
(primary)		Regressions 😿
(secondary)		Improvements 🎉
(primary)		Improvements 🎉
(secondary)		All 😿 🎉
(primary)
count103000
mean2N/A1.4%N/AN/AN/A
maxN/A1.5%N/AN/AN/A

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

Footnotes

  1. number of relevant changes↩

  2. the arithmetic mean of the percent change↩

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 11, 2022
@RalfJung

RalfJung commented May 11, 2022

Copy link
Copy Markdown
MemberAuthor

Hm, well, that did not help...

Maybe the match on a pair (*base, base.layout.abi) compiles less nicely than the previous code?
All but one arm of this match is _, so I could probably rewrite it in different style. Not sure if that's worth it though, LLVM will probably realize that this is what the control flow boils down to.

@oli-obk

oli-obk commented May 11, 2022

Copy link
Copy Markdown
Contributor

mir interpret is always hitting LLVM inlining thresholds, I don't think it's worth looking into further in this PR

@bors r+

@bors

bors commented May 11, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 14f6daf has been approved by oli-obk

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 11, 2022
@bors

bors commented May 11, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 14f6daf with merge 3e2c8514996fffe0081afd8cd6dcf2fcf362d4ff...

@borsbors mentioned this pull request May 11, 2022
Merged
@rust-log-analyzer

rust-log-analyzer commented May 11, 2022

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors

bors commented May 11, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 11, 2022
@oli-obk

oli-obk commented May 11, 2022

Copy link
Copy Markdown
Contributor

@bors retry timeout, logs empty/stuck

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 11, 2022
@bors

bors commented May 11, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 14f6daf with merge 6dd6840...

@bors

bors commented May 11, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 6dd6840 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 11, 2022
@bors
bors merged commit 6dd6840 into rust-lang:masterMay 11, 2022
@rustbotrustbot added this to the 1.62.0 milestone May 11, 2022
@rust-timer

rust-timer commented May 11, 2022

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (6dd6840): comparison url.

Summary:

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
Regressions 😿
(primary)		Regressions 😿
(secondary)		Improvements 🎉
(primary)		Improvements 🎉
(secondary)		All 😿 🎉
(primary)
count104000
mean2N/A1.1%N/AN/AN/A
maxN/A1.5%N/AN/AN/A

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. number of relevant changes↩

  2. the arithmetic mean of the percent change↩

@RalfJung
RalfJung deleted the scalar-no-padding branch May 12, 2022 07:20
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@oli-obkoli-obk

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.62.0

Development

Successfully merging this pull request may close these issues.

7 participants

@RalfJung@rust-highfive@rust-log-analyzer@oli-obk@bors@rust-timer@rustbot