From 575cb4219b8389448b8cc22f5c8f74a8eb94d694 Mon Sep 17 00:00:00 2001 From: John Garry Date: Thu, 8 Mar 2018 18:58:31 +0800 Subject: [PATCH] perf vendor events arm64: Relocate Cortex A53 JSONs to arm subdirectory BugLink: https://bugs.launchpad.net/bugs/1760712 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@lists.infradead.org Cc: linuxarm@huawei.com Link: http://lkml.kernel.org/r/1520506716-197429-7-git-send-email-john.garry@huawei.com Signed-off-by: Arnaldo Carvalho de Melo (cherry picked from commit 82e6fdd6c01257d64009defbbea19d12ba667670) Signed-off-by: dann frazier Signed-off-by: Seth Forshee --- .../perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/branch.json | 0 tools/perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/bus.json | 0 .../perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/cache.json | 0 .../perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/memory.json | 0 .../perf/pmu-events/arch/arm64/{ => arm}/cortex-a53/other.json | 0 .../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.39.2