Correct xlink names in the events and formulae

Signed-off-by: Santosh Sivaraj <santosiv@in.ibm.com>

2 files changed, 18 insertions, 18 deletions

diff --git a/catalog/csv/events.csv b/catalog/csv/events.csv
index ccbcf2d..b8e5691 100644
--- a/catalog/csv/events.csv
+++ b/catalog/csv/events.csv
@@ -1277,20 +1277,20 @@ domain,counter offset,name,group count,detailed description,flag,record byte off
 1,72,PM_MCS_DOWN_128B_DATA_XFER_MC1_LAST_SAMPLE,1,,0,384,128,3,-1,
 1,80,PM_MCS_DOWN_128B_DATA_XFER_MC2_LAST_SAMPLE,1,,0,384,128,3,-1,
 1,88,PM_MCS_DOWN_128B_DATA_XFER_MC3_LAST_SAMPLE,1,,0,384,128,3,-1,
-1,24,PM_XLINK0_IN_DATA_CYC,1,,0,512,128,4,15,Total X-Link0 inbound data cycles
-1,32,PM_XLINK1_IN_DATA_CYC,1,,0,512,128,4,16,Total X-Link1 inbound data cycles
-1,40,PM_XLINK3_IN_DATA_CYC,1,,0,512,128,4,17,Total X-Link3 inbound data cycles
+1,24,PM_XLINK0_OUT_DATA_CYC,1,,0,512,128,4,15,Total X-Link0 inbound data cycles
+1,32,PM_XLINK1_OUT_DATA_CYC,1,,0,512,128,4,16,Total X-Link1 inbound data cycles
+1,40,PM_XLINK3_OUT_DATA_CYC,1,,0,512,128,4,17,Total X-Link3 inbound data cycles
 1,48,PM_XLINK_CYCLES,2,,0,512,128,4,-1,Xlinks Cycle counts
-1,64,PM_XLINK0_IN_DATA_CYC_LAST_SAMPLE,1,,0,512,128,4,-1,
-1,72,PM_XLINK1_IN_DATA_CYC_LAST_SAMPLE,1,,0,512,128,4,-1,
-1,80,PM_XLINK3_IN_DATA_CYC_LAST_SAMPLE,1,,0,512,128,4,-1,
+1,64,PM_XLINK0_OUT_DATA_CYC_LAST_SAMPLE,1,,0,512,128,4,-1,
+1,72,PM_XLINK1_OUT_DATA_CYC_LAST_SAMPLE,1,,0,512,128,4,-1,
+1,80,PM_XLINK3_OUT_DATA_CYC_LAST_SAMPLE,1,,0,512,128,4,-1,
 1,88,PM_XLINK_CYCLES_LAST_SAMPLE,2,,0,512,128,4,-1,
-1,24,PM_XLINK0_IN_IDL_CYC,1,,0,640,128,5,18,Total X-Link0 inbound Idle cycles
-1,32,PM_XLINK1_IN_IDL_CYC,1,,0,640,128,5,19,Total X-Link1 inbound Idle cycles
-1,40,PM_XLINK3_IN_IDL_CYC,1,,0,640,128,5,20,Total X-Link3 inbound Idle cycles
-1,64,PM_XLINK0_IN_IDL_CYC_LAST_SAMPLE,1,,0,640,128,5,-1,
-1,72,PM_XLINK1_IN_IDL_CYC_LAST_SAMPLE,1,,0,640,128,5,-1,
-1,80,PM_XLINK3_IN_IDL_CYC_LAST_SAMPLE,1,,0,640,128,5,-1,
+1,24,PM_XLINK0_OUT_IDL_CYC,1,,0,640,128,5,18,Total X-Link0 inbound Idle cycles
+1,32,PM_XLINK1_OUT_IDL_CYC,1,,0,640,128,5,19,Total X-Link1 inbound Idle cycles
+1,40,PM_XLINK3_OUT_IDL_CYC,1,,0,640,128,5,20,Total X-Link3 inbound Idle cycles
+1,64,PM_XLINK0_OUT_IDL_CYC_LAST_SAMPLE,1,,0,640,128,5,-1,
+1,72,PM_XLINK1_OUT_IDL_CYC_LAST_SAMPLE,1,,0,640,128,5,-1,
+1,80,PM_XLINK3_OUT_IDL_CYC_LAST_SAMPLE,1,,0,640,128,5,-1,
 1,24,PM_ALINK0_IN_DATA_CYC,1,,0,768,128,6,21,Total A-Link0 inbound data cycles
 1,32,PM_ALINK1_IN_DATA_CYC,1,,0,768,128,6,21,Total A-Link1 inbound data cycles
 1,40,PM_ALINK2_IN_DATA_CYC,1,,0,768,128,6,23,Total A-Link2 inbound data cycles
