Skip to content

Commit 4ada799

Browse files
blyxyasblyxyas
committed
Fixup things for perf run
Remove build script
1 parent 665f2e9 commit 4ada799

File tree

9 files changed

+85
-65
lines changed

9 files changed

+85
-65
lines changed

‎Cargo.lock

+15-8
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ dependencies = [
13821382
"fluent-syntax",
13831383
"intl-memoizer",
13841384
"intl_pluralrules",
1385-
"rustc-hash",
1385+
"rustc-hash 1.1.0",
13861386
"self_cell 0.10.3",
13871387
"smallvec",
13881388
"unic-langid",
@@ -2083,7 +2083,7 @@ dependencies = [
20832083
"anyhow",
20842084
"clap",
20852085
"fs-err",
2086-
"rustc-hash",
2086+
"rustc-hash 1.1.0",
20872087
"rustdoc-json-types",
20882088
"serde",
20892089
"serde_json",
@@ -2415,7 +2415,7 @@ dependencies = [
24152415
"memmap2",
24162416
"parking_lot",
24172417
"perf-event-open-sys",
2418-
"rustc-hash",
2418+
"rustc-hash 1.1.0",
24192419
"smallvec",
24202420
]
24212421

@@ -3025,7 +3025,7 @@ checksum = "c4e8e505342045d397d0b6674dcb82d6faf5cf40484d30eeb88fc82ef14e903f"
30253025
dependencies = [
30263026
"datafrog",
30273027
"log",
3028-
"rustc-hash",
3028+
"rustc-hash 1.1.0",
30293029
]
30303030

30313031
[[package]]
@@ -3457,6 +3457,12 @@ version = "1.1.0"
34573457
source = "registry+https://github.com/rust-lang/crates.io-index"
34583458
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
34593459

3460+
[[package]]
3461+
name = "rustc-hash"
3462+
version = "2.0.0"
3463+
source = "registry+https://github.com/rust-lang/crates.io-index"
3464+
checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
3465+
34603466
[[package]]
34613467
name = "rustc-main"
34623468
version = "0.0.0"
@@ -3834,6 +3840,7 @@ dependencies = [
38343840
"memmap2",
38353841
"parking_lot",
38363842
"portable-atomic",
3843+
"rustc-hash 2.0.0",
38373844
"rustc-rayon",
38383845
"rustc_arena",
38393846
"rustc_graphviz",
@@ -4521,7 +4528,7 @@ dependencies = [
45214528
name = "rustc_pattern_analysis"
45224529
version = "0.0.0"
45234530
dependencies = [
4524-
"rustc-hash",
4531+
"rustc-hash 1.1.0",
45254532
"rustc_apfloat",
45264533
"rustc_arena",
45274534
"rustc_data_structures",
@@ -4913,7 +4920,7 @@ name = "rustdoc-json-types"
49134920
version = "0.1.0"
49144921
dependencies = [
49154922
"bincode",
4916-
"rustc-hash",
4923+
"rustc-hash 1.1.0",
49174924
"serde",
49184925
"serde_json",
49194926
]
@@ -5641,7 +5648,7 @@ dependencies = [
56415648
"ignore",
56425649
"miropt-test-tools",
56435650
"regex",
5644-
"rustc-hash",
5651+
"rustc-hash 1.1.0",
56455652
"semver",
56465653
"similar",
56475654
"termcolor",
@@ -5895,7 +5902,7 @@ version = "0.5.0"
58955902
source = "registry+https://github.com/rust-lang/crates.io-index"
58965903
checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
58975904
dependencies = [
5898-
"rustc-hash",
5905+
"rustc-hash 1.1.0",
58995906
]
59005907

59015908
[[package]]

‎compiler/rustc_data_structures/Cargo.toml

+6-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ bitflags = "2.4.1"
1010
either = "1.0"
1111
elsa = "=1.7.1"
1212
ena = "0.14.3"
13-
gxhash = "3.4.1"
1413
indexmap = { version = "2.0.0" }
1514
jobserver_crate = { version = "0.1.28", package = "jobserver" }
1615
measureme = "11"
@@ -53,6 +52,12 @@ memmap2 = "0.2.1"
5352
[target.'cfg(any(target_arch = "mips", target_arch = "powerpc", target_arch = "sparc"))'.dependencies]
5453
portable-atomic = "1.5.1"
5554

55+
[target.'cfg(not(all(target_feature = "sse2", target_feature = "aes")))'.dependencies]
56+
rustc-hash = "2.0.0"
57+
58+
[target.'cfg(all(target_feature = "sse2", target_feature = "aes"))'.dependencies]
59+
gxhash = "3.4.1"
60+
5661
[features]
5762
# tidy-alphabetical-start
5863
rustc_use_parallel_compiler = ["indexmap/rustc-rayon", "rustc-rayon"]

‎compiler/rustc_data_structures/src/gx.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
use std::{
2-
collections::{HashMap, HashSet},
3-
hash::BuildHasherDefault,
4-
};
1+
use std::hash::BuildHasherDefault;
52

6-
// pub use rustc_hash::{GxHashMap, GxHashSet, GxHasher};
3+
#[cfg(not(all(target_feature = "sse2", target_feature = "aes")))]
4+
pub use rustc_hash::{FxHashMap as GxHashMap, FxHashSet as GxHashSet, FxHasher as GxHasher};
75

6+
#[cfg(all(target_feature = "sse2", target_feature = "aes"))]
87
pub use gxhash::GxHasher;
98

109
pub type StdEntry<'a, K, V> = std::collections::hash_map::Entry<'a, K, V>;
1110

12-
pub type GxHashMap<K, V> = HashMap<K, V, BuildHasherDefault<GxHasher>>;
13-
pub type GxHashSet<T> = HashSet<T, BuildHasherDefault<GxHasher>>;
11+
#[cfg(all(target_feature = "sse2", target_feature = "aes"))]
12+
pub type GxHashMap<K, V> = std::collections::HashMap<K, V, BuildHasherDefault<GxHasher>>;
13+
#[cfg(all(target_feature = "sse2", target_feature = "aes"))]
14+
pub type GxHashSet<T> = std::collections::HashSet<T, BuildHasherDefault<GxHasher>>;
1415

1516
pub type GxIndexMap<K, V> = indexmap::IndexMap<K, V, BuildHasherDefault<GxHasher>>;
1617
pub type GxIndexSet<V> = indexmap::IndexSet<V, BuildHasherDefault<GxHasher>>;

‎compiler/rustc_hir_typeck/src/method/suggest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2907,7 +2907,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
29072907
ty::Adt(def, _) => Some(def.did()),
29082908
_ => None,
29092909
})
2910-
.collect::<FxIndexSet<_>>();
2910+
.collect::<GxIndexSet<_>>();
29112911
let mut foreign_spans: MultiSpan = foreign_def_ids
29122912
.iter()
29132913
.filter_map(|def_id| {

‎tests/ui/generic-associated-types/self-outlives-lint.stderr

+11-11
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,6 @@ LL | type Bar<'b>;
108108
= note: this bound is currently required to ensure that impls have maximum flexibility
109109
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
110110

111-
error: missing required bound on `Iterator`
112-
--> $DIR/self-outlives-lint.rs:142:5
113-
|
114-
LL | type Iterator<'a>: Iterator<Item = Self::Item<'a>>;
115-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
116-
| |
117-
| help: add the required where clause: `where Self: 'a`
118-
|
119-
= note: this bound is currently required to ensure that impls have maximum flexibility
120-
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
121-
122111
error: missing required bound on `Item`
123112
--> $DIR/self-outlives-lint.rs:140:5
124113
|
@@ -130,6 +119,17 @@ LL | type Item<'a>;
130119
= note: this bound is currently required to ensure that impls have maximum flexibility
131120
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
132121

122+
error: missing required bound on `Iterator`
123+
--> $DIR/self-outlives-lint.rs:142:5
124+
|
125+
LL | type Iterator<'a>: Iterator<Item = Self::Item<'a>>;
126+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
127+
| |
128+
| help: add the required where clause: `where Self: 'a`
129+
|
130+
= note: this bound is currently required to ensure that impls have maximum flexibility
131+
= note: we are soliciting feedback, see issue #87479 <https://github.com/rust-lang/rust/issues/87479> for more information
132+
133133
error: missing required bound on `Item`
134134
--> $DIR/self-outlives-lint.rs:148:5
135135
|

‎tests/ui/lint/unused/unused-macro-rules-compile-error.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ note: the lint level is defined here
1010
LL | #![deny(unused_macro_rules)]
1111
| ^^^^^^^^^^^^^^^^^^
1212

13-
error: rule #3 of macro `num2` is never used
14-
--> $DIR/unused-macro-rules-compile-error.rs:22:5
15-
|
16-
LL | (two_) => { compile_error! };
17-
| ^^^^^^
18-
1913
error: rule #2 of macro `num2` is never used
2014
--> $DIR/unused-macro-rules-compile-error.rs:20:5
2115
|
2216
LL | (two) => { fn compile_error() {} };
2317
| ^^^^^
2418

19+
error: rule #3 of macro `num2` is never used
20+
--> $DIR/unused-macro-rules-compile-error.rs:22:5
21+
|
22+
LL | (two_) => { compile_error! };
23+
| ^^^^^^
24+
2525
error: aborting due to 3 previous errors
2626

‎tests/ui/lint/unused/unused-macro-rules-decl.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
error: rule #4 of macro `num` is never used
2-
--> $DIR/unused-macro-rules-decl.rs:11:5
1+
error: rule #2 of macro `num` is never used
2+
--> $DIR/unused-macro-rules-decl.rs:9:5
33
|
4-
LL | (four) => { 4 },
5-
| ^^^^^^
4+
LL | (two) => { 2 },
5+
| ^^^^^
66
|
77
note: the lint level is defined here
88
--> $DIR/unused-macro-rules-decl.rs:2:9
99
|
1010
LL | #![deny(unused_macro_rules)]
1111
| ^^^^^^^^^^^^^^^^^^
1212

13-
error: rule #2 of macro `num` is never used
14-
--> $DIR/unused-macro-rules-decl.rs:9:5
13+
error: rule #4 of macro `num` is never used
14+
--> $DIR/unused-macro-rules-decl.rs:11:5
1515
|
16-
LL | (two) => { 2 },
17-
| ^^^^^
16+
LL | (four) => { 4 },
17+
| ^^^^^^
1818

1919
error: rule #3 of macro `num_rec` is never used
2020
--> $DIR/unused-macro-rules-decl.rs:31:5

‎tests/ui/lint/unused/unused-macro-rules.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
error: rule #4 of macro `num` is never used
2-
--> $DIR/unused-macro-rules.rs:10:5
1+
error: rule #2 of macro `num` is never used
2+
--> $DIR/unused-macro-rules.rs:8:5
33
|
4-
LL | (four) => { 4 };
5-
| ^^^^^^
4+
LL | (two) => { 2 };
5+
| ^^^^^
66
|
77
note: the lint level is defined here
88
--> $DIR/unused-macro-rules.rs:1:9
99
|
1010
LL | #![deny(unused_macro_rules)]
1111
| ^^^^^^^^^^^^^^^^^^
1212

13-
error: rule #2 of macro `num` is never used
14-
--> $DIR/unused-macro-rules.rs:8:5
13+
error: rule #4 of macro `num` is never used
14+
--> $DIR/unused-macro-rules.rs:10:5
1515
|
16-
LL | (two) => { 2 };
17-
| ^^^^^
16+
LL | (four) => { 4 };
17+
| ^^^^^^
1818

1919
error: rule #3 of macro `num_rec` is never used
2020
--> $DIR/unused-macro-rules.rs:30:5

‎tests/ui/stats/hir-stats.stderr

+22-15
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ ast-stats-1 ExprField 48 ( 0.7%) 1 48
88
ast-stats-1 WherePredicate 56 ( 0.8%) 1 56
99
ast-stats-1 - BoundPredicate 56 ( 0.8%) 1
1010
ast-stats-1 Attribute 64 ( 1.0%) 2 32
11-
ast-stats-1 - Normal 32 ( 0.5%) 1
1211
ast-stats-1 - DocComment 32 ( 0.5%) 1
12+
ast-stats-1 - Normal 32 ( 0.5%) 1
1313
ast-stats-1 Local 80 ( 1.2%) 1 80
1414
ast-stats-1 ForeignItem 88 ( 1.3%) 1 88
1515
ast-stats-1 - Fn 88 ( 1.3%) 1
1616
ast-stats-1 Arm 96 ( 1.4%) 2 48
1717
ast-stats-1 FnDecl 120 ( 1.8%) 5 24
18+
ast-stats-1 Param 160 ( 2.4%) 4 40
1819
ast-stats-1 FieldDef 160 ( 2.4%) 2 80
1920
ast-stats-1 Stmt 160 ( 2.4%) 5 32
2021
ast-stats-1 - Let 32 ( 0.5%) 1
@@ -41,9 +42,15 @@ ast-stats-1 - Lit 144 ( 2.2%) 2
4142
ast-stats-1 - Block 216 ( 3.3%) 3
4243
ast-stats-1 PathSegment 744 (11.2%) 31 24
4344
ast-stats-1 Ty 896 (13.5%) 14 64
44-
ast-stats-1 - Ptr 64 ( 1.0%) 1
4545
ast-stats-1 - Ref 64 ( 1.0%) 1
46+
ast-stats-1 - Ptr 64 ( 1.0%) 1
4647
ast-stats-1 - ImplicitSelf 128 ( 1.9%) 2
48+
ast-stats-1 - Path 640 ( 9.7%) 10
49+
ast-stats-1 Item 1_224 (18.5%) 9 136
50+
ast-stats-1 - ForeignMod 136 ( 2.1%) 1
51+
ast-stats-1 - Trait 136 ( 2.1%) 1
52+
ast-stats-1 - Impl 136 ( 2.1%) 1
53+
ast-stats-1 - Enum 136 ( 2.1%) 1
4754
ast-stats-1 - Path 640 ( 9.6%) 10
4855
ast-stats-1 Item 1_224 (18.4%) 9 136
4956
ast-stats-1 - Trait 136 ( 2.0%) 1
@@ -73,6 +80,7 @@ ast-stats-2 FnDecl 120 ( 1.6%) 5 24
7380
ast-stats-2 Attribute 128 ( 1.8%) 4 32
7481
ast-stats-2 - DocComment 32 ( 0.4%) 1
7582
ast-stats-2 - Normal 96 ( 1.3%) 3
83+
ast-stats-2 Param 160 ( 2.2%) 4 40
7684
ast-stats-2 FieldDef 160 ( 2.2%) 2 80
7785
ast-stats-2 Stmt 160 ( 2.2%) 5 32
7886
ast-stats-2 - Let 32 ( 0.4%) 1
@@ -101,12 +109,11 @@ ast-stats-2 - Block 216 ( 3.0%) 3
101109
ast-stats-2 PathSegment 864 (11.9%) 36 24
102110
ast-stats-2 Ty 896 (12.3%) 14 64
103111
ast-stats-2 - Ptr 64 ( 0.9%) 1
104-
ast-stats-2 - Ref 64 ( 0.9%) 1
105112
ast-stats-2 - ImplicitSelf 128 ( 1.8%) 2
106113
ast-stats-2 - Path 640 ( 8.8%) 10
107114
ast-stats-2 Item 1_496 (20.5%) 11 136
108115
ast-stats-2 - Trait 136 ( 1.9%) 1
109-
ast-stats-2 - Enum 136 ( 1.9%) 1
116+
ast-stats-2 - Impl 136 ( 1.9%) 1
110117
ast-stats-2 - ExternCrate 136 ( 1.9%) 1
111118
ast-stats-2 - ForeignMod 136 ( 1.9%) 1
112119
ast-stats-2 - Impl 136 ( 1.9%) 1
@@ -125,9 +132,9 @@ hir-stats ExprField 40 ( 0.4%) 1 40
125132
hir-stats TraitItemRef 56 ( 0.6%) 2 28
126133
hir-stats Local 64 ( 0.7%) 1 64
127134
hir-stats Param 64 ( 0.7%) 2 32
128-
hir-stats Body 72 ( 0.8%) 3 24
129-
hir-stats InlineAsm 72 ( 0.8%) 1 72
130135
hir-stats ImplItemRef 72 ( 0.8%) 2 36
136+
hir-stats InlineAsm 72 ( 0.8%) 1 72
137+
hir-stats Body 72 ( 0.8%) 3 24
131138
hir-stats Arm 80 ( 0.9%) 2 40
132139
hir-stats GenericArg 96 ( 1.1%) 4 24
133140
hir-stats - Type 24 ( 0.3%) 1
@@ -139,36 +146,36 @@ hir-stats - Semi 32 ( 0.4%) 1
139146
hir-stats - Expr 32 ( 0.4%) 1
140147
hir-stats FnDecl 120 ( 1.3%) 3 40
141148
hir-stats Attribute 128 ( 1.4%) 4 32
142-
hir-stats Variant 144 ( 1.6%) 2 72
143149
hir-stats GenericArgs 144 ( 1.6%) 3 48
144-
hir-stats GenericBound 192 ( 2.1%) 4 48
145-
hir-stats - Trait 192 ( 2.1%) 4
150+
hir-stats Variant 144 ( 1.6%) 2 72
146151
hir-stats WherePredicate 192 ( 2.1%) 3 64
147152
hir-stats - BoundPredicate 192 ( 2.1%) 3
153+
hir-stats GenericBound 192 ( 2.1%) 4 48
154+
hir-stats - Trait 192 ( 2.1%) 4
148155
hir-stats Block 288 ( 3.2%) 6 48
149-
hir-stats GenericParam 360 ( 4.0%) 5 72
150156
hir-stats Pat 360 ( 4.0%) 5 72
151-
hir-stats - Wild 72 ( 0.8%) 1
152157
hir-stats - Struct 72 ( 0.8%) 1
158+
hir-stats - Wild 72 ( 0.8%) 1
153159
hir-stats - Binding 216 ( 2.4%) 3
160+
hir-stats GenericParam 360 ( 4.0%) 5 72
154161
hir-stats Generics 560 ( 6.2%) 10 56
155162
hir-stats Ty 720 ( 8.0%) 15 48
156-
hir-stats - Ptr 48 ( 0.5%) 1
157163
hir-stats - Ref 48 ( 0.5%) 1
164+
hir-stats - Ptr 48 ( 0.5%) 1
158165
hir-stats - Path 624 ( 6.9%) 13
159166
hir-stats Expr 768 ( 8.5%) 12 64
160167
hir-stats - Path 64 ( 0.7%) 1
161-
hir-stats - Struct 64 ( 0.7%) 1
162168
hir-stats - Match 64 ( 0.7%) 1
169+
hir-stats - Struct 64 ( 0.7%) 1
163170
hir-stats - InlineAsm 64 ( 0.7%) 1
164171
hir-stats - Lit 128 ( 1.4%) 2
165172
hir-stats - Block 384 ( 4.3%) 6
166173
hir-stats Item 968 (10.8%) 11 88
167-
hir-stats - Trait 88 ( 1.0%) 1
168174
hir-stats - Enum 88 ( 1.0%) 1
175+
hir-stats - Trait 88 ( 1.0%) 1
176+
hir-stats - Impl 88 ( 1.0%) 1
169177
hir-stats - ExternCrate 88 ( 1.0%) 1
170178
hir-stats - ForeignMod 88 ( 1.0%) 1
171-
hir-stats - Impl 88 ( 1.0%) 1
172179
hir-stats - Fn 176 ( 2.0%) 2
173180
hir-stats - Use 352 ( 3.9%) 4
174181
hir-stats Path 1_240 (13.8%) 31 40

0 commit comments

Comments
 (0)