Change LZCNT and BMI tests to check IR instead of X86 assembly.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@147267 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 26 insertions, 18 deletions

diff --git a/test/CodeGen/bmi-builtins.c b/test/CodeGen/bmi-builtins.c
index 2a3bcc9fc5..47b0da204e 100644
--- a/test/CodeGen/bmi-builtins.c
+++ b/test/CodeGen/bmi-builtins.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -O3 -triple=x86_64-apple-darwin -target-feature +bmi -S -o - | FileCheck %s
+// RUN: %clang_cc1 %s -O3 -triple=x86_64-apple-darwin -target-feature +bmi -emit-llvm -o - | FileCheck %s
 
 // Don't include mm_malloc.h, it's system specific.
 #define __MM_MALLOC_H
@@ -6,66 +6,74 @@
 #include <x86intrin.h>
 
 unsigned short test__tzcnt16(unsigned short __X) {
-  // CHECK: tzcntw
+  // CHECK: @llvm.cttz.i16
   return __tzcnt16(__X);
 }
 
 unsigned int test__andn_u32(unsigned int __X, unsigned int __Y) {
-  // CHECK: andnl
+  // CHECK: [[DEST:%.*]] = xor i32 %{{.*}}, -1
+  // CHECK-NEXT: %{{.*}} = and i32 %{{.*}}, [[DEST]]
   return __andn_u32(__X, __Y);
 }
 
 unsigned int test__bextr_u32(unsigned int __X, unsigned int __Y) {
-  // CHECK: bextrl
+  // CHECK: @llvm.x86.bmi.bextr.32
   return __bextr_u32(__X, __Y);
 }
 
 unsigned int test__blsi_u32(unsigned int __X) {
-  // CHECK: blsil
+  // CHECK: [[DEST:%.*]] = sub i32 0, [[SRC:%.*]]
+  // CHECK-NEXT: %{{.*}} = and i32 [[SRC]], [[DEST]]
   return __blsi_u32(__X);
 }
 
 unsigned int test__blsmsk_u32(unsigned int __X) {
-  // CHECK: blsmskl
+  // CHECK: [[DEST:%.*]] = add i32 [[SRC:%.*]], -1
+  // CHECK-NEXT: %{{.*}} = xor i32 [[DEST]], [[SRC]]
   return __blsmsk_u32(__X);
 }
 
 unsigned int test__blsr_u32(unsigned int __X) {
-  // CHECK: blsrl
+  // CHECK: [[DEST:%.*]] = add i32 [[SRC:%.*]], -1
+  // CHECK-NEXT: %{{.*}} = and i32 [[DEST]], [[SRC]]
   return __blsr_u32(__X);
 }
 
 unsigned int test_tzcnt32(unsigned int __X) {
-  // CHECK: tzcntl
+  // CHECK: @llvm.cttz.i32
   return __tzcnt32(__X);
 }
 
 unsigned long long test__andn_u64(unsigned long __X, unsigned long __Y) {
-  // CHECK: andnq
+  // CHECK: [[DEST:%.*]] = xor i64 %{{.*}}, -1
+  // CHECK-NEXT: %{{.*}} = and i64 %{{.*}}, [[DEST]]
   return __andn_u64(__X, __Y);
 }
 
 unsigned long long test__bextr_u64(unsigned long __X, unsigned long __Y) {
-  // CHECK: bextrq
+  // CHECK: @llvm.x86.bmi.bextr.64
   return __bextr_u64(__X, __Y);
 }
 
 unsigned long long test__blsi_u64(unsigned long long __X) {
-  // CHECK: blsiq
+  // CHECK: [[DEST:%.*]] = sub i64 0, [[SRC:%.*]]
+  // CHECK-NEXT: %{{.*}} = and i64 [[SRC]], [[DEST]]
   return __blsi_u64(__X);
 }
 
 unsigned long long test__blsmsk_u64(unsigned long long __X) {
-  // CHECK: blsmskq
+  // CHECK: [[DEST:%.*]] = add i64 [[SRC:%.*]], -1
+  // CHECK-NEXT: %{{.*}} = xor i64 [[DEST]], [[SRC]]
   return __blsmsk_u64(__X);
 }
 
 unsigned long long test__blsr_u64(unsigned long long __X) {
-  // CHECK: blsrq
+  // CHECK: [[DEST:%.*]] = add i64 [[SRC:%.*]], -1
+  // CHECK-NEXT: %{{.*}} = and i64 [[DEST]], [[SRC]]
   return __blsr_u64(__X);
 }
 
 unsigned long long test__tzcnt64(unsigned long long __X) {
-  // CHECK: tzcntq
+  // CHECK: @llvm.cttz.i64
   return __tzcnt64(__X);
 }
diff --git a/test/CodeGen/lzcnt-builtins.c b/test/CodeGen/lzcnt-builtins.c
index 7b4da90057..a43c4eede4 100644
--- a/test/CodeGen/lzcnt-builtins.c
+++ b/test/CodeGen/lzcnt-builtins.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -O3 -triple=x86_64-apple-darwin -target-feature +lzcnt -S -o - | FileCheck %s
+// RUN: %clang_cc1 %s -O3 -triple=x86_64-apple-darwin -target-feature +lzcnt -emit-llvm -o - | FileCheck %s
 
 // Don't include mm_malloc.h, it's system specific.
 #define __MM_MALLOC_H
@@ -7,18 +7,18 @@
 
 unsigned short test__lzcnt16(unsigned short __X)
 {
-  // CHECK: lzcntw
+  // CHECK: @llvm.ctlz.i16
   return __lzcnt16(__X);
 }
 
 unsigned int test_lzcnt32(unsigned int __X)
 {
-  // CHECK: lzcntl
+  // CHECK: @llvm.ctlz.i32
   return __lzcnt32(__X);
 }
 
 unsigned long long test__lzcnt64(unsigned long long __X)
 {
-  // CHECK: lzcntq
+  // CHECK: @llvm.ctlz.i64
   return __lzcnt64(__X);
 }