Revert of r284571 because of failing tests.

llvm-svn: 284572

8 files changed, 14 insertions, 148 deletions

diff --git a/llvm/lib/Target/ARM/ARMAsmPrinter.cpp b/llvm/lib/Target/ARM/ARMAsmPrinter.cpp
index eec42f27a03..ad8a6ed0b6d 100644
--- a/llvm/lib/Target/ARM/ARMAsmPrinter.cpp
+++ b/llvm/lib/Target/ARM/ARMAsmPrinter.cpp
@@ -633,17 +633,17 @@ static ARMBuildAttrs::CPUArch getArchForCPU(StringRef CPU,
     return ARMBuildAttrs::v4;
 }
 
-// Returns true if all functions have the same function attribute value.
-// It also returns true when there are no functions, or when
-// the particular function attribute is not set to a value.
-static bool checkFunctionsAttributeConsistency(const Module &M, StringRef Attr,
-                                               StringRef Value) {
-  return !any_of(M, [&](const Function &F) {
-    return F.hasFnAttribute(Attr) &&
-           F.getFnAttribute(Attr).getValueAsString() != Value;
-  });
+// Returns true if all functions have the same function attribute value
+static bool haveAllFunctionsAttribute(const Module &M, StringRef Attr,
+                                      StringRef Value) {
+  for (auto &F : M)
+    if (F.getFnAttribute(Attr).getValueAsString() != Value)
+      return false;
+
+  return true;
 }
 
+
 void ARMAsmPrinter::emitAttributes() {
   MCTargetStreamer &TS = *OutStreamer->getTargetStreamer();
   ARMTargetStreamer &ATS = static_cast<ARMTargetStreamer &>(TS);
@@ -781,15 +781,13 @@ void ARMAsmPrinter::emitAttributes() {
   }
 
   // Set FP Denormals.
-  if (checkFunctionsAttributeConsistency(*MMI->getModule(),
-                                         "denormal-fp-math",
-                                         "preserve-sign") ||
+  if (haveAllFunctionsAttribute(*MMI->getModule(), "denormal-fp-math",
+                                "preserve-sign") ||
       TM.Options.FPDenormalMode == FPDenormal::PreserveSign)
     ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal,
                       ARMBuildAttrs::PreserveFPSign);
-  else if (checkFunctionsAttributeConsistency(*MMI->getModule(),
-                                              "denormal-fp-math",
-                                              "positive-zero") ||
+  else if (haveAllFunctionsAttribute(*MMI->getModule(), "denormal-fp-math",
+                                     "positive-zero") ||
            TM.Options.FPDenormalMode == FPDenormal::PositiveZero)
     ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal,
                       ARMBuildAttrs::PositiveZero);
@@ -823,8 +821,7 @@ void ARMAsmPrinter::emitAttributes() {
   }
 
   // Set FP exceptions and rounding
-  if (checkFunctionsAttributeConsistency(*MMI->getModule(),
-                                         "no-trapping-math", "true") ||
+  if (haveAllFunctionsAttribute(*MMI->getModule(), "no-trapping-math", "true") ||
       TM.Options.NoTrappingFPMath)
     ATS.emitAttribute(ARMBuildAttrs::ABI_FP_exceptions,
                       ARMBuildAttrs::Not_Allowed);
diff --git a/llvm/test/CodeGen/ARM/build-attributes-fn-attr0.ll b/llvm/test/CodeGen/ARM/build-attributes-fn-attr0.ll
deleted file mode 100644
index 2fb3e032e5d..00000000000
--- a/llvm/test/CodeGen/ARM/build-attributes-fn-attr0.ll
+++ /dev/null
@@ -1,11 +0,0 @@
-; Check FP options -fno-trapping-math and -fdenormal-fp-math. They are passed
-; as function attributes, which map on to build attributes ABI_FP_exceptions
-; ABI_FP_denormal. In the backend we therefore have a check to see if all
-; functions have consistent function attributes values. This check also returns
-; true when the compilation unit does not have any functions (i.e. the
-; attributes are consistent), which is what we check with this regression test.
-
-; RUN: llc < %s -mtriple=armv7-linux-gnueabi -mcpu=cortex-a15  | FileCheck %s --check-prefix=CHECK
-
-; CHECK:  .eabi_attribute 20, 2
-; CHECK:  .eabi_attribute 21, 0
diff --git a/llvm/test/CodeGen/ARM/build-attributes-fn-attr1.ll b/llvm/test/CodeGen/ARM/build-attributes-fn-attr1.ll
deleted file mode 100644
index a4e2b8a01a6..00000000000
--- a/llvm/test/CodeGen/ARM/build-attributes-fn-attr1.ll
+++ /dev/null
@@ -1,18 +0,0 @@
-; Check FP options -fno-trapping-math and -fdenormal-fp-math. They are passed as
-; function attributes, which map on to build attributes ABI_FP_exceptions ABI_FP_denormal.
-; In the backend we have a check to see if all functions have consistent function
-; attributes values. This checks the "default" behaviour when these FP function
-; attributes are not set at all.
-
-; RUN: llc < %s -mtriple=armv7-linux-gnueabi -mcpu=cortex-a15  | FileCheck %s --check-prefix=CHECK
-
-; CHECK: .eabi_attribute 20, 2
-; CHECK: .eabi_attribute 21, 0
-
-
-define i32 @foo_no_fn_attr() local_unnamed_addr #0 {
-entry:
-  ret i32 42
-}
-
-attributes #0 = { minsize norecurse nounwind optsize readnone }
diff --git a/llvm/test/CodeGen/ARM/build-attributes-fn-attr2.ll b/llvm/test/CodeGen/ARM/build-attributes-fn-attr2.ll
deleted file mode 100644
index 7461b518e0b..00000000000
--- a/llvm/test/CodeGen/ARM/build-attributes-fn-attr2.ll
+++ /dev/null
@@ -1,18 +0,0 @@
-; Check FP options -fno-trapping-math and -fdenormal-fp-math. They are passed
-; as function attributes, which map on to build attributes ABI_FP_exceptions
-; ABI_FP_denormal. In the backend we therefore have a check to see if all
-; functions have consistent function attributes values.
-; Here we just test correct output for specific values of no trapping math
-; and denormals.
-
-; RUN: llc < %s -mtriple=armv7-linux-gnueabi -mcpu=cortex-a15  | FileCheck %s --check-prefix=CHECK
-
-; CHECK: .eabi_attribute 20, 1
-; CHECK: .eabi_attribute 21, 1
-
-define i32 @foo() local_unnamed_addr #0 {
-entry:
-  ret i32 42
-}
-
-attributes #0 = { minsize norecurse nounwind optsize readnone "no-trapping-math"="false" "denormal-fp-math"="ieee"}
diff --git a/llvm/test/CodeGen/ARM/build-attributes-fn-attr3.ll b/llvm/test/CodeGen/ARM/build-attributes-fn-attr3.ll
deleted file mode 100644
index 224f9d5d38d..00000000000
--- a/llvm/test/CodeGen/ARM/build-attributes-fn-attr3.ll
+++ /dev/null
@@ -1,17 +0,0 @@
-; Check FP options -fno-trapping-math and -fdenormal-fp-math. They are passed
-; as function attributes, which map on to build attributes ABI_FP_exceptions
-; ABI_FP_denormal. In the backend we therefore have a check to see if all
-; functions have consistent function attributes values.
-; Here we check: no-trapping-math=true
-
-; RUN: llc < %s -mtriple=armv7-linux-gnueabi -mcpu=cortex-a15  | FileCheck %s --check-prefix=CHECK
-
-; CHECK: .eabi_attribute 20, 1
-; CHECK: .eabi_attribute 21, 0
-
-define i32 @foo() local_unnamed_addr #0 {
-entry:
-  ret i32 42
-}
-
-attributes #0 = { minsize norecurse nounwind optsize readnone "no-trapping-math"="true"}
diff --git a/llvm/test/CodeGen/ARM/build-attributes-fn-attr4.ll b/llvm/test/CodeGen/ARM/build-attributes-fn-attr4.ll
deleted file mode 100644
index 14707c281ad..00000000000
--- a/llvm/test/CodeGen/ARM/build-attributes-fn-attr4.ll
+++ /dev/null
@@ -1,22 +0,0 @@
-; Check FP options -fno-trapping-math and -fdenormal-fp-math. They are passed
-; as function attributes, which map on to build attributes ABI_FP_exceptions
-; ABI_FP_denormal. In the backend we therefore have a check to see if all
-; functions have consistent function attributes values.
-; Here we check: denormal-fp-math=positive-zero
-
-; RUN: llc < %s -mtriple=armv7-linux-gnueabi -mcpu=cortex-a15  | FileCheck %s --check-prefix=CHECK
-
-; CHECK: .eabi_attribute 20, 0
-; CHECK: .eabi_attribute 21, 0
-
-define i32 @foo1() local_unnamed_addr #0 {
-entry:
-  ret i32 42
-}
-
-define i32 @foo2() local_unnamed_addr #0 {
-entry:
-  ret i32 42
-}
-
-attributes #0 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="positive-zero"}
diff --git a/llvm/test/CodeGen/ARM/build-attributes-fn-attr5.ll b/llvm/test/CodeGen/ARM/build-attributes-fn-attr5.ll
deleted file mode 100644
index b36df521152..00000000000
--- a/llvm/test/CodeGen/ARM/build-attributes-fn-attr5.ll
+++ /dev/null
@@ -1,22 +0,0 @@
-; Check FP options -fno-trapping-math and -fdenormal-fp-math. They are passed
-; as function attributes, which map on to build attributes ABI_FP_exceptions
-; ABI_FP_denormal. In the backend we therefore have a check to see if all
-; functions have consistent function attributes values.
-; Here we check: denormal-fp-math=preserve-sign
-
-; RUN: llc < %s -mtriple=armv7-linux-gnueabi -mcpu=cortex-a15  | FileCheck %s --check-prefix=CHECK
-
-; CHECK: .eabi_attribute 20, 2
-; CHECK: .eabi_attribute 21, 0
-
-define i32 @foo1() local_unnamed_addr #0 {
-entry:
-  ret i32 42
-}
-
-define i32 @foo2() local_unnamed_addr #0 {
-entry:
-  ret i32 42
-}
-
-attributes #0 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="preserve-sign"}
diff --git a/llvm/test/CodeGen/ARM/build-attributes-fn-attr6.ll b/llvm/test/CodeGen/ARM/build-attributes-fn-attr6.ll
deleted file mode 100644
index 2cbe15a6dd0..00000000000
--- a/llvm/test/CodeGen/ARM/build-attributes-fn-attr6.ll
+++ /dev/null
@@ -1,23 +0,0 @@
-; Check FP options -fno-trapping-math and -fdenormal-fp-math. They are passed
-; as function attributes, which map on to build attributes ABI_FP_exceptions
-; ABI_FP_denormal. In the backend we therefore have a check to see if all
-; functions have consistent function attributes values. Here we check two
-; functions have inconsistent values, and that a default is returned. 
-
-; RUN: llc < %s -mtriple=armv7-linux-gnueabi -mcpu=cortex-a15  | FileCheck %s --check-prefix=CHECK
-
-; CHECK: .eabi_attribute 20, 0
-; CHECK: .eabi_attribute 21, 0
-
-define i32 @foo1() local_unnamed_addr #0 {
-entry:
-  ret i32 42
-}
-
-define i32 @foo2() local_unnamed_addr #1 {
-entry:
-  ret i32 42
-}
-
-attributes #0 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="preserve-sign"}
-attributes #0 = { minsize norecurse nounwind optsize readnone "denormal-fp-math"="positive-zero"}