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.

Sign up for GitHub

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

Jump to bottom

Remove the source archive functionality of ArchiveWriter #98098

Merged
merged 5 commits into from
Jun 21, 2022
Merged

Remove the source archive functionality of ArchiveWriter #98098

merged 5 commits into from
Jun 21, 2022

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Jun 14, 2022

We now build archives through strictly additive means rather than taking an existing archive and potentially substracting parts. This is simpler and makes it easier to swap out the archive writer in #97485.

@bjorn3
Inline ArchiveConfig struct into LlvmArchiveBuilder
70e084a
@bjorn3
Remove src_files and remove_file
43929a8 
They only apply to the main source archive and their role can be
fulfilled through the skip argument of add_archive too.
@bjorn3 bjorn3 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 14, 2022
@rust-highfive
Copy link
Collaborator

Some changes occured to rustc_codegen_cranelift

cc @bjorn3

Some changes occured to rustc_codegen_gcc

cc @antoyo

@rust-highfive
Copy link
Collaborator

r? @michaelwoerister

(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 Jun 14, 2022
@bjorn3
Copy link
Member Author

bjorn3 commented Jun 14, 2022

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

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

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 14, 2022
@bors
Copy link
Contributor

bors commented Jun 14, 2022

⌛ Trying commit a0df21d127494fbe882058dd758e4584aba11c61 with merge dde83d14faf6a20c9da4f9a8f2e79c480cc99b31...

@bjorn3
Copy link
Member Author

bjorn3 commented Jun 14, 2022

Forgot to commit a change to cg_gcc.

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

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

@bors
Copy link
Contributor

bors commented Jun 14, 2022

⌛ Trying commit 5a3ebc591652f4c49d36e37d8674e45874f06426 with merge 3113cc267866d900333eee92db6f39e681cb6760...

@bors
Copy link
Contributor

bors commented Jun 14, 2022

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

@rust-timer
Copy link
Collaborator

Queued 3113cc267866d900333eee92db6f39e681cb6760 with parent 872503d, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3113cc267866d900333eee92db6f39e681cb6760): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvement found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -1.0% -1.0% 1
All 😿🎉 (primary) N/A N/A 0

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results
  • Primary benchmarks: mixed results
  • Secondary benchmarks: 😿 relevant regression found
mean1 max count2
Regressions 😿
(primary)		 7.3% 7.3% 1
Regressions 😿
(secondary)		 2.5% 2.5% 1
Improvements 🎉
(primary)		 -1.9% -1.9% 1
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) 2.7% 7.3% 2

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. the arithmetic mean of the percent change ↩ ↩2

  2. number of relevant changes ↩ ↩2

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 14, 2022
@michaelwoerister
Copy link
Member

Thanks, @bjorn3, looks good to me!

@bors r+

@bors
Copy link
Contributor

bors commented Jun 16, 2022

📌 Commit 5a3ebc591652f4c49d36e37d8674e45874f06426 has been approved by michaelwoerister

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

bors commented Jun 16, 2022

⌛ Testing commit 5a3ebc591652f4c49d36e37d8674e45874f06426 with merge 2c30a9e214c3c81727926088e45382bc8c918de3...

@bors
Copy link
Contributor

bors commented Jun 16, 2022

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 16, 2022
@bjorn3
Remove the source archive functionality of ArchiveWriter
18c6fe5 
We now build archives through strictly additive means rather than taking
an existing archive and potentially substracting parts.
@bjorn3
Small refactoring
7643f82
@bjorn3
Copy link
Member Author

bjorn3 commented Jun 19, 2022

That seems to have fixed it. Doing one final run with all reverts removed and then I can remove the debug commit.

@bors try

@bors
Copy link
Contributor

bors commented Jun 19, 2022

⌛ Trying commit bc36a08ea5184b5f93770271a3217817b78e9393 with merge 89977ebb6b9823d02a4b1c2b5a73840663cade92...

@bors
Copy link
Contributor

bors commented Jun 19, 2022

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

@bjorn3
Copy link
Member Author

bjorn3 commented Jun 19, 2022

