x86/cpufeatures: Put the AMX macros in the word 18 block

mainline inclusion
from mainline-v5.18-rc1
commit fa31a4d6
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I590ZC


CVE: NA

Intel-SIG: commit fa31a4d6 x86/cpufeatures: Put the AMX macros in the word 18 block.

--------------------------------

These macros are for bits in CPUID.(EAX=7,ECX=0):EDX, not for bits in
CPUID(EAX=7,ECX=1):EAX. Put them with their brethren.

  [ bp: Sort word 18 bits properly, as caught by Like Xu
    <like.xu.linux@gmail.com> ]

Signed-off-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20220203194308.2469117-1-jmattson@google.com


Signed-off-by: Lin Wang <lin.x.wang@intel.com>
Signed-off-by: Aichun Shi <aichun.shi@intel.com>