[tip:perf/core] perf vendor events: Add NehalemEX V2 event file

[tip:perf/core] perf vendor events: Add NehalemEX V2 event file

[tip-bot for Andi Kleen]

Commit-ID:  d8c303858582d4dcd90f13ebbe9db812a70d0948
Gitweb:     http://git.kernel.org/tip/d8c303858582d4dcd90f13ebbe9db812a70d0948
Author:     Andi Kleen <ak@linux.intel.com>
AuthorDate: Wed, 5 Oct 2016 09:53:09 -0700
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 17 Oct 2016 13:39:47 -0300

perf vendor events: Add NehalemEX V2 event file

Add a Intel event file for perf.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-ls90fv1f9japmtqbwfr28acf@git.kernel.org
[ Lowercased the directory and file names ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/pmu-events/arch/x86/mapfile.csv         |  1 +
 .../arch/x86/{nehalemep => nehalemex}/cache.json   | 45 ----------------------
 .../{nehalemep => nehalemex}/floating-point.json   |  0
 .../x86/{nehalemep => nehalemex}/frontend.json     |  0
 .../arch/x86/{nehalemep => nehalemex}/memory.json  |  0
 .../arch/x86/{nehalemep => nehalemex}/other.json   |  0
 .../x86/{nehalemep => nehalemex}/pipeline.json     |  0
 .../{nehalemep => nehalemex}/virtual-memory.json   |  0
 8 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/tools/perf/pmu-events/arch/x86/mapfile.csv b/tools/perf/pmu-events/arch/x86/mapfile.csv
index a6d378a..ab7471e 100644
--- a/tools/perf/pmu-events/arch/x86/mapfile.csv
+++ b/tools/perf/pmu-events/arch/x86/mapfile.csv
@@ -20,3 +20,4 @@ GenuineIntel-6-57,v9,knightslanding,core
 GenuineIntel-6-1E,v2,nehalemep,core
 GenuineIntel-6-1F,v2,nehalemep,core
 GenuineIntel-6-1A,v2,nehalemep,core
+GenuineIntel-6-2E,v2,nehalemex,core
diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/cache.json b/tools/perf/pmu-events/arch/x86/nehalemex/cache.json
similarity index 98%
copy from tools/perf/pmu-events/arch/x86/nehalemep/cache.json
copy to tools/perf/pmu-events/arch/x86/nehalemex/cache.json
index a11029e..21a0f8f 100644
--- a/tools/perf/pmu-events/arch/x86/nehalemep/cache.json
+++ b/tools/perf/pmu-events/arch/x86/nehalemex/cache.json
@@ -744,51 +744,6 @@
         "BriefDescription": "Retired loads that hit sibling core's L2 in modified or unmodified states (Precise Event)"
     },
     {
-        "PEBS": "1",
-        "EventCode": "0xF",
-        "Counter": "0,1,2,3",
-        "UMask": "0x20",
-        "EventName": "MEM_UNCORE_RETIRED.LOCAL_DRAM",
-        "SampleAfterValue": "10000",
-        "BriefDescription": "Load instructions retired with a data source of local DRAM or locally homed remote hitm (Precise Event)"
-    },
-    {
-        "PEBS": "1",
-        "EventCode": "0xF",
-        "Counter": "0,1,2,3",
-        "UMask": "0x2",
-        "EventName": "MEM_UNCORE_RETIRED.OTHER_CORE_L2_HITM",
-        "SampleAfterValue": "40000",
-        "BriefDescription": "Load instructions retired that HIT modified data in sibling core (Precise Event)"
-    },
-    {
-        "PEBS": "1",
-        "EventCode": "0xF",
-        "Counter": "0,1,2,3",
-        "UMask": "0x8",
-        "EventName": "MEM_UNCORE_RETIRED.REMOTE_CACHE_LOCAL_HOME_HIT",
-        "SampleAfterValue": "20000",
-        "BriefDescription": "Load instructions retired remote cache HIT data source (Precise Event)"
-    },
-    {
-        "PEBS": "1",
-        "EventCode": "0xF",
-        "Counter": "0,1,2,3",
-        "UMask": "0x10",
-        "EventName": "MEM_UNCORE_RETIRED.REMOTE_DRAM",
-        "SampleAfterValue": "10000",
-        "BriefDescription": "Load instructions retired remote DRAM and remote home-remote cache HITM (Precise Event)"
-    },
-    {
-        "PEBS": "1",
-        "EventCode": "0xF",
-        "Counter": "0,1,2,3",
-        "UMask": "0x80",
-        "EventName": "MEM_UNCORE_RETIRED.UNCACHEABLE",
-        "SampleAfterValue": "4000",
-        "BriefDescription": "Load instructions retired IO (Precise Event)"
-    },
-    {
         "EventCode": "0xB0",
         "Counter": "0,1,2,3",
         "UMask": "0x40",
diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json b/tools/perf/pmu-events/arch/x86/nehalemex/floating-point.json
similarity index 100%
copy from tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json
copy to tools/perf/pmu-events/arch/x86/nehalemex/floating-point.json
diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/frontend.json b/tools/perf/pmu-events/arch/x86/nehalemex/frontend.json
similarity index 100%
copy from tools/perf/pmu-events/arch/x86/nehalemep/frontend.json
copy to tools/perf/pmu-events/arch/x86/nehalemex/frontend.json
diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/memory.json b/tools/perf/pmu-events/arch/x86/nehalemex/memory.json
similarity index 100%
copy from tools/perf/pmu-events/arch/x86/nehalemep/memory.json
copy to tools/perf/pmu-events/arch/x86/nehalemex/memory.json
diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/other.json b/tools/perf/pmu-events/arch/x86/nehalemex/other.json
similarity index 100%
copy from tools/perf/pmu-events/arch/x86/nehalemep/other.json
copy to tools/perf/pmu-events/arch/x86/nehalemex/other.json
diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/pipeline.json b/tools/perf/pmu-events/arch/x86/nehalemex/pipeline.json
similarity index 100%
copy from tools/perf/pmu-events/arch/x86/nehalemep/pipeline.json
copy to tools/perf/pmu-events/arch/x86/nehalemex/pipeline.json
diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json b/tools/perf/pmu-events/arch/x86/nehalemex/virtual-memory.json
similarity index 100%
copy from tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json
copy to tools/perf/pmu-events/arch/x86/nehalemex/virtual-memory.json