Skip to content

Commit

Permalink
Rollup merge of rust-lang#48875 - jcowgill:mips-test-fixes, r=sanxiyn
Browse files Browse the repository at this point in the history
MIPS testsuite fixes

This PR adjusts various bits in the testsuite so that more stuff passes on mips*.
  • Loading branch information
kennytm authored Mar 15, 2018
2 parents a45b79d + fb806fd commit da88827
Show file tree
Hide file tree
Showing 18 changed files with 73 additions and 10 deletions.
1 change: 1 addition & 0 deletions src/test/codegen/abi-main-signature-16bit-c-int.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
// ignore-asmjs
// ignore-hexagon
// ignore-mips
// ignore-mips64
// ignore-powerpc
// ignore-s390x
// ignore-sparc
Expand Down
2 changes: 0 additions & 2 deletions src/test/codegen/fastcall-inreg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
// ignore-bpfeb
// ignore-hexagon
// ignore-mips
// ignore-mipsel
// ignore-mips64
// ignore-mips64el
// ignore-msp430
// ignore-powerpc
// ignore-r600
Expand Down
2 changes: 0 additions & 2 deletions src/test/codegen/global_asm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
// ignore-bpfeb
// ignore-hexagon
// ignore-mips
// ignore-mipsel
// ignore-mips64
// ignore-mips64el
// ignore-msp430
// ignore-powerpc
// ignore-r600
Expand Down
2 changes: 0 additions & 2 deletions src/test/codegen/global_asm_include.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
// ignore-bpfeb
// ignore-hexagon
// ignore-mips
// ignore-mipsel
// ignore-mips64
// ignore-mips64el
// ignore-msp430
// ignore-powerpc
// ignore-r600
Expand Down
2 changes: 0 additions & 2 deletions src/test/codegen/global_asm_x2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
// ignore-bpfeb
// ignore-hexagon
// ignore-mips
// ignore-mipsel
// ignore-mips64
// ignore-mips64el
// ignore-msp430
// ignore-powerpc
// ignore-r600
Expand Down
1 change: 1 addition & 0 deletions src/test/codegen/repr-transparent-aggregates-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

// ignore-aarch64
// ignore-asmjs
// ignore-mips64
// ignore-s390x
// ignore-wasm
// ignore-x86
Expand Down
49 changes: 49 additions & 0 deletions src/test/codegen/repr-transparent-aggregates-3.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-flags: -C no-prepopulate-passes

// only-mips64
// See repr-transparent.rs

#![crate_type="lib"]
#![feature(repr_transparent)]


#[repr(C)]
pub struct Big([u32; 16]);

#[repr(transparent)]
pub struct BigW(Big);

// CHECK: define void @test_Big(%Big* [[BIG_RET_ATTRS:.*]], [8 x i64]
#[no_mangle]
pub extern fn test_Big(_: Big) -> Big { loop {} }

// CHECK: define void @test_BigW(%BigW* [[BIG_RET_ATTRS]], [8 x i64]
#[no_mangle]
pub extern fn test_BigW(_: BigW) -> BigW { loop {} }


#[repr(C)]
pub union BigU {
foo: [u32; 16],
}

#[repr(transparent)]
pub struct BigUw(BigU);

// CHECK: define void @test_BigU(%BigU* [[BIGU_RET_ATTRS:.*]], [8 x i64]
#[no_mangle]
pub extern fn test_BigU(_: BigU) -> BigU { loop {} }

// CHECK: define void @test_BigUw(%BigUw* [[BIGU_RET_ATTRS]], [8 x i64]
#[no_mangle]
pub extern fn test_BigUw(_: BigUw) -> BigUw { loop {} }
3 changes: 2 additions & 1 deletion src/test/codegen/stack-probes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@

// ignore-arm
// ignore-aarch64
// ignore-mips
// ignore-mips64
// ignore-powerpc
// ignore-aarch64
// ignore-wasm
// ignore-emscripten
// ignore-windows
Expand Down
2 changes: 2 additions & 0 deletions src/test/codegen/x86_mmx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
// ignore-arm
// ignore-aarch64
// ignore-emscripten
// ignore-mips
// ignore-mips64
// compile-flags: -O

#![feature(repr_simd)]
Expand Down
2 changes: 2 additions & 0 deletions src/test/compile-fail/asm-bad-clobber.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
// ignore-emscripten
// ignore-powerpc
// ignore-sparc
// ignore-mips
// ignore-mips64

#![feature(asm, rustc_attrs)]

Expand Down
2 changes: 2 additions & 0 deletions src/test/compile-fail/asm-in-bad-modifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// ignore-emscripten
// ignore-powerpc
// ignore-sparc
// ignore-mips
// ignore-mips64

#![feature(asm)]

Expand Down
2 changes: 2 additions & 0 deletions src/test/compile-fail/asm-misplaced-option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
// ignore-emscripten
// ignore-powerpc
// ignore-sparc
// ignore-mips
// ignore-mips64

#![feature(asm, rustc_attrs)]

Expand Down
2 changes: 2 additions & 0 deletions src/test/compile-fail/asm-out-no-modifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// ignore-emscripten
// ignore-powerpc
// ignore-sparc
// ignore-mips
// ignore-mips64

#![feature(asm)]

Expand Down
2 changes: 2 additions & 0 deletions src/test/compile-fail/asm-out-read-uninit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// ignore-emscripten
// ignore-powerpc
// ignore-sparc
// ignore-mips
// ignore-mips64

// revisions: ast mir
//[mir]compile-flags: -Z borrowck=mir
Expand Down
4 changes: 3 additions & 1 deletion src/test/compile-fail/borrowck/borrowck-asm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
#[cfg(any(target_arch = "x86",
target_arch = "x86_64",
target_arch = "arm",
target_arch = "aarch64"))]
target_arch = "aarch64",
target_arch = "mips",
target_arch = "mips64"))]
mod test_cases {
fn is_move() {
let y: &mut isize;
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/stack-probes-lto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

// ignore-arm
// ignore-aarch64
// ignore-mips
// ignore-mips64
// ignore-wasm
// ignore-cloudabi no processes
// ignore-emscripten no processes
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/stack-probes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

// ignore-arm
// ignore-aarch64
// ignore-mips
// ignore-mips64
// ignore-wasm
// ignore-cloudabi no processes
// ignore-emscripten no processes
Expand Down
1 change: 1 addition & 0 deletions src/tools/compiletest/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const ARCH_TABLE: &'static [(&'static str, &'static str)] = &[
("i386", "x86"),
("i586", "x86"),
("i686", "x86"),
("mips64", "mips64"),
("mips", "mips"),
("msp430", "msp430"),
("powerpc", "powerpc"),
Expand Down

0 comments on commit da88827

Please sign in to comment.