diff --git a/test/Transforms/InstCombine/double-float-shrink-2.ll b/test/Transforms/InstCombine/double-float-shrink-2.ll
index 5bdeaf7..cbd9dae 100644
--- a/test/Transforms/InstCombine/double-float-shrink-2.ll
+++ b/test/Transforms/InstCombine/double-float-shrink-2.ll
@@ -1,11 +1,11 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -instcombine -S -mtriple "i386-pc-linux" | FileCheck -check-prefix=ALL -check-prefix=DO-SIMPLIFY %s
-; RUN: opt < %s -instcombine -S -mtriple "i386-pc-win32" | FileCheck -check-prefix=ALL -check-prefix=DONT-SIMPLIFY %s
-; RUN: opt < %s -instcombine -S -mtriple "x86_64-pc-win32" | FileCheck -check-prefix=ALL -check-prefix=C89-SIMPLIFY %s
-; RUN: opt < %s -instcombine -S -mtriple "i386-pc-mingw32" | FileCheck -check-prefix=ALL -check-prefix=DO-SIMPLIFY %s
-; RUN: opt < %s -instcombine -S -mtriple "x86_64-pc-mingw32" | FileCheck -check-prefix=ALL -check-prefix=DO-SIMPLIFY %s
-; RUN: opt < %s -instcombine -S -mtriple "sparc-sun-solaris" | FileCheck -check-prefix=ALL -check-prefix=DO-SIMPLIFY %s
-; RUN: opt < %s -enable-debugify -instcombine -S -mtriple "x86_64-pc-win32" 2>&1 | FileCheck -check-prefix=DBG-VALID %s
+; RUN: opt < %s -instcombine -S -mtriple "i386-pc-linux"     | FileCheck --check-prefixes=ALL,DO-SIMPLIFY %s
+; RUN: opt < %s -instcombine -S -mtriple "i386-pc-win32"     | FileCheck --check-prefixes=ALL,DONT-SIMPLIFY %s
+; RUN: opt < %s -instcombine -S -mtriple "x86_64-pc-win32"   | FileCheck --check-prefixes=ALL,C89-SIMPLIFY %s
+; RUN: opt < %s -instcombine -S -mtriple "i386-pc-mingw32"   | FileCheck --check-prefixes=ALL,DO-SIMPLIFY %s
+; RUN: opt < %s -instcombine -S -mtriple "x86_64-pc-mingw32" | FileCheck --check-prefixes=ALL,DO-SIMPLIFY %s
+; RUN: opt < %s -instcombine -S -mtriple "sparc-sun-solaris" | FileCheck --check-prefixes=ALL,DO-SIMPLIFY %s
+; RUN: opt < %s -instcombine -S -mtriple "x86_64-pc-win32" -enable-debugify 2>&1 | FileCheck --check-prefix=DBG-VALID %s
 
 declare double @floor(double)
 declare double @ceil(double)
@@ -60,17 +60,16 @@
 }
 
 define float @test_shrink_libcall_round(float %C) {
-; DO-SIMPLIFY-LABEL: @test_shrink_libcall_round(
+; ALL-LABEL: @test_shrink_libcall_round(
+
 ; DO-SIMPLIFY-NEXT:    [[F:%.*]] = call float @llvm.round.f32(float [[C:%.*]])
 ; DO-SIMPLIFY-NEXT:    ret float [[F]]
 ;
-; DONT-SIMPLIFY-LABEL: @test_shrink_libcall_round(
 ; DONT-SIMPLIFY-NEXT:    [[D:%.*]] = fpext float [[C:%.*]] to double
 ; DONT-SIMPLIFY-NEXT:    [[E:%.*]] = call double @round(double [[D]])
 ; DONT-SIMPLIFY-NEXT:    [[F:%.*]] = fptrunc double [[E]] to float
 ; DONT-SIMPLIFY-NEXT:    ret float [[F]]
 ;
-; C89-SIMPLIFY-LABEL: @test_shrink_libcall_round(
 ; C89-SIMPLIFY-NEXT:    [[D:%.*]] = fpext float [[C:%.*]] to double
 ; C89-SIMPLIFY-NEXT:    [[E:%.*]] = call double @round(double [[D]])
 ; C89-SIMPLIFY-NEXT:    [[F:%.*]] = fptrunc double [[E]] to float
@@ -84,17 +83,16 @@
 }
 
 define float @test_shrink_libcall_nearbyint(float %C) {
-; DO-SIMPLIFY-LABEL: @test_shrink_libcall_nearbyint(
+; ALL-LABEL: @test_shrink_libcall_nearbyint(
+
 ; DO-SIMPLIFY-NEXT:    [[F:%.*]] = call float @llvm.nearbyint.f32(float [[C:%.*]])
 ; DO-SIMPLIFY-NEXT:    ret float [[F]]
 ;
-; DONT-SIMPLIFY-LABEL: @test_shrink_libcall_nearbyint(
 ; DONT-SIMPLIFY-NEXT:    [[D:%.*]] = fpext float [[C:%.*]] to double
 ; DONT-SIMPLIFY-NEXT:    [[E:%.*]] = call double @nearbyint(double [[D]])
 ; DONT-SIMPLIFY-NEXT:    [[F:%.*]] = fptrunc double [[E]] to float
 ; DONT-SIMPLIFY-NEXT:    ret float [[F]]
 ;
-; C89-SIMPLIFY-LABEL: @test_shrink_libcall_nearbyint(
 ; C89-SIMPLIFY-NEXT:    [[D:%.*]] = fpext float [[C:%.*]] to double
 ; C89-SIMPLIFY-NEXT:    [[E:%.*]] = call double @nearbyint(double [[D]])
 ; C89-SIMPLIFY-NEXT:    [[F:%.*]] = fptrunc double [[E]] to float
@@ -108,17 +106,16 @@
 }
 
 define float @test_shrink_libcall_trunc(float %C) {
-; DO-SIMPLIFY-LABEL: @test_shrink_libcall_trunc(
+; ALL-LABEL: @test_shrink_libcall_trunc(
+
 ; DO-SIMPLIFY-NEXT:    [[F:%.*]] = call float @llvm.trunc.f32(float [[C:%.*]])
 ; DO-SIMPLIFY-NEXT:    ret float [[F]]
 ;
-; DONT-SIMPLIFY-LABEL: @test_shrink_libcall_trunc(
 ; DONT-SIMPLIFY-NEXT:    [[D:%.*]] = fpext float [[C:%.*]] to double
 ; DONT-SIMPLIFY-NEXT:    [[E:%.*]] = call double @trunc(double [[D]])
 ; DONT-SIMPLIFY-NEXT:    [[F:%.*]] = fptrunc double [[E]] to float
 ; DONT-SIMPLIFY-NEXT:    ret float [[F]]
 ;
-; C89-SIMPLIFY-LABEL: @test_shrink_libcall_trunc(
 ; C89-SIMPLIFY-NEXT:    [[D:%.*]] = fpext float [[C:%.*]] to double
 ; C89-SIMPLIFY-NEXT:    [[E:%.*]] = call double @trunc(double [[D]])
 ; C89-SIMPLIFY-NEXT:    [[F:%.*]] = fptrunc double [[E]] to float