diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-09-19 12:40:24 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2017-09-19 12:40:24 -0700 |
commit | 6a3843d14594c12104f8afaab4fb758ade632c5c (patch) | |
tree | f0da53f909cc7a6e5333a4be3782425632911701 | |
parent | 230a6ccae1e7ab1651a68642ef678a0ca4802423 (diff) | |
download | meta-clang-6a3843d14594c12104f8afaab4fb758ade632c5c.tar.gz |
llvm: Fix wrong code generation when floor() libm function is called
see
https://reviews.llvm.org/D38050
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | recipes-devtools/clang/clang/0003-llvm-ARM-Use-correct-calling-convention-for-libm.patch | 152 | ||||
-rw-r--r-- | recipes-devtools/clang/common.inc | 1 |
2 files changed, 153 insertions, 0 deletions
diff --git a/recipes-devtools/clang/clang/0003-llvm-ARM-Use-correct-calling-convention-for-libm.patch b/recipes-devtools/clang/clang/0003-llvm-ARM-Use-correct-calling-convention-for-libm.patch new file mode 100644 index 0000000..131e062 --- /dev/null +++ b/recipes-devtools/clang/clang/0003-llvm-ARM-Use-correct-calling-convention-for-libm.patch | |||
@@ -0,0 +1,152 @@ | |||
1 | From 61a5983d8ba6eea3f535a33ab80374a5fe6b515b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 19 Sep 2017 12:37:23 -0700 | ||
4 | Subject: [PATCH 3/3] llvm: [ARM] Use correct calling convention for libm | ||
5 | |||
6 | -mfloat-abi doesn't control the calling convention for compiler-rt: it's built with the compiler, so it can only have one calling convention for a given target. -mfloat-abi does control the calling convention for any function provided by libm: libm is built by the user, so the user should have control over its calling convention. See https://bugs.llvm.org/show_bug.cgi?id=30543 for previous discussion on the subject. | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | lib/Target/ARM/ARMISelLowering.cpp | 71 ++++++++++++++++++++++++++++++++++++ | ||
11 | test/CodeGen/Thumb2/intrinsics-cc.ll | 25 ++++++++++++- | ||
12 | 2 files changed, 94 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp | ||
15 | index 27dda93387b..53ba8f4dd52 100644 | ||
16 | --- a/lib/Target/ARM/ARMISelLowering.cpp | ||
17 | +++ b/lib/Target/ARM/ARMISelLowering.cpp | ||
18 | @@ -225,6 +225,8 @@ ARMTargetLowering::ARMTargetLowering(const TargetMachine &TM, | ||
19 | |||
20 | if (!Subtarget->isTargetDarwin() && !Subtarget->isTargetIOS() && | ||
21 | !Subtarget->isTargetWatchOS()) { | ||
22 | + // Most builtins have their calling convention determined by the | ||
23 | + // target (they don't vary with -float-abi). | ||
24 | const auto &E = Subtarget->getTargetTriple().getEnvironment(); | ||
25 | |||
26 | bool IsHFTarget = E == Triple::EABIHF || E == Triple::GNUEABIHF || | ||
27 | @@ -238,6 +240,75 @@ ARMTargetLowering::ARMTargetLowering(const TargetMachine &TM, | ||
28 | setLibcallCallingConv(static_cast<RTLIB::Libcall>(LCID), | ||
29 | IsHFTarget ? CallingConv::ARM_AAPCS_VFP | ||
30 | : CallingConv::ARM_AAPCS); | ||
31 | + | ||
32 | + // Builtins provided by libm have their calling convention determined by | ||
33 | + // -float-abi. | ||
34 | + bool IsHFMode = TM.Options.FloatABIType == FloatABI::Hard; | ||
35 | + CallingConv::ID LibmConv = IsHFMode ? CallingConv::ARM_AAPCS_VFP | ||
36 | + : CallingConv::ARM_AAPCS; | ||
37 | + setLibcallCallingConv(RTLIB::REM_F32, LibmConv); | ||
38 | + setLibcallCallingConv(RTLIB::REM_F64, LibmConv); | ||
39 | + setLibcallCallingConv(RTLIB::REM_F128, LibmConv); | ||
40 | + setLibcallCallingConv(RTLIB::FMA_F32, LibmConv); | ||
41 | + setLibcallCallingConv(RTLIB::FMA_F64, LibmConv); | ||
42 | + setLibcallCallingConv(RTLIB::FMA_F128, LibmConv); | ||
43 | + setLibcallCallingConv(RTLIB::SQRT_F32, LibmConv); | ||
44 | + setLibcallCallingConv(RTLIB::SQRT_F64, LibmConv); | ||
45 | + setLibcallCallingConv(RTLIB::SQRT_F128, LibmConv); | ||
46 | + setLibcallCallingConv(RTLIB::LOG_F32, LibmConv); | ||
47 | + setLibcallCallingConv(RTLIB::LOG_F64, LibmConv); | ||
48 | + setLibcallCallingConv(RTLIB::LOG_F128, LibmConv); | ||
49 | + setLibcallCallingConv(RTLIB::LOG2_F32, LibmConv); | ||
50 | + setLibcallCallingConv(RTLIB::LOG2_F64, LibmConv); | ||
51 | + setLibcallCallingConv(RTLIB::LOG2_F128, LibmConv); | ||
52 | + setLibcallCallingConv(RTLIB::LOG10_F32, LibmConv); | ||
53 | + setLibcallCallingConv(RTLIB::LOG10_F64, LibmConv); | ||
54 | + setLibcallCallingConv(RTLIB::LOG10_F128, LibmConv); | ||
55 | + setLibcallCallingConv(RTLIB::EXP_F32, LibmConv); | ||
56 | + setLibcallCallingConv(RTLIB::EXP_F64, LibmConv); | ||
57 | + setLibcallCallingConv(RTLIB::EXP_F128, LibmConv); | ||
58 | + setLibcallCallingConv(RTLIB::EXP2_F32, LibmConv); | ||
59 | + setLibcallCallingConv(RTLIB::EXP2_F64, LibmConv); | ||
60 | + setLibcallCallingConv(RTLIB::EXP2_F128, LibmConv); | ||
61 | + setLibcallCallingConv(RTLIB::SIN_F32, LibmConv); | ||
62 | + setLibcallCallingConv(RTLIB::SIN_F64, LibmConv); | ||
63 | + setLibcallCallingConv(RTLIB::SIN_F128, LibmConv); | ||
64 | + setLibcallCallingConv(RTLIB::COS_F32, LibmConv); | ||
65 | + setLibcallCallingConv(RTLIB::COS_F64, LibmConv); | ||
66 | + setLibcallCallingConv(RTLIB::COS_F128, LibmConv); | ||
67 | + setLibcallCallingConv(RTLIB::SINCOS_F32, LibmConv); | ||
68 | + setLibcallCallingConv(RTLIB::SINCOS_F64, LibmConv); | ||
69 | + setLibcallCallingConv(RTLIB::SINCOS_F128, LibmConv); | ||
70 | + setLibcallCallingConv(RTLIB::POW_F32, LibmConv); | ||
71 | + setLibcallCallingConv(RTLIB::POW_F64, LibmConv); | ||
72 | + setLibcallCallingConv(RTLIB::POW_F128, LibmConv); | ||
73 | + setLibcallCallingConv(RTLIB::CEIL_F32, LibmConv); | ||
74 | + setLibcallCallingConv(RTLIB::CEIL_F64, LibmConv); | ||
75 | + setLibcallCallingConv(RTLIB::CEIL_F128, LibmConv); | ||
76 | + setLibcallCallingConv(RTLIB::TRUNC_F32, LibmConv); | ||
77 | + setLibcallCallingConv(RTLIB::TRUNC_F64, LibmConv); | ||
78 | + setLibcallCallingConv(RTLIB::TRUNC_F128, LibmConv); | ||
79 | + setLibcallCallingConv(RTLIB::RINT_F32, LibmConv); | ||
80 | + setLibcallCallingConv(RTLIB::RINT_F64, LibmConv); | ||
81 | + setLibcallCallingConv(RTLIB::RINT_F128, LibmConv); | ||
82 | + setLibcallCallingConv(RTLIB::NEARBYINT_F32, LibmConv); | ||
83 | + setLibcallCallingConv(RTLIB::NEARBYINT_F64, LibmConv); | ||
84 | + setLibcallCallingConv(RTLIB::NEARBYINT_F128, LibmConv); | ||
85 | + setLibcallCallingConv(RTLIB::ROUND_F32, LibmConv); | ||
86 | + setLibcallCallingConv(RTLIB::ROUND_F64, LibmConv); | ||
87 | + setLibcallCallingConv(RTLIB::ROUND_F128, LibmConv); | ||
88 | + setLibcallCallingConv(RTLIB::FLOOR_F32, LibmConv); | ||
89 | + setLibcallCallingConv(RTLIB::FLOOR_F64, LibmConv); | ||
90 | + setLibcallCallingConv(RTLIB::FLOOR_F128, LibmConv); | ||
91 | + setLibcallCallingConv(RTLIB::COPYSIGN_F32, LibmConv); | ||
92 | + setLibcallCallingConv(RTLIB::COPYSIGN_F64, LibmConv); | ||
93 | + setLibcallCallingConv(RTLIB::COPYSIGN_F128, LibmConv); | ||
94 | + setLibcallCallingConv(RTLIB::FMIN_F32, LibmConv); | ||
95 | + setLibcallCallingConv(RTLIB::FMIN_F64, LibmConv); | ||
96 | + setLibcallCallingConv(RTLIB::FMIN_F128, LibmConv); | ||
97 | + setLibcallCallingConv(RTLIB::FMAX_F32, LibmConv); | ||
98 | + setLibcallCallingConv(RTLIB::FMAX_F64, LibmConv); | ||
99 | + setLibcallCallingConv(RTLIB::FMAX_F128, LibmConv); | ||
100 | } | ||
101 | |||
102 | if (Subtarget->isTargetMachO()) { | ||
103 | diff --git a/test/CodeGen/Thumb2/intrinsics-cc.ll b/test/CodeGen/Thumb2/intrinsics-cc.ll | ||
104 | index ab5081e3ab9..3a3014fc919 100644 | ||
105 | --- a/test/CodeGen/Thumb2/intrinsics-cc.ll | ||
106 | +++ b/test/CodeGen/Thumb2/intrinsics-cc.ll | ||
107 | @@ -15,7 +15,7 @@ | ||
108 | |||
109 | declare float @llvm.powi.f32(float, i32) | ||
110 | |||
111 | -define float @f(float %f, i32 %i) { | ||
112 | +define float @powi_f32(float %f, i32 %i) { | ||
113 | entry: | ||
114 | %0 = call float @llvm.powi.f32(float %f, i32 %i) | ||
115 | ret float %0 | ||
116 | @@ -28,7 +28,7 @@ entry: | ||
117 | |||
118 | declare double @llvm.powi.f64(double, i32) | ||
119 | |||
120 | -define double @g(double %d, i32 %i) { | ||
121 | +define double @powi_f64(double %d, i32 %i) { | ||
122 | entry: | ||
123 | %0 = call double @llvm.powi.f64(double %d, i32 %i) | ||
124 | ret double %0 | ||
125 | @@ -39,3 +39,24 @@ entry: | ||
126 | ; CHECK-TO-SOFT: vmov d0, r0, r1 | ||
127 | ; CHECK-TO-HARD: vmov r0, r1, d0 | ||
128 | |||
129 | +declare float @llvm.floor.f32(float) | ||
130 | + | ||
131 | +define float @floor_f32(float %f) { | ||
132 | +entry: | ||
133 | + %0 = call float @llvm.floor.f32(float %f) | ||
134 | + ret float %0 | ||
135 | +} | ||
136 | + | ||
137 | +; CHECK-MATCH: b floorf | ||
138 | +; CHECK-MISMATCH: b floorf | ||
139 | + | ||
140 | +declare double @llvm.floor.f64(double) | ||
141 | + | ||
142 | +define double @floor_f64(double %d) { | ||
143 | +entry: | ||
144 | + %0 = call double @llvm.floor.f64(double %d) | ||
145 | + ret double %0 | ||
146 | +} | ||
147 | + | ||
148 | +; CHECK-MATCH: b floor | ||
149 | +; CHECK-MISMATCH: b floor | ||
150 | -- | ||
151 | 2.14.1 | ||
152 | |||
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc index 194f554..1108747 100644 --- a/recipes-devtools/clang/common.inc +++ b/recipes-devtools/clang/common.inc | |||
@@ -6,6 +6,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/clang:" | |||
6 | LLVMPATCHES = "\ | 6 | LLVMPATCHES = "\ |
7 | file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ | 7 | file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ |
8 | file://0002-llvm-allow-env-override-of-exe-path.patch \ | 8 | file://0002-llvm-allow-env-override-of-exe-path.patch \ |
9 | file://0003-llvm-ARM-Use-correct-calling-convention-for-libm.patch \ | ||
9 | " | 10 | " |
10 | # Fallback to no-PIE if not set | 11 | # Fallback to no-PIE if not set |
11 | GCCPIE ??= "" | 12 | GCCPIE ??= "" |