T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2411 from cfallin/x86-backend-cfg

Browse Source 
Don't run old x86 backend-specific tests with new x64 backend.
This commit is contained in:
Chris Fallin
2020-11-13 09:29:16 -08:00
committed by GitHub
parent 5995c3774f 0d703c12ed
commit 88fce766b0
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cranelift/codegen/src/isa/mod.rs
View File

@@ -75,7 +75,10 @@ use thiserror::Error;
#[cfg(feature = "riscv")]
mod riscv;
#[cfg(feature = "x86")]
// Exclude the old x86 backend when the new one is enabled; it is unreachable
// anyway (requesting the x86-64 ISA will return the new backend), and a number
// of old-backend-specific tests fail.
#[cfg(all(feature = "x86", not(feature = "x64")))]
mod x86;
#[cfg(feature = "x64")]
@@ -102,12 +105,12 @@ mod test_utils;
/// Returns a builder that can create a corresponding `TargetIsa`
/// or `Err(LookupError::SupportDisabled)` if not enabled.
macro_rules! isa_builder {
($name: ident, $feature: tt, $triple: ident) => {{
#[cfg(feature = $feature)]
($name: ident, $cfg_terms: tt, $triple: ident) => {{
#[cfg $cfg_terms]
{
Ok($name::isa_builder($triple))
}
#[cfg(not(feature = $feature))]
#[cfg(not $cfg_terms)]
{
Err(LookupError::SupportDisabled)
}
@@ -119,17 +122,17 @@ macro_rules! isa_builder {
pub fn lookup(triple: Triple) -> Result<Builder, LookupError> {
match triple.architecture {
Architecture::Riscv32 { .. } | Architecture::Riscv64 { .. } => {
isa_builder!(riscv, "riscv", triple)
isa_builder!(riscv, (feature = "riscv"), triple)
}
Architecture::X86_32 { .. } | Architecture::X86_64 => {
if cfg!(feature = "x64") {
isa_builder!(x64, "x64", triple)
isa_builder!(x64, (feature = "x64"), triple)
} else {
isa_builder!(x86, "x86", triple)
isa_builder!(x86, (all(feature = "x86", not(feature = "x64"))), triple)
}
}
Architecture::Arm { .. } => isa_builder!(arm32, "arm32", triple),
Architecture::Aarch64 { .. } => isa_builder!(aarch64, "arm64", triple),
Architecture::Arm { .. } => isa_builder!(arm32, (feature = "arm32"), triple),
Architecture::Aarch64 { .. } => isa_builder!(aarch64, (feature = "arm64"), triple),
_ => Err(LookupError::Unsupported),
}
}

4
cranelift/codegen/src/isa/x86/unwind.rs
View File

@@ -257,7 +257,6 @@ mod tests {
use target_lexicon::triple;
#[test]
#[cfg_attr(feature = "x64", should_panic)] // TODO #2079
fn test_small_alloc() {
let isa = lookup(triple!("x86_64"))
.expect("expect x86 ISA")
@@ -314,7 +313,6 @@ mod tests {
}
#[test]
#[cfg_attr(feature = "x64", should_panic)] // TODO #2079
fn test_medium_alloc() {
let isa = lookup(triple!("x86_64"))
.expect("expect x86 ISA")
@@ -371,7 +369,6 @@ mod tests {
}
#[test]
#[cfg_attr(feature = "x64", should_panic)] // TODO #2079
fn test_large_alloc() {
let isa = lookup(triple!("x86_64"))
.expect("expect x86 ISA")
@@ -444,7 +441,6 @@ mod tests {
}
#[test]
#[cfg_attr(feature = "x64", should_panic)] // TODO #2079
fn test_multi_return_func() {
let isa = lookup(triple!("x86_64"))
.expect("expect x86 ISA")

2
cranelift/codegen/src/isa/x86/unwind/systemv.rs
View File

@@ -142,7 +142,6 @@ mod tests {
use target_lexicon::triple;
#[test]
#[cfg_attr(feature = "x64", should_panic)] // TODO #2079
fn test_simple_func() {
let isa = lookup(triple!("x86_64"))
.expect("expect x86 ISA")
@@ -185,7 +184,6 @@ mod tests {
}
#[test]
#[cfg_attr(feature = "x64", should_panic)] // TODO #2079
fn test_multi_return_func() {
let isa = lookup(triple!("x86_64"))
.expect("expect x86 ISA")

3
cranelift/codegen/src/isa/x86/unwind/winx64.rs
View File

@@ -69,7 +69,6 @@ mod tests {
}
#[test]
#[cfg_attr(feature = "x64", should_panic)] // TODO #2079
fn test_small_alloc() {
let isa = lookup(triple!("x86_64"))
.expect("expect x86 ISA")
@@ -127,7 +126,6 @@ mod tests {
}
#[test]
#[cfg_attr(feature = "x64", should_panic)] // TODO #2079
fn test_medium_alloc() {
let isa = lookup(triple!("x86_64"))
.expect("expect x86 ISA")
@@ -189,7 +187,6 @@ mod tests {
}
#[test]
#[cfg_attr(feature = "x64", should_panic)] // TODO #2079
fn test_large_alloc() {
let isa = lookup(triple!("x86_64"))
.expect("expect x86 ISA")