[llvm] r337450 - ARM: switch armv7em MachO triple to hard-float defaults and libcalls.

[Tim Northover via llvm-commits]

Author: tnorthover
Date: Thu Jul 19 05:44:51 2018
New Revision: 337450

URL: http://llvm.org/viewvc/llvm-project?rev=337450&view=rev
Log:
ARM: switch armv7em MachO triple to hard-float defaults and libcalls.

We were emitting incorrect calls to libm functions that LLVM had decided it
knew about because the default is soft-float.

Recommitted without breaking ELF this time.

Added:
    llvm/trunk/test/CodeGen/ARM/macho-embedded-float.ll
Modified:
    llvm/trunk/lib/Target/ARM/ARMTargetMachine.h
    llvm/trunk/test/CodeGen/ARM/darwin-eabi.ll

Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.h?rev=337450&r1=337449&r2=337450&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.h (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.h Thu Jul 19 05:44:51 2018
@@ -66,6 +66,8 @@ public:
     return TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
            TargetTriple.getEnvironment() == Triple::MuslEABIHF ||
            TargetTriple.getEnvironment() == Triple::EABIHF ||
+           (TargetTriple.isOSBinFormatMachO() &&
+            TargetTriple.getSubArch() == Triple::ARMSubArch_v7em) ||
            TargetTriple.isOSWindows() ||
            TargetABI == ARMBaseTargetMachine::ARM_ABI_AAPCS16;
   }

Modified: llvm/trunk/test/CodeGen/ARM/darwin-eabi.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/darwin-eabi.ll?rev=337450&r1=337449&r2=337450&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/darwin-eabi.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/darwin-eabi.ll Thu Jul 19 05:44:51 2018
@@ -20,5 +20,5 @@ define double @double_op(double %lhs, do
 ; CHECK-M3: bl ___adddf3
 
 ; CHECK-M4-LABEL: double_op:
-; CHECK-M4: {{(blx|b.w)}} ___adddf3
+; CHECK-M4: {{(bl|blx|b.w)}} ___adddf3
 }

Added: llvm/trunk/test/CodeGen/ARM/macho-embedded-float.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/macho-embedded-float.ll?rev=337450&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/macho-embedded-float.ll (added)
+++ llvm/trunk/test/CodeGen/ARM/macho-embedded-float.ll Thu Jul 19 05:44:51 2018
@@ -0,0 +1,37 @@
+; RUN: llc -mtriple=thumbv7em-none-macho %s -o - -mcpu=cortex-m4 | FileCheck --check-prefix=CHECK-HARD %s
+; RUN: llc -mtriple=thumbv7m-none-macho %s -o - -mcpu=cortex-m4 | FileCheck --check-prefix=CHECK-SOFT %s
+; RUN: llc -mtriple=thumbv7em-linux-gnueabi %s -o - -mcpu=cortex-m4 | FileCheck --check-prefix=CHECK-SOFT %s
+
+define float @test_default_cc(float %a, float %b) {
+; CHECK-HARD-LABEL: test_default_cc:
+; CHECK-HARD-NOT: vmov
+; CHECK-HARD: vadd.f32 s0, s0, s1
+; CHECK-HARD-NOT: vmov
+
+; CHECK-SOFT-LABEL: test_default_cc:
+; CHECK-SOFT-DAG: vmov [[A:s[0-9]+]], r0
+; CHECK-SOFT-DAG: vmov [[B:s[0-9]+]], r1
+; CHECK-SOFT: vadd.f32 [[RES:s[0-9]+]], [[A]], [[B]]
+; CEHCK-SOFT: vmov r0, [[RES]]
+
+  %res = fadd float %a, %b
+  ret float %res
+}
+
+
+define arm_aapcs_vfpcc float @test_libcall(float %in) {
+; CHECK-HARD-LABEL: test_libcall:
+; CHECK-HARD-NOT: vmov
+; CHECK-HARD: b.w _sinf
+
+; CHECK-SOFT-LABEL: test_libcall:
+; CHECK-SOFT: vmov r0, s0
+; CHECK-SOFT: bl {{_?}}sinf
+; CHECK-SOFT: vmov s0, r0
+
+  %res = call float @llvm.sin.f32(float %in)
+  ret float %res
+}
+
+
+declare float @llvm.sin.f32(float)