[compiler-rt] [XRay][RISC-V] Guard trampoline FP saves behind float ABI (PR #214390)

[via llvm-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-backend-risc-v

Author: Mark Zhuang (zqb-all)

<details>
<summary>Changes</summary>

Fixed rv64ima build error by guarding FP register saves with __riscv_float_abi_double, following hwasan_setjmp_riscv64.S.

---
Full diff: https://github.com/llvm/llvm-project/pull/214390.diff


2 Files Affected:

- (modified) compiler-rt/lib/xray/xray_trampoline_riscv32.S (+8) 
- (modified) compiler-rt/lib/xray/xray_trampoline_riscv64.S (+8) 


``````````diff
diff --git a/compiler-rt/lib/xray/xray_trampoline_riscv32.S b/compiler-rt/lib/xray/xray_trampoline_riscv32.S
index 05e3d61e5ef71..02cab154d5fd7 100644
--- a/compiler-rt/lib/xray/xray_trampoline_riscv32.S
+++ b/compiler-rt/lib/xray/xray_trampoline_riscv32.S
@@ -27,6 +27,7 @@
 	sw	a2, 84(sp)
 	sw	a1, 80(sp)
 	sw	a0, 76(sp)
+#if __riscv_float_abi_double
 	fsd	fa7, 64(sp)
 	fsd	fa6, 56(sp)
 	fsd	fa5, 48(sp)
@@ -35,10 +36,12 @@
 	fsd	fa2, 24(sp)
 	fsd	fa1, 16(sp)
 	fsd	fa0, 8(sp)
+#endif
 .endm
 
 .macro RESTORE_ARG_REGISTERS
 	// Restore argument registers
+#if __riscv_float_abi_double
 	fld	fa0, 8(sp)
 	fld	fa1, 16(sp)
 	fld	fa2, 24(sp)
@@ -47,6 +50,7 @@
 	fld	fa5, 48(sp)
 	fld	fa6, 56(sp)
 	fld	fa7, 64(sp)
+#endif
 	lw	a0, 76(sp)
 	lw	a1, 80(sp)
 	lw	a2, 84(sp)
@@ -67,14 +71,18 @@
 	sw	ra, 28(sp)
 	sw	a1, 24(sp)
 	sw	a0, 20(sp)
+#if __riscv_float_abi_double
 	fsd	fa1, 8(sp)
 	fsd	fa0, 0(sp)
+#endif
 .endm
 
 .macro RESTORE_RET_REGISTERS
 	// Restore return registers
+#if __riscv_float_abi_double
 	fld	fa0, 0(sp)
 	fld	fa1, 8(sp)
+#endif
 	lw	a0, 20(sp)
 	lw	a1, 24(sp)
 	lw	ra, 28(sp)
diff --git a/compiler-rt/lib/xray/xray_trampoline_riscv64.S b/compiler-rt/lib/xray/xray_trampoline_riscv64.S
index 692350eaaa38e..0cb53f7a9e7c8 100644
--- a/compiler-rt/lib/xray/xray_trampoline_riscv64.S
+++ b/compiler-rt/lib/xray/xray_trampoline_riscv64.S
@@ -27,6 +27,7 @@
         sd	a2, 88(sp)
         sd	a1, 80(sp)
         sd	a0, 72(sp)
+#if __riscv_float_abi_double
         fsd	fa7, 64(sp)
         fsd	fa6, 56(sp)
         fsd	fa5, 48(sp)
@@ -35,6 +36,7 @@
         fsd	fa2, 24(sp)
         fsd	fa1, 16(sp)
         fsd	fa0, 8(sp)
+#endif
 .endm
 
 .macro SAVE_RET_REGISTERS
@@ -44,14 +46,18 @@
         sd      ra, 40(sp)
         sd      a1, 32(sp)
         sd      a0, 24(sp)
+#if __riscv_float_abi_double
         fsd     fa1, 16(sp)
         fsd     fa0, 8(sp)
+#endif
 .endm
 
 .macro RESTORE_RET_REGISTERS
 	// Restore return registers
+#if __riscv_float_abi_double
         fld     fa0, 8(sp)
         fld     fa1, 16(sp)
+#endif
         ld      a0, 24(sp)
         ld      a1, 32(sp)
         ld      ra, 40(sp)
@@ -61,6 +67,7 @@
 
 .macro RESTORE_ARG_REGISTERS
         // Restore argument registers
+#if __riscv_float_abi_double
 	fld	fa0, 8(sp)
 	fld	fa1, 16(sp)
 	fld	fa2, 24(sp)
@@ -69,6 +76,7 @@
 	fld	fa5, 48(sp)
 	fld	fa6, 56(sp)
 	fld	fa7, 64(sp)
+#endif
 	ld	a0, 72(sp)
 	ld	a1, 80(sp)
 	ld	a2, 88(sp)

``````````

</details>


https://github.com/llvm/llvm-project/pull/214390