From: ixgbe00 <yangwang@iscas.ac.cn>
Date: Wed, 12 Jun 2024 13:24:46 +0000 (+0800)
Subject: gh-120400 ：Support Linux perf profile to see Python calls on RISC-V architecture... 
X-Git-Tag: v3.14.0a1~1520
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b1e85bafc5bcb8cb70bb17164e07aebf7ad7e8e;p=thirdparty%2FPython%2Fcpython.git

gh-120400 ：Support Linux perf profile to see Python calls on RISC-V architecture (#120089)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
---

diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-06-05-06-26-04.gh-issue- b/Misc/NEWS.d/next/Core and Builtins/2024-06-05-06-26-04.gh-issue-
new file mode 100644
index 000000000000..29f06d43c359
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2024-06-05-06-26-04.gh-issue-	
@@ -0,0 +1 @@
+Support Linux perf profiler to see Python calls on RISC-V architecture
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-06-12-12-29-45.gh-issue-120400.lZYHVS.rst b/Misc/NEWS.d/next/Core and Builtins/2024-06-12-12-29-45.gh-issue-120400.lZYHVS.rst
new file mode 100644
index 000000000000..8c86d4750e39
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2024-06-12-12-29-45.gh-issue-120400.lZYHVS.rst	
@@ -0,0 +1 @@
+Support Linux perf profiler to see Python calls on RISC-V architecture.
diff --git a/Python/asm_trampoline.S b/Python/asm_trampoline.S
index 460707717df0..0a3265dfeee2 100644
--- a/Python/asm_trampoline.S
+++ b/Python/asm_trampoline.S
@@ -22,6 +22,14 @@ _Py_trampoline_func_start:
     blr     x3
     ldp     x29, x30, [sp], 16
     ret
+#endif
+#ifdef __riscv
+    addi    sp,sp,-16
+    sd      ra,8(sp)
+    jalr    a3
+    ld      ra,8(sp)
+    addi    sp,sp,16
+    jr      ra
 #endif
     .globl	_Py_trampoline_func_end
 _Py_trampoline_func_end:
diff --git a/configure b/configure
index 8e605d31bb5e..4174633b51c3 100755
--- a/configure
+++ b/configure
@@ -13133,6 +13133,8 @@ case $PLATFORM_TRIPLET in #(
     perf_trampoline=yes ;; #(
   aarch64-linux-gnu) :
     perf_trampoline=yes ;; #(
+  riscv64-linux-gnu) :
+    perf_trampoline=yes ;; #(
   *) :
     perf_trampoline=no
  ;;
diff --git a/configure.ac b/configure.ac
index 41023ab92bad..d34ade389cf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3641,6 +3641,7 @@ AC_MSG_CHECKING([perf trampoline])
 AS_CASE([$PLATFORM_TRIPLET],
   [x86_64-linux-gnu], [perf_trampoline=yes],
   [aarch64-linux-gnu], [perf_trampoline=yes],
+  [riscv64-linux-gnu], [perf_trampoline=yes],
   [perf_trampoline=no]
 )
 AC_MSG_RESULT([$perf_trampoline])