perf dwarf-regs: Add loongarch perf to DWARF register number mapping functions

These functions allow the generic initial register state code in
unwind-libdw to be used.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Aditya Bodkhe <aditya.b1@linux.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.ibm.com>
Cc: Chun-Tse Shao <ctshao@google.com>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Dr. David Alan Gilbert <linux@treblig.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Haibo Xu <haibo1.xu@intel.com>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Krzysztof Łopatowski <krzysztof.m.lopatowski@gmail.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Mark Wielaard <mark@klomp.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <pjw@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sergei Trofimovich <slyich@gmail.com>
Cc: Shimin Guo <shimin.guo@skydio.com>
Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/dwarf-regs-arch/Build b/tools/perf/util/dwarf-regs-arch/Build
index 3f19a9ec47c784306d78cab0a43640a231bc768b..188359376ea50a06aa0ff0f4ae385466c3fd84fd 100644 (file)
--- a/tools/perf/util/dwarf-regs-arch/Build
+++ b/tools/perf/util/dwarf-regs-arch/Build
@@ -1,5 +1,6 @@
 perf-util-$(CONFIG_LIBDW) += dwarf-regs-arm64.o
 perf-util-$(CONFIG_LIBDW) += dwarf-regs-arm.o
 perf-util-$(CONFIG_LIBDW) += dwarf-regs-csky.o
+perf-util-$(CONFIG_LIBDW) += dwarf-regs-loongarch.o
 perf-util-$(CONFIG_LIBDW) += dwarf-regs-powerpc.o
 perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o

diff --git a/tools/perf/util/dwarf-regs-arch/dwarf-regs-loongarch.c b/tools/perf/util/dwarf-regs-arch/dwarf-regs-loongarch.c
new file mode 100644 (file)
index 0000000..203077b
--- /dev/null
+++ b/tools/perf/util/dwarf-regs-arch/dwarf-regs-loongarch.c
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <errno.h>
+#include <dwarf-regs.h>
+#include "../../../arch/loongarch/include/uapi/asm/perf_regs.h"
+
+int __get_dwarf_regnum_for_perf_regnum_loongarch(int perf_regnum)
+{
+       if (perf_regnum < 0 || perf_regnum >= PERF_REG_LOONGARCH_MAX)
+               return -ENOENT;
+
+       return perf_regnum;
+}

diff --git a/tools/perf/util/dwarf-regs.c b/tools/perf/util/dwarf-regs.c
index 7fa0930fd29873c4b48342ccde8b4bd6a8eed8e2..033218f14b367346104874f084b2a879abce06ce 100644 (file)
--- a/tools/perf/util/dwarf-regs.c
+++ b/tools/perf/util/dwarf-regs.c
@@ -205,6 +205,9 @@ int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine,
        case EM_CSKY:
                reg = __get_dwarf_regnum_for_perf_regnum_csky(perf_regnum, flags);
                break;
+       case EM_LOONGARCH:
+               reg = __get_dwarf_regnum_for_perf_regnum_loongarch(perf_regnum);
+               break;
        default:
                pr_err("ELF MACHINE %x is not supported.\n", machine);
                return -ENOENT;

diff --git a/tools/perf/util/include/dwarf-regs.h b/tools/perf/util/include/dwarf-regs.h
index 7780bc07e70e495daf6d2d7913395ea43727af97..bec15fb53e73ab5b8dc5a8697895da3e5e966a39 100644 (file)
--- a/tools/perf/util/include/dwarf-regs.h
+++ b/tools/perf/util/include/dwarf-regs.h
@@ -109,6 +109,7 @@ int __get_dwarf_regnum_for_perf_regnum_arm(int perf_regnum);
 int __get_dwarf_regnum_for_perf_regnum_arm64(int perf_regnum);
 
 int __get_dwarf_regnum_for_perf_regnum_csky(int perf_regnum, unsigned int flags);
