--- a/docs/intel-core2-events
+++ b/docs/intel-core2-events
@@ -1,4 +1,4 @@
-<tr><td>CPU_CLK_UNHALTED</td><td>	Clock cycles when not halted </td><td> all</td><td>
+<tr><td>CPU_CLK_UNHALTED</td><td>	Clock cycles when not halted </td><td> 0, 1</td><td>
 	0x00: Unhalted core cycles
  <br />
 	0x01: Unhalted bus cycles
@@ -9,12 +9,12 @@
 
 </tr>
 
-<tr><td>INST_RETIRED_ANY_P</td><td>	number of instructions retired </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>L2_RQSTS</td><td>	number of L2 cache requests </td><td> all</td><td>
+<tr><td>INST_RETIRED_ANY_P</td><td>	number of instructions retired </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>L2_RQSTS</td><td>	number of L2 cache requests </td><td> 0, 1</td><td>
 	0xc0: core: all cores
  <br />
 	0x40: core: this core
@@ -37,57 +37,57 @@
 
 </tr>
 
-<tr><td>LLC_MISSES</td><td>	L2 cache demand requests from this core that missed the L2 </td><td> all</td><td>
+<tr><td>LLC_MISSES</td><td>	L2 cache demand requests from this core that missed the L2 </td><td> 0, 1</td><td>
 	0x41: No unit mask
  <br />
 </td>
 
 </tr>
 
-<tr><td>LLC_REFS</td><td>	L2 cache demand requests from this core </td><td> all</td><td>
+<tr><td>LLC_REFS</td><td>	L2 cache demand requests from this core </td><td> 0, 1</td><td>
 	0x4f: No unit mask
  <br />
 </td>
 
 </tr>
 
-<tr><td>LOAD_BLOCK</td><td>	events pertaining to loads </td><td> all</td><td>
-	0x02: STA Loads blocked by a preceding store with unknown address.
- <br />
-	0x04: STD Loads blocked by a preceding store with unknown data.
- <br />
-	0x08: OVERLAP_STORE Loads that partially overlap an earlier store, or 4K aliased with a previous store.
- <br />
-	0x10: UNTIL_RETIRE Loads blocked until retirement.
- <br />
-	0x20: L1D Loads blocked by the L1 data cache.
- <br />
-</td>
-
-</tr>
-
-<tr><td>STORE_BLOCK</td><td>	events pertaining to stores </td><td> all</td><td>
-	0x01: SB_DRAIN_CYCLES	Cycles while stores are blocked due to store buffer drain.
- <br />
-	0x02: ORDER	Cycles while store is waiting for a preceding store to be globally observed.
- <br />
-	0x08: NOOP	A store is blocked due to a conflict with an external or internal snoop.
- <br />
-</td>
-
-</tr>
-
-<tr><td>MISALIGN_MEM_REF</td><td>	number of misaligned data memory references </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>SEGMENT_REG_LOADS</td><td>	number of segment register loads </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>SSE_PRE_EXEC</td><td>	number of SSE pre-fetch/weakly ordered insns retired </td><td> all</td><td>
+<tr><td>LOAD_BLOCK</td><td>	events pertaining to loads </td><td> 0, 1</td><td>
+	0x02: (name=STA) Loads blocked by a preceding store with unknown address.
+ <br />
+	0x04: (name=STD) Loads blocked by a preceding store with unknown data.
+ <br />
+	0x08: (name=OVERLAP_STORE) Loads that partially overlap an earlier store, or 4K aliased with a previous store.
+ <br />
+	0x10: (name=UNTIL_RETIRE) Loads blocked until retirement.
+ <br />
+	0x20: (name=L1D) Loads blocked by the L1 data cache.
+ <br />
+</td>
+
+</tr>
+
+<tr><td>STORE_BLOCK</td><td>	events pertaining to stores </td><td> 0, 1</td><td>
+	0x01: (name=SB_DRAIN_CYCLES) Cycles while stores are blocked due to store buffer drain.
+ <br />
+	0x02: (name=ORDER) Cycles while store is waiting for a preceding store to be globally observed.
+ <br />
+	0x08: (name=NOOP) A store is blocked due to a conflict with an external or internal snoop.
+ <br />
+</td>
+
+</tr>
+
+<tr><td>MISALIGN_MEM_REF</td><td>	number of misaligned data memory references </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>SEGMENT_REG_LOADS</td><td>	number of segment register loads </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>SSE_PRE_EXEC</td><td>	number of SSE pre-fetch/weakly ordered insns retired </td><td> 0, 1</td><td>
 	0x00: prefetch NTA instructions executed.
  <br />
 	0x01: prefetch T1 instructions executed.
@@ -100,79 +100,79 @@
 
 </tr>
 
