Moves test::black_box to core::hint
This changes removes a cyclic dependency between the "test" and "libtest" crates, where "libtest" depends on "test" for "black_box", but "test" depends on "libtest" for everything else. I've chosen the "hint" module because there seems to be enough consensus in the discussion of RFC2360 that this module is where such an intrinsic would belong, but this PR does not implement that RFC! (note: if that RFC ever gets merged, the API, docs, etc. of this API will need to change). For backwards compatibility reasons I've chosen to also keep the "test" feature gate for these instead of adding a new feature gate. If we change the feature gate, we'll potentially all benchmarks, and while that's something that we could do, it seems unnecessary to do that now - if RFC2360 gets merged, we'll need to do that anyways.
This commit is contained in:
parent
60eca54a7c
commit
f5d6b3af69
@ -91,3 +91,22 @@ pub fn spin_loop() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A function that is opaque to the optimizer, to allow benchmarks to
|
||||
/// pretend to use outputs to assist in avoiding dead-code
|
||||
/// elimination.
|
||||
///
|
||||
/// This function is a no-op, and does not even read from `dummy`.
|
||||
#[cfg_attr(any(target_arch = "asmjs", target_arch = "wasm32"), inline(never))]
|
||||
#[unstable(feature = "test", issue = "27812")]
|
||||
pub fn black_box<T>(dummy: T) -> T {
|
||||
#[cfg(not(any(target_arch = "asmjs", target_arch = "wasm32")))] {
|
||||
// we need to "use" the argument in some way LLVM can't
|
||||
// introspect.
|
||||
unsafe { asm!("" : : "r"(&dummy)) }
|
||||
dummy
|
||||
}
|
||||
#[cfg(any(target_arch = "asmjs", target_arch = "wasm32"))] {
|
||||
dummy
|
||||
}
|
||||
}
|
||||
|
@ -27,23 +27,7 @@ pub use libtest::{
|
||||
TestResult, TrFailed, TrFailedMsg, TrIgnored, TrOk, stats::Summary
|
||||
};
|
||||
|
||||
/// A function that is opaque to the optimizer, to allow benchmarks to
|
||||
/// pretend to use outputs to assist in avoiding dead-code
|
||||
/// elimination.
|
||||
///
|
||||
/// This function is a no-op, and does not even read from `dummy`.
|
||||
#[cfg(not(any(target_arch = "asmjs", target_arch = "wasm32")))]
|
||||
pub fn black_box<T>(dummy: T) -> T {
|
||||
// we need to "use" the argument in some way LLVM can't
|
||||
// introspect.
|
||||
unsafe { asm!("" : : "r"(&dummy)) }
|
||||
dummy
|
||||
}
|
||||
#[cfg(any(target_arch = "asmjs", target_arch = "wasm32"))]
|
||||
#[inline(never)]
|
||||
pub fn black_box<T>(dummy: T) -> T {
|
||||
dummy
|
||||
}
|
||||
pub use std::hint::black_box;
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
|
Loading…
x
Reference in New Issue
Block a user