Skip to content

mips: set llvm_args -mno-check-zero-division for all mips targets #157873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xry111 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mips: set llvm_args -mno-check-zero-division for all mips targets #157873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mips64_openwrt_linux_musl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use rustc_abi::Endian;

use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
let mut base = base::linux_musl::opts();
Expand All @@ -28,6 +28,7 @@ pub(crate) fn target() -> Target {
endian: Endian::Big,
mcount: "_mcount".into(),
llvm_abiname: LlvmAbi::N64,
llvm_args: cvs!["-mno-check-zero-division"],
..base
},
}
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mips64_unknown_linux_gnuabi64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rustc_abi::Endian;

use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -23,6 +23,7 @@ pub(crate) fn target() -> Target {
max_atomic_width: Some(64),
mcount: "_mcount".into(),
llvm_abiname: LlvmAbi::N64,
llvm_args: cvs!["-mno-check-zero-division"],

..base::linux_gnu::opts()
},
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mips64_unknown_linux_muslabi64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rustc_abi::Endian;

use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
let mut base = base::linux_musl::opts();
Expand All @@ -24,6 +24,7 @@ pub(crate) fn target() -> Target {
endian: Endian::Big,
mcount: "_mcount".into(),
llvm_abiname: LlvmAbi::N64,
llvm_args: cvs!["-mno-check-zero-division"],
..base
},
}
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_gnuabi64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -20,6 +20,7 @@ pub(crate) fn target() -> Target {
max_atomic_width: Some(64),
mcount: "_mcount".into(),
llvm_abiname: LlvmAbi::N64,
llvm_args: cvs!["-mno-check-zero-division"],

..base::linux_gnu::opts()
},
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_muslabi64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
let mut base = base::linux_musl::opts();
Expand All @@ -21,6 +21,7 @@ pub(crate) fn target() -> Target {
cfg_abi: CfgAbi::Abi64,
mcount: "_mcount".into(),
llvm_abiname: LlvmAbi::N64,
llvm_args: cvs!["-mno-check-zero-division"],
..base
},
}
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mips_mti_none_elf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use rustc_abi::Endian;

use crate::spec::{
Arch, Cc, LinkerFlavor, Lld, LlvmAbi, PanicStrategy, RelocModel, Target, TargetMetadata,
TargetOptions,
TargetOptions, cvs,
};

