On Mon, Dec 9, 2019 at 11:25 AM Hongtao Liu <crazy...@gmail.com> wrote:
>
> Hi uros:
> This patch is about to rename OPTION_MASK_ISA_$target_[SET,UNSET, ]
> to OPTION_MASK_ISA2_$target_[SET,UNSET, ] for those targets setting
> x_ix86_isa_flags2.
> target list as bellow:
> -----
> 188static struct ix86_target_opts isa2_opts[] =
> 189{
> 190 { "-mcx16", OPTION_MASK_ISA2_CX16 },
> 191 { "-mvaes", OPTION_MASK_ISA2_VAES },
> 192 { "-mrdpid", OPTION_MASK_ISA2_RDPID },
> 193 { "-mpconfig", OPTION_MASK_ISA2_PCONFIG },
> 194 { "-mwbnoinvd", OPTION_MASK_ISA2_WBNOINVD },
> 195 { "-mavx512vp2intersect", OPTION_MASK_ISA2_AVX512VP2INTERSECT },
> 196 { "-msgx", OPTION_MASK_ISA2_SGX },
> 197 { "-mavx5124vnniw", OPTION_MASK_ISA2_AVX5124VNNIW },
> 198 { "-mavx5124fmaps", OPTION_MASK_ISA2_AVX5124FMAPS },
> 199 { "-mhle", OPTION_MASK_ISA2_HLE },
> 200 { "-mmovbe", OPTION_MASK_ISA2_MOVBE },
> 201 { "-mclzero", OPTION_MASK_ISA2_CLZERO },
> 202 { "-mmwaitx", OPTION_MASK_ISA2_MWAITX },
> 203 { "-mmovdir64b", OPTION_MASK_ISA2_MOVDIR64B },
> 204 { "-mwaitpkg", OPTION_MASK_ISA2_WAITPKG },
> 205 { "-mcldemote", OPTION_MASK_ISA2_CLDEMOTE },
> 206 { "-mptwrite", OPTION_MASK_ISA2_PTWRITE },
> 207 { "-mavx512bf16", OPTION_MASK_ISA2_AVX512BF16 },
> 208 { "-menqcmd", OPTION_MASK_ISA2_ENQCMD }
> 209};
> ------
>
> Bootstrap and regression test on i386/x86-64 backend is ok.
> Ok for trunk?
>
> Changelog
> * gcc/common/config/i386/i386-common.c
> (OPTION_MASK_ISA_AVX5124FMAPS_SET): Rename to
> OPTION_MASK_ISA2_AVX5124FMAPS_SET.
> (OPTION_MASK_ISA_AVX5124VNNIW_SET, OPTION_MASK_ISA_AVX512BF16_SET,
> OPTION_MASK_ISA_AVX512VP2INTERSECT_SET,
> OPTION_MASK_ISA_PCONFIG_SET, OPTION_MASK_ISA_WBNOINVD_SET,
> OPTION_MASK_ISA_SGX_SET, OPTION_MASK_ISA_CX16_SET,
> OPTION_MASK_ISA_MOVBE_SET, OPTION_MASK_ISA_PTWRITE_SET,
> OPTION_MASK_ISA_MWAITX_SET, OPTION_MASK_ISA_CLZERO_SET,
> OPTION_MASK_ISA_RDPID_SET, OPTION_MASK_ISA_VAES_SET,
> OPTION_MASK_ISA_MOVDIR64B_SET, OPTION_MASK_ISA_WAITPKG_SET,
> OPTION_MASK_ISA_CLDEMOTE_SET, OPTION_MASK_ISA_ENQCMD_SET,
> OPTION_MASK_ISA_AVX5124FMAPS_UNSET,
> OPTION_MASK_ISA_AVX5124VNNIW_UNSET,
> OPTION_MASK_ISA_AVX512BF16_UNSET,
> OPTION_MASK_ISA_AVX512VP2INTERSECT_UNSET,
> OPTION_MASK_ISA_PCONFIG_UNSET, OPTION_MASK_ISA_WBNOINVD_UNSET,
> OPTION_MASK_ISA_SGX_UNSET, OPTION_MASK_ISA_CX16_UNSET,
> OPTION_MASK_ISA_MOVBE_UNSET, OPTION_MASK_ISA_PTWRITE_UNSET,
> OPTION_MASK_ISA_MWAITX_UNSET, OPTION_MASK_ISA_CLZERO_UNSET,
> OPTION_MASK_ISA_RDPID_UNSET, OPTION_MASK_ISA_VAES_UNSET,
> OPTION_MASK_ISA_MOVDIR64B_UNSET, OPTION_MASK_ISA_WAITPKG_UNSET,
> OPTION_MASK_ISA_CLDEMOTE_UNSET, OPTION_MASK_ISA_ENQCMD_UNSET,
> OPTION_MASK_ISA_AVX5124FMAPS, OPTION_MASK_ISA_AVX5124VNNIW,
> OPTION_MASK_ISA_AVX512BF16, OPTION_MASK_ISA_AVX512VP2INTERSECT,
> OPTION_MASK_ISA_PCONFIG, OPTION_MASK_ISA_WBNOINVD,
> OPTION_MASK_ISA_SGX, OPTION_MASK_ISA_CX16, OPTION_MASK_ISA_MOVBE,
> OPTION_MASK_ISA_PTWRITE, OPTION_MASK_ISA_MWAITX,
> OPTION_MASK_ISA_CLZERO, OPTION_MASK_ISA_RDPID,
> OPTION_MASK_ISA_VAES, OPTION_MASK_ISA_MOVDIR64B,
> OPTION_MASK_ISA_WAITPKG, OPTION_MASK_ISA_CLDEMOTE,
> OPTION_MASK_ISA_ENQCMD): Ditto.
>
> * gcc/config/i386/i386-builtin.def
> (OPTION_MASK_ISA_AVX5124FMAPS, OPTION_MASK_ISA_AVX5124VNNIW,
> OPTION_MASK_ISA_AVX512BF16, OPTION_MASK_ISA_AVX512VP2INTERSECT,
> OPTION_MASK_ISA_WBNOINVD, OPTION_MASK_ISA_PTWRITE,
> OPTION_MASK_ISA_RDPID, OPTION_MASK_ISA_VAES,
> OPTION_MASK_ISA_MOVDIR64B, OPTION_MASK_ISA_ENQCMD): Ditto.
> * gcc/config/i386/i386-builtins.c (OPTION_MASK_ISA_MWAITX,
> OPTION_MASK_ISA_CLZERO, OPTION_MASK_ISA_WAITPKG,
> OPTION_MASK_ISA_CLDEMOTE, OPTION_MASK_ISA_WBNOINVD): Ditto.
> * gcc/config/i386/i386-c.c
> (OPTION_MASK_ISA_AVX5124FMAPS, OPTION_MASK_ISA_AVX5124VNNIW,
> OPTION_MASK_ISA_AVX512BF16, OPTION_MASK_ISA_AVX512VP2INTERSECT,
> OPTION_MASK_ISA_PCONFIG, OPTION_MASK_ISA_WBNOINVD,
> OPTION_MASK_ISA_SGX, OPTION_MASK_ISA_CX16, OPTION_MASK_ISA_MOVBE,
> OPTION_MASK_ISA_PTWRITE, OPTION_MASK_ISA_MWAITX,
> OPTION_MASK_ISA_CLZERO, OPTION_MASK_ISA_RDPID,
> OPTION_MASK_ISA_VAES, OPTION_MASK_ISA_MOVDIR64B,
> OPTION_MASK_ISA_WAITPKG, OPTION_MASK_ISA_CLDEMOTE,
> OPTION_MASK_ISA_ENQCMD): Ditto.
> * gcc/config/i386/i386-option.c: Ditto
> * gcc/config/i386/i386.opt: Ditto..
> * gcc/config/i386/i386.h: (TARGET_ISA_AVX5124FMAPS,
> TARGET_ISA_AVX5124VNNIW, TARGET_ISA_AVX512BF16,
> TARGET_ISA_AVX512VP2INTERSECT, TARGET_ISA_PCONFIG,
> TARGET_ISA_WBNOINVD, TARGET_ISA_SGX, TARGET_ISA_CX16,
> TARGET_ISA_MOVBE, TARGET_ISA_PTWRITE, TARGET_ISA_MWAITX,
> TARGET_ISA_CLZERO, TARGET_ISA_RDPID, TARGET_ISA_VAES,
> TARGET_ISA_MOVDIR64B, TARGET_ISA_WAITPKG, TARGET_ISA_CLDEMOTE,
> TARGET_ISA_ENQCMD): Ditto.
OK.
Thanks,
Uros.
> --
> BR,
> Hongtao
