Re: [PATCH trivial] perf vendor events intel: Assorted style fixes

From: Arnaldo Carvalho de Melo
Date: Mon Jun 17 2019 - 12:01:45 EST


Em Mon, Jun 17, 2019 at 04:21:56PM +0200, Geert Uytterhoeven escreveu:
> - Do not use apostrophes for plurals,
> - Insert commas before "and",
> - Spelling s/statisfied/satisfied/.

I think these files are generated from some other material from Intel,
i.e. if they update something somewhere else and regenerate those files,
your changes would be lost, right Andi, Kan? (Adding them to the CC list).

- Arnaldo

> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
> ---
> tools/perf/pmu-events/arch/x86/nehalemep/cache.json | 12 ++++++------
> tools/perf/pmu-events/arch/x86/nehalemep/memory.json | 4 ++--
> tools/perf/pmu-events/arch/x86/nehalemex/cache.json | 12 ++++++------
> tools/perf/pmu-events/arch/x86/nehalemex/memory.json | 4 ++--
> .../pmu-events/arch/x86/westmereep-sp/cache.json | 12 ++++++------
> .../pmu-events/arch/x86/westmereep-sp/memory.json | 4 ++--
> tools/perf/pmu-events/arch/x86/westmereex/cache.json | 12 ++++++------
> .../perf/pmu-events/arch/x86/westmereex/memory.json | 4 ++--
> 8 files changed, 32 insertions(+), 32 deletions(-)
>
> diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/cache.json b/tools/perf/pmu-events/arch/x86/nehalemep/cache.json
> index a11029efda2f01e6..1c4fd6af138229e3 100644
> --- a/tools/perf/pmu-events/arch/x86/nehalemep/cache.json
> +++ b/tools/perf/pmu-events/arch/x86/nehalemep/cache.json
> @@ -1804,7 +1804,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.IO_CSR_MMIO",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1815,7 +1815,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_NO_OTHER_CORE",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1826,7 +1826,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_OTHER_CORE_HIT",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1837,7 +1837,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_OTHER_CORE_HITM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1892,7 +1892,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_CACHE_HIT",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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 ",
> "Offcore": "1"
> },
> {
> @@ -1903,7 +1903,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_CACHE_HITM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> diff --git a/tools/perf/pmu-events/arch/x86/nehalemep/memory.json b/tools/perf/pmu-events/arch/x86/nehalemep/memory.json
> index f914a4525b651d0f..029a7fc8561c0629 100644
> --- a/tools/perf/pmu-events/arch/x86/nehalemep/memory.json
> +++ b/tools/perf/pmu-events/arch/x86/nehalemep/memory.json
> @@ -293,7 +293,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LOCAL_DRAM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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.",
> "Offcore": "1"
> },
> {
> @@ -304,7 +304,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_DRAM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> diff --git a/tools/perf/pmu-events/arch/x86/nehalemex/cache.json b/tools/perf/pmu-events/arch/x86/nehalemex/cache.json
> index 21a0f8fd057e8388..980352618ad7e987 100644
> --- a/tools/perf/pmu-events/arch/x86/nehalemex/cache.json
> +++ b/tools/perf/pmu-events/arch/x86/nehalemex/cache.json
> @@ -1759,7 +1759,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.IO_CSR_MMIO",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1770,7 +1770,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_NO_OTHER_CORE",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1781,7 +1781,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_OTHER_CORE_HIT",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1792,7 +1792,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_OTHER_CORE_HITM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1847,7 +1847,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_CACHE_HIT",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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 ",
> "Offcore": "1"
> },
> {
> @@ -1858,7 +1858,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_CACHE_HITM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> diff --git a/tools/perf/pmu-events/arch/x86/nehalemex/memory.json b/tools/perf/pmu-events/arch/x86/nehalemex/memory.json
> index f914a4525b651d0f..029a7fc8561c0629 100644
> --- a/tools/perf/pmu-events/arch/x86/nehalemex/memory.json
> +++ b/tools/perf/pmu-events/arch/x86/nehalemex/memory.json
> @@ -293,7 +293,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LOCAL_DRAM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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.",
> "Offcore": "1"
> },
> {
> @@ -304,7 +304,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_DRAM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> diff --git a/tools/perf/pmu-events/arch/x86/westmereep-sp/cache.json b/tools/perf/pmu-events/arch/x86/westmereep-sp/cache.json
> index dad20f0e3cac235f..62cddfff9781766d 100644
> --- a/tools/perf/pmu-events/arch/x86/westmereep-sp/cache.json
> +++ b/tools/perf/pmu-events/arch/x86/westmereep-sp/cache.json
> @@ -1808,7 +1808,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.IO_CSR_MMIO",
> "MSRIndex": "0x1a6,0x1a7",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1819,7 +1819,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_NO_OTHER_CORE",
> "MSRIndex": "0x1a6,0x1a7",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1830,7 +1830,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_OTHER_CORE_HIT",
> "MSRIndex": "0x1a6,0x1a7",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1841,7 +1841,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_OTHER_CORE_HITM",
> "MSRIndex": "0x1a6,0x1a7",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1896,7 +1896,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_CACHE_HIT",
> "MSRIndex": "0x1a6,0x1a7",
> "SampleAfterValue": "100000",
> - "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 ",
> "Offcore": "1"
> },
> {
> @@ -1907,7 +1907,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_CACHE_HITM",
> "MSRIndex": "0x1a6,0x1a7",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> diff --git a/tools/perf/pmu-events/arch/x86/westmereep-sp/memory.json b/tools/perf/pmu-events/arch/x86/westmereep-sp/memory.json
> index 90eb6aac357b5ffa..8355b5d3945ba8fa 100644
> --- a/tools/perf/pmu-events/arch/x86/westmereep-sp/memory.json
> +++ b/tools/perf/pmu-events/arch/x86/westmereep-sp/memory.json
> @@ -293,7 +293,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LOCAL_DRAM",
> "MSRIndex": "0x1a6,0x1a7",
> "SampleAfterValue": "100000",
> - "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.",
> "Offcore": "1"
> },
> {
> @@ -304,7 +304,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_DRAM",
> "MSRIndex": "0x1a6,0x1a7",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> diff --git a/tools/perf/pmu-events/arch/x86/westmereex/cache.json b/tools/perf/pmu-events/arch/x86/westmereex/cache.json
> index f9bc7fdd48d6e648..30266602fc82e85d 100644
> --- a/tools/perf/pmu-events/arch/x86/westmereex/cache.json
> +++ b/tools/perf/pmu-events/arch/x86/westmereex/cache.json
> @@ -1800,7 +1800,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.IO_CSR_MMIO",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1811,7 +1811,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_NO_OTHER_CORE",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1822,7 +1822,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_OTHER_CORE_HIT",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1833,7 +1833,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LLC_HIT_OTHER_CORE_HITM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> @@ -1888,7 +1888,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_CACHE_HIT",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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 ",
> "Offcore": "1"
> },
> {
> @@ -1899,7 +1899,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_CACHE_HITM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> diff --git a/tools/perf/pmu-events/arch/x86/westmereex/memory.json b/tools/perf/pmu-events/arch/x86/westmereex/memory.json
> index 3ba555e73cbd60d5..794e6773bf74cc0c 100644
> --- a/tools/perf/pmu-events/arch/x86/westmereex/memory.json
> +++ b/tools/perf/pmu-events/arch/x86/westmereex/memory.json
> @@ -301,7 +301,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.LOCAL_DRAM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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.",
> "Offcore": "1"
> },
> {
> @@ -312,7 +312,7 @@
> "EventName": "OFFCORE_RESPONSE.DATA_IN.REMOTE_DRAM",
> "MSRIndex": "0x1A6",
> "SampleAfterValue": "100000",
> - "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",
> "Offcore": "1"
> },
> {
> --
> 2.17.1

--

- Arnaldo