-<tr><td>DTLB_MISSES</td><td>	DTLB miss events </td><td> all</td><td>
-	0x01: ANY	Memory accesses that missed the DTLB.
- <br />
-	0x02: MISS_LD	DTLB misses due to load operations.
- <br />
-	0x04: L0_MISS_LD L0 DTLB misses due to load operations.
- <br />
-	0x08: MISS_ST	TLB misses due to store operations.
- <br />
-</td>
-
-</tr>
-
-<tr><td>MEMORY_DISAMBIGUATION</td><td>	Memory disambiguation reset cycles. </td><td> all</td><td>
-	0x01: RESET	Memory disambiguation reset cycles.
- <br />
-	0x02: SUCCESS	Number of loads that were successfully disambiguated.
- <br />
-</td>
-
-</tr>
-
-<tr><td>PAGE_WALKS</td><td>	Page table walk events </td><td> all</td><td>
-	0x01: COUNT	Number of page-walks executed.
- <br />
-	0x02: CYCLES	Duration of page-walks in core cycles.
- <br />
-</td>
-
-</tr>
-
-<tr><td>FLOPS</td><td>	number of FP computational micro-ops executed </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>FP_ASSIST</td><td>	number of FP assists </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>MUL</td><td>	number of multiplies </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>DIV</td><td>	number of divides </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>CYCLES_DIV_BUSY</td><td>	cycles divider is busy </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>IDLE_DURING_DIV</td><td>	cycles divider is busy and all other execution units are idle. </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>DELAYED_BYPASS</td><td>	Delayed bypass events </td><td> all</td><td>
-	0x00: FP		Delayed bypass to FP operation.
- <br />
-	0x01: SIMD	Delayed bypass to SIMD operation.
- <br />
-	0x02: LOAD	Delayed bypass to load operation.
- <br />
-</td>
-
-</tr>
-
-<tr><td>L2_ADS</td><td>	Cycles the L2 address bus is in use. </td><td> all</td><td>
+<tr><td>DTLB_MISSES</td><td>	DTLB miss events </td><td> 0, 1</td><td>
+	0x01: (name=ANY) Memory accesses that missed the DTLB.
+ <br />
+	0x02: (name=MISS_LD) DTLB misses due to load operations.
+ <br />
+	0x04: (name=L0_MISS_LD) L0 DTLB misses due to load operations.
+ <br />
+	0x08: (name=MISS_ST) TLB misses due to store operations.
+ <br />
+</td>
+
+</tr>
+
+<tr><td>MEMORY_DISAMBIGUATION</td><td>	Memory disambiguation reset cycles. </td><td> 0, 1</td><td>
+	0x01: (name=RESET) Memory disambiguation reset cycles.
+ <br />
+	0x02: (name=SUCCESS) Number of loads that were successfully disambiguated.
+ <br />
+</td>
+
+</tr>
+
+<tr><td>PAGE_WALKS</td><td>	Page table walk events </td><td> 0, 1</td><td>
+	0x01: (name=COUNT) Number of page-walks executed.
+ <br />
+	0x02: (name=CYCLES) Duration of page-walks in core cycles.
+ <br />
+</td>
+
+</tr>
+
+<tr><td>FLOPS</td><td>	number of FP computational micro-ops executed </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>FP_ASSIST</td><td>	number of FP assists </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>MUL</td><td>	number of multiplies </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>DIV</td><td>	number of divides </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>CYCLES_DIV_BUSY</td><td>	cycles divider is busy </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>IDLE_DURING_DIV</td><td>	cycles divider is busy and all other execution units are idle. </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>DELAYED_BYPASS</td><td>	Delayed bypass events </td><td> 0, 1</td><td>
+	0x00: (name=FP) Delayed bypass to FP operation.
+ <br />
+	0x01: (name=SIMD) Delayed bypass to SIMD operation.
+ <br />
+	0x02: (name=LOAD) Delayed bypass to load operation.
+ <br />
+</td>
+
+</tr>
+
+<tr><td>L2_ADS</td><td>	Cycles the L2 address bus is in use. </td><td> 0, 1</td><td>
 	0xc0: All cores
  <br />
 	0x40: This core
@@ -181,7 +181,7 @@
 
 </tr>
 
-<tr><td>L2_DBUS_BUSY_RD</td><td>	Cycles the L2 transfers data to the core. </td><td> all</td><td>
+<tr><td>L2_DBUS_BUSY_RD</td><td>	Cycles the L2 transfers data to the core. </td><td> 0, 1</td><td>
 	0xc0: All cores
  <br />
 	0x40: This core
@@ -190,7 +190,7 @@
 
 </tr>
 
