--- a/docs/amd-family10-events
+++ b/docs/amd-family10-events
@@ -1260,7 +1260,7 @@
 
 </tr>
 
-<tr><td>NON_CANCELLED_L3_READ_REQUESTS</td><td>	IBS northbridge remote cache latency </td><td> all</td><td>
+<tr><td>NON_CANCELLED_L3_READ_REQUESTS</td><td>	Non-cancelled L3 Read Requests </td><td> all</td><td>
 	0x01: RbBlk
  <br />
 	0x02: RbBlkS
@@ -1275,195 +1275,495 @@
  <br />
 	0x80: Reserved (Must be selected)
  <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-	0x00: Using IBS OP cycle count mode
- <br />
-	0x01: Using IBS OP dispatch count mode
- <br />
-</td>
-
-</tr>
-
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_ALL</td><td>	All IBS fetch samples </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_KILLED</td><td>	IBS fetch killed </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_ATTEMPTED</td><td>	IBS fetch attempted </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_COMPLETED</td><td>	IBS fetch completed </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_ABORTED</td><td>	IBS fetch aborted </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_ITLB_HITS</td><td>	IBS ITLB hit </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_L1_ITLB_MISSES_L2_ITLB_HITS</td><td>	IBS L1 ITLB misses (and L2 ITLB hits) </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_L1_ITLB_MISSES_L2_ITLB_MISSES</td><td>	IBS L1 L2 ITLB miss </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_ICACHE_MISSES</td><td>	IBS Instruction cache misses </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_ICACHE_HITS</td><td>	IBS Instruction cache hit </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_4K_PAGE</td><td>	IBS 4K page translation </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_2M_PAGE</td><td>	IBS 2M page translation </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_FETCH_LATENCY</td><td>	IBS fetch latency </td><td> ibs_fetch</td><td>
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_ALL</td><td>	All IBS op samples </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_TAG_TO_RETIRE</td><td>	IBS tag-to-retire cycles </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_COMP_TO_RET</td><td>	IBS completion-to-retire cycles </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_BRANCH_RETIRED</td><td>	IBS branch op </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_MISPREDICTED_BRANCH</td><td>	IBS mispredicted branch op </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_TAKEN_BRANCH</td><td>	IBS taken branch op </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_MISPREDICTED_BRANCH_TAKEN</td><td>	IBS mispredicted taken branch op </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_RETURNS</td><td>	IBS return op </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_MISPREDICTED_RETURNS</td><td>	IBS mispredicted return op </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_RESYNC</td><td>	IBS resync op </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_ALL_LOAD_STORE</td><td>	IBS all load store ops </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_LOAD</td><td>	IBS load ops </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_STORE</td><td>	IBS store ops </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_L1_DTLB_HITS</td><td>	IBS L1 DTLB hit </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_L1_DTLB_MISS_L2_DTLB_HIT</td><td>	IBS L1 DTLB misses L2 hits </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_L1_L2_DTLB_MISS</td><td>	IBS L1 and L2 DTLB misses </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_DATA_CACHE_MISS</td><td>	IBS data cache misses </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_DATA_HITS</td><td>	IBS data cache hits </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_MISALIGNED_DATA_ACC</td><td>	IBS misaligned data access </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_BANK_CONF_LOAD</td><td>	IBS bank conflict on load op </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_BANK_CONF_STORE</td><td>	IBS bank conflict on store op </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_FORWARD</td><td>	IBS store-to-load forwarded </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_CANCELLED</td><td>	IBS store-to-load cancelled </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_DCUC_MEM_ACC</td><td>	IBS UC memory access </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_DCWC_MEM_ACC</td><td>	IBS WC memory access </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_LOCKED</td><td>	IBS locked operation </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_MAB_HIT</td><td>	IBS MAB hit </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_L1_DTLB_4K</td><td>	IBS L1 DTLB 4K page </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_L1_DTLB_2M</td><td>	IBS L1 DTLB 2M page </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_L1_DTLB_1G</td><td>	IBS L1 DTLB 1G page </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_L2_DTLB_4K</td><td>	IBS L2 DTLB 4K page </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_L2_DTLB_2M</td><td>	IBS L2 DTLB 2M page </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_L2_DTLB_1G</td><td>	IBS L2 DTLB 1G page </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_DC_LOAD_LAT</td><td>	IBS data cache miss load latency </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_LOCAL_ONLY</td><td>	IBS northbridge local </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_REMOTE_ONLY</td><td>	IBS northbridge remote </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_LOCAL_L3</td><td>	IBS northbridge local L3 </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_LOCAL_CACHE</td><td>	IBS northbridge local core L1 or L2 cache </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_REMOTE_CACHE</td><td>	IBS northbridge local core L1, L2, L3 cache </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_LOCAL_DRAM</td><td>	IBS northbridge local DRAM </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_REMOTE_DRAM</td><td>	IBS northbridge remote DRAM </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_LOCAL_OTHER</td><td>	IBS northbridge local APIC MMIO Config PCI </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_REMOTE_OTHER</td><td>	IBS northbridge remote APIC MMIO Config PCI </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_CACHE_MODIFIED</td><td>	IBS northbridge cache modified state </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_CACHE_OWNED</td><td>	IBS northbridge cache owned state </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_LOCAL_CACHE_LAT</td><td>	IBS northbridge local cache latency </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+
+<tr><td>IBS_OP_NB_REMOTE_CACHE_LAT</td><td>	IBS northbridge remote cache latency </td><td> ibs_op</td><td>
+	0x00: Using IBS OP cycle count mode
+ <br />
+	0x01: Using IBS OP dispatch count mode
+ <br />
+</td>
+
+</tr>
+