From cf71778aaae5c58b74bb107b124bb4c9691ead56 Mon Sep 17 00:00:00 2001 From: yangchenguang Date: Thu, 6 Apr 2023 20:46:42 +0800 Subject: [PATCH] Add loongarch support Signed-off-by: yangchenguang --- add-loongarch-support.patch | 90 +++++++++++++++++++++++++++++++++++++ papi.spec | 6 ++- 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 add-loongarch-support.patch diff --git a/add-loongarch-support.patch b/add-loongarch-support.patch new file mode 100644 index 0000000..c4ee40f --- /dev/null +++ b/add-loongarch-support.patch @@ -0,0 +1,90 @@ +diff -Nur a/src/linux-context.h b/src/linux-context.h +--- a/src/linux-context.h 2023-02-13 17:13:46.695350258 +0800 ++++ b/src/linux-context.h 2023-02-13 17:12:54.094497176 +0800 +@@ -33,6 +33,8 @@ + #define OVERFLOW_ADDRESS(ctx) ctx.ucontext->uc_mcontext.arm_pc + #elif defined(__aarch64__) + #define OVERFLOW_ADDRESS(ctx) ctx.ucontext->uc_mcontext.pc ++#elif defined(__loongarch__) ++#define OVERFLOW_ADDRESS(ctx) ctx.ucontext->uc_mcontext.__pc + #elif defined(__mips__) + #define OVERFLOW_ADDRESS(ctx) ctx.ucontext->uc_mcontext.pc + #elif defined(__hppa__) +diff -Nur a/src/linux-lock.h b/src/linux-lock.h +--- a/src/linux-lock.h 2019-03-05 03:56:23.000000000 +0800 ++++ b/src/linux-lock.h 2023-02-13 17:12:54.094497176 +0800 +@@ -223,6 +223,37 @@ + } + #define _papi_hwd_lock(lck) __raw_spin_lock(&_papi_hwd_lock_data[lck]); + #define _papi_hwd_unlock(lck) __raw_spin_unlock(&_papi_hwd_lock_data[lck]) ++#elif defined(__loongarch__) ++static inline void __raw_spin_lock(volatile unsigned int *lock) ++{ ++ unsigned int tmp; ++ __asm__ __volatile__( ++ "1: ll.w %1, %2 \n" ++ " bnez %1, 1b \n" ++ " li.w %1, 1 \n" ++ " sc.w %1, %0 \n" ++ " beqz %1, 1b \n" ++ " nop \n" ++ : "=m" (*lock), "=&r" (tmp) ++ : "m" (*lock) ++ : "memory"); ++} ++ ++static inline void __raw_spin_unlock(volatile unsigned int *lock) ++{ ++ unsigned int tmp; ++ __asm__ __volatile__( ++ " nop \n" ++ " li.w %1, 0 \n" ++ " st.w %1, %0 \n" ++ : "=m" (*lock), "=&r" (tmp) ++ : "m" (*lock) ++ : "memory"); ++} ++#define _papi_hwd_lock(lck) { rmb(); __raw_spin_lock(&_papi_hwd_lock_data[lck]); rmb(); } ++#define _papi_hwd_unlock(lck) { rmb(); __raw_spin_unlock(&_papi_hwd_lock_data[lck]); rmb(); } ++ ++ + #else + + #error "_papi_hwd_lock/unlock undefined!" +diff -Nur a/src/linux-timer.c b/src/linux-timer.c +--- a/src/linux-timer.c 2023-02-13 17:13:46.695350258 +0800 ++++ b/src/linux-timer.c 2023-02-13 17:12:54.094497176 +0800 +@@ -245,6 +245,20 @@ + return ret; + } + ++/****************************/ ++/* loongarch64 get_cycles() */ ++/****************************/ ++#elif defined(__loongarch__) ++static inline long long ++get_cycles(void) ++{ ++ register unsigned long ret = 0; ++ int rID = 0; ++ __asm__ __volatile__ ("ibar 0" ::: "memory"); ++ __asm__ __volatile__ ("rdtime.d %0, %1" :"=r"(ret),"=r"(rID)); ++ return ret; ++} ++ + /************************/ + /* POWER get_cycles() */ + /************************/ +diff -Nur a/src/mb.h b/src/mb.h +--- a/src/mb.h 2023-02-13 17:13:46.695350258 +0800 ++++ b/src/mb.h 2023-02-13 17:12:54.098497240 +0800 +@@ -39,6 +39,9 @@ + #elif defined(__aarch64__) + #define rmb() asm volatile("dmb ld" ::: "memory") + ++#elif defined(__loongarch__) ++#define rmb() asm volatile("dbar 0" ::: "memory") ++ + #elif defined(__riscv) + #define rmb() asm volatile("fence ir, ir" ::: "memory") + diff --git a/papi.spec b/papi.spec index 06cf427..a65c58f 100644 --- a/papi.spec +++ b/papi.spec @@ -1,6 +1,6 @@ Name: papi Version: 5.7.0 -Release: 1 +Release: 2 Summary: Performance Application Programming Interface License: BSD URL: http://icl.cs.utk.edu/papi/ @@ -12,6 +12,7 @@ Provides: papi-libs = %{version}-%{release} Obsoletes: papi-libs < %{version}-%{release} Patch0001: papi-add-support-riscv64.patch +Patch0002: add-loongarch-support.patch %description PAPI provides a programmer interface to monitor the performance of @@ -87,6 +88,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so* %{_mandir}/man3/* %changelog +* Thu Apr 06 2023 yangchenguang - 5.7.0-2 +- Add loongarch support + * Mon Feb 13 2023 liyanan - 5.7.0-1 - Update to 5.7.0 -- Gitee