Commit 1e452dd8 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

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



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

Now the non-generic code in unwind-libdw has no uses remove it.

Signed-off-by: default avatarIan 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 36b372df

tools/perf/util/dwarf-regs-arch/Build

+1 −0
Original line number Diff line number Diff line
@@ -4,4 +4,5 @@ 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-riscv.o

perf-util-$(CONFIG_LIBDW) += dwarf-regs-s390.o

perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o

tools/perf/util/dwarf-regs-arch/dwarf-regs-s390.c

0 → 100644
+53 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <errno.h>

#include <dwarf-regs.h>

#include "../../../arch/s390/include/uapi/asm/perf_regs.h"



int __get_dwarf_regnum_for_perf_regnum_s390(int perf_regnum)

{

	static const int dwarf_s390_regnums[] = {

		[PERF_REG_S390_R0] = 0,

		[PERF_REG_S390_R1] = 1,

		[PERF_REG_S390_R2] = 2,

		[PERF_REG_S390_R3] = 3,

		[PERF_REG_S390_R4] = 4,

		[PERF_REG_S390_R5] = 5,

		[PERF_REG_S390_R6] = 6,

		[PERF_REG_S390_R7] = 7,

		[PERF_REG_S390_R8] = 8,

		[PERF_REG_S390_R9] = 9,

		[PERF_REG_S390_R10] = 10,

		[PERF_REG_S390_R11] = 11,

		[PERF_REG_S390_R12] = 12,

		[PERF_REG_S390_R13] = 13,

		[PERF_REG_S390_R14] = 14,

		[PERF_REG_S390_R15] = 15,

		[PERF_REG_S390_FP0] = 16,

		[PERF_REG_S390_FP1] = 20,

		[PERF_REG_S390_FP2] = 17,

		[PERF_REG_S390_FP3] = 21,

		[PERF_REG_S390_FP4] = 18,

		[PERF_REG_S390_FP5] = 22,

		[PERF_REG_S390_FP6] = 19,

		[PERF_REG_S390_FP7] = 23,

		[PERF_REG_S390_FP8] = 24,

		[PERF_REG_S390_FP9] = 28,

		[PERF_REG_S390_FP10] = 25,

		[PERF_REG_S390_FP11] = 29,

		[PERF_REG_S390_FP12] = 26,

		[PERF_REG_S390_FP13] = 30,

		[PERF_REG_S390_FP14] = 27,

		[PERF_REG_S390_FP15] = 31,

		[PERF_REG_S390_MASK] = 64,

		[PERF_REG_S390_PC] = 65,

	};



	if (perf_regnum == 0)

		return 0;



	if (perf_regnum <  0 || perf_regnum > (int)ARRAY_SIZE(dwarf_s390_regnums) ||

	    dwarf_s390_regnums[perf_regnum] == 0)

		return -ENOENT;



	return dwarf_s390_regnums[perf_regnum];

}

tools/perf/util/dwarf-regs.c

+3 −0
Original line number Diff line number Diff line
@@ -212,6 +212,9 @@ int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine, 
	case EM_RISCV:

		reg = __get_dwarf_regnum_for_perf_regnum_riscv(perf_regnum);

		break;

	case EM_S390:

		reg = __get_dwarf_regnum_for_perf_regnum_s390(perf_regnum);

		break;

	case EM_LOONGARCH:

		reg = __get_dwarf_regnum_for_perf_regnum_loongarch(perf_regnum);

		break;

tools/perf/util/include/dwarf-regs.h

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ 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);

int __get_dwarf_regnum_for_perf_regnum_powerpc(int perf_regnum);

int __get_dwarf_regnum_for_perf_regnum_riscv(int perf_regnum);

int __get_dwarf_regnum_for_perf_regnum_s390(int perf_regnum);



/*

 * get_dwarf_regnum - Returns DWARF regnum from register name

tools/perf/util/unwind-libdw-arch/Build

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
perf-util-y += unwind-libdw-s390.o