diff --git a/catalog/csv/formulae.csv b/catalog/csv/formulae.csv
index 1939009..244a74b 100644
--- a/catalog/csv/formulae.csv
+++ b/catalog/csv/formulae.csv
@@ -14,12 +14,12 @@ TOTAL_MC0_WRITE_BW,3,n,0,Total Write Bandwidth seen on both MCS of MC0,(PM_MCS_D
 TOTAL_MC1_WRITE_BW,3,n,0,Total Write Bandwidth seen on both MCS of MC1,(PM_MCS_DOWN_128B_DATA_XFER_MC1*128*PB_Freq)/ PM_PB_CYC,bytes/sec
 TOTAL_MC2_WRITE_BW,3,n,0,Total Write Bandwidth seen on both MCS of MC2,(PM_MCS_DOWN_128B_DATA_XFER_MC2*128*PB_Freq)/ PM_PB_CYC,bytes/sec
 TOTAL_MC3_WRITE_BW,3,n,0,Total Write Bandwidth seen on both MCS of MC3,(PM_MCS_DOWN_128B_DATA_XFER_MC3*128*PB_Freq)/ PM_PB_CYC,bytes/sec
-TOTAL_INBOUND_XLINK0_BW,4,y,4,Total X-Link0 inbound data cycles,(PM_XLINK0_IN_DATA_CYC * 8 * XBUS_Freq) / PM_XLINK_CYCLES,bytes/sec
-TOTAL_INBOUND_XLINK1_BW,4,y,4,Total X-Link1 inbound data cycles,(PM_XLINK1_IN_DATA_CYC * 8 * XBUS_Freq) / PM_XLINK_CYCLES,bytes/sec
-TOTAL_INBOUND_XLINK3_BW,4,y,4,Total X-Link2 inbound data cycles,(PM_XLINK3_IN_DATA_CYC * 8 * XBUS_Freq) / PM_XLINK_CYCLES,bytes/sec
-TOTAL_XLINK0_UTILISATION%,5,y,4,Total X-Link0 inbound Idle cycles,(1 - PM_XLINK0_IN_IDL_CYC/PM_XLINK_CYCLES)*100,%
-TOTAL_XLINK1_UTILISATION%,5,y,4,Total X-Link1 inbound Idle cycles,(1 - PM_XLINK1_IN_IDL_CYC/PM_XLINK_CYCLES)*100,%
-TOTAL_XLINK3_UTILISATION%,5,y,4,Total X-Link3 inbound Idle cycles,(1 - PM_XLINK3_IN_IDL_CYC/PM_XLINK_CYCLES)*100,%
+TOTAL_INBOUND_XLINK0_BW,4,y,4,Total X-Link0 inbound data cycles,(PM_XLINK0_OUT_DATA_CYC * 8 * XBUS_Freq) / PM_XLINK_CYCLES,bytes/sec
+TOTAL_INBOUND_XLINK1_BW,4,y,4,Total X-Link1 inbound data cycles,(PM_XLINK1_OUT_DATA_CYC * 8 * XBUS_Freq) / PM_XLINK_CYCLES,bytes/sec
+TOTAL_INBOUND_XLINK3_BW,4,y,4,Total X-Link2 inbound data cycles,(PM_XLINK3_OUT_DATA_CYC * 8 * XBUS_Freq) / PM_XLINK_CYCLES,bytes/sec
+TOTAL_XLINK0_UTILISATION%,5,y,4,Total X-Link0 inbound Idle cycles,(PM_XLINK_CYCLES - PM_XLINK0_OUT_IDL_CYC/2) / PM_XLINK_CYCLES * 100,%
+TOTAL_XLINK1_UTILISATION%,5,y,4,Total X-Link1 inbound Idle cycles,(PM_XLINK_CYCLES - PM_XLINK1_OUT_IDL_CYC/2) / PM_XLINK_CYCLES * 100,%
+TOTAL_XLINK3_UTILISATION%,5,y,4,Total X-Link3 inbound Idle cycles,(PM_XLINK_CYCLES - PM_XLINK3_OUT_IDL_CYC/2) / PM_XLINK_CYCLES * 100,%
 TOTAL_INBOUND_ALINK0_BW,6,y,4,Total A-Link0 inbound data cycles,(PM_ALINK0_IN_DATA_CYC * 8 * ABUS_Freq) / PM_ALINK_CYCLES,bytes/sec
 TOTAL_INBOUND_ALINK1_BW,6,y,4,Total A-Link1 inbound data cycles,(PM_ALINK1_IN_DATA_CYC * 8 * ABUS_Freq) / PM_ALINK_CYCLES,bytes/sec
 TOTAL_INBOUND_ALINK2_BW,6,y,4,Total A-Link2 inbound data cycles,(PM_ALINK2_IN_DATA_CYC * 8 * ABUS_Freq) / PM_ALINK_CYCLES,bytes/sec