From: Haochen Jiang Date: Mon, 9 Oct 2023 08:09:49 +0000 (+0800) Subject: Disable zmm register and 512 bit libmvec call when !TARGET_EVEX512 X-Git-Tag: basepoints/gcc-15~5641 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa9bce39f1cea1f4cbdf41823c53029a8af40d50;p=thirdparty%2Fgcc.git Disable zmm register and 512 bit libmvec call when !TARGET_EVEX512 gcc/ChangeLog: * config/i386/i386-expand.cc (ix86_broadcast_from_constant): Disable zmm broadcast for !TARGET_EVEX512. * config/i386/i386-options.cc (ix86_option_override_internal): Do not use PVW_512 when no-evex512. (ix86_simd_clone_adjust): Add evex512 target into string. * config/i386/i386.cc (type_natural_mode): Report ABI warning when using zmm register w/o evex512. (ix86_return_in_memory): Do not allow zmm when !TARGET_EVEX512. (ix86_hard_regno_mode_ok): Ditto. (ix86_set_reg_reg_cost): Ditto. (ix86_rtx_costs): Ditto. (ix86_vector_mode_supported_p): Ditto. (ix86_preferred_simd_mode): Ditto. (ix86_get_mask_mode): Ditto. (ix86_simd_clone_compute_vecsize_and_simdlen): Disable 512 bit libmvec call when !TARGET_EVEX512. (ix86_simd_clone_usable): Ditto. * config/i386/i386.h (BIGGEST_ALIGNMENT): Disable 512 alignment when !TARGET_EVEX512 (MOVE_MAX): Do not use PVW_512 when !TARGET_EVEX512. (STORE_MAX_PIECES): Ditto. --- diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc index 425f35318620..6e5bc3d30c89 100644 --- a/gcc/config/i386/i386-expand.cc +++ b/gcc/config/i386/i386-expand.cc @@ -611,6 +611,7 @@ ix86_broadcast_from_constant (machine_mode mode, rtx op) avx512 embed broadcast is available. */ if (GET_MODE_INNER (mode) == DImode && !TARGET_64BIT && (!TARGET_AVX512F + || (GET_MODE_SIZE (mode) == 64 && !TARGET_EVEX512) || (GET_MODE_SIZE (mode) < 64 && !TARGET_AVX512VL))) return nullptr; diff --git a/gcc/config/i386/i386-options.cc b/gcc/config/i386/i386-options.cc index 3398151b8e44..06af373ca57a 100644 --- a/gcc/config/i386/i386-options.cc +++ b/gcc/config/i386/i386-options.cc @@ -2863,7 +2863,8 @@ ix86_option_override_internal (bool main_args_p, opts->x_ix86_move_max = opts->x_prefer_vector_width_type; if (opts_set->x_ix86_move_max == PVW_NONE) { - if (TARGET_AVX512F_P (opts->x_ix86_isa_flags)) + if (TARGET_AVX512F_P (opts->x_ix86_isa_flags) + && TARGET_EVEX512_P (opts->x_ix86_isa_flags2)) opts->x_ix86_move_max = PVW_AVX512; else opts->x_ix86_move_max = PVW_AVX128; @@ -2884,7 +2885,8 @@ ix86_option_override_internal (bool main_args_p, opts->x_ix86_store_max = opts->x_prefer_vector_width_type; if (opts_set->x_ix86_store_max == PVW_NONE) { - if (TARGET_AVX512F_P (opts->x_ix86_isa_flags)) + if (TARGET_AVX512F_P (opts->x_ix86_isa_flags) + && TARGET_EVEX512_P (opts->x_ix86_isa_flags2)) opts->x_ix86_store_max = PVW_AVX512; else opts->x_ix86_store_max = PVW_AVX128; @@ -3163,13 +3165,13 @@ ix86_simd_clone_adjust (struct cgraph_node *node) case 'e': if (TARGET_PREFER_AVX256) { - if (!TARGET_AVX512F) - str = "avx512f,prefer-vector-width=512"; + if (!TARGET_AVX512F || !TARGET_EVEX512) + str = "avx512f,evex512,prefer-vector-width=512"; else str = "prefer-vector-width=512"; } - else if (!TARGET_AVX512F) - str = "avx512f"; + else if (!TARGET_AVX512F || !TARGET_EVEX512) + str = "avx512f,evex512"; break; default: gcc_unreachable (); diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index 5dbfd1774be8..f28684990732 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -1940,7 +1940,8 @@ type_natural_mode (const_tree type, const CUMULATIVE_ARGS *cum, if (GET_MODE_NUNITS (mode) == TYPE_VECTOR_SUBPARTS (type) && GET_MODE_INNER (mode) == innermode) { - if (size == 64 && !TARGET_AVX512F && !TARGET_IAMCU) + if (size == 64 && (!TARGET_AVX512F || !TARGET_EVEX512) + && !TARGET_IAMCU) { static bool warnedavx512f; static bool warnedavx512f_ret; @@ -4363,7 +4364,7 @@ ix86_return_in_memory (const_tree type, const_tree fntype ATTRIBUTE_UNUSED) /* AVX512F values are returned in ZMM0 if available. */ if (size == 64) - return !TARGET_AVX512F; + return !TARGET_AVX512F || !TARGET_EVEX512; } if (mode == XFmode) @@ -20448,7 +20449,7 @@ ix86_hard_regno_mode_ok (unsigned int regno, machine_mode mode) - any of 512-bit wide vector mode - any scalar mode. */ if (TARGET_AVX512F - && (VALID_AVX512F_REG_OR_XI_MODE (mode) + && ((VALID_AVX512F_REG_OR_XI_MODE (mode) && TARGET_EVEX512) || VALID_AVX512F_SCALAR_MODE (mode))) return true; @@ -20700,7 +20701,7 @@ ix86_set_reg_reg_cost (machine_mode mode) case MODE_VECTOR_INT: case MODE_VECTOR_FLOAT: - if ((TARGET_AVX512F && VALID_AVX512F_REG_MODE (mode)) + if ((TARGET_AVX512F && TARGET_EVEX512 && VALID_AVX512F_REG_MODE (mode)) || (TARGET_AVX && VALID_AVX256_REG_MODE (mode)) || (TARGET_SSE2 && VALID_SSE2_REG_MODE (mode)) || (TARGET_SSE && VALID_SSE_REG_MODE (mode)) @@ -21429,7 +21430,8 @@ ix86_rtx_costs (rtx x, machine_mode mode, int outer_code_i, int opno, { /* (ior (not ...) ...) can be a single insn in AVX512. */ if (GET_CODE (XEXP (x, 0)) == NOT && TARGET_AVX512F - && (GET_MODE_SIZE (mode) == 64 + && ((TARGET_EVEX512 + && GET_MODE_SIZE (mode) == 64) || (TARGET_AVX512VL && (GET_MODE_SIZE (mode) == 32 || GET_MODE_SIZE (mode) == 16)))) @@ -21477,7 +21479,8 @@ ix86_rtx_costs (rtx x, machine_mode mode, int outer_code_i, int opno, /* (and (not ...) (not ...)) can be a single insn in AVX512. */ if (GET_CODE (right) == NOT && TARGET_AVX512F - && (GET_MODE_SIZE (mode) == 64 + && ((TARGET_EVEX512 + && GET_MODE_SIZE (mode) == 64) || (TARGET_AVX512VL && (GET_MODE_SIZE (mode) == 32 || GET_MODE_SIZE (mode) == 16)))) @@ -21547,7 +21550,8 @@ ix86_rtx_costs (rtx x, machine_mode mode, int outer_code_i, int opno, { /* (not (xor ...)) can be a single insn in AVX512. */ if (GET_CODE (XEXP (x, 0)) == XOR && TARGET_AVX512F - && (GET_MODE_SIZE (mode) == 64 + && ((TARGET_EVEX512 + && GET_MODE_SIZE (mode) == 64) || (TARGET_AVX512VL && (GET_MODE_SIZE (mode) == 32 || GET_MODE_SIZE (mode) == 16)))) @@ -23191,7 +23195,7 @@ ix86_vector_mode_supported_p (machine_mode mode) return true; if (TARGET_AVX && VALID_AVX256_REG_MODE (mode)) return true; - if (TARGET_AVX512F && VALID_AVX512F_REG_MODE (mode)) + if (TARGET_AVX512F && TARGET_EVEX512 && VALID_AVX512F_REG_MODE (mode)) return true; if ((TARGET_MMX || TARGET_MMX_WITH_SSE) && VALID_MMX_REG_MODE (mode)) @@ -23972,7 +23976,7 @@ ix86_preferred_simd_mode (scalar_mode mode) switch (mode) { case E_QImode: - if (TARGET_AVX512BW && !TARGET_PREFER_AVX256) + if (TARGET_AVX512BW && TARGET_EVEX512 && !TARGET_PREFER_AVX256) return V64QImode; else if (TARGET_AVX && !TARGET_PREFER_AVX128) return V32QImode; @@ -23980,7 +23984,7 @@ ix86_preferred_simd_mode (scalar_mode mode) return V16QImode; case E_HImode: - if (TARGET_AVX512BW && !TARGET_PREFER_AVX256) + if (TARGET_AVX512BW && TARGET_EVEX512 && !TARGET_PREFER_AVX256) return V32HImode; else if (TARGET_AVX && !TARGET_PREFER_AVX128) return V16HImode; @@ -23988,7 +23992,7 @@ ix86_preferred_simd_mode (scalar_mode mode) return V8HImode; case E_SImode: - if (TARGET_AVX512F && !TARGET_PREFER_AVX256) + if (TARGET_AVX512F && TARGET_EVEX512 && !TARGET_PREFER_AVX256) return V16SImode; else if (TARGET_AVX && !TARGET_PREFER_AVX128) return V8SImode; @@ -23996,7 +24000,7 @@ ix86_preferred_simd_mode (scalar_mode mode) return V4SImode; case E_DImode: - if (TARGET_AVX512F && !TARGET_PREFER_AVX256) + if (TARGET_AVX512F && TARGET_EVEX512 && !TARGET_PREFER_AVX256) return V8DImode; else if (TARGET_AVX && !TARGET_PREFER_AVX128) return V4DImode; @@ -24010,15 +24014,16 @@ ix86_preferred_simd_mode (scalar_mode mode) { if (TARGET_PREFER_AVX128) return V8HFmode; - else if (TARGET_PREFER_AVX256) + else if (TARGET_PREFER_AVX256 || !TARGET_EVEX512) return V16HFmode; } - return V32HFmode; + if (TARGET_EVEX512) + return V32HFmode; } return word_mode; case E_SFmode: - if (TARGET_AVX512F && !TARGET_PREFER_AVX256) + if (TARGET_AVX512F && TARGET_EVEX512 && !TARGET_PREFER_AVX256) return V16SFmode; else if (TARGET_AVX && !TARGET_PREFER_AVX128) return V8SFmode; @@ -24026,7 +24031,7 @@ ix86_preferred_simd_mode (scalar_mode mode) return V4SFmode; case E_DFmode: - if (TARGET_AVX512F && !TARGET_PREFER_AVX256) + if (TARGET_AVX512F && TARGET_EVEX512 && !TARGET_PREFER_AVX256) return V8DFmode; else if (TARGET_AVX && !TARGET_PREFER_AVX128) return V4DFmode; @@ -24046,13 +24051,13 @@ ix86_preferred_simd_mode (scalar_mode mode) static unsigned int ix86_autovectorize_vector_modes (vector_modes *modes, bool all) { - if (TARGET_AVX512F && !TARGET_PREFER_AVX256) + if (TARGET_AVX512F && TARGET_EVEX512 && !TARGET_PREFER_AVX256) { modes->safe_push (V64QImode); modes->safe_push (V32QImode); modes->safe_push (V16QImode); } - else if (TARGET_AVX512F && all) + else if (TARGET_AVX512F && TARGET_EVEX512 && all) { modes->safe_push (V32QImode); modes->safe_push (V16QImode); @@ -24090,7 +24095,7 @@ ix86_get_mask_mode (machine_mode data_mode) unsigned elem_size = vector_size / nunits; /* Scalar mask case. */ - if ((TARGET_AVX512F && vector_size == 64) + if ((TARGET_AVX512F && TARGET_EVEX512 && vector_size == 64) || (TARGET_AVX512VL && (vector_size == 32 || vector_size == 16))) { if (elem_size == 4 @@ -24588,7 +24593,7 @@ ix86_simd_clone_compute_vecsize_and_simdlen (struct cgraph_node *node, { /* If the function isn't exported, we can pick up just one ISA for the clones. */ - if (TARGET_AVX512F) + if (TARGET_AVX512F && TARGET_EVEX512) clonei->vecsize_mangle = 'e'; else if (TARGET_AVX2) clonei->vecsize_mangle = 'd'; @@ -24680,17 +24685,17 @@ ix86_simd_clone_usable (struct cgraph_node *node) return -1; if (!TARGET_AVX) return 0; - return TARGET_AVX512F ? 3 : TARGET_AVX2 ? 2 : 1; + return (TARGET_AVX512F && TARGET_EVEX512) ? 3 : TARGET_AVX2 ? 2 : 1; case 'c': if (!TARGET_AVX) return -1; - return TARGET_AVX512F ? 2 : TARGET_AVX2 ? 1 : 0; + return (TARGET_AVX512F && TARGET_EVEX512) ? 2 : TARGET_AVX2 ? 1 : 0; case 'd': if (!TARGET_AVX2) return -1; - return TARGET_AVX512F ? 1 : 0; + return (TARGET_AVX512F && TARGET_EVEX512) ? 1 : 0; case 'e': - if (!TARGET_AVX512F) + if (!TARGET_AVX512F || !TARGET_EVEX512) return -1; return 0; default: diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index 7fa7585e058d..ab7cafa508d7 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -774,7 +774,8 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); TARGET_ABSOLUTE_BIGGEST_ALIGNMENT. */ #define BIGGEST_ALIGNMENT \ - (TARGET_IAMCU ? 32 : (TARGET_AVX512F ? 512 : (TARGET_AVX ? 256 : 128))) + (TARGET_IAMCU ? 32 : ((TARGET_AVX512F && TARGET_EVEX512) \ + ? 512 : (TARGET_AVX ? 256 : 128))) /* Maximum stack alignment. */ #define MAX_STACK_ALIGNMENT MAX_OFILE_ALIGNMENT @@ -1848,7 +1849,7 @@ typedef struct ix86_args { MOVE_MAX_PIECES defaults to MOVE_MAX. */ #define MOVE_MAX \ - ((TARGET_AVX512F \ + ((TARGET_AVX512F && TARGET_EVEX512\ && (ix86_move_max == PVW_AVX512 \ || ix86_store_max == PVW_AVX512)) \ ? 64 \ @@ -1867,7 +1868,7 @@ typedef struct ix86_args { store_by_pieces of 16/32/64 bytes. */ #define STORE_MAX_PIECES \ (TARGET_INTER_UNIT_MOVES_TO_VEC \ - ? ((TARGET_AVX512F && ix86_store_max == PVW_AVX512) \ + ? ((TARGET_AVX512F && TARGET_EVEX512 && ix86_store_max == PVW_AVX512) \ ? 64 \ : ((TARGET_AVX \ && ix86_store_max >= PVW_AVX256) \