Commit 05c74de4 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf vendor events intel: Fix uncore topics for jaketown 



Remove 'uncore-other' topic classification, move to cache,
interconnect and io.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Edward Baker <edward.baker@intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20230413132949.3487664-16-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 14b4c544

tools/perf/pmu-events/arch/x86/jaketown/uncore-cache.json

+97 −97

File changed.

Preview size limit exceeded, changes collapsed.

tools/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json

+1153 −84

File changed.

Preview size limit exceeded, changes collapsed.

tools/perf/pmu-events/arch/x86/jaketown/uncore-io.json

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

    {

        "BriefDescription": "Number of uclks in domain",

        "EventCode": "0x1",

        "EventName": "UNC_R2_CLOCKTICKS",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of uclks in the R2PCIe uclk domain.  This could be slightly different than the count in the Ubox because of enable/freeze delays.  However, because the R2PCIe is close to the Ubox, they generally should not diverge by more than a handful of cycles.",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2PCIe IIO Credit Acquired; DRS",

        "EventCode": "0x33",

        "EventName": "UNC_R2_IIO_CREDITS_ACQUIRED.DRS",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of credits that are acquired in the R2PCIe agent for sending transactions into the IIO on either NCB or NCS are in use.  Transactions from the BL ring going into the IIO Agent must first acquire a credit.  These credits are for either the NCB or NCS message classes.  NCB, or non-coherent bypass messages are used to transmit data without coherency (and are common).  NCS is used for reads to PCIe (and should be used sparingly).",

        "UMask": "0x8",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2PCIe IIO Credit Acquired; NCB",

        "EventCode": "0x33",

        "EventName": "UNC_R2_IIO_CREDITS_ACQUIRED.NCB",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of credits that are acquired in the R2PCIe agent for sending transactions into the IIO on either NCB or NCS are in use.  Transactions from the BL ring going into the IIO Agent must first acquire a credit.  These credits are for either the NCB or NCS message classes.  NCB, or non-coherent bypass messages are used to transmit data without coherency (and are common).  NCS is used for reads to PCIe (and should be used sparingly).",

        "UMask": "0x10",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2PCIe IIO Credit Acquired; NCS",

        "EventCode": "0x33",

        "EventName": "UNC_R2_IIO_CREDITS_ACQUIRED.NCS",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of credits that are acquired in the R2PCIe agent for sending transactions into the IIO on either NCB or NCS are in use.  Transactions from the BL ring going into the IIO Agent must first acquire a credit.  These credits are for either the NCB or NCS message classes.  NCB, or non-coherent bypass messages are used to transmit data without coherency (and are common).  NCS is used for reads to PCIe (and should be used sparingly).",

        "UMask": "0x20",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2PCIe IIO Failed to Acquire a Credit; DRS",

        "EventCode": "0x34",

        "EventName": "UNC_R2_IIO_CREDITS_REJECT.DRS",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of times that a request pending in the BL Ingress attempted to acquire either a NCB or NCS credit to transmit into the IIO, but was rejected because no credits were available.  NCB, or non-coherent bypass messages are used to transmit data without coherency (and are common).  NCS is used for reads to PCIe (and should be used sparingly).",

        "UMask": "0x8",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2PCIe IIO Failed to Acquire a Credit; NCB",

        "EventCode": "0x34",

        "EventName": "UNC_R2_IIO_CREDITS_REJECT.NCB",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of times that a request pending in the BL Ingress attempted to acquire either a NCB or NCS credit to transmit into the IIO, but was rejected because no credits were available.  NCB, or non-coherent bypass messages are used to transmit data without coherency (and are common).  NCS is used for reads to PCIe (and should be used sparingly).",

        "UMask": "0x10",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2PCIe IIO Failed to Acquire a Credit; NCS",

        "EventCode": "0x34",

        "EventName": "UNC_R2_IIO_CREDITS_REJECT.NCS",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of times that a request pending in the BL Ingress attempted to acquire either a NCB or NCS credit to transmit into the IIO, but was rejected because no credits were available.  NCB, or non-coherent bypass messages are used to transmit data without coherency (and are common).  NCS is used for reads to PCIe (and should be used sparingly).",

        "UMask": "0x20",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2PCIe IIO Credits in Use; DRS",

        "EventCode": "0x32",

        "EventName": "UNC_R2_IIO_CREDITS_USED.DRS",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when one or more credits in the R2PCIe agent for sending transactions into the IIO on either NCB or NCS are in use.  Transactions from the BL ring going into the IIO Agent must first acquire a credit.  These credits are for either the NCB or NCS message classes.  NCB, or non-coherent bypass messages are used to transmit data without coherency (and are common).  NCS is used for reads to PCIe (and should be used sparingly).",

        "UMask": "0x8",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2PCIe IIO Credits in Use; NCB",

        "EventCode": "0x32",

        "EventName": "UNC_R2_IIO_CREDITS_USED.NCB",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when one or more credits in the R2PCIe agent for sending transactions into the IIO on either NCB or NCS are in use.  Transactions from the BL ring going into the IIO Agent must first acquire a credit.  These credits are for either the NCB or NCS message classes.  NCB, or non-coherent bypass messages are used to transmit data without coherency (and are common).  NCS is used for reads to PCIe (and should be used sparingly).",

        "UMask": "0x10",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2PCIe IIO Credits in Use; NCS",

        "EventCode": "0x32",

        "EventName": "UNC_R2_IIO_CREDITS_USED.NCS",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when one or more credits in the R2PCIe agent for sending transactions into the IIO on either NCB or NCS are in use.  Transactions from the BL ring going into the IIO Agent must first acquire a credit.  These credits are for either the NCB or NCS message classes.  NCB, or non-coherent bypass messages are used to transmit data without coherency (and are common).  NCS is used for reads to PCIe (and should be used sparingly).",

        "UMask": "0x20",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 AD Ring in Use; Counterclockwise and Even",

        "EventCode": "0x7",

        "EventName": "UNC_R2_RING_AD_USED.CCW_EVEN",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the AD ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x4",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 AD Ring in Use; Counterclockwise and Odd",

        "EventCode": "0x7",

        "EventName": "UNC_R2_RING_AD_USED.CCW_ODD",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the AD ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x8",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 AD Ring in Use; Clockwise and Even",

        "EventCode": "0x7",

        "EventName": "UNC_R2_RING_AD_USED.CW_EVEN",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the AD ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x1",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 AD Ring in Use; Clockwise and Odd",

        "EventCode": "0x7",

        "EventName": "UNC_R2_RING_AD_USED.CW_ODD",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the AD ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x2",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 AK Ring in Use; Counterclockwise and Even",

        "EventCode": "0x8",

        "EventName": "UNC_R2_RING_AK_USED.CCW_EVEN",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the AK ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x4",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 AK Ring in Use; Counterclockwise and Odd",

        "EventCode": "0x8",

        "EventName": "UNC_R2_RING_AK_USED.CCW_ODD",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the AK ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x8",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 AK Ring in Use; Clockwise and Even",

        "EventCode": "0x8",

        "EventName": "UNC_R2_RING_AK_USED.CW_EVEN",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the AK ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x1",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 AK Ring in Use; Clockwise and Odd",

        "EventCode": "0x8",

        "EventName": "UNC_R2_RING_AK_USED.CW_ODD",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the AK ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x2",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 BL Ring in Use; Counterclockwise and Even",

        "EventCode": "0x9",

        "EventName": "UNC_R2_RING_BL_USED.CCW_EVEN",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the BL ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x4",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 BL Ring in Use; Counterclockwise and Odd",

        "EventCode": "0x9",

        "EventName": "UNC_R2_RING_BL_USED.CCW_ODD",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the BL ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x8",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 BL Ring in Use; Clockwise and Even",

        "EventCode": "0x9",

        "EventName": "UNC_R2_RING_BL_USED.CW_EVEN",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the BL ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x1",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 BL Ring in Use; Clockwise and Odd",

        "EventCode": "0x9",

        "EventName": "UNC_R2_RING_BL_USED.CW_ODD",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the BL ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sent from the ring stop.",

        "UMask": "0x2",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "R2 IV Ring in Use; Any",

        "EventCode": "0xa",

        "EventName": "UNC_R2_RING_IV_USED.ANY",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles that the IV ring is being used at this ring stop.  This includes when packets are passing by and when packets are being sunk, but does not include when packets are being sunk into the ring stop.  The IV ring is unidirectional.  Whether UP or DN is used is dependent on the system programming.  Thereofore, one should generally set both the UP and DN bits for a given polarity (or both) at a given time.",

        "UMask": "0xf",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "AK Ingress Bounced",

        "EventCode": "0x12",

        "EventName": "UNC_R2_RxR_AK_BOUNCES",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of times when a request destined for the AK ingress bounced.",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Ingress Cycles Not Empty; DRS",

        "EventCode": "0x10",

        "EventName": "UNC_R2_RxR_CYCLES_NE.DRS",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when the R2PCIe Ingress is not empty.  This tracks one of the three rings that are used by the R2PCIe agent.  This can be used in conjunction with the R2PCIe Ingress Occupancy Accumulator event in order to calculate average queue occupancy.  Multiple ingress buffers can be tracked at a given time using multiple counters.",

        "UMask": "0x8",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Ingress Cycles Not Empty; NCB",

        "EventCode": "0x10",

        "EventName": "UNC_R2_RxR_CYCLES_NE.NCB",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when the R2PCIe Ingress is not empty.  This tracks one of the three rings that are used by the R2PCIe agent.  This can be used in conjunction with the R2PCIe Ingress Occupancy Accumulator event in order to calculate average queue occupancy.  Multiple ingress buffers can be tracked at a given time using multiple counters.",

        "UMask": "0x10",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Ingress Cycles Not Empty; NCS",

        "EventCode": "0x10",

        "EventName": "UNC_R2_RxR_CYCLES_NE.NCS",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when the R2PCIe Ingress is not empty.  This tracks one of the three rings that are used by the R2PCIe agent.  This can be used in conjunction with the R2PCIe Ingress Occupancy Accumulator event in order to calculate average queue occupancy.  Multiple ingress buffers can be tracked at a given time using multiple counters.",

        "UMask": "0x20",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Egress Cycles Full; AD",

        "EventCode": "0x25",

        "EventName": "UNC_R2_TxR_CYCLES_FULL.AD",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when the R2PCIe Egress buffer is full.",

        "UMask": "0x1",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Egress Cycles Full; AK",

        "EventCode": "0x25",

        "EventName": "UNC_R2_TxR_CYCLES_FULL.AK",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when the R2PCIe Egress buffer is full.",

        "UMask": "0x2",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Egress Cycles Full; BL",

        "EventCode": "0x25",

        "EventName": "UNC_R2_TxR_CYCLES_FULL.BL",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when the R2PCIe Egress buffer is full.",

        "UMask": "0x4",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Egress Cycles Not Empty; AD",

        "EventCode": "0x23",

        "EventName": "UNC_R2_TxR_CYCLES_NE.AD",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when the R2PCIe Egress is not empty.  This tracks one of the three rings that are used by the R2PCIe agent.  This can be used in conjunction with the R2PCIe Egress Occupancy Accumulator event in order to calculate average queue occupancy.  Only a single Egress queue can be tracked at any given time.  It is not possible to filter based on direction or polarity.",

        "UMask": "0x1",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Egress Cycles Not Empty; AK",

        "EventCode": "0x23",

        "EventName": "UNC_R2_TxR_CYCLES_NE.AK",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when the R2PCIe Egress is not empty.  This tracks one of the three rings that are used by the R2PCIe agent.  This can be used in conjunction with the R2PCIe Egress Occupancy Accumulator event in order to calculate average queue occupancy.  Only a single Egress queue can be tracked at any given time.  It is not possible to filter based on direction or polarity.",

        "UMask": "0x2",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Egress Cycles Not Empty; BL",

        "EventCode": "0x23",

        "EventName": "UNC_R2_TxR_CYCLES_NE.BL",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of cycles when the R2PCIe Egress is not empty.  This tracks one of the three rings that are used by the R2PCIe agent.  This can be used in conjunction with the R2PCIe Egress Occupancy Accumulator event in order to calculate average queue occupancy.  Only a single Egress queue can be tracked at any given time.  It is not possible to filter based on direction or polarity.",

        "UMask": "0x4",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Egress NACK; AD",

        "EventCode": "0x26",

        "EventName": "UNC_R2_TxR_NACKS.AD",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of times that the Egress received a NACK from the ring and could not issue a transaction.",

        "UMask": "0x1",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Egress NACK; AK",

        "EventCode": "0x26",

        "EventName": "UNC_R2_TxR_NACKS.AK",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of times that the Egress received a NACK from the ring and could not issue a transaction.",

        "UMask": "0x2",

        "Unit": "R2PCIe"

    },

    {

        "BriefDescription": "Egress NACK; BL",

        "EventCode": "0x26",

        "EventName": "UNC_R2_TxR_NACKS.BL",

        "PerPkg": "1",

        "PublicDescription": "Counts the number of times that the Egress received a NACK from the ring and could not issue a transaction.",

        "UMask": "0x4",

        "Unit": "R2PCIe"

    }

]

tools/perf/pmu-events/arch/x86/jaketown/uncore-other.json

deleted100644 → 0
+0 −1393

File deleted.

Preview size limit exceeded, changes collapsed.