Commit 5000e7f6 authored by Leo Yan's avatar Leo Yan Committed by Arnaldo Carvalho de Melo
Browse files

perf parse-regs: Refactor arch register parsing functions 



Every architecture has a specific register parsing function for
returning register name based on register index, to support cross
analysis (e.g. we use perf x86 binary to parse Arm64's perf data), we
build all these register parsing functions into the tool, this is why
we place all related functions into util/perf_regs.c.

Unfortunately, since util/perf_regs.c needs to include every arch's
perf_regs.h, this easily introduces duplicated definitions coming from
multiple headers, finally it's fragile for building and difficult for
maintenance.

We cannot simply move these register parsing functions into the
corresponding 'arch' folder, the folder is only conditionally built
based on the target architecture.

Therefore, this commit creates a new folder util/perf-regs-arch/ and
uses a dedicated source file to keep every architecture's register
parsing function to avoid definition conflicts.

This is only a refactoring, no functionality change is expected.

Committer notes:

Had to add util/perf-regs-arch/*.c to tools/perf/util/python-ext-sources
to keep 'perf test python' passing.

Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Eric Lin <eric.lin@sifive.com>
Cc: Fangrui Song <maskray@google.com>
Cc: Guo Ren <guoren@kernel.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ivan Babrou <ivan@cloudflare.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Ming Wang <wangming01@loongson.cn>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-csky@vger.kernel.org
Cc: linux-riscv@lists.infradead.org
Link: https://lore.kernel.org/r/20230606014559.21783-2-leo.yan@linaro.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a1ef3aaf

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ perf-y += parse-events.o 
perf-y += print-events.o

perf-y += tracepoint.o

perf-y += perf_regs.o

perf-y += perf-regs-arch/

perf-y += path.o

perf-y += print_binary.o

perf-y += rlimit.o

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

0 → 100644
+9 −0
Original line number Diff line number Diff line 
perf-y += perf_regs_aarch64.o

perf-y += perf_regs_arm.o

perf-y += perf_regs_csky.o

perf-y += perf_regs_loongarch.o

perf-y += perf_regs_mips.o

perf-y += perf_regs_powerpc.o

perf-y += perf_regs_riscv.o

perf-y += perf_regs_s390.o

perf-y += perf_regs_x86.o

tools/perf/util/perf-regs-arch/perf_regs_aarch64.c

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



#ifdef HAVE_PERF_REGS_SUPPORT



#include "../perf_regs.h"

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



const char *__perf_reg_name_arm64(int id)

{

	switch (id) {

	case PERF_REG_ARM64_X0:

		return "x0";

	case PERF_REG_ARM64_X1:

		return "x1";

	case PERF_REG_ARM64_X2:

		return "x2";

	case PERF_REG_ARM64_X3:

		return "x3";

	case PERF_REG_ARM64_X4:

		return "x4";

	case PERF_REG_ARM64_X5:

		return "x5";

	case PERF_REG_ARM64_X6:

		return "x6";

	case PERF_REG_ARM64_X7:

		return "x7";

	case PERF_REG_ARM64_X8:

		return "x8";

	case PERF_REG_ARM64_X9:

		return "x9";

	case PERF_REG_ARM64_X10:

		return "x10";

	case PERF_REG_ARM64_X11:

		return "x11";

	case PERF_REG_ARM64_X12:

		return "x12";

	case PERF_REG_ARM64_X13:

		return "x13";

	case PERF_REG_ARM64_X14:

		return "x14";

	case PERF_REG_ARM64_X15:

		return "x15";

	case PERF_REG_ARM64_X16:

		return "x16";

	case PERF_REG_ARM64_X17:

		return "x17";

	case PERF_REG_ARM64_X18:

		return "x18";

	case PERF_REG_ARM64_X19:

		return "x19";

	case PERF_REG_ARM64_X20:

		return "x20";

	case PERF_REG_ARM64_X21:

		return "x21";

	case PERF_REG_ARM64_X22:

		return "x22";

	case PERF_REG_ARM64_X23:

		return "x23";

	case PERF_REG_ARM64_X24:

		return "x24";

	case PERF_REG_ARM64_X25:

		return "x25";

	case PERF_REG_ARM64_X26:

		return "x26";

	case PERF_REG_ARM64_X27:

		return "x27";

	case PERF_REG_ARM64_X28:

		return "x28";

	case PERF_REG_ARM64_X29:

		return "x29";

	case PERF_REG_ARM64_SP:

		return "sp";

	case PERF_REG_ARM64_LR:

		return "lr";

	case PERF_REG_ARM64_PC:

		return "pc";

	case PERF_REG_ARM64_VG:

		return "vg";

	default:

		return NULL;

	}



	return NULL;

}



#endif

tools/perf/util/perf-regs-arch/perf_regs_arm.c

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



#ifdef HAVE_PERF_REGS_SUPPORT



#include "../perf_regs.h"

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



const char *__perf_reg_name_arm(int id)

{

	switch (id) {

	case PERF_REG_ARM_R0:

		return "r0";

	case PERF_REG_ARM_R1:

		return "r1";

	case PERF_REG_ARM_R2:

		return "r2";

	case PERF_REG_ARM_R3:

		return "r3";

	case PERF_REG_ARM_R4:

		return "r4";

	case PERF_REG_ARM_R5:

		return "r5";

	case PERF_REG_ARM_R6:

		return "r6";

	case PERF_REG_ARM_R7:

		return "r7";

	case PERF_REG_ARM_R8:

		return "r8";

	case PERF_REG_ARM_R9:

		return "r9";

	case PERF_REG_ARM_R10:

		return "r10";

	case PERF_REG_ARM_FP:

		return "fp";

	case PERF_REG_ARM_IP:

		return "ip";

	case PERF_REG_ARM_SP:

		return "sp";

	case PERF_REG_ARM_LR:

		return "lr";

	case PERF_REG_ARM_PC:

		return "pc";

	default:

		return NULL;

	}



	return NULL;

}



#endif

tools/perf/util/perf-regs-arch/perf_regs_csky.c

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



#ifdef HAVE_PERF_REGS_SUPPORT



#include "../perf_regs.h"

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



const char *__perf_reg_name_csky(int id)

{

	switch (id) {

	case PERF_REG_CSKY_A0:

		return "a0";

	case PERF_REG_CSKY_A1:

		return "a1";

	case PERF_REG_CSKY_A2:

		return "a2";

	case PERF_REG_CSKY_A3:

		return "a3";

	case PERF_REG_CSKY_REGS0:

		return "regs0";

	case PERF_REG_CSKY_REGS1:

		return "regs1";

	case PERF_REG_CSKY_REGS2:

		return "regs2";

	case PERF_REG_CSKY_REGS3:

		return "regs3";

	case PERF_REG_CSKY_REGS4:

		return "regs4";

	case PERF_REG_CSKY_REGS5:

		return "regs5";

	case PERF_REG_CSKY_REGS6:

		return "regs6";

	case PERF_REG_CSKY_REGS7:

		return "regs7";

	case PERF_REG_CSKY_REGS8:

		return "regs8";

	case PERF_REG_CSKY_REGS9:

		return "regs9";

	case PERF_REG_CSKY_SP:

		return "sp";

	case PERF_REG_CSKY_LR:

		return "lr";

	case PERF_REG_CSKY_PC:

		return "pc";

#if defined(__CSKYABIV2__)

	case PERF_REG_CSKY_EXREGS0:

		return "exregs0";

	case PERF_REG_CSKY_EXREGS1:

		return "exregs1";

	case PERF_REG_CSKY_EXREGS2:

		return "exregs2";

	case PERF_REG_CSKY_EXREGS3:

		return "exregs3";

	case PERF_REG_CSKY_EXREGS4:

		return "exregs4";

	case PERF_REG_CSKY_EXREGS5:

		return "exregs5";

	case PERF_REG_CSKY_EXREGS6:

		return "exregs6";

	case PERF_REG_CSKY_EXREGS7:

		return "exregs7";

	case PERF_REG_CSKY_EXREGS8:

		return "exregs8";

	case PERF_REG_CSKY_EXREGS9:

		return "exregs9";

	case PERF_REG_CSKY_EXREGS10:

		return "exregs10";

	case PERF_REG_CSKY_EXREGS11:

		return "exregs11";

	case PERF_REG_CSKY_EXREGS12:

		return "exregs12";

	case PERF_REG_CSKY_EXREGS13:

		return "exregs13";

	case PERF_REG_CSKY_EXREGS14:

		return "exregs14";

	case PERF_REG_CSKY_TLS:

		return "tls";

	case PERF_REG_CSKY_HI:

		return "hi";

	case PERF_REG_CSKY_LO:

		return "lo";

#endif

	default:

		return NULL;

	}



	return NULL;

}



#endif