On Thu, Jun 29, 2023 at 10:51 AM Hu, Lin1 via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: > > Hi, all > > This patch aims to refactor macros in case some other thing is added to > AMX_TILE_SET in future. OK for trunk? Ok, thanks. > > BRs, > Lin > > gcc/ChangeLog: > > * common/config/i386/i386-common.cc (OPTION_MASK_ISA2_AMX_INT8_SET): > Change OPTION_MASK_ISA2_AMX_TILE to OPTION_MASK_ISA2_AMX_TILE_SET. > (OPTION_MASK_ISA2_AMX_FP16_SET): Ditto > (OPTION_MASK_ISA2_AMX_COMPLEX_SET): Ditto > (OPTION_MASK_ISA_ABM_SET): > Change OPTION_MASK_ISA_POPCNT to OPTION_MASK_ISA_POPCNT_SET. > --- > gcc/common/config/i386/i386-common.cc | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/gcc/common/config/i386/i386-common.cc > b/gcc/common/config/i386/i386-common.cc > index bf126f14073..4f79afba917 100644 > --- a/gcc/common/config/i386/i386-common.cc > +++ b/gcc/common/config/i386/i386-common.cc > @@ -107,18 +107,18 @@ along with GCC; see the file COPYING3. If not see > #define OPTION_MASK_ISA2_AVX512VP2INTERSECT_SET > OPTION_MASK_ISA2_AVX512VP2INTERSECT > #define OPTION_MASK_ISA2_AMX_TILE_SET OPTION_MASK_ISA2_AMX_TILE > #define OPTION_MASK_ISA2_AMX_INT8_SET \ > - (OPTION_MASK_ISA2_AMX_TILE | OPTION_MASK_ISA2_AMX_INT8) > + (OPTION_MASK_ISA2_AMX_TILE_SET | OPTION_MASK_ISA2_AMX_INT8) > #define OPTION_MASK_ISA2_AMX_BF16_SET \ > - (OPTION_MASK_ISA2_AMX_TILE | OPTION_MASK_ISA2_AMX_BF16) > + (OPTION_MASK_ISA2_AMX_TILE_SET | OPTION_MASK_ISA2_AMX_BF16) > #define OPTION_MASK_ISA2_AVXVNNIINT8_SET OPTION_MASK_ISA2_AVXVNNIINT8 > #define OPTION_MASK_ISA2_AVXNECONVERT_SET OPTION_MASK_ISA2_AVXNECONVERT > #define OPTION_MASK_ISA2_CMPCCXADD_SET OPTION_MASK_ISA2_CMPCCXADD > #define OPTION_MASK_ISA2_AMX_FP16_SET \ > - (OPTION_MASK_ISA2_AMX_TILE | OPTION_MASK_ISA2_AMX_FP16) > + (OPTION_MASK_ISA2_AMX_TILE_SET | OPTION_MASK_ISA2_AMX_FP16) > #define OPTION_MASK_ISA2_PREFETCHI_SET OPTION_MASK_ISA2_PREFETCHI > #define OPTION_MASK_ISA2_RAOINT_SET OPTION_MASK_ISA2_RAOINT > #define OPTION_MASK_ISA2_AMX_COMPLEX_SET \ > - (OPTION_MASK_ISA2_AMX_TILE | OPTION_MASK_ISA2_AMX_COMPLEX) > + (OPTION_MASK_ISA2_AMX_TILE_SET | OPTION_MASK_ISA2_AMX_COMPLEX) > > /* SSE4 includes both SSE4.1 and SSE4.2. -msse4 should be the same > as -msse4.2. */ > @@ -143,7 +143,7 @@ along with GCC; see the file COPYING3. If not see > (OPTION_MASK_ISA_PCLMUL | OPTION_MASK_ISA_SSE2_SET) > > #define OPTION_MASK_ISA_ABM_SET \ > - (OPTION_MASK_ISA_ABM | OPTION_MASK_ISA_POPCNT) > + (OPTION_MASK_ISA_ABM | OPTION_MASK_ISA_POPCNT_SET) > > #define OPTION_MASK_ISA2_PCONFIG_SET OPTION_MASK_ISA2_PCONFIG > #define OPTION_MASK_ISA2_WBNOINVD_SET OPTION_MASK_ISA2_WBNOINVD > -- > 2.31.1 >
-- BR, Hongtao