pub(crate) fn target() -> Target {
Expand All @@ -26,6 +26,7 @@ pub(crate) fn target() -> Target {
cpu: "mips32r2".into(),

llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
max_atomic_width: Some(32),

features: "+mips32r2,+soft-float,+noabicalls".into(),
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mips_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rustc_abi::Endian;

use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -19,6 +19,7 @@ pub(crate) fn target() -> Target {
cpu: "mips32r2".into(),
features: "+mips32r2,+fpxx,+nooddspreg".into(),
llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
max_atomic_width: Some(32),
mcount: "_mcount".into(),

Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mips_unknown_linux_musl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rustc_abi::Endian;

use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
let mut base = base::linux_musl::opts();
Expand All @@ -21,6 +21,7 @@ pub(crate) fn target() -> Target {
options: TargetOptions {
endian: Endian::Big,
llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
mcount: "_mcount".into(),
..base
},
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mips_unknown_linux_uclibc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rustc_abi::Endian;

use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -19,6 +19,7 @@ pub(crate) fn target() -> Target {
cpu: "mips32r2".into(),
features: "+mips32r2,+soft-float".into(),
llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
max_atomic_width: Some(32),
mcount: "_mcount".into(),

Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mipsel_mti_none_elf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use rustc_abi::Endian;

use crate::spec::{
Arch, Cc, LinkerFlavor, Lld, LlvmAbi, PanicStrategy, RelocModel, Target, TargetMetadata,
TargetOptions,
TargetOptions, cvs,
};

pub(crate) fn target() -> Target {
Expand All @@ -26,6 +26,7 @@ pub(crate) fn target() -> Target {
cpu: "mips32r2".into(),

llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
max_atomic_width: Some(32),

features: "+mips32r2,+soft-float,+noabicalls".into(),
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -17,6 +17,7 @@ pub(crate) fn target() -> Target {
cpu: "mips32r2".into(),
features: "+mips32r2,+fpxx,+nooddspreg".into(),
llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
max_atomic_width: Some(32),
mcount: "_mcount".into(),

Expand Down
9 changes: 7 additions & 2 deletions compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_musl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
let mut base = base::linux_musl::opts();
Expand All @@ -16,6 +16,11 @@ pub(crate) fn target() -> Target {
pointer_width: 32,
data_layout: "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".into(),
arch: Arch::Mips,
options: TargetOptions { llvm_abiname: LlvmAbi::O32, mcount: "_mcount".into(), ..base },
options: TargetOptions {
llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
mcount: "_mcount".into(),
..base
},
}
}
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mipsel_unknown_linux_uclibc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -17,6 +17,7 @@ pub(crate) fn target() -> Target {
cpu: "mips32r2".into(),
features: "+mips32r2,+soft-float".into(),
llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
max_atomic_width: Some(32),
mcount: "_mcount".into(),

Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mipsel_unknown_netbsd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rustc_abi::Endian;

use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
let mut base = base::netbsd::opts();
Expand All @@ -21,6 +21,7 @@ pub(crate) fn target() -> Target {
options: TargetOptions {
features: "+soft-float".into(),
llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
mcount: "__mcount".into(),
endian: Endian::Little,
..base
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mipsel_unknown_none.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use crate::spec::{
Arch, Cc, LinkerFlavor, Lld, LlvmAbi, PanicStrategy, RelocModel, Target, TargetMetadata,
TargetOptions,
TargetOptions, cvs,
};

pub(crate) fn target() -> Target {
Expand All @@ -25,6 +25,7 @@ pub(crate) fn target() -> Target {
cpu: "mips32r2".into(),
features: "+mips32r2,+soft-float,+noabicalls".into(),
llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
max_atomic_width: Some(32),
linker: Some("rust-lld".into()),
panic_strategy: PanicStrategy::Abort,
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mipsisa32r6_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rustc_abi::Endian;

use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -19,6 +19,7 @@ pub(crate) fn target() -> Target {
cpu: "mips32r6".into(),
features: "+mips32r6".into(),
llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
max_atomic_width: Some(32),
mcount: "_mcount".into(),

Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mipsisa32r6el_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -17,6 +17,7 @@ pub(crate) fn target() -> Target {
cpu: "mips32r6".into(),
features: "+mips32r6".into(),
llvm_abiname: LlvmAbi::O32,
llvm_args: cvs!["-mno-check-zero-division"],
max_atomic_width: Some(32),
mcount: "_mcount".into(),

Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mipsisa64r6_unknown_linux_gnuabi64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rustc_abi::Endian;

use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -23,6 +23,7 @@ pub(crate) fn target() -> Target {
max_atomic_width: Some(64),
mcount: "_mcount".into(),
llvm_abiname: LlvmAbi::N64,
llvm_args: cvs!["-mno-check-zero-division"],

..base::linux_gnu::opts()
},
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/mipsisa64r6el_unknown_linux_gnuabi64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base};
use crate::spec::{Arch, CfgAbi, LlvmAbi, Target, TargetMetadata, TargetOptions, base, cvs};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -20,6 +20,7 @@ pub(crate) fn target() -> Target {
max_atomic_width: Some(64),
mcount: "_mcount".into(),
llvm_abiname: LlvmAbi::N64,
llvm_args: cvs!["-mno-check-zero-division"],

..base::linux_gnu::opts()
},
Expand Down
81 changes: 81 additions & 0 deletions tests/assembly-llvm/mips-div-no-trap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
// Test that there's no conditional trap for zero divisor for all mips
// targets. Division by zero is defined as panic so the trap is redundant.
//
//@ add-minicore
//@ assembly-output: emit-asm
//@ revisions: mips64el-unknown-linux-gnuabi64
//@[mips64el-unknown-linux-gnuabi64] compile-flags: --target=mips64el-unknown-linux-gnuabi64
//@[mips64el-unknown-linux-gnuabi64] needs-llvm-components: mips
//@ revisions: mips64el-unknown-linux-muslabi64
//@[mips64el-unknown-linux-muslabi64] compile-flags: --target=mips64el-unknown-linux-muslabi64
//@[mips64el-unknown-linux-muslabi64] needs-llvm-components: mips
//@ revisions: mips64-openwrt-linux-musl
//@[mips64-openwrt-linux-musl] compile-flags: --target=mips64-openwrt-linux-musl
//@[mips64-openwrt-linux-musl] needs-llvm-components: mips
//@ revisions: mips64-unknown-linux-gnuabi64
//@[mips64-unknown-linux-gnuabi64] compile-flags: --target=mips64-unknown-linux-gnuabi64
//@[mips64-unknown-linux-gnuabi64] needs-llvm-components: mips
//@ revisions: mips64-unknown-linux-muslabi64
//@[mips64-unknown-linux-muslabi64] compile-flags: --target=mips64-unknown-linux-muslabi64
//@[mips64-unknown-linux-muslabi64] needs-llvm-components: mips
//@ revisions: mipsel-mti-none-elf
//@[mipsel-mti-none-elf] compile-flags: --target=mipsel-mti-none-elf
//@[mipsel-mti-none-elf] needs-llvm-components: mips
//@ revisions: mipsel-sony-psp
//@[mipsel-sony-psp] compile-flags: --target=mipsel-sony-psp
//@[mipsel-sony-psp] needs-llvm-components: mips
//@ revisions: mipsel-sony-psx
//@[mipsel-sony-psx] compile-flags: --target=mipsel-sony-psx
//@[mipsel-sony-psx] needs-llvm-components: mips
//@ revisions: mipsel-unknown-linux-gnu
//@[mipsel-unknown-linux-gnu] compile-flags: --target=mipsel-unknown-linux-gnu
//@[mipsel-unknown-linux-gnu] needs-llvm-components: mips
//@ revisions: mipsel-unknown-linux-musl
//@[mipsel-unknown-linux-musl] compile-flags: --target=mipsel-unknown-linux-musl
//@[mipsel-unknown-linux-musl] needs-llvm-components: mips
//@ revisions: mipsel-unknown-linux-uclibc
//@[mipsel-unknown-linux-uclibc] compile-flags: --target=mipsel-unknown-linux-uclibc
//@[mipsel-unknown-linux-uclibc] needs-llvm-components: mips
//@ revisions: mipsel-unknown-netbsd
//@[mipsel-unknown-netbsd] compile-flags: --target=mipsel-unknown-netbsd
//@[mipsel-unknown-netbsd] needs-llvm-components: mips
//@ revisions: mipsel-unknown-none
//@[mipsel-unknown-none] compile-flags: --target=mipsel-unknown-none
//@[mipsel-unknown-none] needs-llvm-components: mips
//@ revisions: mipsisa32r6el-unknown-linux-gnu
//@[mipsisa32r6el-unknown-linux-gnu] compile-flags: --target=mipsisa32r6el-unknown-linux-gnu
//@[mipsisa32r6el-unknown-linux-gnu] needs-llvm-components: mips
//@ revisions: mipsisa32r6-unknown-linux-gnu
//@[mipsisa32r6-unknown-linux-gnu] compile-flags: --target=mipsisa32r6-unknown-linux-gnu
//@[mipsisa32r6-unknown-linux-gnu] needs-llvm-components: mips
//@ revisions: mipsisa64r6el-unknown-linux-gnuabi64
//@[mipsisa64r6el-unknown-linux-gnuabi64] compile-flags: --target=mipsisa64r6el-unknown-linux-gnuabi64
//@[mipsisa64r6el-unknown-linux-gnuabi64] needs-llvm-components: mips
//@ revisions: mipsisa64r6-unknown-linux-gnuabi64
//@[mipsisa64r6-unknown-linux-gnuabi64] compile-flags: --target=mipsisa64r6-unknown-linux-gnuabi64
//@[mipsisa64r6-unknown-linux-gnuabi64] needs-llvm-components: mips
//@ revisions: mips-mti-none-elf
//@[mips-mti-none-elf] compile-flags: --target=mips-mti-none-elf
//@[mips-mti-none-elf] needs-llvm-components: mips
//@ revisions: mips-unknown-linux-gnu
//@[mips-unknown-linux-gnu] compile-flags: --target=mips-unknown-linux-gnu
//@[mips-unknown-linux-gnu] needs-llvm-components: mips
//@ revisions: mips-unknown-linux-musl
//@[mips-unknown-linux-musl] compile-flags: --target=mips-unknown-linux-musl
//@[mips-unknown-linux-musl] needs-llvm-components: mips
//@ revisions: mips-unknown-linux-uclibc
//@[mips-unknown-linux-uclibc] compile-flags: --target=mips-unknown-linux-uclibc
//@[mips-unknown-linux-uclibc] needs-llvm-components: mips

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

extern crate minicore;
use minicore::*;

// CHECK-NOT: teq
#[no_mangle]
pub fn div_i32(x: i32, y: i32) -> i32 {
x / y
}
Loading