Skip to content

Commit 67f9961

Browse files
lu-zerolu-zero
committed
Move the tests away from the code
1 parent 5edac6c commit 67f9961

4 files changed

Lines changed: 149 additions & 143 deletions

File tree

‎crates/std_detect/src/detect/mod.rs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,3 @@ pub fn features() -> impl Iterator<Item = (&'static str, bool)> {
135135
}
136136
impl_()
137137
}
138-
139-
#[test]
140-
fn features_roundtrip() {
141-
for (f, _) in features() {
142-
let _ = Feature::from_str(f).unwrap();
143-
}
144-
}

‎crates/std_detect/src/detect/os/x86.rs‎

Lines changed: 0 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -243,139 +243,3 @@ pub(crate) fn detect_features() -> cache::Initializer {
243243

244244
value
245245
}
246-
247-
#[cfg(test)]
248-
mod tests {
249-
extern crate cupid;
250-
251-
#[test]
252-
fn dump() {
253-
println!("aes: {:?}", is_x86_feature_detected!("aes"));
254-
println!("pclmulqdq: {:?}", is_x86_feature_detected!("pclmulqdq"));
255-
println!("rdrand: {:?}", is_x86_feature_detected!("rdrand"));
256-
println!("rdseed: {:?}", is_x86_feature_detected!("rdseed"));
257-
println!("tsc: {:?}", is_x86_feature_detected!("tsc"));
258-
println!("sse: {:?}", is_x86_feature_detected!("sse"));
259-
println!("sse2: {:?}", is_x86_feature_detected!("sse2"));
260-
println!("sse3: {:?}", is_x86_feature_detected!("sse3"));
261-
println!("ssse3: {:?}", is_x86_feature_detected!("ssse3"));
262-
println!("sse4.1: {:?}", is_x86_feature_detected!("sse4.1"));
263-
println!("sse4.2: {:?}", is_x86_feature_detected!("sse4.2"));
264-
println!("sse4a: {:?}", is_x86_feature_detected!("sse4a"));
265-
println!("sha: {:?}", is_x86_feature_detected!("sha"));
266-
println!("avx: {:?}", is_x86_feature_detected!("avx"));
267-
println!("avx2: {:?}", is_x86_feature_detected!("avx2"));
268-
println!("avx512f {:?}", is_x86_feature_detected!("avx512f"));
269-
println!("avx512cd {:?}", is_x86_feature_detected!("avx512cd"));
270-
println!("avx512er {:?}", is_x86_feature_detected!("avx512er"));
271-
println!("avx512pf {:?}", is_x86_feature_detected!("avx512pf"));
272-
println!("avx512bw {:?}", is_x86_feature_detected!("avx512bw"));
273-
println!("avx512dq {:?}", is_x86_feature_detected!("avx512dq"));
274-
println!("avx512vl {:?}", is_x86_feature_detected!("avx512vl"));
275-
println!("avx512_ifma {:?}", is_x86_feature_detected!("avx512ifma"));
276-
println!("avx512_vbmi {:?}", is_x86_feature_detected!("avx512vbmi"));
277-
println!(
278-
"avx512_vpopcntdq {:?}",
279-
is_x86_feature_detected!("avx512vpopcntdq")
280-
);
281-
println!("fma: {:?}", is_x86_feature_detected!("fma"));
282-
println!("abm: {:?}", is_x86_feature_detected!("abm"));
283-
println!("bmi: {:?}", is_x86_feature_detected!("bmi1"));
284-
println!("bmi2: {:?}", is_x86_feature_detected!("bmi2"));
285-
println!("tbm: {:?}", is_x86_feature_detected!("tbm"));
286-
println!("popcnt: {:?}", is_x86_feature_detected!("popcnt"));
287-
println!("lzcnt: {:?}", is_x86_feature_detected!("lzcnt"));
288-
println!("fxsr: {:?}", is_x86_feature_detected!("fxsr"));
289-
println!("xsave: {:?}", is_x86_feature_detected!("xsave"));
290-
println!("xsaveopt: {:?}", is_x86_feature_detected!("xsaveopt"));
291-
println!("xsaves: {:?}", is_x86_feature_detected!("xsaves"));
292-
println!("xsavec: {:?}", is_x86_feature_detected!("xsavec"));
293-
println!("cmpxchg16b: {:?}", is_x86_feature_detected!("cmpxchg16b"));
294-
println!("adx: {:?}", is_x86_feature_detected!("adx"));
295-
println!("rtm: {:?}", is_x86_feature_detected!("rtm"));
296-
}
297-
298-
#[cfg(feature = "std_detect_env_override")]
299-
#[test]
300-
fn env_override_no_avx() {
301-
if let Ok(disable) = crate::env::var("RUST_STD_DETECT_UNSTABLE") {
302-
let information = cupid::master().unwrap();
303-
for d in disable.split(" ") {
304-
match d {
305-
"avx" => if information.avx() {
306-
assert_ne!(is_x86_feature_detected!("avx"), information.avx())
307-
}
308-
"avx2" => if information.avx2() {
309-
assert_ne!(is_x86_feature_detected!("avx2"), information.avx2())
310-
}
311-
_ => {}
312-
}
313-
}
314-
}
315-
}
316-
317-
#[test]
318-
fn compare_with_cupid() {
319-
let information = cupid::master().unwrap();
320-
assert_eq!(is_x86_feature_detected!("aes"), information.aesni());
321-
assert_eq!(
322-
is_x86_feature_detected!("pclmulqdq"),
323-
information.pclmulqdq()
324-
);
325-
assert_eq!(is_x86_feature_detected!("rdrand"), information.rdrand());
326-
assert_eq!(is_x86_feature_detected!("rdseed"), information.rdseed());
327-
assert_eq!(is_x86_feature_detected!("tsc"), information.tsc());
328-
assert_eq!(is_x86_feature_detected!("sse"), information.sse());
329-
assert_eq!(is_x86_feature_detected!("sse2"), information.sse2());
330-
assert_eq!(is_x86_feature_detected!("sse3"), information.sse3());
331-
assert_eq!(is_x86_feature_detected!("ssse3"), information.ssse3());
332-
assert_eq!(is_x86_feature_detected!("sse4.1"), information.sse4_1());
333-
assert_eq!(is_x86_feature_detected!("sse4.2"), information.sse4_2());
334-
assert_eq!(is_x86_feature_detected!("sse4a"), information.sse4a());
335-
assert_eq!(is_x86_feature_detected!("sha"), information.sha());
336-
assert_eq!(is_x86_feature_detected!("avx"), information.avx());
337-
assert_eq!(is_x86_feature_detected!("avx2"), information.avx2());
338-
assert_eq!(is_x86_feature_detected!("avx512f"), information.avx512f());
339-
assert_eq!(is_x86_feature_detected!("avx512cd"), information.avx512cd());
340-
assert_eq!(is_x86_feature_detected!("avx512er"), information.avx512er());
341-
assert_eq!(is_x86_feature_detected!("avx512pf"), information.avx512pf());
342-
assert_eq!(is_x86_feature_detected!("avx512bw"), information.avx512bw());
343-
assert_eq!(is_x86_feature_detected!("avx512dq"), information.avx512dq());
344-
assert_eq!(is_x86_feature_detected!("avx512vl"), information.avx512vl());
345-
assert_eq!(
346-
is_x86_feature_detected!("avx512ifma"),
347-
information.avx512_ifma()
348-
);
349-
assert_eq!(
350-
is_x86_feature_detected!("avx512vbmi"),
351-
information.avx512_vbmi()
352-
);
353-
assert_eq!(
354-
is_x86_feature_detected!("avx512vpopcntdq"),
355-
information.avx512_vpopcntdq()
356-
);
357-
assert_eq!(is_x86_feature_detected!("fma"), information.fma());
358-
assert_eq!(is_x86_feature_detected!("bmi1"), information.bmi1());
359-
assert_eq!(is_x86_feature_detected!("bmi2"), information.bmi2());
360-
assert_eq!(is_x86_feature_detected!("popcnt"), information.popcnt());
361-
assert_eq!(is_x86_feature_detected!("abm"), information.lzcnt());
362-
assert_eq!(is_x86_feature_detected!("tbm"), information.tbm());
363-
assert_eq!(is_x86_feature_detected!("lzcnt"), information.lzcnt());
364-
assert_eq!(is_x86_feature_detected!("xsave"), information.xsave());
365-
assert_eq!(is_x86_feature_detected!("xsaveopt"), information.xsaveopt());
366-
assert_eq!(
367-
is_x86_feature_detected!("xsavec"),
368-
information.xsavec_and_xrstor()
369-
);
370-
assert_eq!(
371-
is_x86_feature_detected!("xsaves"),
372-
information.xsaves_xrstors_and_ia32_xss()
373-
);
374-
assert_eq!(
375-
is_x86_feature_detected!("cmpxchg16b"),
376-
information.cmpxchg16b(),
377-
);
378-
assert_eq!(is_x86_feature_detected!("adx"), information.adx(),);
379-
assert_eq!(is_x86_feature_detected!("rtm"), information.rtm(),);
380-
}
381-
}

