diff --git a/llvm/test/Transforms/InstCombine/fdiv.ll b/llvm/test/Transforms/InstCombine/fdiv.ll
index 9a10c4523351..b723ace318fe 100644
--- a/llvm/test/Transforms/InstCombine/fdiv.ll
+++ b/llvm/test/Transforms/InstCombine/fdiv.ll
@@ -1,69 +1,85 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt -S -instcombine < %s | FileCheck %s
 
-define float @test1(float %x) nounwind readnone ssp {
+define float @test1(float %x) {
+; CHECK-LABEL: @test1(
+; CHECK-NEXT:    [[DIV:%.*]] = fmul float [[X:%.*]], 0x47D0000000000000
+; CHECK-NEXT:    ret float [[DIV]]
+;
   %div = fdiv float %x, 0x3810000000000000
   ret float %div
-
-; CHECK-LABEL: @test1(
-; CHECK-NEXT: fmul float %x, 0x47D0000000000000
 }
 
-define float @test2(float %x) nounwind readnone ssp {
+define float @test2(float %x) {
+; CHECK-LABEL: @test2(
+; CHECK-NEXT:    [[DIV:%.*]] = fdiv float [[X:%.*]], 0x47E0000000000000
+; CHECK-NEXT:    ret float [[DIV]]
+;
   %div = fdiv float %x, 0x47E0000000000000
   ret float %div
-
-; CHECK-LABEL: @test2(
-; CHECK-NEXT: fdiv float %x, 0x47E0000000000000
 }
 
-define float @test3(float %x) nounwind readnone ssp {
+define float @test3(float %x) {
+; CHECK-LABEL: @test3(
+; CHECK-NEXT:    [[DIV:%.*]] = fdiv float [[X:%.*]], 0x36A0000000000000
+; CHECK-NEXT:    ret float [[DIV]]
+;
   %div = fdiv float %x, 0x36A0000000000000
   ret float %div
-
-; CHECK-LABEL: @test3(
-; CHECK-NEXT: fdiv float %x, 0x36A0000000000000
 }
 
-define float @test4(float %x) nounwind readnone ssp {
+define float @test4(float %x) {
+; CHECK-LABEL: @test4(
+; CHECK-NEXT:    [[DIV:%.*]] = fmul fast float [[X:%.*]], 1.250000e-01
+; CHECK-NEXT:    ret float [[DIV]]
+;
   %div = fdiv fast float %x, 8.0
   ret float %div
-
-; CHECK-LABEL: @test4(
-; CHECK-NEXT: fmul fast float %x, 1.250000e-01
 }
 
-define float @test5(float %x, float %y, float %z) nounwind readnone ssp {
+define float @test5(float %x, float %y, float %z) {
+; CHECK-LABEL: @test5(
+; CHECK-NEXT:    [[TMP1:%.*]] = fmul fast float [[Y:%.*]], [[Z:%.*]]
+; CHECK-NEXT:    [[DIV2:%.*]] = fdiv fast float [[X:%.*]], [[TMP1]]
+; CHECK-NEXT:    ret float [[DIV2]]
+;
   %div1 = fdiv fast float %x, %y
   %div2 = fdiv fast float %div1, %z
   ret float %div2
-; CHECK-LABEL: @test5(
-; CHECK-NEXT: fmul fast
-; CHECK-NEXT: fdiv fast
 }
 
-define float @test6(float %x, float %y, float %z) nounwind readnone ssp {
+define float @test6(float %x, float %y, float %z) {
+; CHECK-LABEL: @test6(
+; CHECK-NEXT:    [[TMP1:%.*]] = fmul fast float [[Z:%.*]], [[Y:%.*]]
+; CHECK-NEXT:    [[DIV2:%.*]] = fdiv fast float [[TMP1]], [[X:%.*]]
+; CHECK-NEXT:    ret float [[DIV2]]
+;
   %div1 = fdiv fast float %x, %y
   %div2 = fdiv fast float %z, %div1
   ret float %div2
-; CHECK-LABEL: @test6(
-; CHECK-NEXT: fmul fast
-; CHECK-NEXT: fdiv fast
 }
 
-; CHECK-LABEL @fdiv_fneg_fneg(
-; CHECK: %div = fdiv float %x, %y
 define float @fdiv_fneg_fneg(float %x, float %y) {
+; CHECK-LABEL: @fdiv_fneg_fneg(
+; CHECK-NEXT:    [[DIV:%.*]] = fdiv float [[X:%.*]], [[Y:%.*]]
+; CHECK-NEXT:    ret float [[DIV]]
+;
   %x.fneg = fsub float -0.0, %x
   %y.fneg = fsub float -0.0, %y
   %div = fdiv float %x.fneg, %y.fneg
   ret float %div
 }
 
-; CHECK-LABEL @fdiv_fneg_fneg_fast(
-; CHECK: %div = fdiv fast float %x, %y
+; The test above shows that no FMF are needed, but show that we are not dropping FMF.
+
 define float @fdiv_fneg_fneg_fast(float %x, float %y) {
+; CHECK-LABEL: @fdiv_fneg_fneg_fast(
+; CHECK-NEXT:    [[DIV:%.*]] = fdiv fast float [[X:%.*]], [[Y:%.*]]
+; CHECK-NEXT:    ret float [[DIV]]
+;
   %x.fneg = fsub float -0.0, %x
   %y.fneg = fsub float -0.0, %y
   %div = fdiv fast float %x.fneg, %y.fneg
   ret float %div
 }
+