Commit 78282bec authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.17-20180328' of... 

Merge tag 'perf-core-for-mingo-4.17-20180328' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

- Be consistent when checking if a perf_mmap instance had
  its ring buffer unmmaped, fixing segfaults noticed in
  'perf trace' (Kan Liang, Arnaldo Carvalho de Melo)

- Avoid adding the same option multiple times to the 'diff'
  command in check-headers.sh (Jiri Olsa)

- Add vendor event files (JSON format) to various IBM
  s390 models (z10EC, z10BC, z196, zEC12, zBC12, z13
  and z14) (Thomas Richter)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 631fe154 109d59b9

tools/perf/check-headers.sh

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ check () { 
  file=$1



  shift

  opts=

  while [ -n "$*" ]; do

    opts="$opts \"$1\""

    shift

tools/perf/pmu-events/arch/s390/cf_z10/basic.json

0 → 100644
+74 −0
Original line number Diff line number Diff line 
[

	{

		"EventCode": "0",

		"EventName": "CPU_CYCLES",

		"BriefDescription": "CPU Cycles",

		"PublicDescription": "Cycle Count"

	},

	{

		"EventCode": "1",

		"EventName": "INSTRUCTIONS",

		"BriefDescription": "Instructions",

		"PublicDescription": "Instruction Count"

	},

	{

		"EventCode": "2",

		"EventName": "L1I_DIR_WRITES",

		"BriefDescription": "L1I Directory Writes",

		"PublicDescription": "Level-1 I-Cache Directory Write Count"

	},

	{

		"EventCode": "3",

		"EventName": "L1I_PENALTY_CYCLES",

		"BriefDescription": "L1I Penalty Cycles",

		"PublicDescription": "Level-1 I-Cache Penalty Cycle Count"

	},

	{

		"EventCode": "4",

		"EventName": "L1D_DIR_WRITES",

		"BriefDescription": "L1D Directory Writes",

		"PublicDescription": "Level-1 D-Cache Directory Write Count"

	},

	{

		"EventCode": "5",

		"EventName": "L1D_PENALTY_CYCLES",

		"BriefDescription": "L1D Penalty Cycles",

		"PublicDescription": "Level-1 D-Cache Penalty Cycle Count"

	},

	{

		"EventCode": "32",

		"EventName": "PROBLEM_STATE_CPU_CYCLES",

		"BriefDescription": "Problem-State CPU Cycles",

		"PublicDescription": "Problem-State Cycle Count"

	},

	{

		"EventCode": "33",

		"EventName": "PROBLEM_STATE_INSTRUCTIONS",

		"BriefDescription": "Problem-State Instructions",

		"PublicDescription": "Problem-State Instruction Count"

	},

	{

		"EventCode": "34",

		"EventName": "PROBLEM_STATE_L1I_DIR_WRITES",

		"BriefDescription": "Problem-State L1I Directory Writes",

		"PublicDescription": "Problem-State Level-1 I-Cache Directory Write Count"

	},

	{

		"EventCode": "35",

		"EventName": "PROBLEM_STATE_L1I_PENALTY_CYCLES",

		"BriefDescription": "Problem-State L1I Penalty Cycles",

		"PublicDescription": "Problem-State Level-1 I-Cache Penalty Cycle Count"

	},

	{

		"EventCode": "36",

		"EventName": "PROBLEM_STATE_L1D_DIR_WRITES",

		"BriefDescription": "Problem-State L1D Directory Writes",

		"PublicDescription": "Problem-State Level-1 D-Cache Directory Write Count"

	},

	{

		"EventCode": "37",

		"EventName": "PROBLEM_STATE_L1D_PENALTY_CYCLES",

		"BriefDescription": "Problem-State L1D Penalty Cycles",

		"PublicDescription": "Problem-State Level-1 D-Cache Penalty Cycle Count"

	},

]

tools/perf/pmu-events/arch/s390/cf_z10/crypto.json

0 → 100644
+98 −0
Original line number Diff line number Diff line 
[

	{

		"EventCode": "64",

		"EventName": "PRNG_FUNCTIONS",

		"BriefDescription": "PRNG Functions",

		"PublicDescription": "Total number of the PRNG functions issued by the CPU"

	},

	{

		"EventCode": "65",

		"EventName": "PRNG_CYCLES",

		"BriefDescription": "PRNG Cycles",

		"PublicDescription": "Total number of CPU cycles when the DEA/AES coprocessor is busy performing PRNG functions issued by the CPU"

	},

	{

		"EventCode": "66",

		"EventName": "PRNG_BLOCKED_FUNCTIONS",

		"BriefDescription": "PRNG Blocked Functions",

		"PublicDescription": "Total number of the PRNG functions that are issued by the CPU and are blocked because the DEA/AES coprocessor is busy performing a function issued by another CPU"

	},

	{

		"EventCode": "67",

		"EventName": "PRNG_BLOCKED_CYCLES",

		"BriefDescription": "PRNG Blocked Cycles",

		"PublicDescription": "Total number of CPU cycles blocked for the PRNG functions issued by the CPU because the DEA/AES coprocessor is busy performing a function issued by another CPU"

	},

	{

		"EventCode": "68",

		"EventName": "SHA_FUNCTIONS",

		"BriefDescription": "SHA Functions",

		"PublicDescription": "Total number of SHA functions issued by the CPU"

	},

	{

		"EventCode": "69",

		"EventName": "SHA_CYCLES",

		"BriefDescription": "SHA Cycles",

		"PublicDescription": "Total number of CPU cycles when the SHA coprocessor is busy performing the SHA functions issued by the CPU"

	},

	{

		"EventCode": "70",

		"EventName": "SHA_BLOCKED_FUNCTIONS",

		"BriefDescription": "SHA Blocked Functions",

		"PublicDescription": "Total number of the SHA functions that are issued by the CPU and are blocked because the SHA coprocessor is busy performing a function issued by another CPU"

	},

	{

		"EventCode": "71",

		"EventName": "SHA_BLOCKED_CYCLES",

		"BriefDescription": "SHA Bloced Cycles",

		"PublicDescription": "Total number of CPU cycles blocked for the SHA functions issued by the CPU because the SHA coprocessor is busy performing a function issued by another CPU"

	},

	{

		"EventCode": "72",

		"EventName": "DEA_FUNCTIONS",

		"BriefDescription": "DEA Functions",

		"PublicDescription": "Total number of the DEA functions issued by the CPU"

	},

	{

		"EventCode": "73",

		"EventName": "DEA_CYCLES",

		"BriefDescription": "DEA Cycles",

		"PublicDescription": "Total number of CPU cycles when the DEA/AES coprocessor is busy performing the DEA functions issued by the CPU"

	},

	{

		"EventCode": "74",

		"EventName": "DEA_BLOCKED_FUNCTIONS",

		"BriefDescription": "DEA Blocked Functions",

		"PublicDescription": "Total number of the DEA functions that are issued by the CPU and are blocked because the DEA/AES coprocessor is busy performing a function issued by another CPU"

	},

	{

		"EventCode": "75",

		"EventName": "DEA_BLOCKED_CYCLES",

		"BriefDescription": "DEA Blocked Cycles",

		"PublicDescription": "Total number of CPU cycles blocked for the DEA functions issued by the CPU because the DEA/AES coprocessor is busy performing a function issued by another CPU"

	},

	{

		"EventCode": "76",

		"EventName": "AES_FUNCTIONS",

		"BriefDescription": "AES Functions",

		"PublicDescription": "Total number of AES functions issued by the CPU"

	},

	{

		"EventCode": "77",

		"EventName": "AES_CYCLES",

		"BriefDescription": "AES Cycles",

		"PublicDescription": "Total number of CPU cycles when the DEA/AES coprocessor is busy performing the AES functions issued by the CPU"

	},

	{

		"EventCode": "78",

		"EventName": "AES_BLOCKED_FUNCTIONS",

		"BriefDescription": "AES Blocked Functions",

		"PublicDescription": "Total number of AES functions that are issued by the CPU and are blocked because the DEA/AES coprocessor is busy performing a function issued by another CPU"

	},

	{

		"EventCode": "79",

		"EventName": "AES_BLOCKED_CYCLES",

		"BriefDescription": "AES Blocked Cycles",

		"PublicDescription": "Total number of CPU cycles blocked for the AES functions issued by the CPU because the DEA/AES coprocessor is busy performing a function issued by another CPU"

	},

]

tools/perf/pmu-events/arch/s390/cf_z10/extended.json

0 → 100644
+110 −0
Original line number Diff line number Diff line 
[

	{

		"EventCode": "128",

		"EventName": "L1I_L2_SOURCED_WRITES",

		"BriefDescription": "L1I L2 Sourced Writes",

		"PublicDescription": "A directory write to the Level-1 I-Cache directory where the returned cache line was sourced from the Level-2 (L1.5) cache"

	},

	{

		"EventCode": "129",

		"EventName": "L1D_L2_SOURCED_WRITES",

		"BriefDescription": "L1D L2 Sourced Writes",

		"PublicDescription": "A directory write to the Level-1 D-Cache directory where the installed cache line was sourced from the Level-2 (L1.5) cache"

	},

	{

		"EventCode": "130",

		"EventName": "L1I_L3_LOCAL_WRITES",

		"BriefDescription": "L1I L3 Local Writes",

		"PublicDescription": "A directory write to the Level-1 I-Cache directory where the installed cache line was sourced from the Level-3 cache that is on the same book as the Instruction cache (Local L2 cache)"

	},

	{

		"EventCode": "131",

		"EventName": "L1D_L3_LOCAL_WRITES",

		"BriefDescription": "L1D L3 Local Writes",

		"PublicDescription": "A directory write to the Level-1 D-Cache directory where the installtion cache line was source from the Level-3 cache that is on the same book as the Data cache (Local L2 cache)"

	},

	{

		"EventCode": "132",

		"EventName": "L1I_L3_REMOTE_WRITES",

		"BriefDescription": "L1I L3 Remote Writes",

		"PublicDescription": "A directory write to the Level-1 I-Cache directory where the installed cache line was sourced from a Level-3 cache that is not on the same book as the Instruction cache (Remote L2 cache)"

	},

	{

		"EventCode": "133",

		"EventName": "L1D_L3_REMOTE_WRITES",

		"BriefDescription": "L1D L3 Remote Writes",

		"PublicDescription": "A directory write to the Level-1 D-Cache directory where the installed cache line was sourced from a Level-3 cache that is not on the same book as the Data cache (Remote L2 cache)"

	},

	{

		"EventCode": "134",

		"EventName": "L1D_LMEM_SOURCED_WRITES",

		"BriefDescription": "L1D Local Memory Sourced Writes",

		"PublicDescription": "A directory write to the Level-1 D-Cache directory where the installed cache line was sourced from memory that is attached to the same book as the Data cache (Local Memory)"

	},

	{

		"EventCode": "135",

		"EventName": "L1I_LMEM_SOURCED_WRITES",

		"BriefDescription": "L1I Local Memory Sourced Writes",

		"PublicDescription": "A directory write to the Level-1 I-Cache where the installed cache line was sourced from memory that is attached to the s ame book as the Instruction cache (Local Memory)"

	},

	{

		"EventCode": "136",

		"EventName": "L1D_RO_EXCL_WRITES",

		"BriefDescription": "L1D Read-only Exclusive Writes",

		"PublicDescription": "A directory write to the Level-1 D-Cache where the line was originally in a Read-Only state in the cache but has been updated to be in the Exclusive state that allows stores to the cache line"

	},

	{

		"EventCode": "137",

		"EventName": "L1I_CACHELINE_INVALIDATES",

		"BriefDescription": "L1I Cacheline Invalidates",

		"PublicDescription": "A cache line in the Level-1 I-Cache has been invalidated by a store on the same CPU as the Level-1 I-Cache"

	},

	{

		"EventCode": "138",

		"EventName": "ITLB1_WRITES",

		"BriefDescription": "ITLB1 Writes",

		"PublicDescription": "A translation entry has been written into the Level-1 Instruction Translation Lookaside Buffer"

	},

	{

		"EventCode": "139",

		"EventName": "DTLB1_WRITES",

		"BriefDescription": "DTLB1 Writes",

		"PublicDescription": "A translation entry has been written to the Level-1 Data Translation Lookaside Buffer"

	},

	{

		"EventCode": "140",

		"EventName": "TLB2_PTE_WRITES",

		"BriefDescription": "TLB2 PTE Writes",

		"PublicDescription": "A translation entry has been written to the Level-2 TLB Page Table Entry arrays"

	},

	{

		"EventCode": "141",

		"EventName": "TLB2_CRSTE_WRITES",

		"BriefDescription": "TLB2 CRSTE Writes",

		"PublicDescription": "A translation entry has been written to the Level-2 TLB Common Region Segment Table Entry arrays"

	},

	{

		"EventCode": "142",

		"EventName": "TLB2_CRSTE_HPAGE_WRITES",

		"BriefDescription": "TLB2 CRSTE One-Megabyte Page Writes",

		"PublicDescription": "A translation entry has been written to the Level-2 TLB Common Region Segment Table Entry arrays for a one-megabyte large page translation"

	},

	{

		"EventCode": "145",

		"EventName": "ITLB1_MISSES",

		"BriefDescription": "ITLB1 Misses",

		"PublicDescription": "Level-1 Instruction TLB miss in progress. Incremented by one for every cycle an ITLB1 miss is in progress"

	},

	{

		"EventCode": "146",

		"EventName": "DTLB1_MISSES",

		"BriefDescription": "DTLB1 Misses",

		"PublicDescription": "Level-1 Data TLB miss in progress. Incremented by one for every cycle an DTLB1 miss is in progress"

	},

	{

		"EventCode": "147",

		"EventName": "L2C_STORES_SENT",

		"BriefDescription": "L2C Stores Sent",

		"PublicDescription": "Incremented by one for every store sent to Level-2 (L1.5) cache"

	},

]

tools/perf/pmu-events/arch/s390/cf_z13/basic.json

0 → 100644
+74 −0
Original line number Diff line number Diff line 
[

	{

		"EventCode": "0",

		"EventName": "CPU_CYCLES",

		"BriefDescription": "CPU Cycles",

		"PublicDescription": "Cycle Count"

	},

	{

		"EventCode": "1",

		"EventName": "INSTRUCTIONS",

		"BriefDescription": "Instructions",

		"PublicDescription": "Instruction Count"

	},

	{

		"EventCode": "2",

		"EventName": "L1I_DIR_WRITES",

		"BriefDescription": "L1I Directory Writes",

		"PublicDescription": "Level-1 I-Cache Directory Write Count"

	},

	{

		"EventCode": "3",

		"EventName": "L1I_PENALTY_CYCLES",

		"BriefDescription": "L1I Penalty Cycles",

		"PublicDescription": "Level-1 I-Cache Penalty Cycle Count"

	},

	{

		"EventCode": "4",

		"EventName": "L1D_DIR_WRITES",

		"BriefDescription": "L1D Directory Writes",

		"PublicDescription": "Level-1 D-Cache Directory Write Count"

	},

	{

		"EventCode": "5",

		"EventName": "L1D_PENALTY_CYCLES",

		"BriefDescription": "L1D Penalty Cycles",

		"PublicDescription": "Level-1 D-Cache Penalty Cycle Count"

	},

	{

		"EventCode": "32",

		"EventName": "PROBLEM_STATE_CPU_CYCLES",

		"BriefDescription": "Problem-State CPU Cycles",

		"PublicDescription": "Problem-State Cycle Count"

	},

	{

		"EventCode": "33",

		"EventName": "PROBLEM_STATE_INSTRUCTIONS",

		"BriefDescription": "Problem-State Instructions",

		"PublicDescription": "Problem-State Instruction Count"

	},

	{

		"EventCode": "34",

		"EventName": "PROBLEM_STATE_L1I_DIR_WRITES",

		"BriefDescription": "Problem-State L1I Directory Writes",

		"PublicDescription": "Problem-State Level-1 I-Cache Directory Write Count"

	},

	{

		"EventCode": "35",

		"EventName": "PROBLEM_STATE_L1I_PENALTY_CYCLES",

		"BriefDescription": "Problem-State L1I Penalty Cycles",

		"PublicDescription": "Problem-State Level-1 I-Cache Penalty Cycle Count"

	},

	{

		"EventCode": "36",

		"EventName": "PROBLEM_STATE_L1D_DIR_WRITES",

		"BriefDescription": "Problem-State L1D Directory Writes",

		"PublicDescription": "Problem-State Level-1 D-Cache Directory Write Count"

	},

	{

		"EventCode": "37",

		"EventName": "PROBLEM_STATE_L1D_PENALTY_CYCLES",

		"BriefDescription": "Problem-State L1D Penalty Cycles",

		"PublicDescription": "Problem-State Level-1 D-Cache Penalty Cycle Count"

	},

]

CRA Git | Maintained and supported by SUSTech CRA and CCSE