-
Notifications
You must be signed in to change notification settings - Fork 14.5k
ARM: Fix calling convention for gnu half conversion functions #147951
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ARM: Fix calling convention for gnu half conversion functions #147951
Conversation
I'm surprised at how bad the test coverage is here. There is some overlap with existing tests, but they aren't comprehensive and do not cover all the ABIs, or all the different types. Fixes #147935
@llvm/pr-subscribers-backend-arm Author: Matt Arsenault (arsenm) ChangesI'm surprised at how bad the test coverage is here. There is some Fixes #147935 Full diff: https://github.com/llvm/llvm-project/pull/147951.diff 2 Files Affected:
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
index 45311e92f9866..cbd43cde78548 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
@@ -715,10 +715,14 @@ ARMTargetLowering::ARMTargetLowering(const TargetMachine &TM_,
setLibcallImplCallingConv(RTLIB::__truncsfhf2, CallingConv::ARM_AAPCS);
setLibcallImplCallingConv(RTLIB::__truncdfhf2, CallingConv::ARM_AAPCS);
setLibcallImplCallingConv(RTLIB::__extendhfsf2, CallingConv::ARM_AAPCS);
+ setLibcallImplCallingConv(RTLIB::__gnu_h2f_ieee, CallingConv::ARM_AAPCS);
+ setLibcallImplCallingConv(RTLIB::__gnu_f2h_ieee, CallingConv::ARM_AAPCS);
} else {
setLibcallImplCallingConv(RTLIB::__truncsfhf2, CallingConv::ARM_APCS);
setLibcallImplCallingConv(RTLIB::__truncdfhf2, CallingConv::ARM_APCS);
setLibcallImplCallingConv(RTLIB::__extendhfsf2, CallingConv::ARM_APCS);
+ setLibcallImplCallingConv(RTLIB::__gnu_h2f_ieee, CallingConv::ARM_APCS);
+ setLibcallImplCallingConv(RTLIB::__gnu_f2h_ieee, CallingConv::ARM_APCS);
}
}
diff --git a/llvm/test/CodeGen/ARM/issue147935-half-convert-libcall-abi.ll b/llvm/test/CodeGen/ARM/issue147935-half-convert-libcall-abi.ll
new file mode 100644
index 0000000000000..20cfa2b80eb79
--- /dev/null
+++ b/llvm/test/CodeGen/ARM/issue147935-half-convert-libcall-abi.ll
@@ -0,0 +1,188 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
+; RUN: llc -mtriple=arm-unknown-linux-gnueabihf < %s | FileCheck -check-prefix=AAPCS-HARD %s
+; RUN: llc -mtriple=arm-unknown-linux-gnueabi < %s | FileCheck -check-prefix=AAPCS-SOFT %s
+; RUN: llc -mtriple=armv7-unknown-linux -target-abi=apcs -float-abi=soft < %s | FileCheck -check-prefix=APCS %s
+; RUN: llc -mtriple=armv7-unknown-linux -target-abi=apcs -float-abi=hard < %s | FileCheck -check-prefix=APCS %s
+
+define i1 @test(half %self) #0 {
+; AAPCS-HARD-LABEL: test:
+; AAPCS-HARD: @ %bb.0:
+; AAPCS-HARD-NEXT: .save {r11, lr}
+; AAPCS-HARD-NEXT: push {r11, lr}
+; AAPCS-HARD-NEXT: vmov r0, s0
+; AAPCS-HARD-NEXT: bl __gnu_h2f_ieee
+; AAPCS-HARD-NEXT: vmov s0, r0
+; AAPCS-HARD-NEXT: mov r0, #0
+; AAPCS-HARD-NEXT: vcmp.f32 s0, s0
+; AAPCS-HARD-NEXT: vmrs APSR_nzcv, fpscr
+; AAPCS-HARD-NEXT: movvs r0, #1
+; AAPCS-HARD-NEXT: pop {r11, lr}
+; AAPCS-HARD-NEXT: mov pc, lr
+;
+; AAPCS-SOFT-LABEL: test:
+; AAPCS-SOFT: @ %bb.0:
+; AAPCS-SOFT-NEXT: .save {r11, lr}
+; AAPCS-SOFT-NEXT: push {r11, lr}
+; AAPCS-SOFT-NEXT: bl __gnu_h2f_ieee
+; AAPCS-SOFT-NEXT: vmov s0, r0
+; AAPCS-SOFT-NEXT: mov r0, #0
+; AAPCS-SOFT-NEXT: vcmp.f32 s0, s0
+; AAPCS-SOFT-NEXT: vmrs APSR_nzcv, fpscr
+; AAPCS-SOFT-NEXT: movvs r0, #1
+; AAPCS-SOFT-NEXT: pop {r11, lr}
+; AAPCS-SOFT-NEXT: mov pc, lr
+;
+; APCS-LABEL: test:
+; APCS: @ %bb.0:
+; APCS-NEXT: push {lr}
+; APCS-NEXT: bl __gnu_h2f_ieee
+; APCS-NEXT: vmov s0, r0
+; APCS-NEXT: mov r0, #0
+; APCS-NEXT: vcmp.f32 s0, s0
+; APCS-NEXT: vmrs APSR_nzcv, fpscr
+; APCS-NEXT: movwvs r0, #1
+; APCS-NEXT: pop {lr}
+; APCS-NEXT: bx lr
+ %_0 = fcmp une half %self, %self
+ ret i1 %_0
+}
+
+define float @f16_to_f32(ptr %p) #0 {
+; AAPCS-HARD-LABEL: f16_to_f32:
+; AAPCS-HARD: @ %bb.0:
+; AAPCS-HARD-NEXT: .save {r11, lr}
+; AAPCS-HARD-NEXT: push {r11, lr}
+; AAPCS-HARD-NEXT: ldrh r0, [r0]
+; AAPCS-HARD-NEXT: bl __gnu_h2f_ieee
+; AAPCS-HARD-NEXT: vmov s0, r0
+; AAPCS-HARD-NEXT: pop {r11, lr}
+; AAPCS-HARD-NEXT: mov pc, lr
+;
+; AAPCS-SOFT-LABEL: f16_to_f32:
+; AAPCS-SOFT: @ %bb.0:
+; AAPCS-SOFT-NEXT: ldrh r0, [r0]
+; AAPCS-SOFT-NEXT: b __gnu_h2f_ieee
+;
+; APCS-LABEL: f16_to_f32:
+; APCS: @ %bb.0:
+; APCS-NEXT: ldrh r0, [r0]
+; APCS-NEXT: b __gnu_h2f_ieee
+ %load = load half, ptr %p
+ %cvt = fpext half %load to float
+ ret float %cvt
+}
+
+define void @f32_to_f16(ptr %p, float %arg) #0 {
+; AAPCS-HARD-LABEL: f32_to_f16:
+; AAPCS-HARD: @ %bb.0:
+; AAPCS-HARD-NEXT: .save {r4, lr}
+; AAPCS-HARD-NEXT: push {r4, lr}
+; AAPCS-HARD-NEXT: mov r4, r0
+; AAPCS-HARD-NEXT: vmov r0, s0
+; AAPCS-HARD-NEXT: bl __gnu_f2h_ieee
+; AAPCS-HARD-NEXT: strh r0, [r4]
+; AAPCS-HARD-NEXT: pop {r4, lr}
+; AAPCS-HARD-NEXT: mov pc, lr
+;
+; AAPCS-SOFT-LABEL: f32_to_f16:
+; AAPCS-SOFT: @ %bb.0:
+; AAPCS-SOFT-NEXT: .save {r4, lr}
+; AAPCS-SOFT-NEXT: push {r4, lr}
+; AAPCS-SOFT-NEXT: mov r4, r0
+; AAPCS-SOFT-NEXT: mov r0, r1
+; AAPCS-SOFT-NEXT: bl __gnu_f2h_ieee
+; AAPCS-SOFT-NEXT: strh r0, [r4]
+; AAPCS-SOFT-NEXT: pop {r4, lr}
+; AAPCS-SOFT-NEXT: mov pc, lr
+;
+; APCS-LABEL: f32_to_f16:
+; APCS: @ %bb.0:
+; APCS-NEXT: push {r4, lr}
+; APCS-NEXT: mov r4, r0
+; APCS-NEXT: mov r0, r1
+; APCS-NEXT: bl __gnu_f2h_ieee
+; APCS-NEXT: strh r0, [r4]
+; APCS-NEXT: pop {r4, pc}
+ %cvt = fptrunc float %arg to half
+ store half %cvt, ptr %p
+ ret void
+}
+
+define double @f16_to_f64(ptr %p) #0 {
+; AAPCS-HARD-LABEL: f16_to_f64:
+; AAPCS-HARD: @ %bb.0:
+; AAPCS-HARD-NEXT: .save {r11, lr}
+; AAPCS-HARD-NEXT: push {r11, lr}
+; AAPCS-HARD-NEXT: ldrh r0, [r0]
+; AAPCS-HARD-NEXT: bl __gnu_h2f_ieee
+; AAPCS-HARD-NEXT: vmov s0, r0
+; AAPCS-HARD-NEXT: vcvt.f64.f32 d0, s0
+; AAPCS-HARD-NEXT: pop {r11, lr}
+; AAPCS-HARD-NEXT: mov pc, lr
+;
+; AAPCS-SOFT-LABEL: f16_to_f64:
+; AAPCS-SOFT: @ %bb.0:
+; AAPCS-SOFT-NEXT: .save {r11, lr}
+; AAPCS-SOFT-NEXT: push {r11, lr}
+; AAPCS-SOFT-NEXT: ldrh r0, [r0]
+; AAPCS-SOFT-NEXT: bl __gnu_h2f_ieee
+; AAPCS-SOFT-NEXT: vmov s0, r0
+; AAPCS-SOFT-NEXT: vcvt.f64.f32 d0, s0
+; AAPCS-SOFT-NEXT: vmov r0, r1, d0
+; AAPCS-SOFT-NEXT: pop {r11, lr}
+; AAPCS-SOFT-NEXT: mov pc, lr
+;
+; APCS-LABEL: f16_to_f64:
+; APCS: @ %bb.0:
+; APCS-NEXT: push {lr}
+; APCS-NEXT: ldrh r0, [r0]
+; APCS-NEXT: bl __gnu_h2f_ieee
+; APCS-NEXT: vmov s0, r0
+; APCS-NEXT: vcvt.f64.f32 d16, s0
+; APCS-NEXT: vmov r0, r1, d16
+; APCS-NEXT: pop {lr}
+; APCS-NEXT: bx lr
+ %load = load half, ptr %p
+ %cvt = fpext half %load to double
+ ret double %cvt
+}
+
+define void @f64_to_f16(ptr %p, double %arg) #0 {
+; AAPCS-HARD-LABEL: f64_to_f16:
+; AAPCS-HARD: @ %bb.0:
+; AAPCS-HARD-NEXT: .save {r4, lr}
+; AAPCS-HARD-NEXT: push {r4, lr}
+; AAPCS-HARD-NEXT: mov r4, r0
+; AAPCS-HARD-NEXT: vmov r0, r1, d0
+; AAPCS-HARD-NEXT: bl __aeabi_d2h
+; AAPCS-HARD-NEXT: strh r0, [r4]
+; AAPCS-HARD-NEXT: pop {r4, lr}
+; AAPCS-HARD-NEXT: mov pc, lr
+;
+; AAPCS-SOFT-LABEL: f64_to_f16:
+; AAPCS-SOFT: @ %bb.0:
+; AAPCS-SOFT-NEXT: .save {r4, lr}
+; AAPCS-SOFT-NEXT: push {r4, lr}
+; AAPCS-SOFT-NEXT: mov r4, r0
+; AAPCS-SOFT-NEXT: mov r1, r3
+; AAPCS-SOFT-NEXT: mov r0, r2
+; AAPCS-SOFT-NEXT: bl __aeabi_d2h
+; AAPCS-SOFT-NEXT: strh r0, [r4]
+; AAPCS-SOFT-NEXT: pop {r4, lr}
+; AAPCS-SOFT-NEXT: mov pc, lr
+;
+; APCS-LABEL: f64_to_f16:
+; APCS: @ %bb.0:
+; APCS-NEXT: push {r4, lr}
+; APCS-NEXT: mov r4, r0
+; APCS-NEXT: mov r0, r1
+; APCS-NEXT: mov r1, r2
+; APCS-NEXT: bl __truncdfhf2
+; APCS-NEXT: strh r0, [r4]
+; APCS-NEXT: pop {r4, pc}
+ %cvt = fptrunc double %arg to half
+ store half %cvt, ptr %p
+ ret void
+}
+
+attributes #0 = { "target-features"="+vfp2" }
|
ret void | ||
} | ||
|
||
attributes #0 = { "target-features"="+vfp2" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd move this into -mattr
on the llc invocations where relevant.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The subtarget features changing the ABI is pretty broken and confusing. This ends up using the caller's subtarget features, not the callee?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
A lot of the older parts of the Arm backend were written a long time ago without much apparent code review or test coverage. With the huge number of valid architecture and platform options that accumulated over the years it can mean that the test coverage is difficult to trust. |
I'm surprised at how bad the test coverage is here. There is some
overlap with existing tests, but they aren't comprehensive and do
not cover all the ABIs, or all the different types.
Fixes #147935