-<tr><td>L2_LINES_IN</td><td>	number of allocated lines in L2 </td><td> all</td><td>
+<tr><td>L2_LINES_IN</td><td>	number of allocated lines in L2 </td><td> 0, 1</td><td>
 	0xc0: core: all cores
  <br />
 	0x40: core: this core
@@ -205,7 +205,7 @@
 
 </tr>
 
-<tr><td>L2_M_LINES_IN</td><td>	number of modified lines allocated in L2 </td><td> all</td><td>
+<tr><td>L2_M_LINES_IN</td><td>	number of modified lines allocated in L2 </td><td> 0, 1</td><td>
 	0xc0: All cores
  <br />
 	0x40: This core
@@ -214,7 +214,7 @@
 
 </tr>
 
-<tr><td>L2_LINES_OUT</td><td>	number of recovered lines from L2 </td><td> all</td><td>
+<tr><td>L2_LINES_OUT</td><td>	number of recovered lines from L2 </td><td> 0, 1</td><td>
 	0xc0: core: all cores
  <br />
 	0x40: core: this core
@@ -229,7 +229,7 @@
 
 </tr>
 
-<tr><td>L2_M_LINES_OUT</td><td>	number of modified lines removed from L2 </td><td> all</td><td>
+<tr><td>L2_M_LINES_OUT</td><td>	number of modified lines removed from L2 </td><td> 0, 1</td><td>
 	0xc0: core: all cores
  <br />
 	0x40: core: this core
@@ -244,7 +244,7 @@
 
 </tr>
 
-<tr><td>L2_IFETCH</td><td>	number of L2 cacheable instruction fetches </td><td> all</td><td>
+<tr><td>L2_IFETCH</td><td>	number of L2 cacheable instruction fetches </td><td> 0, 1</td><td>
 	0xc0: core: all cores
  <br />
 	0x40: core: this core
@@ -261,7 +261,7 @@
 
 </tr>
 
-<tr><td>L2_LD</td><td>	number of L2 data loads </td><td> all</td><td>
+<tr><td>L2_LD</td><td>	number of L2 data loads </td><td> 0, 1</td><td>
 	0xc0: core: all cores
  <br />
 	0x40: core: this core
@@ -284,7 +284,7 @@
 
 </tr>
 
-<tr><td>L2_ST</td><td>	number of L2 data stores </td><td> all</td><td>
+<tr><td>L2_ST</td><td>	number of L2 data stores </td><td> 0, 1</td><td>
 	0xc0: core: all cores
  <br />
 	0x40: core: this core
@@ -301,7 +301,7 @@
 
 </tr>
 
-<tr><td>L2_LOCK</td><td>	number of locked L2 data accesses </td><td> all</td><td>
+<tr><td>L2_LOCK</td><td>	number of locked L2 data accesses </td><td> 0, 1</td><td>
 	0xc0: core: all cores
  <br />
 	0x40: core: this core
@@ -318,7 +318,7 @@
 
 </tr>
 
-<tr><td>L2_REJECT_BUSQ</td><td>	Rejected L2 cache requests </td><td> all</td><td>
+<tr><td>L2_REJECT_BUSQ</td><td>	Rejected L2 cache requests </td><td> 0, 1</td><td>
 	0xc0: core: all cores
  <br />
 	0x40: core: this core
@@ -341,7 +341,7 @@
 
 </tr>
 
-<tr><td>L2_NO_REQ</td><td>	Cycles no L2 cache requests are pending </td><td> all</td><td>
+<tr><td>L2_NO_REQ</td><td>	Cycles no L2 cache requests are pending </td><td> 0, 1</td><td>
 	0xc0: All cores
  <br />
 	0x40: This core
@@ -350,19 +350,19 @@
 
 </tr>
 
-<tr><td>EIST_TRANS_ALL</td><td>	Intel(tm) Enhanced SpeedStep(r) Technology transitions </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>THERMAL_TRIP</td><td>	Number of thermal trips </td><td> all</td><td>
+<tr><td>EIST_TRANS_ALL</td><td>	Intel(tm) Enhanced SpeedStep(r) Technology transitions </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>THERMAL_TRIP</td><td>	Number of thermal trips </td><td> 0, 1</td><td>
 	0xc0: No unit mask
  <br />
 </td>
 
 </tr>
 
-<tr><td>L1D_CACHE_LD</td><td>	L1 cacheable data read operations </td><td> all</td><td>
+<tr><td>L1D_CACHE_LD</td><td>	L1 cacheable data read operations </td><td> 0, 1</td><td>
 	0x08: (M)ESI: Modified
  <br />
 	0x04: M(E)SI: Exclusive
@@ -375,7 +375,7 @@
 
 </tr>
 
