lkml.org 
[lkml]   [2022]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v1 20/31] perf vendor events: Update Intel nehalemep
    From
    Use script at:
    https://github.com/intel/event-converter-for-linux-perf/blob/master/download_and_gen.py

    to download and generate the latest events and metrics. Manually copy
    the nehalemep files into perf and update mapfile.csv.

    Tested on a non-nehalemep with 'perf test':
    10: PMU events :
    10.1: PMU event table sanity : Ok
    10.2: PMU event map aliases : Ok
    10.3: Parsing of PMU event table metrics : Ok
    10.4: Parsing of PMU event table metrics with fake PMUs : Ok

    Signed-off-by: Ian Rogers <irogers@google.com>
    ---
    tools/perf/pmu-events/arch/x86/mapfile.csv | 4 +---
    .../perf/pmu-events/arch/x86/nehalemep/cache.json | 14 +++++++-------
    .../arch/x86/nehalemep/floating-point.json | 2 +-
    .../pmu-events/arch/x86/nehalemep/frontend.json | 2 +-
    .../perf/pmu-events/arch/x86/nehalemep/memory.json | 6 +++---
    .../arch/x86/nehalemep/virtual-memory.json | 2 +-
    6 files changed, 14 insertions(+), 16 deletions(-)

    diff --git a/tools/perf/pmu-events/arch/x86/mapfile.csv b/tools/perf/pmu-events/arch/x86/mapfile.csv
    index 7d6731e81102..8336f2c8f96f 100644
    --- a/tools/perf/pmu-events/arch/x86/mapfile.csv
    +++ b/tools/perf/pmu-events/arch/x86/mapfile.csv
    @@ -17,9 +17,7 @@ GenuineIntel-6-3E,v21,ivytown,core
    GenuineIntel-6-2D,v21,jaketown,core
    GenuineIntel-6-(57|85),v9,knightslanding,core
    GenuineIntel-6-AA,v1.00,meteorlake,core
    -GenuineIntel-6-1E,v2,nehalemep,core
    -GenuineIntel-6-1F,v2,nehalemep,core
    -GenuineIntel-6-1A,v2,nehalemep,core
    +GenuineIntel-6-1[AEF],v3,nehalemep,core
    GenuineIntel-6-2E,v2,nehalemex,core
    GenuineIntel-6-[4589]E,v24,skylake,core
    GenuineIntel-6-A[56],v24,skylake,core
    diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/cache.json b/tools/perf/pmu-events/arch/x86/nehalemep/cache.json
    index bcf74d793ae2..1ee91300baf9 100644
    --- a/tools/perf/pmu-events/arch/x86/nehalemep/cache.json
    +++ b/tools/perf/pmu-events/arch/x86/nehalemep/cache.json
    @@ -1773,7 +1773,7 @@
    "UMask": "0x1"
    },
    {
    - "BriefDescription": "Offcore data reads, RFO's and prefetches satisfied by the IO, CSR, MMIO unit",
    + "BriefDescription": "Offcore data reads, RFOs, and prefetches satisfied by the IO, CSR, MMIO unit",
    "Counter": "2",
    "EventCode": "0xB7",
    "EventName": "OFFCORE_RESPONSE.DATA_IN.IO_CSR_MMIO",
    @@ -1784,7 +1784,7 @@
    "UMask": "0x1"
    },
    {
    - "BriefDescription": "Offcore data reads, RFO's and prefetches statisfied by the LLC and not found in a sibling core",
    + "BriefDescription": "Offcore data reads, RFOs, and prefetches satisfied by the LLC and not found in a sibling core",
    "Counter": "2",
    "EventCode": "0xB7",
    "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_NO_OTHER_CORE",
    @@ -1795,7 +1795,7 @@
    "UMask": "0x1"
    },
    {
    - "BriefDescription": "Offcore data reads, RFO's and prefetches satisfied by the LLC and HIT in a sibling core",
    + "BriefDescription": "Offcore data reads, RFOs, and prefetches satisfied by the LLC and HIT in a sibling core",
    "Counter": "2",
    "EventCode": "0xB7",
    "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_OTHER_CORE_HIT",
    @@ -1806,7 +1806,7 @@
    "UMask": "0x1"
    },
    {
    - "BriefDescription": "Offcore data reads, RFO's and prefetches satisfied by the LLC and HITM in a sibling core",
    + "BriefDescription": "Offcore data reads, RFOs, and prefetches satisfied by the LLC and HITM in a sibling core",
    "Counter": "2",
    "EventCode": "0xB7",
    "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_OTHER_CORE_HITM",
    @@ -1861,7 +1861,7 @@
    "UMask": "0x1"
    },
    {
    - "BriefDescription": "Offcore data reads, RFO's and prefetches that HIT in a remote cache",
    + "BriefDescription": "Offcore data reads, RFOs, and prefetches that HIT in a remote cache",
    "Counter": "2",
    "EventCode": "0xB7",
    "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_CACHE_HIT",
    @@ -1872,7 +1872,7 @@
    "UMask": "0x1"
    },
    {
    - "BriefDescription": "Offcore data reads, RFO's and prefetches that HITM in a remote cache",
    + "BriefDescription": "Offcore data reads, RFOs, and prefetches that HITM in a remote cache",
    "Counter": "2",
    "EventCode": "0xB7",
    "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_CACHE_HITM",
    @@ -3226,4 +3226,4 @@
    "SampleAfterValue": "200000",
    "UMask": "0x8"
    }
    -]
    \ No newline at end of file
    +]
    diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json b/tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json
    index 39af1329224a..666e466d351c 100644
    --- a/tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json
    +++ b/tools/perf/pmu-events/arch/x86/nehalemep/floating-point.json
    @@ -226,4 +226,4 @@
    "SampleAfterValue": "200000",
    "UMask": "0x8"
    }
    -]
    \ No newline at end of file
    +]
    diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/frontend.json b/tools/perf/pmu-events/arch/x86/nehalemep/frontend.json
    index 8ac5c24888c5..c561ac24d91d 100644
    --- a/tools/perf/pmu-events/arch/x86/nehalemep/frontend.json
    +++ b/tools/perf/pmu-events/arch/x86/nehalemep/frontend.json
    @@ -23,4 +23,4 @@
    "SampleAfterValue": "2000000",
    "UMask": "0x1"
    }
    -]
    \ No newline at end of file
    +]
    diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/memory.json b/tools/perf/pmu-events/arch/x86/nehalemep/memory.json
    index 26138ae639f4..6e95de3f3409 100644
    --- a/tools/perf/pmu-events/arch/x86/nehalemep/memory.json
    +++ b/tools/perf/pmu-events/arch/x86/nehalemep/memory.json
    @@ -286,7 +286,7 @@
    "UMask": "0x1"
    },
    {
    - "BriefDescription": "Offcore data reads, RFO's and prefetches statisfied by the local DRAM.",
    + "BriefDescription": "Offcore data reads, RFOs, and prefetches satisfied by the local DRAM.",
    "Counter": "2",
    "EventCode": "0xB7",
    "EventName": "OFFCORE_RESPONSE.DATA_IN.LOCAL_DRAM",
    @@ -297,7 +297,7 @@
    "UMask": "0x1"
    },
    {
    - "BriefDescription": "Offcore data reads, RFO's and prefetches statisfied by the remote DRAM",
    + "BriefDescription": "Offcore data reads, RFOs, and prefetches satisfied by the remote DRAM",
    "Counter": "2",
    "EventCode": "0xB7",
    "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_DRAM",
    @@ -736,4 +736,4 @@
    "SampleAfterValue": "100000",
    "UMask": "0x1"
    }
    -]
    \ No newline at end of file
    +]
    diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json b/tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json
    index 6d3247c55bcd..e88c0802e679 100644
    --- a/tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json
    +++ b/tools/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json
    @@ -106,4 +106,4 @@
    "SampleAfterValue": "200000",
    "UMask": "0x1"
    }
    -]
    \ No newline at end of file
    +]
    --
    2.37.1.359.gd136c6c3e2-goog
    \
     
     \ /
      Last update: 2022-07-23 00:36    [W:3.556 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site