diff --git a/llvm/test/CodeGen/X86/3addr-16bit.ll b/llvm/test/CodeGen/X86/3addr-16bit.ll
index 882150a6e39ab..c9390d91d59c2 100644
--- a/llvm/test/CodeGen/X86/3addr-16bit.ll
+++ b/llvm/test/CodeGen/X86/3addr-16bit.ll
@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin | FileCheck %s -check-prefix=X64
-; RUN: llc < %s -mtriple=i686-apple-darwin   | FileCheck %s -check-prefix=X32
+; RUN: llc < %s -mtriple=i686-apple-darwin   | FileCheck %s -check-prefix=X86
 
 ; rdar://7329206
 
@@ -25,27 +25,27 @@ define zeroext i16 @test1(i16 zeroext %c, i16 zeroext %k) nounwind ssp {
 ; X64-NEXT:    movzwl %ax, %eax
 ; X64-NEXT:    retq
 ;
-; X32-LABEL: test1:
-; X32:       ## %bb.0: ## %entry
-; X32-NEXT:    pushl %esi
-; X32-NEXT:    subl $8, %esp
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    movl %ecx, %eax
-; X32-NEXT:    incl %eax
-; X32-NEXT:    cmpw {{[0-9]+}}(%esp), %cx
-; X32-NEXT:    jne LBB0_2
-; X32-NEXT:  ## %bb.1: ## %bb
-; X32-NEXT:    movzwl %ax, %esi
-; X32-NEXT:    movl %esi, (%esp)
-; X32-NEXT:    calll _foo
-; X32-NEXT:    movl %esi, %eax
-; X32-NEXT:    jmp LBB0_3
-; X32-NEXT:  LBB0_2: ## %bb1
-; X32-NEXT:    movzwl %ax, %eax
-; X32-NEXT:  LBB0_3: ## %bb1
-; X32-NEXT:    addl $8, %esp
-; X32-NEXT:    popl %esi
-; X32-NEXT:    retl
+; X86-LABEL: test1:
+; X86:       ## %bb.0: ## %entry
+; X86-NEXT:    pushl %esi
+; X86-NEXT:    subl $8, %esp
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    movl %ecx, %eax
+; X86-NEXT:    incl %eax
+; X86-NEXT:    cmpw {{[0-9]+}}(%esp), %cx
+; X86-NEXT:    jne LBB0_2
+; X86-NEXT:  ## %bb.1: ## %bb
+; X86-NEXT:    movzwl %ax, %esi
+; X86-NEXT:    movl %esi, (%esp)
+; X86-NEXT:    calll _foo
+; X86-NEXT:    movl %esi, %eax
+; X86-NEXT:    jmp LBB0_3
+; X86-NEXT:  LBB0_2: ## %bb1
+; X86-NEXT:    movzwl %ax, %eax
+; X86-NEXT:  LBB0_3: ## %bb1
+; X86-NEXT:    addl $8, %esp
+; X86-NEXT:    popl %esi
+; X86-NEXT:    retl
 entry:
   %0 = icmp eq i16 %k, %c
   %1 = add i16 %k, 1
@@ -78,27 +78,27 @@ define zeroext i16 @test2(i16 zeroext %c, i16 zeroext %k) nounwind ssp {
 ; X64-NEXT:    movzwl %ax, %eax
 ; X64-NEXT:    retq
 ;
-; X32-LABEL: test2:
-; X32:       ## %bb.0: ## %entry
-; X32-NEXT:    pushl %esi
-; X32-NEXT:    subl $8, %esp
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    movl %ecx, %eax
-; X32-NEXT:    decl %eax
-; X32-NEXT:    cmpw {{[0-9]+}}(%esp), %cx
-; X32-NEXT:    jne LBB1_2
-; X32-NEXT:  ## %bb.1: ## %bb
-; X32-NEXT:    movzwl %ax, %esi
-; X32-NEXT:    movl %esi, (%esp)
-; X32-NEXT:    calll _foo
-; X32-NEXT:    movl %esi, %eax
-; X32-NEXT:    jmp LBB1_3
-; X32-NEXT:  LBB1_2: ## %bb1
-; X32-NEXT:    movzwl %ax, %eax
-; X32-NEXT:  LBB1_3: ## %bb1
-; X32-NEXT:    addl $8, %esp
-; X32-NEXT:    popl %esi
-; X32-NEXT:    retl
+; X86-LABEL: test2:
+; X86:       ## %bb.0: ## %entry
+; X86-NEXT:    pushl %esi
+; X86-NEXT:    subl $8, %esp
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    movl %ecx, %eax
+; X86-NEXT:    decl %eax
+; X86-NEXT:    cmpw {{[0-9]+}}(%esp), %cx
+; X86-NEXT:    jne LBB1_2
+; X86-NEXT:  ## %bb.1: ## %bb
+; X86-NEXT:    movzwl %ax, %esi
+; X86-NEXT:    movl %esi, (%esp)
+; X86-NEXT:    calll _foo
+; X86-NEXT:    movl %esi, %eax
+; X86-NEXT:    jmp LBB1_3
+; X86-NEXT:  LBB1_2: ## %bb1
+; X86-NEXT:    movzwl %ax, %eax
+; X86-NEXT:  LBB1_3: ## %bb1
+; X86-NEXT:    addl $8, %esp
+; X86-NEXT:    popl %esi
+; X86-NEXT:    retl
 entry:
   %0 = icmp eq i16 %k, %c
   %1 = add i16 %k, -1
@@ -133,27 +133,27 @@ define zeroext i16 @test3(i16 zeroext %c, i16 zeroext %k) nounwind ssp {
 ; X64-NEXT:    movzwl %ax, %eax
 ; X64-NEXT:    retq
 ;
-; X32-LABEL: test3:
-; X32:       ## %bb.0: ## %entry
-; X32-NEXT:    pushl %esi
-; X32-NEXT:    subl $8, %esp
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    movl %ecx, %eax
-; X32-NEXT:    addl $2, %eax
-; X32-NEXT:    cmpw {{[0-9]+}}(%esp), %cx
-; X32-NEXT:    jne LBB2_2
-; X32-NEXT:  ## %bb.1: ## %bb
-; X32-NEXT:    movzwl %ax, %esi
-; X32-NEXT:    movl %esi, (%esp)
-; X32-NEXT:    calll _foo
-; X32-NEXT:    movl %esi, %eax
-; X32-NEXT:    jmp LBB2_3
-; X32-NEXT:  LBB2_2: ## %bb1
-; X32-NEXT:    movzwl %ax, %eax
-; X32-NEXT:  LBB2_3: ## %bb1
-; X32-NEXT:    addl $8, %esp
-; X32-NEXT:    popl %esi
-; X32-NEXT:    retl
+; X86-LABEL: test3:
+; X86:       ## %bb.0: ## %entry
+; X86-NEXT:    pushl %esi
+; X86-NEXT:    subl $8, %esp
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    movl %ecx, %eax
+; X86-NEXT:    addl $2, %eax
+; X86-NEXT:    cmpw {{[0-9]+}}(%esp), %cx
+; X86-NEXT:    jne LBB2_2
+; X86-NEXT:  ## %bb.1: ## %bb
+; X86-NEXT:    movzwl %ax, %esi
+; X86-NEXT:    movl %esi, (%esp)
+; X86-NEXT:    calll _foo
+; X86-NEXT:    movl %esi, %eax
+; X86-NEXT:    jmp LBB2_3
+; X86-NEXT:  LBB2_2: ## %bb1
+; X86-NEXT:    movzwl %ax, %eax
+; X86-NEXT:  LBB2_3: ## %bb1
+; X86-NEXT:    addl $8, %esp
+; X86-NEXT:    popl %esi
+; X86-NEXT:    retl
 entry:
   %0 = add i16 %k, 2
   %1 = icmp eq i16 %k, %c
@@ -186,28 +186,28 @@ define zeroext i16 @test4(i16 zeroext %c, i16 zeroext %k) nounwind ssp {
 ; X64-NEXT:    movzwl %ax, %eax
 ; X64-NEXT:    retq
 ;
-; X32-LABEL: test4:
-; X32:       ## %bb.0: ## %entry
-; X32-NEXT:    pushl %esi
-; X32-NEXT:    subl $8, %esp
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %edx
-; X32-NEXT:    movl %edx, %eax
-; X32-NEXT:    addl %ecx, %eax
-; X32-NEXT:    cmpw %cx, %dx
-; X32-NEXT:    jne LBB3_2
-; X32-NEXT:  ## %bb.1: ## %bb
-; X32-NEXT:    movzwl %ax, %esi
-; X32-NEXT:    movl %esi, (%esp)
-; X32-NEXT:    calll _foo
-; X32-NEXT:    movl %esi, %eax
-; X32-NEXT:    jmp LBB3_3
-; X32-NEXT:  LBB3_2: ## %bb1
-; X32-NEXT:    movzwl %ax, %eax
-; X32-NEXT:  LBB3_3: ## %bb1
-; X32-NEXT:    addl $8, %esp
-; X32-NEXT:    popl %esi
-; X32-NEXT:    retl
+; X86-LABEL: test4:
+; X86:       ## %bb.0: ## %entry
+; X86-NEXT:    pushl %esi
+; X86-NEXT:    subl $8, %esp
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %edx
+; X86-NEXT:    movl %edx, %eax
+; X86-NEXT:    addl %ecx, %eax
+; X86-NEXT:    cmpw %cx, %dx
+; X86-NEXT:    jne LBB3_2
+; X86-NEXT:  ## %bb.1: ## %bb
+; X86-NEXT:    movzwl %ax, %esi
+; X86-NEXT:    movl %esi, (%esp)
+; X86-NEXT:    calll _foo
+; X86-NEXT:    movl %esi, %eax
+; X86-NEXT:    jmp LBB3_3
+; X86-NEXT:  LBB3_2: ## %bb1
+; X86-NEXT:    movzwl %ax, %eax
+; X86-NEXT:  LBB3_3: ## %bb1
+; X86-NEXT:    addl $8, %esp
+; X86-NEXT:    popl %esi
+; X86-NEXT:    retl
 entry:
   %0 = add i16 %k, %c
   %1 = icmp eq i16 %k, %c