fix tests

Author: ficol

clang/lib/CodeGen/CGBuiltin.cpp

@@ -2951,7 +2951,13 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
       CodeGenFunction::CGFPOptionsRAII FPOptsRAII(*this, E);
       Value *Arg1 = EmitScalarExpr(E->getArg(0));
       Value *Arg2 = EmitScalarExpr(E->getArg(1));
-      return RValue::get(Builder.CreateFRem(Arg1, Arg2, "fmod"));
+      if (Builder.getIsFPConstrained()) {
+        Function *F = CGM.getIntrinsic(Intrinsic::experimental_constrained_frem,
+                                       Arg1->getType());
+        return RValue::get(Builder.CreateConstrainedFPCall(F, {Arg1, Arg2}));
+      } else {
+        return RValue::get(Builder.CreateFRem(Arg1, Arg2, "fmod"));
+      }
     }
 
     case Builtin::BIlog:
@@ -3203,6 +3209,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
     case Builtin::BI__builtin_ldexpl:
     case Builtin::BI__builtin_ldexpf16:
     case Builtin::BI__builtin_ldexpf128: {
+    case Builtin::BI__builtin_elementwise_ldexp:
       return RValue::get(emitBinaryExpMaybeConstrainedFPBuiltin(
           *this, E, Intrinsic::ldexp,
           Intrinsic::experimental_constrained_ldexp));

clang/test/CodeGen/fp-contract-fast-pragma.cpp

@@ -89,59 +89,17 @@ float fp_contract_6(float a, float b, float c) {
 
 
 #pragma clang fp contract(fast)
-float fp_contract_7(float a, float b, float c) {
+float fp_contract_7(float a) {
 // COMMON: _Z13fp_contract_7f
 // CHECK: tail call contract float @llvm.sqrt.f32(float %a)
-// CHECK: tail call contract float @llvm.ceil.f32(float %a)
-// CHECK: tail call contract float @llvm.sin.f32(float %a)
-// CHECK: tail call contract float @llvm.pow.f32(float %a, float %b)
-// CHECK: tail call contract float @llvm.exp.f32(float %a)
-// CHECK: tail call contract float @llvm.fma.f32(float %a, float %b, float %c)
-// CHECK: tail call contract float @llvm.nearbyint.f32(float %a)
-// CHECK: tail call contract float @llvm.log2.f32(float %a)
 // STRICT: tail call contract float @llvm.experimental.constrained.sqrt.f32(float %a, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call contract float @llvm.experimental.constrained.ceil.f32(float %a, metadata !"fpexcept.strict")
-// STRICT: tail call contract float @llvm.experimental.constrained.sin.f32(float %a, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call contract float @llvm.experimental.constrained.pow.f32(float %a, float %b, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call contract float @llvm.experimental.constrained.exp.f32(float %a, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call contract float @llvm.experimental.constrained.fma.f32(float %a, float %b, float %c, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call contract float @llvm.experimental.constrained.nearbyint.f32(float %a, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call contract float @llvm.experimental.constrained.log2.f32(float %a, metadata !"round.tonearest", metadata !"fpexcept.strict")
-  return __builtin_sqrtf(a) +
-         __builtin_elementwise_ceil(a) +
-         __builtin_elementwise_sin(a) +
-         __builtin_elementwise_pow(a, b) +
-         __builtin_elementwise_exp(a) +
-         __builtin_elementwise_fma(a, b, c) +
-         __builtin_elementwise_nearbyint(a) +
-         __builtin_elementwise_log2(a);
+  return __builtin_sqrtf(a);
 }
 
-float fp_contract_8(float a, float b, float c) {
+float fp_contract_8(float a) {
 // COMMON: _Z13fp_contract_8f
 // CHECK: tail call float @llvm.sqrt.f32(float %a)
-// CHECK: tail call float @llvm.ceil.f32(float %a)
-// CHECK: tail call float @llvm.sin.f32(float %a)
-// CHECK: tail call float @llvm.pow.f32(float %a, float %b)
-// CHECK: tail call float @llvm.exp.f32(float %a)
-// CHECK: tail call float @llvm.fma.f32(float %a, float %b, float %c)
-// CHECK: tail call float @llvm.nearbyint.f32(float %a)
-// CHECK: tail call float @llvm.log2.f32(float %a)
 // STRICT: tail call float @llvm.experimental.constrained.sqrt.f32(float %a, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call float @llvm.experimental.constrained.ceil.f32(float %a, metadata !"fpexcept.strict")
-// STRICT: tail call float @llvm.experimental.constrained.sin.f32(float %a, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call float @llvm.experimental.constrained.pow.f32(float %a, float %b, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call float @llvm.experimental.constrained.exp.f32(float %a, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call float @llvm.experimental.constrained.fma.f32(float %a, float %b, float %c, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call float @llvm.experimental.constrained.nearbyint.f32(float %a, metadata !"round.tonearest", metadata !"fpexcept.strict")
-// STRICT: tail call float @llvm.experimental.constrained.log2.f32(float %a, metadata !"round.tonearest", metadata !"fpexcept.strict")
-#pragma clang fp contract(off)  
-  return __builtin_sqrtf(a) +
-         __builtin_elementwise_ceil(a) +
-         __builtin_elementwise_sin(a) +
-         __builtin_elementwise_pow(a, b) +
-         __builtin_elementwise_exp(a) +
-         __builtin_elementwise_fma(a, b, c) +
-         __builtin_elementwise_nearbyint(a) +
-         __builtin_elementwise_log2(a);
+#pragma clang fp contract(off)
+  return __builtin_sqrtf(a);
 }