Skip to content

Commit d16d30f

Browse files
committed
tools headers cpufeatures: Sync with the kernel sources
To pick the changes from: fa31a4d ("x86/cpufeatures: Put the AMX macros in the word 18 block") 7b8f40b ("x86/cpu: Add definitions for the Intel Hardware Feedback Interface") This only causes these perf files to be rebuilt: CC /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o CC /tmp/build/perf/bench/mem-memset-x86-64-asm.o And addresses this perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h' diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h Cc: Borislav Petkov <bp@suse.de> Cc: Jim Mattson <jmattson@google.com> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> Link: https://lore.kernel.org/lkml/YjzZPxdyLjf76gM+@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 1efe4cb commit d16d30f

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

tools/arch/x86/include/asm/cpufeatures.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,6 @@
299299
/* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */
300300
#define X86_FEATURE_AVX_VNNI (12*32+ 4) /* AVX VNNI instructions */
301301
#define X86_FEATURE_AVX512_BF16 (12*32+ 5) /* AVX512 BFLOAT16 instructions */
302-
#define X86_FEATURE_AMX_BF16 (18*32+22) /* AMX bf16 Support */
303-
#define X86_FEATURE_AMX_TILE (18*32+24) /* AMX tile Support */
304-
#define X86_FEATURE_AMX_INT8 (18*32+25) /* AMX int8 Support */
305302

306303
/* AMD-defined CPU features, CPUID level 0x80000008 (EBX), word 13 */
307304
#define X86_FEATURE_CLZERO (13*32+ 0) /* CLZERO instruction */
@@ -330,6 +327,7 @@
330327
#define X86_FEATURE_HWP_ACT_WINDOW (14*32+ 9) /* HWP Activity Window */
331328
#define X86_FEATURE_HWP_EPP (14*32+10) /* HWP Energy Perf. Preference */
332329
#define X86_FEATURE_HWP_PKG_REQ (14*32+11) /* HWP Package Level Request */
330+
#define X86_FEATURE_HFI (14*32+19) /* Hardware Feedback Interface */
333331

334332
/* AMD SVM Feature Identification, CPUID level 0x8000000a (EDX), word 15 */
335333
#define X86_FEATURE_NPT (15*32+ 0) /* Nested Page Table support */
@@ -390,7 +388,10 @@
390388
#define X86_FEATURE_TSXLDTRK (18*32+16) /* TSX Suspend Load Address Tracking */
391389
#define X86_FEATURE_PCONFIG (18*32+18) /* Intel PCONFIG */
392390
#define X86_FEATURE_ARCH_LBR (18*32+19) /* Intel ARCH LBR */
391+
#define X86_FEATURE_AMX_BF16 (18*32+22) /* AMX bf16 Support */
393392
#define X86_FEATURE_AVX512_FP16 (18*32+23) /* AVX512 FP16 */
393+
#define X86_FEATURE_AMX_TILE (18*32+24) /* AMX tile Support */
394+
#define X86_FEATURE_AMX_INT8 (18*32+25) /* AMX int8 Support */
394395
#define X86_FEATURE_SPEC_CTRL (18*32+26) /* "" Speculation Control (IBRS + IBPB) */
395396
#define X86_FEATURE_INTEL_STIBP (18*32+27) /* "" Single Thread Indirect Branch Predictors */
396397
#define X86_FEATURE_FLUSH_L1D (18*32+28) /* Flush L1D cache */

0 commit comments

Comments
 (0)