+int __get_dwarf_regnum_for_perf_regnum_loongarch(int perf_regnum);
 
 /*
  * get_dwarf_regnum - Returns DWARF regnum from register name

diff --git a/tools/perf/util/unwind-libdw-arch/Build b/tools/perf/util/unwind-libdw-arch/Build
index 5fa1754fca8d20094b4b4b10b9cc22b469ce04f1..62a4cbf2dca8e98ee992ceff4d0cff47da02d7d0 100644 (file)
--- a/tools/perf/util/unwind-libdw-arch/Build
+++ b/tools/perf/util/unwind-libdw-arch/Build
@@ -1,4 +1,3 @@
-perf-util-y += unwind-libdw-loongarch.o
 perf-util-y += unwind-libdw-powerpc.o
 perf-util-y += unwind-libdw-riscv.o
 perf-util-y += unwind-libdw-s390.o

diff --git a/tools/perf/util/unwind-libdw-arch/unwind-libdw-loongarch.c b/tools/perf/util/unwind-libdw-arch/unwind-libdw-loongarch.c
deleted file mode 100644 (file)
index 5fca673..0000000
--- a/tools/perf/util/unwind-libdw-arch/unwind-libdw-loongarch.c
+++ /dev/null
@@ -1,57 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2020-2023 Loongson Technology Corporation Limited */
-
-#include <elfutils/libdwfl.h>
-#include "../arch/loongarch/include/uapi/asm/perf_regs.h"
-#include "util/unwind-libdw.h"
-#include "util/perf_regs.h"
-#include "util/sample.h"
-
-bool libdw_set_initial_registers_loongarch(Dwfl_Thread *thread, void *arg)
-{
-       struct unwind_info *ui = arg;
-       struct regs_dump *user_regs = perf_sample__user_regs(ui->sample);
-       Dwarf_Word dwarf_regs[PERF_REG_LOONGARCH_MAX];
-
-#define REG(r) ({                                                      \
-       Dwarf_Word val = 0;                                             \
-       perf_reg_value(&val, user_regs, PERF_REG_LOONGARCH_##r);        \
-       val;                                                            \
-})
-
-       dwarf_regs[0]  = 0;
-       dwarf_regs[1]  = REG(R1);
-       dwarf_regs[2]  = REG(R2);
-       dwarf_regs[3]  = REG(R3);
-       dwarf_regs[4]  = REG(R4);
-       dwarf_regs[5]  = REG(R5);
-       dwarf_regs[6]  = REG(R6);
-       dwarf_regs[7]  = REG(R7);
-       dwarf_regs[8]  = REG(R8);
-       dwarf_regs[9]  = REG(R9);
-       dwarf_regs[10] = REG(R10);
-       dwarf_regs[11] = REG(R11);
-       dwarf_regs[12] = REG(R12);
-       dwarf_regs[13] = REG(R13);
-       dwarf_regs[14] = REG(R14);
-       dwarf_regs[15] = REG(R15);
-       dwarf_regs[16] = REG(R16);
-       dwarf_regs[17] = REG(R17);
-       dwarf_regs[18] = REG(R18);
-       dwarf_regs[19] = REG(R19);
-       dwarf_regs[20] = REG(R20);
-       dwarf_regs[21] = REG(R21);
-       dwarf_regs[22] = REG(R22);
-       dwarf_regs[23] = REG(R23);
-       dwarf_regs[24] = REG(R24);
-       dwarf_regs[25] = REG(R25);
-       dwarf_regs[26] = REG(R26);
-       dwarf_regs[27] = REG(R27);
-       dwarf_regs[28] = REG(R28);
-       dwarf_regs[29] = REG(R29);
-       dwarf_regs[30] = REG(R30);
-       dwarf_regs[31] = REG(R31);
-       dwfl_thread_state_register_pc(thread, REG(PC));
-
-       return dwfl_thread_state_registers(thread, 0, PERF_REG_LOONGARCH_MAX, dwarf_regs);
-}

diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c
index a193163da707851d59cd1917b5c76a499a5edae4..9c8dad643cd06f3d0b3c40d3d01e71b78271cfa6 100644 (file)
--- a/tools/perf/util/unwind-libdw.c
+++ b/tools/perf/util/unwind-libdw.c
@@ -292,16 +292,13 @@ static const Dwfl_Thread_Callbacks callbacks_generic = {
        .set_initial_registers = libdw_set_initial_registers_generic,
 };
 
-DEFINE_DWFL_THREAD_CALLBACKS(loongarch);
 DEFINE_DWFL_THREAD_CALLBACKS(powerpc);
 DEFINE_DWFL_THREAD_CALLBACKS(riscv);
 DEFINE_DWFL_THREAD_CALLBACKS(s390);
 
 static const Dwfl_Thread_Callbacks *get_thread_callbacks(const char *arch)
 {
-       if (!strcmp(arch, "loongarch"))
-               return &callbacks_loongarch;
-       else if (!strcmp(arch, "powerpc"))
+       if (!strcmp(arch, "powerpc"))
                return &callbacks_powerpc;
        else if (!strcmp(arch, "riscv"))
                return &callbacks_riscv;

diff --git a/tools/perf/util/unwind-libdw.h b/tools/perf/util/unwind-libdw.h
index ee56f1e827e51d315d79e9487e9042febe1f46c2..9d177d70f15c0868c93484e95a98380e45016f55 100644 (file)
--- a/tools/perf/util/unwind-libdw.h
+++ b/tools/perf/util/unwind-libdw.h
@@ -9,7 +9,6 @@ struct machine;
 struct perf_sample;
 struct thread;
 
-bool libdw_set_initial_registers_loongarch(Dwfl_Thread *thread, void *arg);
 bool libdw_set_initial_registers_mips(Dwfl_Thread *thread, void *arg);
 bool libdw_set_initial_registers_powerpc(Dwfl_Thread *thread, void *arg);
 bool libdw_set_initial_registers_riscv(Dwfl_Thread *thread, void *arg);