Revert r296865 "[ARM] fpscr read/write intrinsics not aware of each other"

It caused PR32134: "Cannot select: intrinsic %llvm.arm.get.fpscr".

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

diff --git a/include/llvm/IR/IntrinsicsARM.td b/include/llvm/IR/IntrinsicsARM.td
index 18ed24b..2423968 100644 (file)
--- a/include/llvm/IR/IntrinsicsARM.td
+++ b/include/llvm/IR/IntrinsicsARM.td
@@ -67,7 +67,7 @@ def int_arm_isb : GCCBuiltin<"__builtin_arm_isb">, MSBuiltin<"__isb">,
 // VFP
 
 def int_arm_get_fpscr : GCCBuiltin<"__builtin_arm_get_fpscr">,
-                       Intrinsic<[llvm_i32_ty], [], []>;
+                       Intrinsic<[llvm_i32_ty], [], [IntrNoMem]>;
 def int_arm_set_fpscr : GCCBuiltin<"__builtin_arm_set_fpscr">,
                        Intrinsic<[], [llvm_i32_ty], []>;
 def int_arm_vcvtr     : Intrinsic<[llvm_float_ty], [llvm_anyfloat_ty],

diff --git a/test/CodeGen/ARM/fpscr-intrinsics.ll b/test/CodeGen/ARM/fpscr-intrinsics.ll
deleted file mode 100644 (file)
index db24d0d..0000000
--- a/test/CodeGen/ARM/fpscr-intrinsics.ll
+++ /dev/null
@@ -1,23 +0,0 @@
-; RUN: llc < %s -O0 -mtriple=armv7-eabi -mcpu=cortex-a8 | FileCheck %s
-; RUN: llc < %s -O3 -mtriple=armv7-eabi -mcpu=cortex-a8 | FileCheck %s
-
-; Function Attrs: nounwind
-define void @fn1(i32* nocapture %p) local_unnamed_addr {
-entry:
-  ; CHECK: vmrs r{{[0-9]+}}, fpscr
-  %0 = tail call i32 @llvm.arm.get.fpscr()
-  store i32 %0, i32* %p, align 4
-  ; CHECK: vmsr fpscr, r{{[0-9]+}}
-  tail call void @llvm.arm.set.fpscr(i32 1)
-  ; CHECK: vmrs r{{[0-9]+}}, fpscr
-  %1 = tail call i32 @llvm.arm.get.fpscr()
-  %arrayidx1 = getelementptr inbounds i32, i32* %p, i32 1
-  store i32 %1, i32* %arrayidx1, align 4
-  ret void
-}
-
-; Function Attrs: nounwind readonly
-declare i32 @llvm.arm.get.fpscr()
-
-; Function Attrs: nounwind writeonly
-declare void @llvm.arm.set.fpscr(i32)