-<tr><td>L1D_CACHE_ST</td><td>	L1 cacheable data write operations </td><td> all</td><td>
+<tr><td>L1D_CACHE_ST</td><td>	L1 cacheable data write operations </td><td> 0, 1</td><td>
 	0x08: (M)ESI: Modified
  <br />
 	0x04: M(E)SI: Exclusive
@@ -388,7 +388,7 @@
 
 </tr>
 
-<tr><td>L1D_CACHE_LOCK</td><td>	L1 cacheable lock read operations </td><td> all</td><td>
+<tr><td>L1D_CACHE_LOCK</td><td>	L1 cacheable lock read operations </td><td> 0, 1</td><td>
 	0x08: (M)ESI: Modified
  <br />
 	0x04: M(E)SI: Exclusive
@@ -401,50 +401,50 @@
 
 </tr>
 
-<tr><td>L1D_CACHE_LOCK_DURATION</td><td>	Duration of L1 data cacheable locked operations </td><td> all</td><td>
+<tr><td>L1D_CACHE_LOCK_DURATION</td><td>	Duration of L1 data cacheable locked operations </td><td> 0, 1</td><td>
 	0x10: No unit mask
  <br />
 </td>
 
 </tr>
 
-<tr><td>L1D_ALL_REF</td><td>	All references to the L1 data cache </td><td> all</td><td>
+<tr><td>L1D_ALL_REF</td><td>	All references to the L1 data cache </td><td> 0, 1</td><td>
 	0x10: No unit mask
  <br />
 </td>
 
 </tr>
 
-<tr><td>L1D_ALL_CACHE_REF</td><td>	L1 data cacheable reads and writes </td><td> all</td><td>
+<tr><td>L1D_ALL_CACHE_REF</td><td>	L1 data cacheable reads and writes </td><td> 0, 1</td><td>
 	0x02: No unit mask
  <br />
 </td>
 
 </tr>
 
-<tr><td>L1D_REPL</td><td>	Cache lines allocated in the L1 data cache </td><td> all</td><td>
+<tr><td>L1D_REPL</td><td>	Cache lines allocated in the L1 data cache </td><td> 0, 1</td><td>
 	0x0f: No unit mask
  <br />
 </td>
 
 </tr>
 
-<tr><td>L1D_M_REPL</td><td>	Modified cache lines allocated in the L1 data cache </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>L1D_M_EVICT</td><td>	Modified cache lines evicted from the L1 data cache </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>L1D_PEND_MISS</td><td>	Total number of outstanding L1 data cache misses at any cycle </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>L1D_SPLIT</td><td>	Cache line split load/stores </td><td> all</td><td>
+<tr><td>L1D_M_REPL</td><td>	Modified cache lines allocated in the L1 data cache </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>L1D_M_EVICT</td><td>	Modified cache lines evicted from the L1 data cache </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>L1D_PEND_MISS</td><td>	Total number of outstanding L1 data cache misses at any cycle </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>L1D_SPLIT</td><td>	Cache line split load/stores </td><td> 0, 1</td><td>
 	0x01: split loads
  <br />
 	0x02: split stores
@@ -453,7 +453,7 @@
 
 </tr>
 
-<tr><td>SSE_PREF_MISS</td><td>	SSE instructions that missed all caches </td><td> all</td><td>
+<tr><td>SSE_PREF_MISS</td><td>	SSE instructions that missed all caches </td><td> 0, 1</td><td>
 	0x00: PREFETCHNTA
  <br />
 	0x01: PREFETCHT0
@@ -464,32 +464,32 @@
 
 </tr>
 
-<tr><td>LOAD_HIT_PRE</td><td>	Load operations conflicting with a software prefetch to the same address </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>L1D_PREFETCH</td><td>	L1 data cache prefetch requests </td><td> all</td><td>
+<tr><td>LOAD_HIT_PRE</td><td>	Load operations conflicting with a software prefetch to the same address </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>L1D_PREFETCH</td><td>	L1 data cache prefetch requests </td><td> 0, 1</td><td>
 	0x10: No unit mask
  <br />
 </td>
 
 </tr>
 
-<tr><td>BUS_REQ_OUTSTANDING</td><td>	Outstanding cacheable data read bus requests duration </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_BNR_DRV</td><td>	Number of Bus Not Ready signals asserted </td><td> all</td><td>
+<tr><td>BUS_REQ_OUTSTANDING</td><td>	Outstanding cacheable data read bus requests duration </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_BNR_DRV</td><td>	Number of Bus Not Ready signals asserted </td><td> 0, 1</td><td>
 	0x00: this agent
  <br />
 	0x20: include all agents
@@ -498,7 +498,7 @@
 
 </tr>
 
-<tr><td>BUS_DRDY_CLOCKS</td><td>	Bus cycles when data is sent on the bus </td><td> all</td><td>
+<tr><td>BUS_DRDY_CLOCKS</td><td>	Bus cycles when data is sent on the bus </td><td> 0, 1</td><td>
 	0x00: this agent
  <br />
 	0x20: include all agents
