Skip to content

Commit

Permalink
Auto merge of #32362 - bluss:float-fast-math, r=eddyb
Browse files Browse the repository at this point in the history
Fix floating point fast-math intrinsics

The implementation did not handle the case where both operands were constants, which caused an llvm assertion:

```
rustc: //buildslave//rust-buildbot//slave//nightly-dist-rustc-musl-linux//build//src//llvm//include/llvm/Support/Casting.h:237:
typename llvm::cast_retty<X, Y*>::ret_type llvm::cast(Y*) [with X = llvm::Instruction; Y = llvm::Value; typename llvm::cast_retty<X, Y*>::ret_type = llvm::Instruction*]:
Assertion `isa<X>(Val) && "cast<Ty>() argument of incompatible type!"' failed.
```
  • Loading branch information
bors committed Mar 19, 2016
2 parents 8eeb506 + ba89b25 commit 02310fd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
6 changes: 4 additions & 2 deletions src/rustllvm/RustWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,10 @@ extern "C" void LLVMRemoveFunctionAttrString(LLVMValueRef fn, unsigned index, co
}

// enable fpmath flag UnsafeAlgebra
extern "C" void LLVMRustSetHasUnsafeAlgebra(LLVMValueRef Instr) {
unwrap<Instruction>(Instr)->setHasUnsafeAlgebra(true);
extern "C" void LLVMRustSetHasUnsafeAlgebra(LLVMValueRef V) {
if (auto I = dyn_cast<Instruction>(unwrap<Value>(V))) {
I->setHasUnsafeAlgebra(true);
}
}

extern "C" LLVMValueRef LLVMBuildAtomicLoad(LLVMBuilderRef B,
Expand Down
18 changes: 12 additions & 6 deletions src/test/run-pass/float_math.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,19 @@

use std::intrinsics::{fadd_fast, fsub_fast, fmul_fast, fdiv_fast, frem_fast};

fn main() {
#[inline(never)]
pub fn test_operations(a: f64, b: f64) {
// make sure they all map to the correct operation
unsafe {
assert_eq!(fadd_fast(1., 2.), 1. + 2.);
assert_eq!(fsub_fast(1., 2.), 1. - 2.);
assert_eq!(fmul_fast(2., 3.), 2. * 3.);
assert_eq!(fdiv_fast(10., 5.), 10. / 5.);
assert_eq!(frem_fast(10., 5.), 10. % 5.);
assert_eq!(fadd_fast(a, b), a + b);
assert_eq!(fsub_fast(a, b), a - b);
assert_eq!(fmul_fast(a, b), a * b);
assert_eq!(fdiv_fast(a, b), a / b);
assert_eq!(frem_fast(a, b), a % b);
}
}

fn main() {
test_operations(1., 2.);
test_operations(10., 5.);
}

0 comments on commit 02310fd

Please sign in to comment.