diff --git a/test/Transforms/InstSimplify/fold-builtin-fma.ll b/test/Transforms/InstSimplify/fold-builtin-fma.ll
index 6331b8c2dd4..ff2b6cd52f4 100644
--- a/test/Transforms/InstSimplify/fold-builtin-fma.ll
+++ b/test/Transforms/InstSimplify/fold-builtin-fma.ll
@@ -1,3 +1,4 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt -instsimplify -S < %s | FileCheck %s
 
 ; Fixes PR20832
@@ -8,112 +9,118 @@ declare double @llvm.fma.f64(double, double, double)
 
 
 define double @PR20832()  {
+; CHECK-LABEL: @PR20832(
+; CHECK-NEXT:    ret double 5.600000e+01
+;
   %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 0.0)
   ret double %1
 }
-; CHECK-LABEL: @PR20832(
-; CHECK: ret double 5.600000e+01
 
 ; Test builtin fma with all finite non-zero constants.
 define double @test_all_finite()  {
+; CHECK-LABEL: @test_all_finite(
+; CHECK-NEXT:    ret double 6.100000e+01
+;
   %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 5.0)
   ret double %1
 }
-; CHECK-LABEL: @test_all_finite(
-; CHECK: ret double 6.100000e+01
 
 ; Test builtin fma with a +/-NaN addend.
 define double @test_NaN_addend()  {
+; CHECK-LABEL: @test_NaN_addend(
+; CHECK-NEXT:    ret double 0x7FF8000000000000
+;
   %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 0x7FF8000000000000)
   ret double %1
 }
-; CHECK-LABEL: @test_NaN_addend(
-; CHECK: ret double 0x7FF8000000000000
 
 define double @test_NaN_addend_2()  {
+; CHECK-LABEL: @test_NaN_addend_2(
+; CHECK-NEXT:    ret double 0xFFF8000000000000
+;
   %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 0xFFF8000000000000)
   ret double %1
 }
-; CHECK-LABEL: @test_NaN_addend_2(
-; CHECK: ret double 0xFFF8000000000000
 
 ; Test builtin fma with a +/-Inf addend.
 define double @test_Inf_addend()  {
+; CHECK-LABEL: @test_Inf_addend(
+; CHECK-NEXT:    ret double 0x7FF0000000000000
+;
   %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 0x7FF0000000000000)
   ret double %1
 }
-; CHECK-LABEL: @test_Inf_addend(
-; CHECK: ret double 0x7FF0000000000000
 
 define double @test_Inf_addend_2()  {
+; CHECK-LABEL: @test_Inf_addend_2(
+; CHECK-NEXT:    ret double 0xFFF0000000000000
+;
   %1 = call double @llvm.fma.f64(double 7.0, double 8.0, double 0xFFF0000000000000)
   ret double %1
 }
-; CHECK-LABEL: @test_Inf_addend_2(
-; CHECK: ret double 0xFFF0000000000000
 
 ; Test builtin fma with one of the operands to the multiply being +/-NaN.
 define double @test_NaN_1()  {
+; CHECK-LABEL: @test_NaN_1(
+; CHECK-NEXT:    ret double 0x7FF8000000000000
+;
   %1 = call double @llvm.fma.f64(double 0x7FF8000000000000, double 8.0, double 0.0)
   ret double %1
 }
-; CHECK-LABEL: @test_NaN_1(
-; CHECK: ret double 0x7FF8000000000000
-
 
 define double @test_NaN_2()  {
+; CHECK-LABEL: @test_NaN_2(
+; CHECK-NEXT:    ret double 0x7FF8000000000000
+;
   %1 = call double @llvm.fma.f64(double 7.0, double 0x7FF8000000000000, double 0.0)
   ret double %1
 }
-; CHECK-LABEL: @test_NaN_2(
-; CHECK: ret double 0x7FF8000000000000
-
 
 define double @test_NaN_3()  {
+; CHECK-LABEL: @test_NaN_3(
+; CHECK-NEXT:    ret double 0x7FF8000000000000
+;
   %1 = call double @llvm.fma.f64(double 0xFFF8000000000000, double 8.0, double 0.0)
   ret double %1
 }
-; CHECK-LABEL: @test_NaN_3(
-; CHECK: ret double 0x7FF8000000000000
-
 
 define double @test_NaN_4()  {
+; CHECK-LABEL: @test_NaN_4(
+; CHECK-NEXT:    ret double 0x7FF8000000000000
+;
   %1 = call double @llvm.fma.f64(double 7.0, double 0xFFF8000000000000, double 0.0)
   ret double %1
 }
-; CHECK-LABEL: @test_NaN_4(
-; CHECK: ret double 0x7FF8000000000000
-
 
 ; Test builtin fma with one of the operands to the multiply being +/-Inf.
 define double @test_Inf_1()  {
+; CHECK-LABEL: @test_Inf_1(
+; CHECK-NEXT:    ret double 0x7FF0000000000000
+;
   %1 = call double @llvm.fma.f64(double 0x7FF0000000000000, double 8.0, double 0.0)
   ret double %1
 }
-; CHECK-LABEL: @test_Inf_1(
-; CHECK: ret double 0x7FF0000000000000
-
 
 define double @test_Inf_2()  {
+; CHECK-LABEL: @test_Inf_2(
+; CHECK-NEXT:    ret double 0x7FF0000000000000
+;
   %1 = call double @llvm.fma.f64(double 7.0, double 0x7FF0000000000000, double 0.0)
   ret double %1
 }
-; CHECK-LABEL: @test_Inf_2(
-; CHECK: ret double 0x7FF0000000000000
-
 
 define double @test_Inf_3()  {
+; CHECK-LABEL: @test_Inf_3(
+; CHECK-NEXT:    ret double 0xFFF0000000000000
+;
   %1 = call double @llvm.fma.f64(double 0xFFF0000000000000, double 8.0, double 0.0)
   ret double %1
 }
-; CHECK-LABEL: @test_Inf_3(
-; CHECK: ret double 0xFFF0000000000000
-
 
 define double @test_Inf_4()  {
+; CHECK-LABEL: @test_Inf_4(
+; CHECK-NEXT:    ret double 0xFFF0000000000000
+;
   %1 = call double @llvm.fma.f64(double 7.0, double 0xFFF0000000000000, double 0.0)
   ret double %1
 }
-; CHECK-LABEL: @test_Inf_4(
-; CHECK: ret double 0xFFF0000000000000
-