It is indeed fixed. Removed the debug commit. The change is in 7ff0df5

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 19, 2022
@michaelwoerister
Copy link
Member

Thanks, @bjorn3! Looks good.

@bors r+

@bors
Copy link
Contributor

bors commented Jun 21, 2022

📌 Commit 7643f82 has been approved by michaelwoerister

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

bors commented Jun 21, 2022

⌛ Testing commit 7643f82 with merge dc80ca7...

@bjorn3
Copy link
Member Author

bjorn3 commented Jun 21, 2022

Looks like macOS CI got stuck. Should I ask bors to retry?

@bors
Copy link
Contributor

bors commented Jun 21, 2022

☀️ Test successful - checks-actions
Approved by: michaelwoerister
Pushing dc80ca7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2022
@bors bors merged commit dc80ca7 into rust-lang:master Jun 21, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 21, 2022
@bjorn3
Copy link
Member Author

bjorn3 commented Jun 21, 2022

Looks like I was just too impatient.

@bjorn3 bjorn3 deleted the archive_refactor branch June 21, 2022 19:43
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (dc80ca7): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 🎉 relevant improvements found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 N/A N/A 0
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -0.8% -1.4% 2
All 😿🎉 (primary) N/A N/A 0

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 2.4% 3.6% 2
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 N/A N/A 0
All 😿🎉 (primary) N/A N/A 0

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)		 N/A N/A 0
Regressions 😿
(secondary)		 2.0% 2.0% 1
Improvements 🎉
(primary)		 N/A N/A 0
Improvements 🎉
(secondary)		 -2.0% -2.0% 1
All 😿🎉 (primary) N/A N/A 0

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

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

celinval added a commit to celinval/kani-dev that referenced this pull request Jul 6, 2022
@celinval
Update toolchain to 2022-07-05
4a4539b 
The updates required were related to the following changes:
  - Simplify memory ordering intrinsics
    - rust-lang/rust#97423
  - once cell renamings
    - rust-lang/rust#98165
  - Rename the ConstS::val field as kind
    - rust-lang/rust#97935
  - Remove the source archive functionality of ArchiveWriter
    - rust-lang/rust#98098
  - Use valtrees as the type-system representation for constant values
    - rust-lang/rust#96591
@celinval celinval mentioned this pull request Jul 6, 2022
Merged
4 tasks
celinval added a commit to model-checking/kani that referenced this pull request Jul 6, 2022
@celinval
Update toolchain to 2022-07-05 (#1340)
d84b123 
* Update toolchain to 2022-07-05

The updates required were related to the following changes:
  - Simplify memory ordering intrinsics
    - rust-lang/rust#97423
  - once cell renamings
    - rust-lang/rust#98165
  - Rename the ConstS::val field as kind
    - rust-lang/rust#97935
  - Remove the source archive functionality of ArchiveWriter
    - rust-lang/rust#98098
  - Use valtrees as the type-system representation for constant values
    - rust-lang/rust#96591

* Codegen unimplemented for unsupported constant slices

See #1339 for more details.

* Fix copyright check

* Use codegen_option_span instead
JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Jul 26, 2022
@bors
Auto merge of rust-lang#98098 - bjorn3:archive_refactor, r=michaelwoe…
92749f0 
…rister

Remove the source archive functionality of ArchiveWriter

We now build archives through strictly additive means rather than taking an existing archive and potentially substracting parts. This is simpler and makes it easier to swap out the archive writer in rust-lang#97485.
matthiaskrgr pushed a commit to matthiaskrgr/rust that referenced this pull request Mar 7, 2023
@bors
Auto merge of rust-lang#98098 - bjorn3:archive_refactor, r=michaelwoe…
6bad0d5 
…rister

Remove the source archive functionality of ArchiveWriter

We now build archives through strictly additive means rather than taking an existing archive and potentially substracting parts. This is simpler and makes it easier to swap out the archive writer in rust-lang#97485.
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@michaelwoerister michaelwoerister

Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. 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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.63.0
Development

Successfully merging this pull request may close these issues.
7 participants
@bjorn3 @rust-highfive @rust-timer @bors @michaelwoerister @rust-log-analyzer @rustbot