From mboxrd@z Thu Jan 1 00:00:00 1970 From: acme@kernel.org (Arnaldo Carvalho de Melo) Date: Tue, 13 Mar 2018 09:04:53 -0300 Subject: [PATCH 16/31] perf vendor events arm64: Relocate Cortex A53 JSONs to arm subdirectory In-Reply-To: <20180313120508.29327-1-acme@kernel.org> References: <20180313120508.29327-1-acme@kernel.org> Message-ID: <20180313120508.29327-17-acme@kernel.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: John Garry Since jevents now supports vendor subdirectory, relocate the Cortex-A53 JSONs to arm subdirectory. Signed-off-by: John Garry Cc: Alexander Shishkin Cc: Andi Kleen Cc: Ganapatrao Kulkarni Cc: Jiri Olsa Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Shaokun Zhang Cc: Will Deacon Cc: William Cohen Cc: linux-arm-kernel at lists.infradead.org Cc: linuxarm at huawei.com Link: http://lkml.kernel.org/r/1520506716-197429-7-git-send-email-john.garry at huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/branch.json | 0 tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/bus.json | 0 tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/cache.json | 0 tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/memory.json | 0 tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/other.json | 0 tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/pipeline.json | 0 tools/perf/pmu-events/arch/arm64/mapfile.csv | 2 +- 7 files changed, 1 insertion(+), 1 deletion(-) rename tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/branch.json (100%) rename tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/bus.json (100%) rename tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/cache.json (100%) rename tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/memory.json (100%) rename tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/other.json (100%) rename tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/pipeline.json (100%) diff --git a/tools/perf/pmu-events/arch/arm64/cortex-a53/branch.json b/tools/perf/pmu-events/arch/arm64/arm/cortex-a53/branch.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/cortex-a53/branch.json rename to tools/perf/pmu-events/arch/arm64/arm/cortex-a53/branch.json diff --git a/tools/perf/pmu-events/arch/arm64/cortex-a53/bus.json b/tools/perf/pmu-events/arch/arm64/arm/cortex-a53/bus.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/cortex-a53/bus.json rename to tools/perf/pmu-events/arch/arm64/arm/cortex-a53/bus.json diff --git a/tools/perf/pmu-events/arch/arm64/cortex-a53/cache.json b/tools/perf/pmu-events/arch/arm64/arm/cortex-a53/cache.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/cortex-a53/cache.json rename to tools/perf/pmu-events/arch/arm64/arm/cortex-a53/cache.json diff --git a/tools/perf/pmu-events/arch/arm64/cortex-a53/memory.json b/tools/perf/pmu-events/arch/arm64/arm/cortex-a53/memory.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/cortex-a53/memory.json rename to tools/perf/pmu-events/arch/arm64/arm/cortex-a53/memory.json diff --git a/tools/perf/pmu-events/arch/arm64/cortex-a53/other.json b/tools/perf/pmu-events/arch/arm64/arm/cortex-a53/other.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/cortex-a53/other.json rename to tools/perf/pmu-events/arch/arm64/arm/cortex-a53/other.json diff --git a/tools/perf/pmu-events/arch/arm64/cortex-a53/pipeline.json b/tools/perf/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/cortex-a53/pipeline.json rename to tools/perf/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json diff --git a/tools/perf/pmu-events/arch/arm64/mapfile.csv b/tools/perf/pmu-events/arch/arm64/mapfile.csv index 952a05cbf675..cf14e23b6404 100644 --- a/tools/perf/pmu-events/arch/arm64/mapfile.csv +++ b/tools/perf/pmu-events/arch/arm64/mapfile.csv @@ -12,5 +12,5 @@ # # #Family-model,Version,Filename,EventType +0x00000000410fd03[[:xdigit:]],v1,arm/cortex-a53,core 0x00000000420f5160,v1,cavium/thunderx2,core -0x00000000410fd03[[:xdigit:]],v1,cortex-a53,core -- 2.14.3