@@ -507,189 +507,189 @@
 
 </tr>
 
-<tr><td>BUS_LOCK_CLOCKS</td><td>	Bus cycles when a LOCK signal is asserted </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_DATA_RCV</td><td>	Bus cycles while processor receives data </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRAN_BRD</td><td>	Burst read bus transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRAN_RFO</td><td>	number of completed read for ownership transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRAN_WB</td><td>	number of explicit writeback bus transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRAN_IFETCH</td><td>	number of instruction fetch transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRAN_INVAL</td><td>	number of invalidate transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRAN_PWR</td><td>	number of partial write bus transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRANS_P</td><td>	number of partial bus transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRANS_IO</td><td>	number of I/O bus transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRANS_DEF</td><td>	number of completed defer transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRAN_BURST</td><td>	number of completed burst transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRAN_MEM</td><td>	number of completed memory transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_TRAN_ANY</td><td>	number of any completed bus transactions </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>EXT_SNOOP</td><td>	External snoops </td><td> all</td><td>
+<tr><td>BUS_LOCK_CLOCKS</td><td>	Bus cycles when a LOCK signal is asserted </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_DATA_RCV</td><td>	Bus cycles while processor receives data </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRAN_BRD</td><td>	Burst read bus transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRAN_RFO</td><td>	number of completed read for ownership transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRAN_WB</td><td>	number of explicit writeback bus transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRAN_IFETCH</td><td>	number of instruction fetch transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRAN_INVAL</td><td>	number of invalidate transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRAN_PWR</td><td>	number of partial write bus transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRANS_P</td><td>	number of partial bus transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRANS_IO</td><td>	number of I/O bus transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRANS_DEF</td><td>	number of completed defer transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRAN_BURST</td><td>	number of completed burst transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRAN_MEM</td><td>	number of completed memory transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_TRAN_ANY</td><td>	number of any completed bus transactions </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>EXT_SNOOP</td><td>	External snoops </td><td> 0, 1</td><td>
 	0x00: bus: this agent
  <br />
 	0x20: bus: include all agents
@@ -704,7 +704,7 @@
 
 </tr>
 
-<tr><td>CMP_SNOOP</td><td>	L1 data cache is snooped by other core </td><td> all</td><td>
+<tr><td>CMP_SNOOP</td><td>	L1 data cache is snooped by other core </td><td> 0, 1</td><td>
 	0xc0: core: all cores
  <br />
 	0x40: core: this core
@@ -717,7 +717,7 @@
 
 </tr>
 
-<tr><td>BUS_HIT_DRV</td><td>	HIT signal asserted </td><td> all</td><td>
+<tr><td>BUS_HIT_DRV</td><td>	HIT signal asserted </td><td> 0, 1</td><td>
 	0x00: this agent
  <br />
 	0x20: include all agents
@@ -726,7 +726,7 @@
 
 </tr>
 
-<tr><td>BUS_HITM_DRV</td><td>	HITM signal asserted </td><td> all</td><td>
+<tr><td>BUS_HITM_DRV</td><td>	HITM signal asserted </td><td> 0, 1</td><td>
 	0x00: this agent
  <br />
 	0x20: include all agents
@@ -735,7 +735,7 @@
 
 </tr>
 
-<tr><td>BUSQ_EMPTY</td><td>	Bus queue is empty </td><td> all</td><td>
+<tr><td>BUSQ_EMPTY</td><td>	Bus queue is empty </td><td> 0, 1</td><td>
 	0xc0: All cores
  <br />
 	0x40: This core
@@ -744,20 +744,20 @@
 
 </tr>
 
-<tr><td>SNOOP_STALL_DRV</td><td>	Bus stalled for snoops </td><td> all</td><td>
-	0xc0: core: all cores
- <br />
-	0x40: core: this core
- <br />
-	0x00: bus: this agent
- <br />
-	0x20: bus: include all agents
- <br />
-</td>
-
-</tr>
-
-<tr><td>BUS_IO_WAIT</td><td>	IO requests waiting in the bus queue </td><td> all</td><td>
+<tr><td>SNOOP_STALL_DRV</td><td>	Bus stalled for snoops </td><td> 0, 1</td><td>
+	0xc0: core: all cores
+ <br />
+	0x40: core: this core
+ <br />
+	0x00: bus: this agent
+ <br />
+	0x20: bus: include all agents
+ <br />
+</td>
+
+</tr>
+
+<tr><td>BUS_IO_WAIT</td><td>	IO requests waiting in the bus queue </td><td> 0, 1</td><td>
 	0xc0: All cores
  <br />
 	0x40: This core
