Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Prefetch some queries used by the metadata encoder #67888

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

Merged
merged 7 commits into from
Mar 21, 2020
Merged

Prefetch some queries used by the metadata encoder #67888

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6cd0dca
Prefetch queries used by the metadata encoder
Zoxc Jan 4, 2020
1a34cbc
Encode exported symbols last
Zoxc Jan 11, 2020
03af82b
Prefetch exported symbols
Zoxc Jan 11, 2020
3d59c0e
Make the timer more verbose
Zoxc Jan 11, 2020
a2bca90
Make metadata prefetching more accurate
Zoxc Jan 13, 2020
801e442
Add some comments
Zoxc Mar 14, 2020
027c8d9
Use `assert_ignored` when encoding metadata
Zoxc Mar 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Encode exported symbols last
  • Loading branch information
@Zoxc
Zoxc committed Mar 19, 2020
commit 1a34cbc2e229d3d146a08ce1dc1d76497e05337d
12 changes: 6 additions & 6 deletions src/librustc_metadata/rmeta/encoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,12 +467,6 @@ impl<'tcx> EncodeContext<'tcx> {
let impls = self.encode_impls();
let impl_bytes = self.position() - i;

// Encode exported symbols info.
i = self.position();
let exported_symbols = self.tcx.exported_symbols(LOCAL_CRATE);
let exported_symbols = self.encode_exported_symbols(&exported_symbols);
let exported_symbols_bytes = self.position() - i;

let tcx = self.tcx;

// Encode the items.
Expand Down Expand Up @@ -513,6 +507,12 @@ impl<'tcx> EncodeContext<'tcx> {
let proc_macro_data = self.encode_proc_macros();
let proc_macro_data_bytes = self.position() - i;

// Encode exported symbols info.
i = self.position();
let exported_symbols = self.tcx.exported_symbols(LOCAL_CRATE);
let exported_symbols = self.encode_exported_symbols(&exported_symbols);
let exported_symbols_bytes = self.position() - i;
Copy link
Member

Choose a reason for hiding this comment

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

Could this commit be fleshed out with some description of why this is done? (i.e., in the commit message ideally)?

Right now it looks like presumably it's to make sure the exported_symbols query can fallback on the parallel MIR optimization in the last commit... but I'm not sure.


let attrs = tcx.hir().krate_attrs();
let has_default_lib_allocator = attr::contains_name(&attrs, sym::default_lib_allocator);

Expand Down
3 changes: 2 additions & 1 deletion src/librustc_metadata/rmeta/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,15 @@ crate struct CrateRoot<'tcx> {
source_map: Lazy<[rustc_span::SourceFile]>,
def_path_table: Lazy<map::definitions::DefPathTable>,
impls: Lazy<[TraitImpls]>,
exported_symbols: Lazy!([(ExportedSymbol<'tcx>, SymbolExportLevel)]),
interpret_alloc_index: Lazy<[u32]>,

per_def: LazyPerDefTables<'tcx>,

/// The DefIndex's of any proc macros declared by this crate.
proc_macro_data: Option<Lazy<[DefIndex]>>,

exported_symbols: Lazy!([(ExportedSymbol<'tcx>, SymbolExportLevel)]),

compiler_builtins: bool,
needs_allocator: bool,
needs_panic_runtime: bool,
Expand Down