diff --git a/test/Transforms/EarlyCSE/commute.ll b/test/Transforms/EarlyCSE/commute.ll
index b6a33a7..348e928 100644
--- a/test/Transforms/EarlyCSE/commute.ll
+++ b/test/Transforms/EarlyCSE/commute.ll
@@ -1,11 +1,12 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt < %s -S -early-cse | FileCheck %s
 ; RUN: opt < %s -S -basicaa -early-cse-memssa | FileCheck %s
 
 define void @test1(float %A, float %B, float* %PA, float* %PB) {
 ; CHECK-LABEL: @test1(
-; CHECK-NEXT:    [[C:%.*]] = fadd float %A, %B
-; CHECK-NEXT:    store float [[C]], float* %PA
-; CHECK-NEXT:    store float [[C]], float* %PB
+; CHECK-NEXT:    [[C:%.*]] = fadd float [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    store float [[C]], float* [[PA:%.*]]
+; CHECK-NEXT:    store float [[C]], float* [[PB:%.*]]
 ; CHECK-NEXT:    ret void
 ;
   %C = fadd float %A, %B
@@ -17,9 +18,9 @@
 
 define void @test2(float %A, float %B, i1* %PA, i1* %PB) {
 ; CHECK-LABEL: @test2(
-; CHECK-NEXT:    [[C:%.*]] = fcmp oeq float %A, %B
-; CHECK-NEXT:    store i1 [[C]], i1* %PA
-; CHECK-NEXT:    store i1 [[C]], i1* %PB
+; CHECK-NEXT:    [[C:%.*]] = fcmp oeq float [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    store i1 [[C]], i1* [[PA:%.*]]
+; CHECK-NEXT:    store i1 [[C]], i1* [[PB:%.*]]
 ; CHECK-NEXT:    ret void
 ;
   %C = fcmp oeq float %A, %B
@@ -31,9 +32,9 @@
 
 define void @test3(float %A, float %B, i1* %PA, i1* %PB) {
 ; CHECK-LABEL: @test3(
-; CHECK-NEXT:    [[C:%.*]] = fcmp uge float %A, %B
-; CHECK-NEXT:    store i1 [[C]], i1* %PA
-; CHECK-NEXT:    store i1 [[C]], i1* %PB
+; CHECK-NEXT:    [[C:%.*]] = fcmp uge float [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    store i1 [[C]], i1* [[PA:%.*]]
+; CHECK-NEXT:    store i1 [[C]], i1* [[PB:%.*]]
 ; CHECK-NEXT:    ret void
 ;
   %C = fcmp uge float %A, %B
@@ -45,9 +46,9 @@
 
 define void @test4(i32 %A, i32 %B, i1* %PA, i1* %PB) {
 ; CHECK-LABEL: @test4(
-; CHECK-NEXT:    [[C:%.*]] = icmp eq i32 %A, %B
-; CHECK-NEXT:    store i1 [[C]], i1* %PA
-; CHECK-NEXT:    store i1 [[C]], i1* %PB
+; CHECK-NEXT:    [[C:%.*]] = icmp eq i32 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    store i1 [[C]], i1* [[PA:%.*]]
+; CHECK-NEXT:    store i1 [[C]], i1* [[PB:%.*]]
 ; CHECK-NEXT:    ret void
 ;
   %C = icmp eq i32 %A, %B
@@ -59,9 +60,9 @@
 
 define void @test5(i32 %A, i32 %B, i1* %PA, i1* %PB) {
 ; CHECK-LABEL: @test5(
-; CHECK-NEXT:    [[C:%.*]] = icmp sgt i32 %A, %B
-; CHECK-NEXT:    store i1 [[C]], i1* %PA
-; CHECK-NEXT:    store i1 [[C]], i1* %PB
+; CHECK-NEXT:    [[C:%.*]] = icmp sgt i32 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    store i1 [[C]], i1* [[PA:%.*]]
+; CHECK-NEXT:    store i1 [[C]], i1* [[PB:%.*]]
 ; CHECK-NEXT:    ret void
 ;
   %C = icmp sgt i32 %A, %B
@@ -75,9 +76,9 @@
 
 define i8 @smin_commute(i8 %a, i8 %b) {
 ; CHECK-LABEL: @smin_commute(
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp slt i8 %a, %b
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp slt i8 %b, %a
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %a, i8 %b
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp slt i8 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp slt i8 [[B]], [[A]]
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[A]], i8 [[B]]
 ; CHECK-NEXT:    [[R:%.*]] = mul i8 [[M1]], [[M1]]
 ; CHECK-NEXT:    ret i8 [[R]]
 ;
@@ -93,9 +94,9 @@
 
 define i1 @smin_swapped(i8 %a, i8 %b) {
 ; CHECK-LABEL: @smin_swapped(
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp sgt i8 %a, %b
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp slt i8 %a, %b
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %b, i8 %a
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp sgt i8 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp slt i8 [[A]], [[B]]
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[B]], i8 [[A]]
 ; CHECK-NEXT:    ret i1 true
 ;
   %cmp1 = icmp sgt i8 %a, %b
@@ -108,9 +109,9 @@
 
 define i8 @smax_commute(i8 %a, i8 %b) {
 ; CHECK-LABEL: @smax_commute(
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp sgt i8 %a, %b
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp sgt i8 %b, %a
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %a, i8 %b
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp sgt i8 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp sgt i8 [[B]], [[A]]
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[A]], i8 [[B]]
 ; CHECK-NEXT:    ret i8 0
 ;
   %cmp1 = icmp sgt i8 %a, %b
@@ -123,9 +124,9 @@
 
 define i8 @smax_swapped(i8 %a, i8 %b) {
 ; CHECK-LABEL: @smax_swapped(
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp slt i8 %a, %b
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp sgt i8 %a, %b
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %b, i8 %a
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp slt i8 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp sgt i8 [[A]], [[B]]
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[B]], i8 [[A]]
 ; CHECK-NEXT:    ret i8 1
 ;
   %cmp1 = icmp slt i8 %a, %b
@@ -138,9 +139,9 @@
 
 define i8 @umin_commute(i8 %a, i8 %b) {
 ; CHECK-LABEL: @umin_commute(
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp ult i8 %a, %b
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp ult i8 %b, %a
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %a, i8 %b
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp ult i8 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp ult i8 [[B]], [[A]]
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[A]], i8 [[B]]
 ; CHECK-NEXT:    ret i8 0
 ;
   %cmp1 = icmp ult i8 %a, %b
@@ -155,9 +156,9 @@
 
 define <2 x i8> @umin_swapped(<2 x i8> %a, <2 x i8> %b) {
 ; CHECK-LABEL: @umin_swapped(
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp ugt <2 x i8> %a, %b
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp ult <2 x i8> %a, %b
-; CHECK-NEXT:    [[M1:%.*]] = select <2 x i1> [[CMP1]], <2 x i8> %b, <2 x i8> %a
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp ugt <2 x i8> [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp ult <2 x i8> [[A]], [[B]]
+; CHECK-NEXT:    [[M1:%.*]] = select <2 x i1> [[CMP1]], <2 x i8> [[B]], <2 x i8> [[A]]
 ; CHECK-NEXT:    ret <2 x i8> zeroinitializer
 ;
   %cmp1 = icmp ugt <2 x i8> %a, %b
@@ -170,9 +171,9 @@
 
 define i8 @umax_commute(i8 %a, i8 %b) {
 ; CHECK-LABEL: @umax_commute(
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp ugt i8 %a, %b
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp ugt i8 %b, %a
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %a, i8 %b
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp ugt i8 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp ugt i8 [[B]], [[A]]
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[A]], i8 [[B]]
 ; CHECK-NEXT:    ret i8 1
 ;
   %cmp1 = icmp ugt i8 %a, %b
@@ -185,9 +186,9 @@
 
 define i8 @umax_swapped(i8 %a, i8 %b) {
 ; CHECK-LABEL: @umax_swapped(
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp ult i8 %a, %b
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp ugt i8 %a, %b
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %b, i8 %a
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp ult i8 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp ugt i8 [[A]], [[B]]
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[B]], i8 [[A]]
 ; CHECK-NEXT:    [[R:%.*]] = add i8 [[M1]], [[M1]]
 ; CHECK-NEXT:    ret i8 [[R]]
 ;
@@ -203,8 +204,8 @@
 
 define i8 @smax_nsw(i8 %a, i8 %b) {
 ; CHECK-LABEL: @smax_nsw(
-; CHECK-NEXT:    [[SUB:%.*]] = sub nsw i8 %a, %b
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp slt i8 %a, %b
+; CHECK-NEXT:    [[SUB:%.*]] = sub nsw i8 [[A:%.*]], [[B:%.*]]
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp slt i8 [[A]], [[B]]
 ; CHECK-NEXT:    [[CMP2:%.*]] = icmp sgt i8 [[SUB]], 0
 ; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 0, i8 [[SUB]]
 ; CHECK-NEXT:    ret i8 0
@@ -220,10 +221,10 @@
 
 define i8 @abs_swapped(i8 %a) {
 ; CHECK-LABEL: @abs_swapped(
-; CHECK-NEXT:    [[NEG:%.*]] = sub i8 0, %a
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp sgt i8 %a, 0
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp slt i8 %a, 0
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %a, i8 [[NEG]]
+; CHECK-NEXT:    [[NEG:%.*]] = sub i8 0, [[A:%.*]]
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp sgt i8 [[A]], 0
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp slt i8 [[A]], 0
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[A]], i8 [[NEG]]
 ; CHECK-NEXT:    ret i8 [[M1]]
 ;
   %neg = sub i8 0, %a
@@ -237,10 +238,10 @@
 
 define i8 @nabs_swapped(i8 %a) {
 ; CHECK-LABEL: @nabs_swapped(
-; CHECK-NEXT:    [[NEG:%.*]] = sub i8 0, %a
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp slt i8 %a, 0
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp sgt i8 %a, 0
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %a, i8 [[NEG]]
+; CHECK-NEXT:    [[NEG:%.*]] = sub i8 0, [[A:%.*]]
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp slt i8 [[A]], 0
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp sgt i8 [[A]], 0
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[A]], i8 [[NEG]]
 ; CHECK-NEXT:    ret i8 0
 ;
   %neg = sub i8 0, %a
@@ -256,10 +257,10 @@
 ; compares are different.
 define i8 @abs_different_constants(i8 %a) {
 ; CHECK-LABEL: @abs_different_constants(
-; CHECK-NEXT:    [[NEG:%.*]] = sub i8 0, %a
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp sgt i8 %a, -1
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp slt i8 %a, 0
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %a, i8 [[NEG]]
+; CHECK-NEXT:    [[NEG:%.*]] = sub i8 0, [[A:%.*]]
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp sgt i8 [[A]], -1
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp slt i8 [[A]], 0
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[A]], i8 [[NEG]]
 ; CHECK-NEXT:    ret i8 [[M1]]
 ;
   %neg = sub i8 0, %a
@@ -273,10 +274,10 @@
 
 define i8 @nabs_different_constants(i8 %a) {
 ; CHECK-LABEL: @nabs_different_constants(
-; CHECK-NEXT:    [[NEG:%.*]] = sub i8 0, %a
-; CHECK-NEXT:    [[CMP1:%.*]] = icmp slt i8 %a, 0
-; CHECK-NEXT:    [[CMP2:%.*]] = icmp sgt i8 %a, -1
-; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 %a, i8 [[NEG]]
+; CHECK-NEXT:    [[NEG:%.*]] = sub i8 0, [[A:%.*]]
+; CHECK-NEXT:    [[CMP1:%.*]] = icmp slt i8 [[A]], 0
+; CHECK-NEXT:    [[CMP2:%.*]] = icmp sgt i8 [[A]], -1
+; CHECK-NEXT:    [[M1:%.*]] = select i1 [[CMP1]], i8 [[A]], i8 [[NEG]]
 ; CHECK-NEXT:    ret i8 0
 ;
   %neg = sub i8 0, %a