@@ -766,17 +766,17 @@
 
 </tr>
 
-<tr><td>L1I_READS</td><td>	number of instruction fetches </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>L1I_MISSES</td><td>	number of instruction fetch misses </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>ITLB</td><td>	number of ITLB misses </td><td> all</td><td>
+<tr><td>L1I_READS</td><td>	number of instruction fetches </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>L1I_MISSES</td><td>	number of instruction fetch misses </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>ITLB</td><td>	number of ITLB misses </td><td> 0, 1</td><td>
 	0x02: ITLB small page misses
  <br />
 	0x10: ITLB large page misses
@@ -787,109 +787,109 @@
 
 </tr>
 
-<tr><td>INST_QUEUE_FULL</td><td>	cycles during which the instruction queue is full </td><td> all</td><td>
+<tr><td>INST_QUEUE_FULL</td><td>	cycles during which the instruction queue is full </td><td> 0, 1</td><td>
 	0x02: No unit mask
  <br />
 </td>
 
 </tr>
 
-<tr><td>IFU_MEM_STALL</td><td>	cycles instruction fetch pipe is stalled </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>ILD_STALL</td><td>	cycles instruction length decoder is stalled </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_INST_EXEC</td><td>	Branch instructions executed (not necessarily retired) </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_MISSP_EXEC</td><td>	Branch instructions executed that were mispredicted at execution </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_BAC_MISSP_EXEC</td><td>	Branch instructions executed that were mispredicted at Front End (BAC) </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_CND_EXEC</td><td>	Conditional Branch instructions executed </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_CND_MISSP_EXEC</td><td>	Conditional Branch instructions executed that were mispredicted </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_IND_EXEC</td><td>	Indirect Branch instructions executed </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_IND_MISSP_EXEC</td><td>	Indirect Branch instructions executed that were mispredicted </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_RET_EXEC</td><td>	Return Branch instructions executed </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_RET_MISSP_EXEC</td><td>	Return Branch instructions executed that were mispredicted at Execution </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_RET_BAC_MISSP_EXEC</td><td>	Branch instructions executed that were mispredicted at Front End (BAC) </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_CALL_EXEC</td><td>	CALL instruction executed </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_CALL_MISSP_EXEC</td><td>	CALL instruction executed and miss predicted </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_IND_CALL_EXEC</td><td>	Indirect CALL instruction executed </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_TKN_BUBBLE_1</td><td>	Branch predicted taken with bubble 1 </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_TKN_BUBBLE_2</td><td>	Branch predicted taken with bubble 2 </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>RS_UOPS_DISPATCHED</td><td>	Micro-ops dispatched for execution </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>RS_UOPS_DISPATCHED_NONE</td><td>	No Micro-ops dispatched for execution </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>MACRO_INSTS</td><td>	instructions decoded </td><td> all</td><td>
+<tr><td>IFU_MEM_STALL</td><td>	cycles instruction fetch pipe is stalled </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>ILD_STALL</td><td>	cycles instruction length decoder is stalled </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_INST_EXEC</td><td>	Branch instructions executed (not necessarily retired) </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_MISSP_EXEC</td><td>	Branch instructions executed that were mispredicted at execution </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_BAC_MISSP_EXEC</td><td>	Branch instructions executed that were mispredicted at Front End (BAC) </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_CND_EXEC</td><td>	Conditional Branch instructions executed </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_CND_MISSP_EXEC</td><td>	Conditional Branch instructions executed that were mispredicted </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_IND_EXEC</td><td>	Indirect Branch instructions executed </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_IND_MISSP_EXEC</td><td>	Indirect Branch instructions executed that were mispredicted </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_RET_EXEC</td><td>	Return Branch instructions executed </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_RET_MISSP_EXEC</td><td>	Return Branch instructions executed that were mispredicted at Execution </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_RET_BAC_MISSP_EXEC</td><td>	Branch instructions executed that were mispredicted at Front End (BAC) </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_CALL_EXEC</td><td>	CALL instruction executed </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_CALL_MISSP_EXEC</td><td>	CALL instruction executed and miss predicted </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_IND_CALL_EXEC</td><td>	Indirect CALL instruction executed </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_TKN_BUBBLE_1</td><td>	Branch predicted taken with bubble 1 </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_TKN_BUBBLE_2</td><td>	Branch predicted taken with bubble 2 </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>RS_UOPS_DISPATCHED</td><td>	Micro-ops dispatched for execution </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>RS_UOPS_DISPATCHED_NONE</td><td>	No Micro-ops dispatched for execution </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>MACRO_INSTS</td><td>	instructions decoded </td><td> 0, 1</td><td>
 	0x01: Instructions decoded
  <br />
 	0x08: CISC Instructions decoded
