Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix x test src/tools/error_index_generator --stage {0,1} #95440

Merged
merged 2 commits into from
Apr 8, 2022

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Mar 29, 2022

There were two fixes needed:

  1. Use top_stage instead of top_stage - 1. There was a long and torturous comment about trying to match rustdoc's version, but it works better without the hard-coding than with (before it gave errors that libtest.so couldn't be found).
  2. Make sure that ci-llvm/lib is added to LD_LIBRARY_PATH. Previously the error index would be unable to load LLVM for stage0 builds.

At some point we should probably have a discussion about how rustdoc stages should be numbered;
confusion between 0/1/2 has come up several times in bootstrap now. cc #92538

Note that this is still broken when using download-rustc = true and --stage 1,
but that's really a corner case and should affect almost no one. --stage {0,2}
work fine with download-rustc.

Fixes #80096.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 29, 2022
@rust-log-analyzer

This comment has been minimized.

There were two fixes needed:
1. Use `top_stage` instead of `top_stage - 1`. There was a long and torturous comment about trying to match rustdoc's version, but it works better without the hard-coding than with.
2. Make sure that `ci-llvm/lib` is added to LD_LIBRARY_PATH. Previously the error index would be unable to load LLVM for stage0 builds.

At some point we should probably have a discussion about how rustdoc stages should be numbered;
confusion between 0/1/2 has come up several times in bootstrap now.

Note that this is still broken when using `download-rustc = true` and `--stage 1`,
but that's *really* a corner case and should affect almost no one. `--stage {0,2}`
work fine with download-rustc.
@yaahc
Copy link
Member

yaahc commented Apr 7, 2022

fwiw, I've been running into the libllvm not found issue consistently recently, specifically the one consistent with nick's description here, and tested out this fix and it resolved the issue. I am eager for this to land.

@Mark-Simulacrum
Copy link
Member

@bors r+

There was a long and torturous comment about trying to match rustdoc's version, but it works better without the hard-coding than with (before it gave errors that libtest.so couldn't be found).
...
At some point we should probably have a discussion about how rustdoc stages should be numbered;
confusion between 0/1/2 has come up several times in bootstrap now.

Yeah, I agree that there's work to be done here. The comment there was probably authored by me (too long ago for it to be in cache, but I recall vaguely). I think this patch is probably fine -- particularly given your testing -- though it may cause some additional builds in edge cases. I think our bootstrap tests should be largely catching any likely regressions, and my own CI timing scripts will catch anything on the slower builders, so I'm hopeful we're OK there.

We can revert or further iterate if this causes trouble to some workloads. My personal take has long been that consuming rustdoc as a library, not a binary, is a mistake and we should avoid it. I think the easiest way to do that is to just special-case any of the logic the error index wants behind a -Z flag and use that (rustdoc -Z ...) in combination with moving any generation logic into rustbuild itself. That should be fairly straightforward and will likely eliminate a good chunk of operational pain here.

@bors
Copy link
Contributor

bors commented Apr 7, 2022

📌 Commit 7470592 has been approved by Mark-Simulacrum

@bors bors 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 Apr 7, 2022
@bors
Copy link
Contributor

bors commented Apr 8, 2022

⌛ Testing commit 7470592 with merge dc1f829...

@bors
Copy link
Contributor

bors commented Apr 8, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing dc1f829 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 8, 2022
@bors bors merged commit dc1f829 into rust-lang:master Apr 8, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 8, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (dc1f829): comparison url.

Summary:

  • Primary benchmarks: 😿 relevant regressions found
  • Secondary benchmarks: 😿 relevant regressions found
Regressions 😿
(primary)
Regressions 😿
(secondary)
Improvements 🎉
(primary)
Improvements 🎉
(secondary)
All 😿 🎉
(primary)
count1 2 6 0 0 2
mean2 0.3% 1.0% N/A N/A 0.3%
max 0.3% 1.2% N/A N/A 0.3%

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

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

Footnotes

  1. number of relevant changes

  2. the arithmetic mean of the percent change

@rustbot rustbot added the perf-regression Performance regression. label Apr 8, 2022
@rylev
Copy link
Member

rylev commented Apr 8, 2022

Looks like the perf regressions here we just a blip. The run for the next PR shows the exact same test cases improving by the same amount as they regressed here. Going to remove the perf regression label since this isn't actually a regression at all.

@rustbot label: -perf-regression

@rustbot rustbot removed the perf-regression Performance regression. label Apr 8, 2022
@jyn514 jyn514 deleted the error-index branch April 8, 2022 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

error_index_generator: error while loading shared libraries: libLLVM-11-rust-1.50.0-nightly.so
9 participants