[CodeGen][ARM] Revert r309257

The test arm-float-helpers.c appears to be failing on some builders and
needs some work to make it more robust.

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

diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp
index 12341431ac0c21abe8eb0eb4f01c0ebe3d561151..b07326e06d9f09360e44841237caa148239ae43e 100644 (file)
--- a/lib/CodeGen/TargetInfo.cpp
+++ b/lib/CodeGen/TargetInfo.cpp
@@ -5620,14 +5620,17 @@ void ARMABIInfo::setCCs() {
   // AAPCS apparently requires runtime support functions to be soft-float, but
   // that's almost certainly for historic reasons (Thumb1 not supporting VFP
   // most likely). It's more convenient for AAPCS16_VFP to be hard-float.
-
-  // The Run-time ABI for the ARM Architecture section 4.1.2 requires
-  // AEABI-complying FP helper functions to use the base AAPCS.
-  // These AEABI functions are expanded in the ARM llvm backend, all the builtin
-  // support functions emitted by clang such as the _Complex helpers follow the
-  // abiCC.
-  if (abiCC != getLLVMDefaultCC())
+  switch (getABIKind()) {
+  case APCS:
+  case AAPCS16_VFP:
+    if (abiCC != getLLVMDefaultCC())
       BuiltinCC = abiCC;
+    break;
+  case AAPCS:
+  case AAPCS_VFP:
+    BuiltinCC = llvm::CallingConv::ARM_AAPCS;
+    break;
+  }
 }
 
 ABIArgInfo ARMABIInfo::classifyArgumentType(QualType Ty,

diff --git a/test/CodeGen/arm-float-helpers.c b/test/CodeGen/arm-float-helpers.c
deleted file mode 100644 (file)
index a3c983d..0000000
--- a/test/CodeGen/arm-float-helpers.c
+++ /dev/null
@@ -1,233 +0,0 @@
-// REQUIRES: arm-registered-target
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-linux-gnueabi %s | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-linux-gnueabihf %s | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-linux-gnueabi -target-feature "+soft-float" -target-feature "+soft-float-abi" %s | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-linux-gnueabi -target-feature "+soft-float" %s | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-eabi %s | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-eabi -meabi gnu %s | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-eabi %s | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-eabi -target-feature "+soft-float" -target-feature "+soft-float-abi" -meabi gnu %s | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-eabi -target-feature "+soft-float" -meabi gnu %s | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-eabihf %s | FileCheck %s
-// RUN: %clang_cc1 -emit-llvm -o - -triple arm-none-eabihf -meabi gnu %s | FileCheck %s
-
-// The Runtime ABI for the ARM Architecture IHI0043 section 4.1.2 The
-// floating-point helper functions to always use the base AAPCS (soft-float)
-// calling convention.
-//
-// These helper functions such as __aeabi_fadd are not explicitly called by
-// clang, instead they are generated by the ARMISelLowering when they are
-// needed; clang relies on llvm to use the base AAPCS.
-//
-// In this test we check that clang is not directly calling the __aeabi_
-// functions. We rely on llvm to test that the base AAPCS is used for any
-// __aeabi_ function from 4.1.2 that is used.
-//
-// When compiled to an object file with -mfloat-abi=soft each function F
-// below should result in a call to __aeabi_F. If clang is changed to call any
-// of these functions directly the test will need to be altered to check that
-// arm_aapcscc is used.
-//
-// Note that it is only the functions in 4.1.2 that must use the base AAPCS,
-// other runtime functions such as the _Complex helper routines are not covered.
-
-float fadd(float a, float b) { return a + b; }
-// CHECK-LABEL: define float @fadd(float %a, float %b)
-// CHECK-NOT: __aeabi_fadd
-// CHECK: %add = fadd float %0, %1
-
-float fdiv(float a, float b) { return a / b; }
-// CHECK-LABEL: define float @fdiv(float %a, float %b)
-// CHECK-NOT: __aeabi_fdiv
-// CHECK: %div = fdiv float %0, %1
-
-float fmul(float a, float b) { return a * b; }
-// CHECK-LABEL: define float @fmul(float %a, float %b)
-// CHECK-NOT: __aeabi_fmul
-// CHECK: %mul = fmul float %0, %1
-
-float fsub(float a, float b) { return a - b; }
-// CHECK-LABEL: define float @fsub(float %a, float %b)
-// CHECK-NOT: __aeabi_fsub
-// CHECK: %sub = fsub float %0, %1
-
-int fcmpeq(float a, float b) { return a == b; }
-// CHECK-LABEL: define i32 @fcmpeq(float %a, float %b)
-// CHECK-NOT: __aeabi_fcmpeq
-// CHECK: %cmp = fcmp oeq float %0, %1
-
-int fcmplt(float a, float b) { return a < b; }
-// CHECK-LABEL: define i32 @fcmplt(float %a, float %b)
-// CHECK-NOT: __aeabi_fcmplt
-// CHECK: %cmp = fcmp olt float %0, %1
-
-int fcmple(float a, float b) { return a <= b; }
-// CHECK-LABEL: define i32 @fcmple(float %a, float %b)
-// CHECK-NOT: __aeabi_fcmple
-// CHECK: %cmp = fcmp ole float %0, %1
-
-int fcmpge(float a, float b) { return a >= b; }
-// CHECK-LABEL: define i32 @fcmpge(float %a, float %b)
-// CHECK-NOT: __aeabi_fcmpge
-// CHECK: %cmp = fcmp oge float %0, %1
-
-int fcmpgt(float a, float b) { return a > b; }
-// CHECK-LABEL: define i32 @fcmpgt(float %a, float %b)
-// CHECK-NOT: __aeabi_fcmpgt
-// CHECK: %cmp = fcmp ogt float %0, %1
-
-int fcmpun(float a, float b) { return __builtin_isunordered(a, b); }
-// CHECK-LABEL: define i32 @fcmpun(float %a, float %b)
-// CHECK-NOT: __aeabi_fcmpun
-// CHECK: %cmp = fcmp uno double %conv, %conv1
-
-double dadd(double a, double b) { return a + b; }
-// CHECK-LABEL: define double @dadd(double %a, double %b)
-// CHECK-NOT: __aeabi_dadd
-// CHECK: %add = fadd double %0, %1
-
-double ddiv(double a, double b) { return a / b; }
-// CHECK-LABEL: define double @ddiv(double %a, double %b)
-// CHECK-NOT: __aeabi_ddiv
-// CHECK: %div = fdiv double %0, %1
-
-double dmul(double a, double b) { return a * b; }
-// CHECK-LABEL: define double @dmul(double %a, double %b)
-// CHECK-NOT: __aeabi_dmul
-// CHECK: %mul = fmul double %0, %1
-
-double dsub(double a, double b) { return a - b; }
-// CHECK-LABEL: define double @dsub(double %a, double %b)
-// CHECK-NOT: __aeabi_dsub
-// CHECK: %sub = fsub double %0, %1
-
-int dcmpeq(double a, double b) { return a == b; }
-// CHECK-LABEL: define i32 @dcmpeq(double %a, double %b)
-// CHECK-NOT: __aeabi_dcmpeq
-// CHECK: %cmp = fcmp oeq double %0, %1
-
-int dcmplt(double a, double b) { return a < b; }
-// CHECK-LABEL: define i32 @dcmplt(double %a, double %b)
-// CHECK-NOT: __aeabi_dcmplt
-// CHECK: %cmp = fcmp olt double %0, %1
-
-int dcmple(double a, double b) { return a <= b; }
-// CHECK-LABEL: define i32 @dcmple(double %a, double %b)
-// CHECK-NOT: __aeabi_dcmple
-// CHECK: %cmp = fcmp ole double %0, %1
-
-int dcmpge(double a, double b) { return a >= b; }
-// CHECK-LABEL: define i32 @dcmpge(double %a, double %b)
-// CHECK-NOT: __aeabi_dcmpge
-// CHECK: %cmp = fcmp oge double %0, %1
-
-int dcmpgt(double a, double b) { return a > b; }
-// CHECK-LABEL: define i32 @dcmpgt(double %a, double %b)
-// CHECK-NOT: __aeabi_dcmpgt
-// CHECK: %cmp = fcmp ogt double %0, %1
-
-int dcmpun(double a, double b) { return __builtin_isunordered(a, b); }
-// CHECK-LABEL: define i32 @dcmpun(double %a, double %b)
-// CHECK-NOT: __aeabi_dcmpun
-// CHECK: %cmp = fcmp uno double %0, %1
-
-int d2iz(double a) { return (int)a; }
-// CHECK-LABEL: define i32 @d2iz(double %a)
-// CHECK-NOT: __aeabi_d2iz
-// CHECK: %conv = fptosi double %0 to i32
-
-unsigned int d2uiz(double a) { return (unsigned int)a; }
-// CHECK-LABEL: define i32 @d2uiz(double %a)
-// CHECK-NOT: __aeabi_d2uiz
-// CHECK: %conv = fptoui double %0 to i32
-
-long long d2lz(double a) { return (long long)a; }
-// CHECK-LABEL: define i64 @d2lz(double %a)
-// CHECK-NOT: __aeabi_d2lz
-// CHECK: %conv = fptosi double %0 to i64
-
-unsigned long long d2ulz(double a) { return (unsigned long long)a; }
-// CHECK-LABEL: define i64 @d2ulz(double %a)
-// CHECK-NOT: __aeabi_d2ulz
-// CHECK: %conv = fptoui double %0 to i64
-
-int f2iz(float a) { return (int)a; }
-// CHECK-LABEL: define i32 @f2iz(float %a)
-// CHECK-NOT: __aeabi_f2iz
-// CHECK: %conv = fptosi float %0 to i32
-
-unsigned int f2uiz(float a) { return (unsigned int)a; }
-// CHECK-LABEL: define i32 @f2uiz(float %a)
-// CHECK-NOT: __aeabi_f2uiz
-// CHECK: %conv = fptoui float %0 to i32
-
-long long f2lz(float a) { return (long long)a; }
-// CHECK-LABEL: define i64 @f2lz(float %a)
-// CHECK-NOT: __aeabi_f2lz
-// CHECK: %conv = fptosi float %0 to i64
-
-unsigned long long f2ulz(float a) { return (unsigned long long)a; }
-// CHECK-LABEL: define i64 @f2ulz(float %a)
-// CHECK-NOT: __aeabi_f2ulz
-// CHECK: %conv = fptoui float %0 to i64
-
-float d2f(double a) { return (float)a; }
-// CHECK-LABEL: define float @d2f(double %a)
-// CHECK-NOT: __aeabi_d2f
-// CHECK: %conv = fptrunc double %0 to float
-
-double f2d(float a) { return (double)a; }
-// CHECK-LABEL: define double @f2d(float %a)
-// CHECK-NOT: __aeabi_f2d
-// CHECK: %conv = fpext float %0 to double
-
-double i2d(int a) { return (double)a; }
-// CHECK-LABEL: define double @i2d(i32 %a)
-// CHECK-NOT: __aeabi_i2d
-// CHECK: %conv = sitofp i32 %0 to double
-
-double ui2d(unsigned int a) { return (double)a; }
-// CHECK-LABEL: define double @ui2d(i32 %a)
-// CHECK-NOT: __aeabi_ui2d
-// CHECK: %conv = uitofp i32 %0 to double
-
-double l2d(long long a) { return (double)a; }
-// CHECK-LABEL: define double @l2d(i64 %a)
-// CHECK-NOT: __aeabi_l2d
-// CHECK: %conv = sitofp i64 %0 to double
-
-double ul2d(unsigned long long a) { return (unsigned long long)a; }
-// CHECK-LABEL: define double @ul2d(i64 %a)
-// CHECK-NOT: __aeabi_ul2d
-// CHECK: %conv = uitofp i64 %0 to double
-
-float i2f(int a) { return (int)a; }
-// CHECK-LABEL: define float @i2f(i32 %a)
-// CHECK-NOT: __aeabi_i2f
-// CHECK: %conv = sitofp i32 %0 to float
-
-float ui2f(unsigned int a) { return (unsigned int)a; }
-// CHECK-LABEL: define float @ui2f(i32 %a)
-// CHECK-NOT: __aeabi_ui2f
-// CHECK: %conv = uitofp i32 %0 to float
-
-float l2f(long long a) { return (long long)a; }
-// CHECK-LABEL: define float @l2f(i64 %a)
-// CHECK-NOT: __aeabi_l2f
-// CHECK: %conv = sitofp i64 %0 to float
-
-float ul2f(unsigned long long a) { return (unsigned long long)a; }
-// CHECK-LABEL: define float @ul2f(i64 %a)
-// CHECK-NOT: __aeabi_ul2f
-// CHECK: %conv = uitofp i64 %0 to float
-
-// Functions in section 4.1.2 not used by llvm and don't easily map directly to
-// C source code.
-// cfcmpeq
-// cfcmple
-// cfrcmple
-// cdcmpeq
-// cdcmple
-// cdrcmple
-// frsub
-// drsub

diff --git a/test/CodeGen/complex-math.c b/test/CodeGen/complex-math.c
index 8792ca14b9d88ef6f9229ad110b32d43604d9f49..96c7ad9cdbc93df4d3a80af866f76f83b181dab8 100644 (file)
--- a/test/CodeGen/complex-math.c
+++ b/test/CodeGen/complex-math.c
@@ -2,8 +2,7 @@
 // RUN: %clang_cc1 %s -O1 -emit-llvm -triple x86_64-pc-win64 -o - | FileCheck %s --check-prefix=X86
 // RUN: %clang_cc1 %s -O1 -emit-llvm -triple i686-unknown-unknown -o - | FileCheck %s --check-prefix=X86
 // RUN: %clang_cc1 %s -O1 -emit-llvm -triple powerpc-unknown-unknown -o - | FileCheck %s --check-prefix=PPC
-// RUN %clang_cc1 %s -O1 -emit-llvm -triple armv7-none-linux-gnueabi -o - | FileCheck %s --check-prefix=ARM
-// RUN: %clang_cc1 %s -O1 -emit-llvm -triple armv7-none-linux-gnueabihf -o - | FileCheck %s --check-prefix=ARMHF
+// RUN: %clang_cc1 %s -O1 -emit-llvm -triple armv7-none-linux-gnueabihf -o - | FileCheck %s --check-prefix=ARM
 // RUN: %clang_cc1 %s -O1 -emit-llvm -triple thumbv7k-apple-watchos2.0 -o - -target-abi aapcs16 | FileCheck %s --check-prefix=ARM7K
 
 float _Complex add_float_rr(float a, float b) {
@@ -477,15 +476,8 @@ _Bool ne_float_cc(float _Complex a, float _Complex b) {
 
 // Check that the libcall will obtain proper calling convention on ARM
 _Complex double foo(_Complex double a, _Complex double b) {
-  // These functions are not defined as floating point helper functions in
-  // Run-time ABI for the ARM architecture document so they must not always
-  // use the base AAPCS.
-
   // ARM-LABEL: @foo(
-  // ARM: call void { double, double } @__muldc3
-
-  // ARMHF-LABEL: @foo(
-  // ARMHF: call { double, double } @__muldc3
+  // ARM: call arm_aapcscc { double, double } @__muldc3
 
   // ARM7K-LABEL: @foo(
   // ARM7K: call { double, double } @__muldc3