XCore target: correct test layout

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@188663 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/xcore-abi.c b/test/CodeGen/xcore-abi.c
index 2e5e658..6c32526 100644
--- a/test/CodeGen/xcore-abi.c
+++ b/test/CodeGen/xcore-abi.c
@@ -1,8 +1,13 @@
-// RUN: %clang -target xcore -O1 -o - -emit-llvm -S %s | FileCheck %s
+// RUN: %clang -target xcore -O0 -o - -emit-llvm -S %s | FileCheck %s
 
 // CHECK: target datalayout = "e-p:32:32:32-a0:0:32-n32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:32-f16:16:32-f32:32:32-f64:32:32"
 // CHECK: target triple = "xcore"
 
+// CHECK: @g1 = global i32 0, align 4
+int g1;
+// CHECK: @g2 = common global i32 0, align 4
+int g2 __attribute__((common));
+
 #include <stdarg.h>
 struct x { int a; };
 void testva (int n, ...) {
@@ -23,13 +28,22 @@
 }
 
 void testbuiltin (void) {
-// CHECK: [[I:%[a-z0-9]+]] = tail call i32 @llvm.xcore.getid()
-// CHECK: [[UI:%[a-z0-9]+]] = tail call i32 @llvm.xcore.getps(i32 [[I]])
-// CHECK: [[UI2:%[a-z0-9]+]] = tail call i32 @llvm.xcore.bitrev(i32 [[UI]])
-// CHECK: tail call void @llvm.xcore.setps(i32 [[I]], i32 [[UI2]])
+  // CHECK-LABEL: testbuiltin
+  // CHECK: call i32 @llvm.xcore.getid()
+  // CHECK: call i32 @llvm.xcore.getps(i32 {{%[a-z0-9]+}})
+  // CHECK: call i32 @llvm.xcore.bitrev(i32 {{%[a-z0-9]+}})
+  // CHECK: call void @llvm.xcore.setps(i32 {{%[a-z0-9]+}}, i32 {{%[a-z0-9]+}})
   int i = __builtin_getid();
   unsigned int ui = __builtin_getps(i);
   ui = __builtin_bitrev(ui);
   __builtin_setps(i,ui);
-
 }
+
+// CHECK-LABEL: define zeroext i8 @testchar()
+// CHECK: ret i8 -1
+char testchar (void) {
+  return (char)-1;
+}
+
+// CHECK: "no-frame-pointer-elim"="false"
+// CHECK: "no-frame-pointer-elim-non-leaf"="false"
diff --git a/test/Driver/xcore-opts.c b/test/Driver/xcore-opts.c
index 137e28f..809b1fd 100644
--- a/test/Driver/xcore-opts.c
+++ b/test/Driver/xcore-opts.c
@@ -1,15 +1,7 @@
-// RUN: %clang -target xcore -O1 -o - -emit-llvm -S %s | FileCheck %s
+// RUN: %clang -target xcore %s -### -o %t.o 2>&1 FileCheck %s
 
-// CHECK: @g1 = global
-int g1;
-// CHECK: @g2 = common global i32 0, align 4
-int g2 __attribute__((common));
+// CHECK: "-momit-leaf-frame-pointer"
+// CHECK-NOT: "-mdisable-fp-elim"
+// CHECK: "-fno-signed-char"
+// CHECK: "-fno-common"
 
-// CHECK: define zeroext i8 @testchar()
-// CHECK: ret i8 -1
-char testchar (void) {
-  return (char)-1;
-}
-
-// CHECK: "no-frame-pointer-elim"="false"
-// CHECK: "no-frame-pointer-elim-non-leaf"="false"