‎crates/std_detect/tests/features.rs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#![feature(stdsimd)]
2+
#![feature(stdsimd_internal)]
3+
4+
extern crate std_detect;
5+
6+
use std_detect::detect::{Feature, features};
7+
8+
#[test]
9+
fn features_roundtrip() {
10+
for (f, _) in features() {
11+
let _ = Feature::from_str(f).unwrap();
12+
}
13+
}

‎crates/std_detect/tests/x86-specific.rs‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
#![feature(stdsimd)]
2+
3+
extern crate cupid;
4+
#[macro_use]
5+
extern crate std_detect;
6+
7+
#[test]
8+
fn dump() {
9+
println!("aes: {:?}", is_x86_feature_detected!("aes"));
10+
println!("pclmulqdq: {:?}", is_x86_feature_detected!("pclmulqdq"));
11+
println!("rdrand: {:?}", is_x86_feature_detected!("rdrand"));
12+
println!("rdseed: {:?}", is_x86_feature_detected!("rdseed"));
13+
println!("tsc: {:?}", is_x86_feature_detected!("tsc"));
14+
println!("sse: {:?}", is_x86_feature_detected!("sse"));
15+
println!("sse2: {:?}", is_x86_feature_detected!("sse2"));
16+
println!("sse3: {:?}", is_x86_feature_detected!("sse3"));
17+
println!("ssse3: {:?}", is_x86_feature_detected!("ssse3"));
18+
println!("sse4.1: {:?}", is_x86_feature_detected!("sse4.1"));
19+
println!("sse4.2: {:?}", is_x86_feature_detected!("sse4.2"));
20+
println!("sse4a: {:?}", is_x86_feature_detected!("sse4a"));
21+
println!("sha: {:?}", is_x86_feature_detected!("sha"));
22+
println!("avx: {:?}", is_x86_feature_detected!("avx"));
23+
println!("avx2: {:?}", is_x86_feature_detected!("avx2"));
24+
println!("avx512f {:?}", is_x86_feature_detected!("avx512f"));
25+
println!("avx512cd {:?}", is_x86_feature_detected!("avx512cd"));
26+
println!("avx512er {:?}", is_x86_feature_detected!("avx512er"));
27+
println!("avx512pf {:?}", is_x86_feature_detected!("avx512pf"));
28+
println!("avx512bw {:?}", is_x86_feature_detected!("avx512bw"));
29+
println!("avx512dq {:?}", is_x86_feature_detected!("avx512dq"));
30+
println!("avx512vl {:?}", is_x86_feature_detected!("avx512vl"));
31+
println!("avx512_ifma {:?}", is_x86_feature_detected!("avx512ifma"));
32+
println!("avx512_vbmi {:?}", is_x86_feature_detected!("avx512vbmi"));
33+
println!(
34+
"avx512_vpopcntdq {:?}",
35+
is_x86_feature_detected!("avx512vpopcntdq")
36+
);
37+
println!("fma: {:?}", is_x86_feature_detected!("fma"));
38+
println!("abm: {:?}", is_x86_feature_detected!("abm"));
39+
println!("bmi: {:?}", is_x86_feature_detected!("bmi1"));
40+
println!("bmi2: {:?}", is_x86_feature_detected!("bmi2"));
41+
println!("tbm: {:?}", is_x86_feature_detected!("tbm"));
42+
println!("popcnt: {:?}", is_x86_feature_detected!("popcnt"));
43+
println!("lzcnt: {:?}", is_x86_feature_detected!("lzcnt"));
44+
println!("fxsr: {:?}", is_x86_feature_detected!("fxsr"));
45+
println!("xsave: {:?}", is_x86_feature_detected!("xsave"));
46+
println!("xsaveopt: {:?}", is_x86_feature_detected!("xsaveopt"));
47+
println!("xsaves: {:?}", is_x86_feature_detected!("xsaves"));
48+
println!("xsavec: {:?}", is_x86_feature_detected!("xsavec"));
49+
println!("cmpxchg16b: {:?}", is_x86_feature_detected!("cmpxchg16b"));
50+
println!("adx: {:?}", is_x86_feature_detected!("adx"));
51+
println!("rtm: {:?}", is_x86_feature_detected!("rtm"));
52+
}
53+
54+
#[cfg(feature = "std_detect_env_override")]
55+
#[test]
56+
fn env_override_no_avx() {
57+
if let Ok(disable) = std::env::var("RUST_STD_DETECT_UNSTABLE") {
58+
let information = cupid::master().unwrap();
59+
for d in disable.split(" ") {
60+
match d {
61+
"avx" => if information.avx() {
62+
assert_ne!(is_x86_feature_detected!("avx"), information.avx())
63+
}
64+
"avx2" => if information.avx2() {
65+
assert_ne!(is_x86_feature_detected!("avx2"), information.avx2())
66+
}
67+
_ => {}
68+
}
69+
}
70+
}
71+
}
72+
73+
#[test]
74+
fn compare_with_cupid() {
75+
let information = cupid::master().unwrap();
76+
assert_eq!(is_x86_feature_detected!("aes"), information.aesni());
77+
assert_eq!(
78+
is_x86_feature_detected!("pclmulqdq"),
79+
information.pclmulqdq()
80+
);
81+
assert_eq!(is_x86_feature_detected!("rdrand"), information.rdrand());
82+
assert_eq!(is_x86_feature_detected!("rdseed"), information.rdseed());
83+
assert_eq!(is_x86_feature_detected!("tsc"), information.tsc());
84+
assert_eq!(is_x86_feature_detected!("sse"), information.sse());
85+
assert_eq!(is_x86_feature_detected!("sse2"), information.sse2());
86+
assert_eq!(is_x86_feature_detected!("sse3"), information.sse3());
87+
assert_eq!(is_x86_feature_detected!("ssse3"), information.ssse3());
88+
assert_eq!(is_x86_feature_detected!("sse4.1"), information.sse4_1());
89+
assert_eq!(is_x86_feature_detected!("sse4.2"), information.sse4_2());
90+
assert_eq!(is_x86_feature_detected!("sse4a"), information.sse4a());
91+
assert_eq!(is_x86_feature_detected!("sha"), information.sha());
92+
assert_eq!(is_x86_feature_detected!("avx"), information.avx());
93+
assert_eq!(is_x86_feature_detected!("avx2"), information.avx2());
94+
assert_eq!(is_x86_feature_detected!("avx512f"), information.avx512f());
95+
assert_eq!(is_x86_feature_detected!("avx512cd"), information.avx512cd());
96+
assert_eq!(is_x86_feature_detected!("avx512er"), information.avx512er());
97+
assert_eq!(is_x86_feature_detected!("avx512pf"), information.avx512pf());
98+
assert_eq!(is_x86_feature_detected!("avx512bw"), information.avx512bw());
99+
assert_eq!(is_x86_feature_detected!("avx512dq"), information.avx512dq());
100+
assert_eq!(is_x86_feature_detected!("avx512vl"), information.avx512vl());
101+
assert_eq!(
102+
is_x86_feature_detected!("avx512ifma"),
103+
information.avx512_ifma()
104+
);
105+
assert_eq!(
106+
is_x86_feature_detected!("avx512vbmi"),
107+
information.avx512_vbmi()
108+
);
109+
assert_eq!(
110+
is_x86_feature_detected!("avx512vpopcntdq"),
111+
information.avx512_vpopcntdq()
112+
);
113+
assert_eq!(is_x86_feature_detected!("fma"), information.fma());
114+
assert_eq!(is_x86_feature_detected!("bmi1"), information.bmi1());
115+
assert_eq!(is_x86_feature_detected!("bmi2"), information.bmi2());
116+
assert_eq!(is_x86_feature_detected!("popcnt"), information.popcnt());
117+
assert_eq!(is_x86_feature_detected!("abm"), information.lzcnt());
118+
assert_eq!(is_x86_feature_detected!("tbm"), information.tbm());
119+
assert_eq!(is_x86_feature_detected!("lzcnt"), information.lzcnt());
120+
assert_eq!(is_x86_feature_detected!("xsave"), information.xsave());
121+
assert_eq!(is_x86_feature_detected!("xsaveopt"), information.xsaveopt());
122+
assert_eq!(
123+
is_x86_feature_detected!("xsavec"),
124+
information.xsavec_and_xrstor()
125+
);
126+
assert_eq!(
127+
is_x86_feature_detected!("xsaves"),
128+
information.xsaves_xrstors_and_ia32_xss()
129+
);
130+
assert_eq!(
131+
is_x86_feature_detected!("cmpxchg16b"),
132+
information.cmpxchg16b(),
133+
);
134+
assert_eq!(is_x86_feature_detected!("adx"), information.adx(),);
135+
assert_eq!(is_x86_feature_detected!("rtm"), information.rtm(),);
136+
}

0 commit comments

Comments
 (0)