@@ -898,7 +898,7 @@
 
 </tr>
 
-<tr><td>ESP</td><td>	ESP register events </td><td> all</td><td>
+<tr><td>ESP</td><td>	ESP register events </td><td> 0, 1</td><td>
 	0x01: ESP register content synchronizations
  <br />
 	0x02: ESP register automatic additions
@@ -907,17 +907,17 @@
 
 </tr>
 
-<tr><td>SIMD_UOPS_EXEC</td><td>	SIMD micro-ops executed (excluding stores) </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>SIMD_SAT_UOP_EXEC</td><td>	number of SIMD saturating instructions executed </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>SIMD_UOP_TYPE_EXEC</td><td>	number of SIMD packing instructions </td><td> all</td><td>
+<tr><td>SIMD_UOPS_EXEC</td><td>	SIMD micro-ops executed (excluding stores) </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>SIMD_SAT_UOP_EXEC</td><td>	number of SIMD saturating instructions executed </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>SIMD_UOP_TYPE_EXEC</td><td>	number of SIMD packing instructions </td><td> 0, 1</td><td>
 	0x01: SIMD packed multiplies
  <br />
 	0x02: SIMD packed shifts
@@ -936,20 +936,20 @@
 
 </tr>
 
-<tr><td>INST_RETIRED</td><td>	number of instructions retired </td><td> all</td><td>
-	0x00: Any
- <br />
-	0x01: Loads
- <br />
-	0x02: Stores
- <br />
-	0x04: Other
- <br />
-</td>
-
-</tr>
-
-<tr><td>X87_OPS_RETIRED</td><td>	number of computational FP operations retired </td><td> all</td><td>
+<tr><td>INST_RETIRED</td><td>	number of instructions retired </td><td> 0, 1</td><td>
+	0x00: (name=Any) Any
+ <br />
+	0x01: (name=Loads) Loads
+ <br />
+	0x02: (name=Stores) Stores
+ <br />
+	0x04: (name=Other) Other
+ <br />
+</td>
+
+</tr>
+
+<tr><td>X87_OPS_RETIRED</td><td>	number of computational FP operations retired </td><td> 0, 1</td><td>
 	0x01: FXCH instructions retired
  <br />
 	0xfe: Retired floating-point computational operations (precise)
@@ -958,7 +958,7 @@
 
 </tr>
 
-<tr><td>UOPS_RETIRED</td><td>	number of UOPs retired </td><td> all</td><td>
+<tr><td>UOPS_RETIRED</td><td>	number of UOPs retired </td><td> 0, 1</td><td>
 	0x01: Fused load+op or load+indirect branch retired
  <br />
 	0x02: Fused store address + data retired
@@ -975,7 +975,7 @@
 
 </tr>
 
-<tr><td>MACHINE_NUKES_SMC</td><td>	number of pipeline flushing events </td><td> all</td><td>
+<tr><td>MACHINE_NUKES_SMC</td><td>	number of pipeline flushing events </td><td> 0, 1</td><td>
 	0x01: Self-Modifying Code detected
  <br />
 	0x04: Execution pipeline restart due to memory ordering conflict or memory disambiguation misprediction
@@ -984,7 +984,7 @@
 
 </tr>
 
-<tr><td>BR_INST_RETIRED</td><td>	number of branch instructions retired </td><td> all</td><td>
+<tr><td>BR_INST_RETIRED</td><td>	number of branch instructions retired </td><td> 0, 1</td><td>
 	0x01: predicted not-taken
  <br />
 	0x02: mispredicted not-taken
@@ -997,12 +997,12 @@
 
 </tr>
 
-<tr><td>BR_MISS_PRED_RETIRED</td><td>	number of mispredicted branches retired (precise) </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>CYCLES_INT_MASKED</td><td>	cycles interrupts are disabled </td><td> all</td><td>
+<tr><td>BR_MISS_PRED_RETIRED</td><td>	number of mispredicted branches retired (precise) </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>CYCLES_INT_MASKED</td><td>	cycles interrupts are disabled </td><td> 0, 1</td><td>
 	0x01: Interrupts disabled
  <br />
 	0x02: Interrupts pending and disabled
@@ -1011,7 +1011,7 @@
 
 </tr>
 
-<tr><td>SIMD_INST_RETIRED</td><td>	SSE/SSE2 instructions retired </td><td> all</td><td>
+<tr><td>SIMD_INST_RETIRED</td><td>	SSE/SSE2 instructions retired </td><td> 0, 1</td><td>
 	0x01: Retired SSE packed-single instructions
  <br />
 	0x02: Retired SSE scalar-single instructions
@@ -1028,7 +1028,7 @@
 
 </tr>
 
-<tr><td>HW_INT_RCV</td><td>	number of hardware interrupts received </td><td> all</td><td>
+<tr><td>HW_INT_RCV</td><td>	number of hardware interrupts received </td><td> 0, 1</td><td>
 </td>
 
 </tr>
@@ -1038,7 +1038,7 @@
 
 </tr>
 
-<tr><td>SIMD_COMP_INST_RETIRED</td><td>	Retired computational SSE/SSE2 instructions </td><td> all</td><td>
+<tr><td>SIMD_COMP_INST_RETIRED</td><td>	Retired computational SSE/SSE2 instructions </td><td> 0, 1</td><td>
 	0x01: Retired computational SSE packed-single instructions
  <br />
 	0x02: Retired computational SSE scalar-single instructions
@@ -1066,7 +1066,7 @@
 
 </tr>
 
-<tr><td>FP_MMX_TRANS</td><td>	MMX-floating point transitions </td><td> all</td><td>
+<tr><td>FP_MMX_TRANS</td><td>	MMX-floating point transitions </td><td> 0, 1</td><td>
 	0x01: float->MMX transitions
  <br />
 	0x02: MMX->float transitions
@@ -1075,22 +1075,22 @@
 
 </tr>
 
-<tr><td>MMX_ASSIST</td><td>	number of EMMS instructions executed </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>SIMD_INSTR_RET</td><td>	number of SIMD instructions retired </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>SIMD_SAT_INSTR_RET</td><td>	number of saturated arithmetic instructions retired </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>RAT_STALLS</td><td>	Partial register stall cycles </td><td> all</td><td>
+<tr><td>MMX_ASSIST</td><td>	number of EMMS instructions executed </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>SIMD_INSTR_RET</td><td>	number of SIMD instructions retired </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>SIMD_SAT_INSTR_RET</td><td>	number of saturated arithmetic instructions retired </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>RAT_STALLS</td><td>	Partial register stall cycles </td><td> 0, 1</td><td>
 	0x01: ROB read port
  <br />
 	0x02: Partial register
@@ -1105,33 +1105,33 @@
 
 </tr>
 
-<tr><td>SEG_RENAME_STALLS</td><td>	Segment rename stalls </td><td> all</td><td>
-	0x01: ES
- <br />
-	0x02: DS
- <br />
-	0x04: FS
- <br />
-	0x08: GS
- <br />
-</td>
-
-</tr>
-
-<tr><td>SEG_RENAMES</td><td>	Segment renames </td><td> all</td><td>
-	0x01: ES
- <br />
-	0x02: DS
- <br />
-	0x04: FS
- <br />
-	0x08: GS
- <br />
-</td>
-
-</tr>
-
-<tr><td>RESOURCE_STALLS</td><td>	Cycles during which resource stalls occur </td><td> all</td><td>
+<tr><td>SEG_RENAME_STALLS</td><td>	Segment rename stalls </td><td> 0, 1</td><td>
+	0x01: (name=ES) ES
+ <br />
+	0x02: (name=DS) DS
+ <br />
+	0x04: (name=FS) FS
+ <br />
+	0x08: (name=GS) GS
+ <br />
+</td>
+
+</tr>
+
+<tr><td>SEG_RENAMES</td><td>	Segment renames </td><td> 0, 1</td><td>
+	0x01: (name=ES) ES
+ <br />
+	0x02: (name=DS) DS
+ <br />
+	0x04: (name=FS) FS
+ <br />
+	0x08: (name=GS) GS
+ <br />
+</td>
+
+</tr>
+
+<tr><td>RESOURCE_STALLS</td><td>	Cycles during which resource stalls occur </td><td> 0, 1</td><td>
 	0x01: when the ROB is full
  <br />
 	0x02: during which the RS is full
@@ -1146,28 +1146,28 @@
 
 </tr>
 
-<tr><td>BR_INST_DECODED</td><td>	number of branch instructions decoded </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BR_BOGUS</td><td>	number of bogus branches </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>BACLEARS</td><td>	number of times BACLEAR is asserted </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>PREF_RQSTS_UP</td><td>	Number of upward prefetches issued </td><td> all</td><td>
-</td>
-
-</tr>
-
-<tr><td>PREF_RQSTS_DN</td><td>	Number of downward prefetches issued </td><td> all</td><td>
-</td>
-
-</tr>
-
+<tr><td>BR_INST_DECODED</td><td>	number of branch instructions decoded </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BR_BOGUS</td><td>	number of bogus branches </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>BACLEARS</td><td>	number of times BACLEAR is asserted </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>PREF_RQSTS_UP</td><td>	Number of upward prefetches issued </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+
+<tr><td>PREF_RQSTS_DN</td><td>	Number of downward prefetches issued </td><td> 0, 1</td><td>
+</td>
+
+</tr>
+