D12654.id33945.diff
No OneTemporary
Actions

Size

62 KB

Referenced Files

None

Subscribers

None

D12654.id33945.diff
View Options

	Index: lib/libpmc/libpmc.c
	===================================================================
	--- lib/libpmc/libpmc.c
	+++ lib/libpmc/libpmc.c
	@@ -237,6 +237,11 @@
	__PMC_EV_ALIAS_SKYLAKE_XEON()
	};

	+static const struct pmc_event_descr kabylake_event_table[] =
	+{
	+ __PMC_EV_ALIAS_KABYLAKE()
	+};
	+
	static const struct pmc_event_descr ivybridge_event_table[] =
	{
	__PMC_EV_ALIAS_IVYBRIDGE()
	@@ -334,6 +339,7 @@
	PMC_MDEP_TABLE(broadwell_xeon, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP);
	PMC_MDEP_TABLE(skylake, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP);
	PMC_MDEP_TABLE(skylake_xeon, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC);
	+PMC_MDEP_TABLE(kabylake, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP);
	PMC_MDEP_TABLE(ivybridge, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC);
	PMC_MDEP_TABLE(ivybridge_xeon, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC);
	PMC_MDEP_TABLE(sandybridge, IAP, PMC_CLASS_SOFT, PMC_CLASS_IAF, PMC_CLASS_TSC, PMC_CLASS_UCF, PMC_CLASS_UCP);
	@@ -390,6 +396,7 @@
	PMC_CLASS_TABLE_DESC(broadwell_xeon, IAP, broadwell_xeon, iap);
	PMC_CLASS_TABLE_DESC(skylake, IAP, skylake, iap);
	PMC_CLASS_TABLE_DESC(skylake_xeon, IAP, skylake_xeon, iap);
	+PMC_CLASS_TABLE_DESC(kabylake, IAP, kabylake, iap);
	PMC_CLASS_TABLE_DESC(ivybridge, IAP, ivybridge, iap);
	PMC_CLASS_TABLE_DESC(ivybridge_xeon, IAP, ivybridge_xeon, iap);
	PMC_CLASS_TABLE_DESC(sandybridge, IAP, sandybridge, iap);
	@@ -730,6 +737,8 @@
	#define skylake_aliases_without_iaf core2_aliases_without_iaf
	#define skylake_xeon_aliases core2_aliases
	#define skylake_xeon_aliases_without_iaf core2_aliases_without_iaf
	+#define kabylake_aliases core2_aliases
	+#define kabylake_aliases_without_iaf core2_aliases_without_iaf
	#define ivybridge_aliases core2_aliases
	#define ivybridge_aliases_without_iaf core2_aliases_without_iaf
	#define ivybridge_xeon_aliases core2_aliases
	@@ -1052,6 +1061,11 @@
	n = pmc_parse_mask(iap_rsp_mask_skylake, p, &rsp);
	} else
	return (-1);
	+ } else if (cpu_info.pm_cputype == PMC_CPU_INTEL_KABYLAKE) {
	+ if (KWPREFIXMATCH(p, IAP_KW_RSP "=")) {
	+ n = pmc_parse_mask(iap_rsp_mask_skylake, p, &rsp);
	+ } else
	+ return (-1);

	} else
	return (-1);
	@@ -3021,6 +3035,10 @@
	ev = skylake_xeon_event_table;
	count = PMC_EVENT_TABLE_SIZE(skylake_xeon);
	break;
	+ case PMC_CPU_INTEL_KABYLAKE:
	+ ev = kabylake_event_table;
	+ count = PMC_EVENT_TABLE_SIZE(kabylake);
	+ break;
	case PMC_CPU_INTEL_IVYBRIDGE:
	ev = ivybridge_event_table;
	count = PMC_EVENT_TABLE_SIZE(ivybridge);
	@@ -3403,6 +3421,9 @@
	case PMC_CPU_INTEL_SKYLAKE_XEON:
	PMC_MDEP_INIT_INTEL_V2(skylake_xeon);
	break;
	+ case PMC_CPU_INTEL_KABYLAKE:
	+ PMC_MDEP_INIT_INTEL_V2(kabylake);
	+ break;
	case PMC_CPU_INTEL_IVYBRIDGE:
	PMC_MDEP_INIT_INTEL_V2(ivybridge);
	break;
	@@ -3620,6 +3641,11 @@
	evfence = skylake_xeon_event_table +
	PMC_EVENT_TABLE_SIZE(skylake_xeon);
	break;
	+ case PMC_CPU_INTEL_KABYLAKE:
	+ ev = kabylake_event_table;
	+ evfence = kabylake_event_table +
	+ PMC_EVENT_TABLE_SIZE(kabylake);
	+ break;
	case PMC_CPU_INTEL_IVYBRIDGE:
	ev = ivybridge_event_table;
	evfence = ivybridge_event_table + PMC_EVENT_TABLE_SIZE(ivybridge);
	Index: sys/dev/hwpmc/hwpmc_core.c
	===================================================================
	--- sys/dev/hwpmc/hwpmc_core.c
	+++ sys/dev/hwpmc/hwpmc_core.c
	@@ -583,6 +583,7 @@
	#define IAP_F_BWX (1 << 14) /* CPU: Broadwell Xeon */
	#define IAP_F_SL (1 << 15) /* CPU: Skylake */
	#define IAP_F_SLX (1 << 16) /* CPU: Skylake Xeon AKA scalable */
	+#define IAP_F_KL (1 << 17) /* CPU: Kabylake */
	#define IAP_F_FM (1 << 18) /* Fixed mask */

	#define IAP_F_ALLCPUSCORE2 \
	@@ -627,12 +628,12 @@
	IAP_F_SBX \| IAP_F_CAS),
	IAPDESCR(03H_02H, 0x03, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \|
	- IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(03H_04H, 0x03, 0x04, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| IAP_F_I7O \|
	IAP_F_CAS),
	IAPDESCR(03H_08H, 0x03, 0x08, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| IAP_F_SB \|
	IAP_F_SBX \| IAP_F_CAS \| IAP_F_IB \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(03H_10H, 0x03, 0x10, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| IAP_F_SB \|
	IAP_F_SBX \| IAP_F_CAS),
	IAPDESCR(03H_20H, 0x03, 0x20, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| IAP_F_CAS),
	@@ -671,7 +672,7 @@
	IAPDESCR(07H_00H, 0x07, 0x00, IAP_F_FM \| IAP_F_CC \| IAP_F_CC2),
	IAPDESCR(07H_01H, 0x07, 0x01, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \|
	- IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(07H_02H, 0x07, 0x02, IAP_F_FM \| IAP_F_ALLCPUSCORE2),
	IAPDESCR(07H_03H, 0x07, 0x03, IAP_F_FM \| IAP_F_ALLCPUSCORE2),
	IAPDESCR(07H_06H, 0x07, 0x06, IAP_F_FM \| IAP_F_CA),
	@@ -680,7 +681,7 @@

	IAPDESCR(08H_01H, 0x08, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(08H_02H, 0x08, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_HW \| IAP_F_HWX \|
	IAP_F_BW \| IAP_F_BWX \| IAP_F_SLX),
	@@ -691,13 +692,13 @@
	IAPDESCR(08H_07H, 0x08, 0x07, IAP_F_FM \| IAP_F_CA),
	IAPDESCR(08H_08H, 0x08, 0x08, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| IAP_F_SLX),
	IAPDESCR(08H_09H, 0x08, 0x09, IAP_F_FM \| IAP_F_CA),
	- IAPDESCR(08H_0EH, 0x08, 0x0E, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAPDESCR(08H_0EH, 0x08, 0x0E, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(08H_10H, 0x08, 0x10, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \|
	- IAP_F_SBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_SBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(08H_20H, 0x08, 0x20, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_HW \|
	- IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(08H_40H, 0x08, 0x40, IAP_F_FM \| IAP_F_I7O \| IAP_F_HW \| IAP_F_HWX),
	IAPDESCR(08H_60H, 0x08, 0x60, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX),
	IAPDESCR(08H_80H, 0x08, 0x80, IAP_F_FM \| IAP_F_I7 \| IAP_F_HW \| IAP_F_HWX),
	@@ -720,21 +721,21 @@
	IAPDESCR(0CH_02H, 0x0C, 0x02, IAP_F_FM \| IAP_F_CC2),
	IAPDESCR(0CH_03H, 0x0C, 0x03, IAP_F_FM \| IAP_F_CA),

	- IAPDESCR(0DH_01H, 0x0D, 0x80, IAP_F_FM \| IAP_F_SLX),
	+ IAPDESCR(0DH_01H, 0x0D, 0x80, IAP_F_FM \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(0DH_03H, 0x0D, 0x01, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_HW \|
	IAP_F_IB \| IAP_F_IBX \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),
	IAPDESCR(0DH_40H, 0x0D, 0x40, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX),
	- IAPDESCR(0DH_80H, 0x0D, 0x80, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	+ IAPDESCR(0DH_80H, 0x0D, 0x80, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(0EH_01H, 0x0E, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \|
	IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(0EH_02H, 0x0E, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \|
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(0EH_02H, 0x0E, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(0EH_10H, 0x0E, 0x10, IAP_F_FM \| IAP_F_IB \| IAP_F_IBX \| IAP_F_HW \|
	IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),
	IAPDESCR(0EH_20H, 0x0E, 0x20, IAP_F_FM \| IAP_F_IB \| IAP_F_IBX \| IAP_F_HW \|
	- IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(0EH_40H, 0x0E, 0x40, IAP_F_FM \| IAP_F_IB \| IAP_F_IBX \| IAP_F_HW \|
	IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),

	@@ -787,7 +788,7 @@
	IAPDESCR(14H_00H, 0x14, 0x00, IAP_F_FM \| IAP_F_CC \| IAP_F_CC2),
	IAPDESCR(14H_01H, 0x14, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_I7 \|
	IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(14H_02H, 0x14, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),

	IAPDESCR(17H_01H, 0x17, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \|
	@@ -829,26 +830,26 @@
	IAPDESCR(24H_20H, 0x24, 0x20, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \|
	IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX),
	IAPDESCR(24H_21H, 0x24, 0x21, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(24H_22H, 0x24, 0x22, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(24H_22H, 0x24, 0x22, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	- IAPDESCR(24H_24H, 0x24, 0x24, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAPDESCR(24H_24H, 0x24, 0x24, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	- IAPDESCR(24H_27H, 0x24, 0x27, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAPDESCR(24H_27H, 0x24, 0x27, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(24H_30H, 0x24, 0x30, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \|
	IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	IAP_F_BW \| IAP_F_BWX),
	- IAPDESCR(24H_38H, 0x24, 0x38, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(24H_3FH, 0x24, 0x3F, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAPDESCR(24H_38H, 0x24, 0x38, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(24H_3FH, 0x24, 0x3F, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(24H_40H, 0x24, 0x40, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \|
	IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX),
	IAPDESCR(24H_41H, 0x24, 0x41, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(24H_42H, 0x24, 0x42, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(24H_42H, 0x24, 0x42, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	- IAPDESCR(24H_44H, 0x24, 0x44, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAPDESCR(24H_44H, 0x24, 0x44, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(24H_50H, 0x24, 0x50, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \|
	IAP_F_BW \| IAP_F_BWX),
	@@ -857,18 +858,18 @@
	IAPDESCR(24H_AAH, 0x24, 0xAA, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	IAPDESCR(24H_C0H, 0x24, 0xC0, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \|
	IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX),
	- IAPDESCR(24H_D8H, 0x24, 0xD8, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	+ IAPDESCR(24H_D8H, 0x24, 0xD8, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(24H_E1H, 0x24, 0xE1, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(24H_E2H, 0x24, 0xE2, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \|
	- IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(24H_E4H, 0x24, 0xE4, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \|
	- IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(24H_E7H, 0x24, 0xE7, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(24H_E7H, 0x24, 0xE7, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	- IAPDESCR(24H_EFH, 0x24, 0xEF, IAP_F_FM \| IAP_F_SL),
	+ IAPDESCR(24H_EFH, 0x24, 0xEF, IAP_F_FM \| IAP_F_SL \| IAP_F_KL),
	IAPDESCR(24H_F8H, 0x24, 0xF8, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \|
	- IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(24H_FFH, 0x24, 0xFF, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_HW \|
	IAP_F_HWX \| IAP_F_SLX),

	@@ -933,10 +934,10 @@
	IAPDESCR(2EH_02H, 0x2E, 0x02, IAP_F_FM \| IAP_F_WM),
	IAPDESCR(2EH_41H, 0x2E, 0x41, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \| IAP_F_I7 \|
	IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \|
	- IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(2EH_4FH, 0x2E, 0x4F, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \| IAP_F_I7 \|
	IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \|
	- IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(30H, 0x30, IAP_M_CORE \| IAP_M_MESI \| IAP_M_PREFETCH,
	IAP_F_ALLCPUSCORE2),
	@@ -952,13 +953,13 @@

	IAPDESCR(3CH_00H, 0x3C, 0x00, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \|
	- IAP_F_HW \| IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_HW \| IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(3CH_01H, 0x3C, 0x01, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \|
	- IAP_F_HW \| IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_HW \| IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	- IAPDESCR(3CH_02H, 0x3C, 0x02, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \| IAP_F_SL \|
	+ IAPDESCR(3CH_02H, 0x3C, 0x02, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),

	IAPDESCR(3DH_01H, 0x3D, 0x01, IAP_F_FM \| IAP_F_I7O),
	@@ -1001,26 +1002,26 @@
	IAPDESCR(48H_00H, 0x48, 0x00, IAP_F_FM \| IAP_F_ALLCPUSCORE2),
	IAPDESCR(48H_01H, 0x48, 0x01, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(48H_02H, 0x48, 0x02, IAP_F_FM \| IAP_F_I7O \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(48H_02H, 0x48, 0x02, IAP_F_FM \| IAP_F_I7O \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(49H_00H, 0x49, 0x00, IAP_F_FM \| IAP_F_CC),
	IAPDESCR(49H_01H, 0x49, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \|
	- IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(49H_02H, 0x49, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \|
	IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SLX),
	IAPDESCR(49H_04H, 0x49, 0x04, IAP_F_FM \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SLX),
	IAPDESCR(49H_08H, 0x49, 0x08, IAP_F_FM \| IAP_F_SLX),
	- IAPDESCR(49H_0EH, 0x49, 0x0E, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAPDESCR(49H_0EH, 0x49, 0x0E, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(49H_10H, 0x49, 0x10, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(49H_20H, 0x49, 0x20, IAP_F_FM \| IAP_F_I7 \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(49H_40H, 0x49, 0x40, IAP_F_FM \| IAP_F_I7O \| IAP_F_HW \| IAP_F_HWX),
	IAPDESCR(49H_60H, 0x49, 0x60, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX),
	IAPDESCR(49H_80H, 0x49, 0x80, IAP_F_FM \| IAP_F_WM \| IAP_F_I7 \| IAP_F_HW \|
	@@ -1035,7 +1036,7 @@
	IAPDESCR(4CH_00H, 0x4C, 0x00, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2),
	IAPDESCR(4CH_01H, 0x4C, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(4CH_02H, 0x4C, 0x02, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),

	@@ -1052,11 +1053,11 @@
	IAPDESCR(4FH_04H, 0x4F, 0x04, IAP_F_FM \| IAP_F_I7O),
	IAPDESCR(4FH_08H, 0x4F, 0x08, IAP_F_FM \| IAP_F_I7O),
	IAPDESCR(4FH_10H, 0x4F, 0x10, IAP_F_FM \| IAP_F_WM \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(51H_01H, 0x51, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \|
	- IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(51H_02H, 0x51, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_SBX),
	IAPDESCR(51H_04H, 0x51, 0x04, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	@@ -1107,7 +1108,7 @@

	IAPDESCR(5EH_01H, 0x5E, 0x01, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(5FH_01H, 0x5F, 0x01, IAP_F_FM \| IAP_F_IB ), /* IB not in manual */
	IAPDESCR(5FH_04H, 0x5F, 0x04, IAP_F_FM \| IAP_F_IBX \| IAP_F_IB),
	@@ -1115,17 +1116,17 @@
	IAPDESCR(60H, 0x60, IAP_M_AGENT \| IAP_M_CORE, IAP_F_ALLCPUSCORE2),
	IAPDESCR(60H_01H, 0x60, 0x01, IAP_F_FM \| IAP_F_WM \| IAP_F_I7O \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(60H_02H, 0x60, 0x02, IAP_F_FM \| IAP_F_WM \| IAP_F_I7O \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(60H_04H, 0x60, 0x04, IAP_F_FM \|IAP_F_I7O \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(60H_08H, 0x60, 0x08, IAP_F_FM \|IAP_F_I7O \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(60H_10H, 0x60, 0x10, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(60H_10H, 0x60, 0x10, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(61H, 0x61, IAP_M_AGENT, IAP_F_CA \| IAP_F_CC2),

	@@ -1142,7 +1143,7 @@
	IAP_F_BW \| IAP_F_BWX ),
	IAPDESCR(63H_02H, 0x63, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_KL),

	IAPDESCR(64H, 0x64, IAP_M_CORE, IAP_F_CA \| IAP_F_CC2),
	IAPDESCR(64H_40H, 0x64, 0x40, IAP_F_FM \| IAP_F_CC),
	@@ -1186,23 +1187,23 @@
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),
	IAPDESCR(79H_04H, 0x79, 0x04, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(79H_08H, 0x79, 0x08, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	- IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_BW \|
	+ IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_BW \|
	IAP_F_BWX \| IAP_F_SLX),
	IAPDESCR(79H_10H, 0x79, 0x10, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(79H_18H, 0x79, 0x18, IAP_F_FM \| IAP_F_IB \| IAP_F_IBX \| IAP_F_HW \|
	- IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(79H_20H, 0x79, 0x20, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(79H_24H, 0x79, 0x24, IAP_F_FM \| IAP_F_IB \| IAP_F_IBX \| IAP_F_HW \|
	- IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(79H_30H, 0x79, 0x30, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(79H_3CH, 0x79, 0x3C, IAP_F_FM \| IAP_F_IB \| IAP_F_IBX \| IAP_F_HW \|
	IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),

	@@ -1225,7 +1226,7 @@
	IAPDESCR(80H_03H, 0x80, 0x03, IAP_F_FM \| IAP_F_CA \| IAP_F_I7 \|
	IAP_F_WM \| IAP_F_CAS),
	IAPDESCR(80H_04H, 0x80, 0x04, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_SL \| IAP_F_SLX), /* SL may have a spec bug two with
	+ IAP_F_IBX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX), /* SL may have a spec bug two with
	same entry no cmask */

	IAPDESCR(81H_00H, 0x81, 0x00, IAP_F_FM \| IAP_F_ALLCPUSCORE2),
	@@ -1239,15 +1240,15 @@
	IAPDESCR(82H_12H, 0x82, 0x12, IAP_F_FM \| IAP_F_CC2),
	IAPDESCR(82H_40H, 0x82, 0x40, IAP_F_FM \| IAP_F_CC2),

	- IAPDESCR(83H_01H, 0x83, 0x01, IAP_F_FM \| IAP_F_I7O \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(83H_02H, 0x83, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| IAP_F_SL \|
	+ IAPDESCR(83H_01H, 0x83, 0x01, IAP_F_FM \| IAP_F_I7O \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(83H_02H, 0x83, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(83H_04H, 0x83, 0x04, IAP_F_FM \| IAP_F_SLX),

	IAPDESCR(85H_00H, 0x85, 0x00, IAP_F_FM \| IAP_F_CC),
	IAPDESCR(85H_01H, 0x85, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(85H_02H, 0x85, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	IAP_F_BW \| IAP_F_BWX \| IAP_F_SLX),
	@@ -1255,13 +1256,13 @@
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	IAP_F_SLX),
	IAPDESCR(85H_08H, 0x85, 0x08, IAP_F_FM \| IAP_F_SLX),
	- IAPDESCR(85H_0EH, 0x85, 0x0E, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAPDESCR(85H_0EH, 0x85, 0x0E, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(85H_10H, 0x85, 0x10, IAP_F_FM \| IAP_F_I7O \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(85H_20H, 0x85, 0x20, IAP_F_FM \| IAP_F_I7O \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(85H_40H, 0x85, 0x40, IAP_F_FM \| IAP_F_I7O \| IAP_F_HW \| IAP_F_HWX),
	IAPDESCR(85H_60H, 0x85, 0x60, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX),
	IAPDESCR(85H_80H, 0x85, 0x80, IAP_F_FM \| IAP_F_WM \| IAP_F_I7O),
	@@ -1271,7 +1272,7 @@
	IAPDESCR(87H_00H, 0x87, 0x00, IAP_F_FM \| IAP_F_ALLCPUSCORE2),
	IAPDESCR(87H_01H, 0x87, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(87H_02H, 0x87, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	IAPDESCR(87H_04H, 0x87, 0x04, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX),
	@@ -1354,41 +1355,41 @@

	IAPDESCR(9CH_01H, 0x9C, 0x01, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(A0H_00H, 0xA0, 0x00, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2),

	IAPDESCR(A1H_01H, 0xA1, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A1H_02H, 0xA1, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A1H_04H, 0xA1, 0x04, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| /* No desc in IB for this*/
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A1H_08H, 0xA1, 0x08, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| /* No desc in IB for this*/
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A1H_0CH, 0xA1, 0x0C, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX),
	IAPDESCR(A1H_10H, 0xA1, 0x10, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| /* No desc in IB for this*/
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A1H_20H, 0xA1, 0x20, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| /* No desc in IB for this*/
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A1H_40H, 0xA1, 0x40, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A1H_80H, 0xA1, 0x80, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(A2H_00H, 0xA2, 0x00, IAP_F_FM \| IAP_F_CC),
	IAPDESCR(A2H_01H, 0xA2, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A2H_02H, 0xA2, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_SBX),
	IAPDESCR(A2H_04H, 0xA2, 0x04, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	@@ -1396,7 +1397,7 @@
	IAP_F_BW \| IAP_F_BWX),
	IAPDESCR(A2H_08H, 0xA2, 0x08, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A2H_10H, 0xA2, 0x10, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	IAP_F_BW \| IAP_F_BWX),
	@@ -1408,34 +1409,34 @@
	IAP_F_SB \| IAP_F_SBX),

	IAPDESCR(A3H_01H, 0xA3, 0x01, IAP_F_FM \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_IB \|
	- IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A3H_02H, 0xA3, 0x02, IAP_F_FM \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_IB \|
	- IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A3H_04H, 0xA3, 0x04, IAP_F_FM \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_IB \|
	- IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(A3H_05H, 0xA3, 0x05, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \|
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(A3H_05H, 0xA3, 0x05, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	- IAPDESCR(A3H_06H, 0xA3, 0x06, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	+ IAPDESCR(A3H_06H, 0xA3, 0x06, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(A3H_08H, 0xA3, 0x08, IAP_F_FM \| IAP_F_IBX \| IAP_F_HW \| IAP_F_IB \|
	- IAP_F_HWX \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(A3H_0CH, 0xA3, 0x0C, IAP_F_FM \| IAP_F_HW \| IAP_F_HW \| IAP_F_SL \|
	+ IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(A3H_0CH, 0xA3, 0x0C, IAP_F_FM \| IAP_F_HW \| IAP_F_HW \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	- IAPDESCR(A3H_10H, 0xA3, 0x10, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(A3H_14H, 0xA3, 0x14, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	+ IAPDESCR(A3H_10H, 0xA3, 0x10, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(A3H_14H, 0xA3, 0x14, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	- IAPDESCR(A6H_01H, 0xA6, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \|
	+ IAPDESCR(A6H_01H, 0xA6, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	- IAPDESCR(A6H_02H, 0xA3, 0x02, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(A6H_04H, 0xA3, 0x04, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(A6H_08H, 0xA3, 0x08, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(A6H_10H, 0xA3, 0x10, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(A6H_40H, 0xA3, 0x40, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	+ IAPDESCR(A6H_02H, 0xA3, 0x02, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(A6H_04H, 0xA3, 0x04, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(A6H_08H, 0xA3, 0x08, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(A6H_10H, 0xA3, 0x10, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(A6H_40H, 0xA3, 0x40, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(A7H_01H, 0xA7, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM ),

	IAPDESCR(A8H_01H, 0xA8, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_IBX \|
	IAP_F_IB \|IAP_F_SB \| IAP_F_SBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \|
	- IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(AAH_01H, 0xAA, 0x01, IAP_F_FM \| IAP_F_CC2),
	IAPDESCR(AAH_02H, 0xAA, 0x02, IAP_F_FM \| IAP_F_CA),
	@@ -1446,47 +1447,47 @@
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX),
	IAPDESCR(ABH_02H, 0xAB, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SLX),
	+ IAP_F_KL \| IAP_F_SLX),

	- IAPDESCR(ACH_02H, 0xAC, 0x02, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_SL),
	+ IAPDESCR(ACH_02H, 0xAC, 0x02, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_SL \| IAP_F_KL),
	IAPDESCR(ACH_08H, 0xAC, 0x08, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX),
	IAPDESCR(ACH_0AH, 0xAC, 0x0A, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX),

	IAPDESCR(AEH_01H, 0xAE, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(B0H_00H, 0xB0, 0x00, IAP_F_FM \| IAP_F_ALLCPUSCORE2),
	IAPDESCR(B0H_01H, 0xB0, 0x01, IAP_F_FM \| IAP_F_WM \| IAP_F_I7O \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(B0H_02H, 0xB0, 0x02, IAP_F_FM \| IAP_F_WM \| IAP_F_I7O \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(B0H_04H, 0xB0, 0x04, IAP_F_FM \| IAP_F_WM \| IAP_F_I7O \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(B0H_08H, 0xB0, 0x08, IAP_F_FM \| IAP_F_WM \| IAP_F_I7O \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	- IAPDESCR(B0H_10H, 0xB0, 0x10, IAP_F_FM \| IAP_F_WM \| IAP_F_I7O \| IAP_F_SL \|
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	+ IAPDESCR(B0H_10H, 0xB0, 0x10, IAP_F_FM \| IAP_F_WM \| IAP_F_I7O \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(B0H_20H, 0xB0, 0x20, IAP_F_FM \| IAP_F_I7O),
	IAPDESCR(B0H_40H, 0xB0, 0x40, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	IAPDESCR(B0H_80H, 0xB0, 0x80, IAP_F_FM \| IAP_F_CA \| IAP_F_WM \| IAP_F_I7O \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(B1H_00H, 0xB1, 0x00, IAP_F_FM \| IAP_F_ALLCPUSCORE2),
	IAPDESCR(B1H_01H, 0xB1, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(B1H_02H, 0xB1, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(B1H_04H, 0xB1, 0x04, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	IAPDESCR(B1H_08H, 0xB1, 0x08, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	- IAPDESCR(B1H_10H, 0xB1, 0x10, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_SLX),
	+ IAPDESCR(B1H_10H, 0xB1, 0x10, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(B1H_1FH, 0xB1, 0x1F, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	IAPDESCR(B1H_20H, 0xB1, 0x20, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	IAPDESCR(B1H_3FH, 0xB1, 0x3F, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	@@ -1495,7 +1496,7 @@
	IAP_F_WM),

	IAPDESCR(B2H_01H, 0xB2, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	- IAP_F_SB \| IAP_F_SBX \| IAP_F_SLX),
	+ IAP_F_SB \| IAP_F_SBX \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(B3H_01H, 0xB3, 0x01, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \|
	IAP_F_WM \| IAP_F_I7O),
	@@ -1522,7 +1523,7 @@

	IAPDESCR(B7H_01H, 0xB7, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_CAS \|
	- IAP_F_HWX \|IAP_F_BW \| IAP_F_BWX \| IAP_F_SL),
	+ IAP_F_HWX \|IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL),
	IAPDESCR(B7H_02H, 0xB7, 0x02, IAP_F_CAS),

	IAPDESCR(B8H_01H, 0xB8, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	@@ -1534,7 +1535,7 @@

	IAPDESCR(BBH_01H, 0xBB, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL),

	IAPDESCR(BCH_11H, 0xBC, 0x11, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),
	IAPDESCR(BCH_12H, 0xBC, 0x12, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),
	@@ -1546,7 +1547,7 @@
	IAPDESCR(BCH_28H, 0xBC, 0x28, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX),

	IAPDESCR(BDH_01H, 0xBD, 0x01, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	- IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_SLX), /* spec bug SL? */
	+ IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX), /* spec bug SL? */
	IAPDESCR(BDH_20H, 0xBD, 0x20, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SLX),

	@@ -1554,10 +1555,10 @@

	IAPDESCR(C0H_00H, 0xC0, 0x00, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \|
	IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \|
	- IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C0H_01H, 0xC0, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(C0H_02H, 0xC0, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_BW \| IAP_F_BWX),
	@@ -1574,7 +1575,7 @@
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),
	IAPDESCR(C1H_20H, 0xC1, 0x20, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX),
	- IAPDESCR(C1H_3FH, 0xC1, 0x3F, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	+ IAPDESCR(C1H_3FH, 0xC1, 0x3F, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C1H_40H, 0xC1, 0x40, IAP_F_FM \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),
	IAPDESCR(C1H_80H, 0xC1, 0x80, IAP_F_FM \|IAP_F_IB \| IAP_F_IBX),
	IAPDESCR(C1H_FEH, 0xC1, 0xFE, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2),
	@@ -1583,10 +1584,10 @@
	IAPDESCR(C2H_01H, 0xC2, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \|
	IAP_F_IBX \| IAP_F_HW \| IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C2H_02H, 0xC2, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(C2H_04H, 0xC2, 0x04, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM),
	@@ -1597,15 +1598,15 @@

	IAPDESCR(C3H_00H, 0xC3, 0x00, IAP_F_FM \| IAP_F_CC),
	IAPDESCR(C3H_01H, 0xC3, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	- IAP_F_I7 \| IAP_F_WM \| IAP_F_CAS \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_I7 \| IAP_F_WM \| IAP_F_CAS \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(C3H_02H, 0xC3, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \|
	- IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C3H_04H, 0xC3, 0x04, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \|
	IAP_F_IBX \| IAP_F_HW \| IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C3H_08H, 0xC3, 0x08, IAP_F_FM \| IAP_F_CAS),
	IAPDESCR(C3H_10H, 0xC3, 0x10, IAP_F_FM \| IAP_F_I7O),
	IAPDESCR(C3H_20H, 0xC3, 0x20, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	@@ -1614,33 +1615,33 @@
	IAPDESCR(C4H_00H, 0xC4, 0x00, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \|
	IAP_F_IBX \| IAP_F_HW \| IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C4H_01H, 0xC4, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(C4H_02H, 0xC4, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(C4H_04H, 0xC4, 0x04, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(C4H_08H, 0xC4, 0x08, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \|
	- IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C4H_0CH, 0xC4, 0x0C, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2),
	IAPDESCR(C4H_0FH, 0xC4, 0x0F, IAP_F_FM \| IAP_F_CA),
	IAPDESCR(C4H_10H, 0xC4, 0x10, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C4H_20H, 0xC4, 0x20, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C4H_40H, 0xC4, 0x40, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C4H_7EH, 0xC4, 0x7E, IAP_F_FM \| IAP_F_CAS),
	IAPDESCR(C4H_BFH, 0xC4, 0xBF, IAP_F_FM \| IAP_F_CAS),
	IAPDESCR(C4H_EBH, 0xC4, 0xEB, IAP_F_FM \| IAP_F_CAS),
	@@ -1653,19 +1654,19 @@
	IAPDESCR(C5H_00H, 0xC5, 0x00, IAP_F_FM \| IAP_F_ALLCPUSCORE2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \|
	IAP_F_IBX \| IAP_F_HW \| IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C5H_01H, 0xC5, 0x01, IAP_F_FM \| IAP_F_WM \| IAP_F_SB \|
	IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \|
	- IAP_F_BWX \| IAP_F_SLX),
	+ IAP_F_BWX \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C5H_02H, 0xC5, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_SL \| IAP_F_SLX),
	IAPDESCR(C5H_04H, 0xC5, 0x04, IAP_F_FM \| IAP_F_WM \| IAP_F_SB \|
	IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \|
	- IAP_F_BWX \| IAP_F_SL),
	+ IAP_F_BWX \| IAP_F_SL \| IAP_F_KL),
	IAPDESCR(C5H_10H, 0xC5, 0x10, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX),
	IAPDESCR(C5H_20H, 0xC5, 0x20, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	- IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C5H_7EH, 0xC5, 0x7E, IAP_F_FM \| IAP_F_CAS),
	IAPDESCR(C5H_BFH, 0xC5, 0xBF, IAP_F_FM \| IAP_F_CAS),
	IAPDESCR(C5H_EBH, 0xC5, 0xEB, IAP_F_FM \| IAP_F_CAS),
	@@ -1677,23 +1678,23 @@

	IAPDESCR(C6H_00H, 0xC6, 0x00, IAP_F_FM \| IAP_F_CC),
	/* For SL C6_01 needs EV_SEL? 0x11, 0x12, 0x13, 0x14, 0x15? */
	- IAPDESCR(C6H_01H, 0xC6, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| IAP_F_SL \|
	+ IAPDESCR(C6H_01H, 0xC6, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(C6H_02H, 0xC6, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2),

	IAPDESCR(C7H_00H, 0xC7, 0x00, IAP_F_FM \| IAP_F_CC),
	IAPDESCR(C7H_01H, 0xC7, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	- IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C7H_02H, 0xC7, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	- IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C7H_04H, 0xC7, 0x04, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	- IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C7H_08H, 0xC7, 0x08, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	- IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C7H_10H, 0xC7, 0x10, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	- IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_I7 \| IAP_F_WM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C7H_1FH, 0xC7, 0x1F, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2),
	- IAPDESCR(C7H_20H, 0xC7, 0x20, IAP_F_FM \| IAP_F_SL \| IAP_F_SLX),
	+ IAPDESCR(C7H_20H, 0xC7, 0x20, IAP_F_FM \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(C7H_40H, 0xc7, 0x40, IAP_F_FM \| IAP_F_SLX),
	IAPDESCR(C7H_80H, 0xc7, 0x80, IAP_F_FM \| IAP_F_SLX),

	@@ -1732,13 +1733,13 @@
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX),
	IAPDESCR(CAH_1EH, 0xCA, 0x1E, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(CAH_20H, 0xCA, 0x20, IAP_F_FM \| IAP_F_CAS \| IAP_F_BW \| IAP_F_BWX),
	IAPDESCR(CAH_3FH, 0xCA, 0x3F, IAP_F_FM \| IAP_F_CAS),
	IAPDESCR(CAH_50H, 0xCA, 0x50, IAP_F_FM \| IAP_F_CAS),

	IAPDESCR(CBH_01H, 0xCB, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	- IAP_F_I7 \| IAP_F_WM \| IAP_F_CAS \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_I7 \| IAP_F_WM \| IAP_F_CAS \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(CBH_02H, 0xCB, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM),
	IAPDESCR(CBH_04H, 0xCB, 0x04, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	@@ -1764,7 +1765,7 @@
	IAPDESCR(CDH_00H, 0xCD, 0x00, IAP_F_FM \| IAP_F_ALLCPUSCORE2),
	IAPDESCR(CDH_01H, 0xCD, 0x01, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_CAS \| IAP_F_HWX \| IAP_F_BW \|
	- IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(CDH_02H, 0xCD, 0x02, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX),

	@@ -1775,61 +1776,61 @@
	IAPDESCR(D0H_00H, 0xD0, 0x00, IAP_F_FM \| IAP_F_CC),
	IAPDESCR(D0H_01H, 0xD0, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	IAPDESCR(D0H_11H, 0xD0, 0x11, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(D0H_12H, 0xD0, 0x12, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(D0H_21H, 0xD0, 0x21, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_BW \|
	- IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(D0H_41H, 0xD0, 0x41, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(D0H_42H, 0xD0, 0x42, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(D0H_81H, 0xD0, 0x81, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(D0H_82H, 0xD0, 0x82, IAP_F_FM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),

	IAPDESCR(D1H_01H, 0xD1, 0x01, IAP_F_FM \| IAP_F_WM \| IAP_F_SB \|
	IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \|
	- IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(D1H_02H, 0xD1, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(D1H_04H, 0xD1, 0x04, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(D1H_08H, 0xD1, 0x08, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(D1H_10H, 0xD1, 0x10, IAP_F_HW \| IAP_F_IB \| IAP_F_IBX \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(D1H_20H, 0xD1, 0x20, IAP_F_FM \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_IB \|
	- IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(D1H_40H, 0xD1, 0x40, IAP_F_FM \| IAP_F_SB \| IAP_F_IB \|
	IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \|
	- IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),

	IAPDESCR(D2H_01H, 0xD2, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(D2H_02H, 0xD2, 0x02, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(D2H_04H, 0xD2, 0x04, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(D2H_08H, 0xD2, 0x08, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	- IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \|
	+ IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \| IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \|
	IAP_F_SLX),
	IAPDESCR(D2H_0FH, 0xD2, 0x0F, IAP_F_FM \| IAP_F_CA \| IAP_F_CC2 \|
	IAP_F_I7 \| IAP_F_WM \| IAP_F_SB \| IAP_F_SBX \| IAP_F_IB \|
	@@ -1902,7 +1903,7 @@

	IAPDESCR(E6H_00H, 0xE6, 0x00, IAP_F_FM \| IAP_F_CC \| IAP_F_CC2),
	IAPDESCR(E6H_01H, 0xE6, 0x01, IAP_F_FM \| IAP_F_CA \| IAP_F_I7 \|
	- IAP_F_WM \| IAP_F_SBX \| IAP_F_CAS \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_WM \| IAP_F_SBX \| IAP_F_CAS \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(E6H_02H, 0xE6, 0x02, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM),
	IAPDESCR(E6H_08H, 0xE6, 0x08, IAP_F_FM \| IAP_F_CAS),
	IAPDESCR(E6H_10H, 0xE6, 0x10, IAP_F_FM \| IAP_F_CAS),
	@@ -1938,7 +1939,7 @@
	IAP_F_BW \| IAP_F_BWX),
	IAPDESCR(F0H_40H, 0xF0, 0x40, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_SLX),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL \| IAP_F_SLX),
	IAPDESCR(F0H_80H, 0xF0, 0x80, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	IAP_F_BW \| IAP_F_BWX),
	@@ -1953,7 +1954,7 @@
	IAP_F_BW \| IAP_F_BWX ),
	IAPDESCR(F1H_07H, 0xF1, 0x07, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	IAP_F_SB \| IAP_F_IB \| IAP_F_SBX \| IAP_F_IBX \| IAP_F_HW \| IAP_F_HWX \|
	- IAP_F_BW \| IAP_F_BWX \| IAP_F_SL),
	+ IAP_F_BW \| IAP_F_BWX \| IAP_F_SL \| IAP_F_KL),
	IAPDESCR(F1H_1FH, 0xF1, 0x1f, IAP_F_FM \| IAP_F_SLX),

	IAPDESCR(F2H_01H, 0xF2, 0x01, IAP_F_FM \| IAP_F_I7 \| IAP_F_WM \|
	@@ -2284,6 +2285,7 @@
	break;
	case PMC_CPU_INTEL_SKYLAKE:
	case PMC_CPU_INTEL_SKYLAKE_XEON:
	+ case PMC_CPU_INTEL_KABYLAKE:
	case PMC_CPU_INTEL_BROADWELL:
	case PMC_CPU_INTEL_BROADWELL_XEON:
	case PMC_CPU_INTEL_SANDYBRIDGE:
	@@ -2324,6 +2326,9 @@
	case PMC_CPU_INTEL_SKYLAKE:
	cpuflag = IAP_F_SL;
	break;
	+ case PMC_CPU_INTEL_KABYLAKE:
	+ cpuflag = IAP_F_KL;
	+ break;
	case PMC_CPU_INTEL_BROADWELL_XEON:
	cpuflag = IAP_F_BWX;
	break;
	Index: sys/dev/hwpmc/hwpmc_intel.c
	===================================================================
	--- sys/dev/hwpmc/hwpmc_intel.c
	+++ sys/dev/hwpmc/hwpmc_intel.c
	@@ -214,6 +214,11 @@
	nclasses = 3;
	break;
	}
	+ case 0x8E: /* Per Intel document 325462-063US July 2017. */
	+ case 0x9E: /* Per Intel document 325462-063US July 2017. */
	+ cputype = PMC_CPU_INTEL_KABYLAKE;
	+ nclasses = 3;
	+ break;
	break;
	#if defined(__i386__) \|\| defined(__amd64__)
	case 0xF00: /* P4 */
	@@ -250,6 +255,7 @@
	case PMC_CPU_INTEL_BROADWELL_XEON:
	case PMC_CPU_INTEL_SKYLAKE_XEON:
	case PMC_CPU_INTEL_SKYLAKE:
	+ case PMC_CPU_INTEL_KABYLAKE:
	case PMC_CPU_INTEL_CORE:
	case PMC_CPU_INTEL_CORE2:
	case PMC_CPU_INTEL_CORE2EXTREME:
	@@ -347,6 +353,7 @@
	case PMC_CPU_INTEL_BROADWELL_XEON:
	case PMC_CPU_INTEL_SKYLAKE_XEON:
	case PMC_CPU_INTEL_SKYLAKE:
	+ case PMC_CPU_INTEL_KABYLAKE:
	case PMC_CPU_INTEL_CORE:
	case PMC_CPU_INTEL_CORE2:
	case PMC_CPU_INTEL_CORE2EXTREME:
	Index: sys/dev/hwpmc/pmc_events.h
	===================================================================
	--- sys/dev/hwpmc/pmc_events.h
	+++ sys/dev/hwpmc/pmc_events.h
	@@ -2427,6 +2427,185 @@
	__PMC_EV_ALIAS("IDI_MISC.WB_UPGRADE", IAP_EVENT_FEH_02H) \
	__PMC_EV_ALIAS("IDI_MISC.WB_DOWNGRADE", IAP_EVENT_FEH_04H)

	+/*
	+ * Alisases for Kaby Lake
	+ */
	+#define __PMC_EV_ALIAS_KABYLAKE() \
	+__PMC_EV_ALIAS_INTEL_ARCHITECTURAL() \
	+__PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H) \
	+__PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H) \
	+__PMC_EV_ALIAS("LD_BLOCKS_PARTIAL.ADDRESS_ALIAS", IAP_EVENT_07H_01H) \
	+__PMC_EV_ALIAS("DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_08H_01H)\
	+__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED", IAP_EVENT_08H_0EH) \
	+__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_PENDING", IAP_EVENT_08H_10H) \
	+__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT", IAP_EVENT_08H_20H) \
	+__PMC_EV_ALIAS("INT_MISC.RECOVERY_CYCLES", IAP_EVENT_0DH_01H) \
	+__PMC_EV_ALIAS("INT_MISC.CLEAR_RESTEER_CYCLES", IAP_EVENT_0DH_80H) \
	+__PMC_EV_ALIAS("UOPS_ISSUED.ANY", IAP_EVENT_0EH_01H) \
	+__PMC_EV_ALIAS("UOPS_ISSUED.VECTORS_WIDTH_MISMATCH", IAP_EVENT_0EH_02H) \
	+__PMC_EV_ALIAS("UOPS_ISSUED.SLOW_LEA", IAP_EVENT_0EH_20H) \
	+__PMC_EV_ALIAS("ARITH.FPU_DIV_ACTIVE", IAP_EVENT_14H_01H) \
	+__PMC_EV_ALIAS("L2_RQSTS.DEMAND_DATA_RD_MISS", IAP_EVENT_24H_21H) \
	+__PMC_EV_ALIAS("L2_RQSTS.RFO_MISS", IAP_EVENT_24H_22H) \
	+__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_MISS", IAP_EVENT_24H_24H) \
	+__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_MISS", IAP_EVENT_24H_27H) \
	+__PMC_EV_ALIAS("L2_RQSTS.PF_MISS", IAP_EVENT_24H_38H) \
	+__PMC_EV_ALIAS("L2_RQSTS.MISS", IAP_EVENT_24H_3FH) \
	+__PMC_EV_ALIAS("L2_RQSTS.DEMAND_DATA_RD_HIT", IAP_EVENT_24H_41H) \
	+__PMC_EV_ALIAS("L2_RQSTS.RFO_HIT", IAP_EVENT_24H_42H) \
	+__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_HIT", IAP_EVENT_24H_44H) \
	+__PMC_EV_ALIAS("L2_RQSTS.PF_HIT", IAP_EVENT_24H_D8H) \
	+__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_DATA_RD", IAP_EVENT_24H_E1H) \
	+__PMC_EV_ALIAS("L2_RQSTS.ALL_RFO", IAP_EVENT_24H_E2H) \
	+__PMC_EV_ALIAS("L2_RQSTS.ALL_CODE_RD", IAP_EVENT_24H_E4H) \
	+__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_REFERENCES", IAP_EVENT_24H_E7H) \
	+__PMC_EV_ALIAS("L2_RQSTS.ALL_PF", IAP_EVENT_24H_F8H) \
	+__PMC_EV_ALIAS("L2_RQSTS.REFERENCES", IAP_EVENT_24H_EFH) \
	+__PMC_EV_ALIAS("LONGEST_LAT_CACHE.REFERENCE", IAP_EVENT_2EH_4FH) \
	+__PMC_EV_ALIAS("LONGEST_LAT_CACHE.MISS", IAP_EVENT_2EH_41H) \
	+__PMC_EV_ALIAS("CPU_CLK_UNHALTED.THREAD_P", IAP_EVENT_3CH_00H) \
	+__PMC_EV_ALIAS("CPU_CLK_THREAD_UNHALTED.REF_XCLK", IAP_EVENT_3CH_01H) \
	+__PMC_EV_ALIAS("CPU_CLK_THREAD_UNHALTED.ONE_THREAD_ACTIVE", \
	+ IAP_EVENT_3CH_02H) \
	+__PMC_EV_ALIAS("L1D_PEND_MISS.PENDING", IAP_EVENT_48H_01H) \
	+__PMC_EV_ALIAS("L1D_PEND_MISS.FB_FULL", IAP_EVENT_48H_02H) \
	+__PMC_EV_ALIAS("DTLB_STORE_MISSES.MISS_CAUSES_A_WALK", \
	+ IAP_EVENT_49H_01H) \
	+__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED", IAP_EVENT_49H_0EH) \
	+__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_PENDING", IAP_EVENT_49H_10H) \
	+__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT", IAP_EVENT_49H_20H) \
	+__PMC_EV_ALIAS("LOAD_HIT_PRE.HW_PF", IAP_EVENT_4CH_01H) \
	+__PMC_EV_ALIAS("EPT.WALK_CYCLES", IAP_EVENT_4FH_10H) \
	+__PMC_EV_ALIAS("L1D.REPLACEMENT", IAP_EVENT_51H_01H) \
	+__PMC_EV_ALIAS("RS_EVENTS.EMPTY_CYCLES", IAP_EVENT_5EH_01H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD", \
	+ IAP_EVENT_60H_01H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CODE_RD", \
	+ IAP_EVENT_60H_02H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO", \
	+ IAP_EVENT_60H_04H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD", \
	+ IAP_EVENT_60H_08H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.L3_MISS_DEMAND_DATA_RD", \
	+ IAP_EVENT_60H_10H) \
	+__PMC_EV_ALIAS("LOCK_CYCLES.CACHE_LOCK_DURATION", IAP_EVENT_63H_02H) \
	+__PMC_EV_ALIAS("IDQ.MITE_UOPS", IAP_EVENT_79H_04H) \
	+__PMC_EV_ALIAS("IDQ.DSB_UOPS", IAP_EVENT_79H_08H) \
	+__PMC_EV_ALIAS("IDQ.MS_DSB_UOPS", IAP_EVENT_79H_10H) \
	+__PMC_EV_ALIAS("IDQ.ALL_DSB_CYCLES_ANY_UOPS", IAP_EVENT_79H_18H) \
	+__PMC_EV_ALIAS("IDQ.MS_MITE_UOPS", IAP_EVENT_79H_20H) \
	+__PMC_EV_ALIAS("IDQ.MS_UOPS", IAP_EVENT_79H_30H) \
	+__PMC_EV_ALIAS("ICACHE_16B.IFDATA_STALL", IAP_EVENT_80H_04H) \
	+__PMC_EV_ALIAS("ICACHE_64B.IFTAG_HIT", IAP_EVENT_83H_01H) \
	+__PMC_EV_ALIAS("ICACHE_64B.IFTAG_MISS", IAP_EVENT_83H_02H) \
	+__PMC_EV_ALIAS("ITLB_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_85H_01H) \
	+__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED", IAP_EVENT_85H_0EH) \
	+__PMC_EV_ALIAS("ITLB_MISSES.WALK_PENDING", IAP_EVENT_85H_10H) \
	+__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT", IAP_EVENT_85H_20H) \
	+__PMC_EV_ALIAS("ILD_STALL.LCP", IAP_EVENT_87H_01H) \
	+__PMC_EV_ALIAS("IDQ_UOPS_NOT_DELIVERED.CORE", IAP_EVENT_9CH_01H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_0", IAP_EVENT_A1H_01H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_1", IAP_EVENT_A1H_02H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_2", IAP_EVENT_A1H_04H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_3", IAP_EVENT_A1H_08H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_4", IAP_EVENT_A1H_10H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_5", IAP_EVENT_A1H_20H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_6", IAP_EVENT_A1H_40H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_7", IAP_EVENT_A1H_80H) \
	+__PMC_EV_ALIAS("RESOURCE_STALLS.ANY", IAP_EVENT_A2H_01H) \
	+__PMC_EV_ALIAS("RESOURCE_STALLS.SB", IAP_EVENT_A2H_08H) \
	+__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L2_MISS", IAP_EVENT_A3H_01H) \
	+__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L3_MISS", IAP_EVENT_A3H_02H) \
	+__PMC_EV_ALIAS("CYCLE_ACTIVITY.STALLS_TOTAL", IAP_EVENT_A3H_04H) \
	+__PMC_EV_ALIAS("CYCLE_ACTIVITY.STALLS_L2_MISS", IAP_EVENT_A3H_05H) \
	+__PMC_EV_ALIAS("CYCLE_ACTIVITY.STALLS_L3_MISS", IAP_EVENT_A3H_06H) \
	+__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L1D_MISS", IAP_EVENT_A3H_08H) \
	+__PMC_EV_ALIAS("CYCLE_ACTIVITY.STALLS_L1D_MISS", IAP_EVENT_A3H_0CH) \
	+__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_MEM_ANY", IAP_EVENT_A3H_10H) \
	+__PMC_EV_ALIAS("CYCLE_ACTIVITY.STALLS_MEM_ANY", IAP_EVENT_A3H_14H) \
	+__PMC_EV_ALIAS("EXE_ACTIVITY.EXE_BOUND_0_PORTS", IAP_EVENT_A6H_01H) \
	+__PMC_EV_ALIAS("EXE_ACTIVITY.1_PORTS_UTIL", IAP_EVENT_A6H_02H) \
	+__PMC_EV_ALIAS("EXE_ACTIVITY.2_PORTS_UTIL", IAP_EVENT_A6H_04H) \
	+__PMC_EV_ALIAS("EXE_ACTIVITY.3_PORTS_UTIL", IAP_EVENT_A6H_08H) \
	+__PMC_EV_ALIAS("EXE_ACTIVITY.4_PORTS_UTIL", IAP_EVENT_A6H_10H) \
	+__PMC_EV_ALIAS("EXE_ACTIVITY.BOUND_ON_STORES", IAP_EVENT_A6H_40H) \
	+__PMC_EV_ALIAS("LSD.UOPS", IAP_EVENT_A8H_01H) \
	+__PMC_EV_ALIAS("DSB2MITE_SWITCHES.PENALTY_CYCLES", IAP_EVENT_ABH_02H) \
	+__PMC_EV_ALIAS("ITLB.ITLB_FLUSH", IAP_EVENT_AEH_01H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_DATA_RD", IAP_EVENT_B0H_01H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_CODE_RD", IAP_EVENT_B0H_02H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_RFO", IAP_EVENT_B0H_04H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS.ALL_DATA_RD", IAP_EVENT_B0H_08H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS.L3_MISS_DEMAND_DATA_RD", \
	+ IAP_EVENT_B0H_10H) \
	+__PMC_EV_ALIAS("OFFCORE_REQUESTS.ALL_REQUESTS", IAP_EVENT_B0H_80H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED.THREAD", IAP_EVENT_B1H_01H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED.CORE", IAP_EVENT_B1H_02H) \
	+__PMC_EV_ALIAS("UOPS_EXECUTED.X87", IAP_EVENT_B1H_10H) \
	+__PMC_EV_ALIAS("OFF_CORE_REQUEST_BUFFER.SQ_FULL", IAP_EVENT_B2H_01H) \
	+__PMC_EV_ALIAS("OFF_CORE_RESPONSE_0", IAP_EVENT_B7H_01H) \
	+__PMC_EV_ALIAS("OFF_CORE_RESPONSE_1", IAP_EVENT_BBH_01H) \
	+__PMC_EV_ALIAS("TLB_FLUSH.DTLB_THREAD", IAP_EVENT_BDH_01H) \
	+__PMC_EV_ALIAS("INST_RETIRED.ANY_P", IAP_EVENT_C0H_00H) \
	+__PMC_EV_ALIAS("INST_RETIRED.PREC_DIST", IAP_EVENT_C0H_01H) \
	+__PMC_EV_ALIAS("OTHER_ASSISTS.ANY", IAP_EVENT_C1H_3FH) \
	+__PMC_EV_ALIAS("UOPS_RETIRED.STALL_CYCLES", IAP_EVENT_C2H_01H) \
	+__PMC_EV_ALIAS("UOPS_RETIRED.RETIRE_SLOTS", IAP_EVENT_C2H_02H) \
	+__PMC_EV_ALIAS("MACHINE_CLEARS.CYCLES", IAP_EVENT_C3H_01H) \
	+__PMC_EV_ALIAS("MACHINE_CLEARS.MEMORY_ORDERING", IAP_EVENT_C3H_02H) \
	+__PMC_EV_ALIAS("MACHINE_CLEARS.SMC", IAP_EVENT_C3H_04H) \
	+__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_00H) \
	+__PMC_EV_ALIAS("BR_INST_RETIRED.CONDITIONAL", IAP_EVENT_C4H_01H) \
	+__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_CALL", IAP_EVENT_C4H_02H) \
	+__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_04H) \
	+__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_RETURN", IAP_EVENT_C4H_08H) \
	+__PMC_EV_ALIAS("BR_INST_RETIRED.NOT_TAKEN", IAP_EVENT_C4H_10H) \
	+__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_TAKEN", IAP_EVENT_C4H_20H) \
	+__PMC_EV_ALIAS("BR_INST_RETIRED.FAR_BRANCH", IAP_EVENT_C4H_40H) \
	+__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_00H) \
	+__PMC_EV_ALIAS("BR_MISP_RETIRED.CONDITIONAL", IAP_EVENT_C5H_01H) \
	+__PMC_EV_ALIAS("BR_MISP_U_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_04H) \
	+__PMC_EV_ALIAS("BR_MISP_RETIRED.NEAR_TAKEN", IAP_EVENT_C5H_20H) \
	+__PMC_EV_ALIAS("FRONTEND_RETIRED.DSB_MISS", IAP_EVENT_C6H_01H) \
	+__PMC_EV_ALIAS("FP_ARIT_INST_RETIRED.SCALAR_DOUBLE", IAP_EVENT_C7H_01H) \
	+__PMC_EV_ALIAS("FP_ARIT_INST_RETIRED.SCALAR_SINGLE", IAP_EVENT_C7H_02H) \
	+__PMC_EV_ALIAS("FP_ARIT_INST_RETIRED.128B_PACKED_DOUBLE", \
	+ IAP_EVENT_C7H_04H) \
	+__PMC_EV_ALIAS("FP_ARIT_INST_RETIRED.128B_PACKED_SINGLE", \
	+ IAP_EVENT_C7H_08H) \
	+__PMC_EV_ALIAS("FP_ARIT_INST_RETIRED.256B_PACKED_DOUBLE", \
	+ IAP_EVENT_C7H_10H) \
	+__PMC_EV_ALIAS("FP_ARIT_INST_RETIRED.256B_PACKED_SINGLE", \
	+ IAP_EVENT_C7H_20H) \
	+__PMC_EV_ALIAS("FP_ASSIST.ANY", IAP_EVENT_CAH_1EH) \
	+__PMC_EV_ALIAS("HW_INTERRUPTS.RECEIVED", IAP_EVENT_CBH_01H) \
	+__PMC_EV_ALIAS("MEM_TRANS_RETIRED.LOAD_LATENCY", IAP_EVENT_CDH_01H) \
	+__PMC_EV_ALIAS("MEM_UOPS_RETIRED.STLB_MISS_LOADS", IAP_EVENT_D0H_11H) \
	+__PMC_EV_ALIAS("MEM_UOPS_RETIRED.STLB_MISS_STORES", IAP_EVENT_D0H_12H) \
	+__PMC_EV_ALIAS("MEM_UOPS_RETIRED.LOCK_LOADS", IAP_EVENT_D0H_21H) \
	+__PMC_EV_ALIAS("MEM_UOPS_RETIRED.SPLIT_LOADS", IAP_EVENT_D0H_41H) \
	+__PMC_EV_ALIAS("MEM_UOPS_RETIRED.SPLIT_STORES", IAP_EVENT_D0H_42H) \
	+__PMC_EV_ALIAS("MEM_UOPS_RETIRED.ALL_LOADS", IAP_EVENT_D0H_81H) \
	+__PMC_EV_ALIAS("MEM_UOPS_RETIRED.ALL_STORES", IAP_EVENT_D0H_82H) \
	+__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_HIT", IAP_EVENT_D1H_01H) \
	+__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_HIT", IAP_EVENT_D1H_02H) \
	+__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L3_HIT", IAP_EVENT_D1H_04H) \
	+__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_MISS", IAP_EVENT_D1H_08H) \
	+__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_MISS", IAP_EVENT_D1H_10H) \
	+__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L3_MISS", IAP_EVENT_D1H_20H) \
	+__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.FB_HIT", IAP_EVENT_D1H_40H) \
	+__PMC_EV_ALIAS("MEM_LOAD_L3_HIT_RETIRED.XSNP_MISS", \
	+ IAP_EVENT_D2H_01H) \
	+__PMC_EV_ALIAS("MEM_LOAD_L3_HIT_RETIRED.XSNP_HIT", \
	+ IAP_EVENT_D2H_02H) \
	+__PMC_EV_ALIAS("MEM_LOAD_L3_HIT_RETIRED.XSNP_HITM", \
	+ IAP_EVENT_D2H_04H) \
	+__PMC_EV_ALIAS("MEM_LOAD_L3_HIT_RETIRED.XSNP_NONE", \
	+ IAP_EVENT_D2H_08H) \
	+__PMC_EV_ALIAS("BACLEARS.ANY", IAP_EVENT_E6H_01H) \
	+__PMC_EV_ALIAS("L2_TRANS.L2_WB", IAP_EVENT_F0H_40H) \
	+__PMC_EV_ALIAS("L2_LINES_IN.ALL", IAP_EVENT_F1H_07H)
	+
	/*
	* Aliases for Core PMC events.
	*/
	Index: sys/sys/pmc.h
	===================================================================
	--- sys/sys/pmc.h
	+++ sys/sys/pmc.h
	@@ -99,6 +99,7 @@
	__PMC_CPU(INTEL_BROADWELL_XEON, 0x97, "Intel Broadwell Xeon") \
	__PMC_CPU(INTEL_SKYLAKE, 0x98, "Intel Skylake") \
	__PMC_CPU(INTEL_SKYLAKE_XEON, 0x99, "Intel Skylake Xeon") \
	+ __PMC_CPU(INTEL_KABYLAKE, 0x9A, "Intel Kabylake") \
	__PMC_CPU(INTEL_XSCALE, 0x100, "Intel XScale") \
	__PMC_CPU(MIPS_24K, 0x200, "MIPS 24K") \
	__PMC_CPU(MIPS_OCTEON, 0x201, "Cavium Octeon") \

File Metadata

Mime Type: text/plain
Expires: Thu, Jun 11, 8:18 PM (4 h, 20 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 33889576
Default Alt Text: D12654.id33945.diff (62 KB)

D12654.id33945.diffNo OneTemporaryActions

D12654.id33945.diffView Options

File Metadata

Event Timeline

D12654.id33945.diff
No OneTemporary
Actions

D12654.id33945.diff
View Options