Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf xtensa: Remove dwarf-regs.c

The file just provides the function get_arch_regstr, however, if in
the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case
the function can never be called. So remove as dead code. As this is
the only file in the arch/xtensa/util clean up Build files. Tidy up the
EM_NONE cases for xtensa in dwarf-regs.c.

Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Anup Patel <anup@brainfault.org>
Cc: Yang Jihong <yangjihong@bytedance.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Shenlin Liang <liangshenlin@eswincomputing.com>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Guilherme Amadio <amadio@gentoo.org>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Alexander Lobakin <aleksander.lobakin@intel.com>
Cc: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: James Clark <james.clark@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Chen Pei <cp0613@linux.alibaba.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Aditya Gupta <adityag@linux.ibm.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-riscv@lists.infradead.org
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Atish Patra <atishp@rivosinc.com>
Cc: Dima Kogan <dima@secretsauce.net>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Dr. David Alan Gilbert <linux@treblig.org>
Cc: linux-csky@vger.kernel.org
Link: https://lore.kernel.org/r/20241108234606.429459-19-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

authored by

Ian Rogers and committed by
Namhyung Kim
a4747c09 85567a2a

+3 -26
-1
tools/perf/arch/xtensa/Build
··· 1 - perf-util-y += util/
-1
tools/perf/arch/xtensa/util/Build
··· 1 - perf-$(CONFIG_LIBDW) += dwarf-regs.o
-21
tools/perf/arch/xtensa/util/dwarf-regs.c
··· 1 - // SPDX-License-Identifier: GPL-2.0-or-later 2 - /* 3 - * Mapping of DWARF debug register numbers into register names. 4 - * 5 - * Copyright (c) 2015 Cadence Design Systems Inc. 6 - */ 7 - 8 - #include <stddef.h> 9 - #include <dwarf-regs.h> 10 - 11 - #define XTENSA_MAX_REGS 16 12 - 13 - const char *xtensa_regs_table[XTENSA_MAX_REGS] = { 14 - "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", 15 - "a8", "a9", "a10", "a11", "a12", "a13", "a14", "a15", 16 - }; 17 - 18 - const char *get_arch_regstr(unsigned int n) 19 - { 20 - return n < XTENSA_MAX_REGS ? xtensa_regs_table[n] : NULL; 21 - }
+2 -2
tools/perf/util/dwarf-regs.c
··· 35 35 #if EM_HOST == EM_X86_64 || EM_HOST == EM_386 || EM_HOST == EM_AARCH64 || EM_HOST == EM_ARM \ 36 36 || EM_HOST == EM_CSKY || EM_HOST == EM_LOONGARCH || EM_HOST == EM_MIPS || EM_HOST == EM_PPC \ 37 37 || EM_HOST == EM_PPC64 || EM_HOST == EM_RISCV || EM_HOST == EM_S390 || EM_HOST == EM_SH \ 38 - || EM_HOST == EM_SPARC || EM_HOST == EM_SPARCV9 38 + || EM_HOST == EM_SPARC || EM_HOST == EM_SPARCV9 || EM_HOST == EM_XTENSA 39 39 if (machine == EM_NONE) { 40 40 /* Generic arch - use host arch */ 41 41 machine = EM_HOST; ··· 45 45 #if EM_HOST != EM_X86_64 && EM_HOST != EM_386 && EM_HOST != EM_AARCH64 && EM_HOST != EM_ARM \ 46 46 && EM_HOST != EM_CSKY && EM_HOST != EM_LOONGARCH && EM_HOST != EM_MIPS && EM_HOST != EM_PPC \ 47 47 && EM_HOST != EM_PPC64 && EM_HOST != EM_RISCV && EM_HOST != EM_S390 && EM_HOST != EM_SH \ 48 - && EM_HOST != EM_SPARC && EM_HOST != EM_SPARCV9 48 + && EM_HOST != EM_SPARC && EM_HOST != EM_SPARCV9 && EM_HOST != EM_XTENSA 49 49 case EM_NONE: /* Generic arch - use host arch */ 50 50 return get_arch_regstr(n); 51 51 #endif
+1 -1
tools/perf/util/include/dwarf-regs.h
··· 92 92 #if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \ 93 93 && !defined(__loongarch__) && !defined(__mips__) && !defined(__powerpc__) \ 94 94 && !defined(__powerpc64__) && !defined(__riscv__) && !defined(__s390x__) && !defined(__sh__) \ 95 - && !defined(__sparc64__) && !defined(__sparc__) 95 + && !defined(__sparc64__) && !defined(__sparc__) && !defined(__xtensa__) 96 96 const char *get_arch_regstr(unsigned int n); 97 97 #endif 98 98