diff --git a/llvm/test/CodeGen/X86/bmi-intrinsics-fast-isel.ll b/llvm/test/CodeGen/X86/bmi-intrinsics-fast-isel.ll
index c6950da4064d12..3db5fdaf825a4a 100644
--- a/llvm/test/CodeGen/X86/bmi-intrinsics-fast-isel.ll
+++ b/llvm/test/CodeGen/X86/bmi-intrinsics-fast-isel.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc -fast-isel-sink-local-values < %s -fast-isel -mtriple=i686-unknown-unknown -mattr=+bmi | FileCheck %s --check-prefix=X32
+; RUN: llc -fast-isel-sink-local-values < %s -fast-isel -mtriple=i686-unknown-unknown -mattr=+bmi | FileCheck %s --check-prefix=X86
 ; RUN: llc -fast-isel-sink-local-values < %s -fast-isel -mtriple=x86_64-unknown-unknown -mattr=+bmi | FileCheck %s --check-prefix=X64
 
 ; NOTE: This should use IR equivalent to what is generated by clang/test/CodeGen/bmi-builtins.c
@@ -9,10 +9,10 @@
 ;
 
 define i16 @test__tzcnt_u16(i16 %a0) {
-; X32-LABEL: test__tzcnt_u16:
-; X32:       # %bb.0:
-; X32-NEXT:    tzcntw {{[0-9]+}}(%esp), %ax
-; X32-NEXT:    retl
+; X86-LABEL: test__tzcnt_u16:
+; X86:       # %bb.0:
+; X86-NEXT:    tzcntw {{[0-9]+}}(%esp), %ax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test__tzcnt_u16:
 ; X64:       # %bb.0:
@@ -25,12 +25,12 @@ define i16 @test__tzcnt_u16(i16 %a0) {
 }
 
 define i32 @test__andn_u32(i32 %a0, i32 %a1) {
-; X32-LABEL: test__andn_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %eax
-; X32-NEXT:    xorl $-1, %eax
-; X32-NEXT:    andl {{[0-9]+}}(%esp), %eax
-; X32-NEXT:    retl
+; X86-LABEL: test__andn_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    xorl $-1, %eax
+; X86-NEXT:    andl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test__andn_u32:
 ; X64:       # %bb.0:
@@ -44,11 +44,11 @@ define i32 @test__andn_u32(i32 %a0, i32 %a1) {
 }
 
 define i32 @test__bextr_u32(i32 %a0, i32 %a1) {
-; X32-LABEL: test__bextr_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %eax
-; X32-NEXT:    bextrl %eax, {{[0-9]+}}(%esp), %eax
-; X32-NEXT:    retl
+; X86-LABEL: test__bextr_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    bextrl %eax, {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test__bextr_u32:
 ; X64:       # %bb.0:
@@ -59,13 +59,13 @@ define i32 @test__bextr_u32(i32 %a0, i32 %a1) {
 }
 
 define i32 @test__blsi_u32(i32 %a0) {
-; X32-LABEL: test__blsi_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    xorl %eax, %eax
-; X32-NEXT:    subl %ecx, %eax
-; X32-NEXT:    andl %ecx, %eax
-; X32-NEXT:    retl
+; X86-LABEL: test__blsi_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    xorl %eax, %eax
+; X86-NEXT:    subl %ecx, %eax
+; X86-NEXT:    andl %ecx, %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test__blsi_u32:
 ; X64:       # %bb.0:
@@ -79,12 +79,12 @@ define i32 @test__blsi_u32(i32 %a0) {
 }
 
 define i32 @test__blsmsk_u32(i32 %a0) {
-; X32-LABEL: test__blsmsk_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    leal -1(%ecx), %eax
-; X32-NEXT:    xorl %ecx, %eax
-; X32-NEXT:    retl
+; X86-LABEL: test__blsmsk_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    leal -1(%ecx), %eax
+; X86-NEXT:    xorl %ecx, %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test__blsmsk_u32:
 ; X64:       # %bb.0:
@@ -98,12 +98,12 @@ define i32 @test__blsmsk_u32(i32 %a0) {
 }
 
 define i32 @test__blsr_u32(i32 %a0) {
-; X32-LABEL: test__blsr_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    leal -1(%ecx), %eax
-; X32-NEXT:    andl %ecx, %eax
-; X32-NEXT:    retl
+; X86-LABEL: test__blsr_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    leal -1(%ecx), %eax
+; X86-NEXT:    andl %ecx, %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test__blsr_u32:
 ; X64:       # %bb.0:
@@ -117,10 +117,10 @@ define i32 @test__blsr_u32(i32 %a0) {
 }
 
 define i32 @test__tzcnt_u32(i32 %a0) {
-; X32-LABEL: test__tzcnt_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    tzcntl {{[0-9]+}}(%esp), %eax
-; X32-NEXT:    retl
+; X86-LABEL: test__tzcnt_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    tzcntl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test__tzcnt_u32:
 ; X64:       # %bb.0:
@@ -136,10 +136,10 @@ define i32 @test__tzcnt_u32(i32 %a0) {
 ;
 
 define i16 @test_tzcnt_u16(i16 %a0) {
-; X32-LABEL: test_tzcnt_u16:
-; X32:       # %bb.0:
-; X32-NEXT:    tzcntw {{[0-9]+}}(%esp), %ax
-; X32-NEXT:    retl
+; X86-LABEL: test_tzcnt_u16:
+; X86:       # %bb.0:
+; X86-NEXT:    tzcntw {{[0-9]+}}(%esp), %ax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test_tzcnt_u16:
 ; X64:       # %bb.0:
@@ -152,12 +152,12 @@ define i16 @test_tzcnt_u16(i16 %a0) {
 }
 
 define i32 @test_andn_u32(i32 %a0, i32 %a1) {
-; X32-LABEL: test_andn_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %eax
-; X32-NEXT:    xorl $-1, %eax
-; X32-NEXT:    andl {{[0-9]+}}(%esp), %eax
-; X32-NEXT:    retl
+; X86-LABEL: test_andn_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    xorl $-1, %eax
+; X86-NEXT:    andl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test_andn_u32:
 ; X64:       # %bb.0:
@@ -171,16 +171,16 @@ define i32 @test_andn_u32(i32 %a0, i32 %a1) {
 }
 
 define i32 @test_bextr_u32(i32 %a0, i32 %a1, i32 %a2) {
-; X32-LABEL: test_bextr_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %eax
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    andl $255, %ecx
-; X32-NEXT:    andl $255, %eax
-; X32-NEXT:    shll $8, %eax
-; X32-NEXT:    orl %ecx, %eax
-; X32-NEXT:    bextrl %eax, {{[0-9]+}}(%esp), %eax
-; X32-NEXT:    retl
+; X86-LABEL: test_bextr_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    andl $255, %ecx
+; X86-NEXT:    andl $255, %eax
+; X86-NEXT:    shll $8, %eax
+; X86-NEXT:    orl %ecx, %eax
+; X86-NEXT:    bextrl %eax, {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test_bextr_u32:
 ; X64:       # %bb.0:
@@ -199,13 +199,13 @@ define i32 @test_bextr_u32(i32 %a0, i32 %a1, i32 %a2) {
 }
 
 define i32 @test_blsi_u32(i32 %a0) {
-; X32-LABEL: test_blsi_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    xorl %eax, %eax
-; X32-NEXT:    subl %ecx, %eax
-; X32-NEXT:    andl %ecx, %eax
-; X32-NEXT:    retl
+; X86-LABEL: test_blsi_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    xorl %eax, %eax
+; X86-NEXT:    subl %ecx, %eax
+; X86-NEXT:    andl %ecx, %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test_blsi_u32:
 ; X64:       # %bb.0:
@@ -219,12 +219,12 @@ define i32 @test_blsi_u32(i32 %a0) {
 }
 
 define i32 @test_blsmsk_u32(i32 %a0) {
-; X32-LABEL: test_blsmsk_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    leal -1(%ecx), %eax
-; X32-NEXT:    xorl %ecx, %eax
-; X32-NEXT:    retl
+; X86-LABEL: test_blsmsk_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    leal -1(%ecx), %eax
+; X86-NEXT:    xorl %ecx, %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test_blsmsk_u32:
 ; X64:       # %bb.0:
@@ -238,12 +238,12 @@ define i32 @test_blsmsk_u32(i32 %a0) {
 }
 
 define i32 @test_blsr_u32(i32 %a0) {
-; X32-LABEL: test_blsr_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    movl {{[0-9]+}}(%esp), %ecx
-; X32-NEXT:    leal -1(%ecx), %eax
-; X32-NEXT:    andl %ecx, %eax
-; X32-NEXT:    retl
+; X86-LABEL: test_blsr_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    movl {{[0-9]+}}(%esp), %ecx
+; X86-NEXT:    leal -1(%ecx), %eax
+; X86-NEXT:    andl %ecx, %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test_blsr_u32:
 ; X64:       # %bb.0:
@@ -257,10 +257,10 @@ define i32 @test_blsr_u32(i32 %a0) {
 }
 
 define i32 @test_tzcnt_u32(i32 %a0) {
-; X32-LABEL: test_tzcnt_u32:
-; X32:       # %bb.0:
-; X32-NEXT:    tzcntl {{[0-9]+}}(%esp), %eax
-; X32-NEXT:    retl
+; X86-LABEL: test_tzcnt_u32:
+; X86:       # %bb.0:
+; X86-NEXT:    tzcntl {{[0-9]+}}(%esp), %eax
+; X86-NEXT:    retl
 ;
 ; X64-LABEL: test_tzcnt_u32:
 ; X64:       # %bb.0: