public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Michael Meissner <meissner@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/meissner/heads/work071)] Revert patches. Date: Mon, 18 Oct 2021 17:43:02 +0000 (GMT) [thread overview] Message-ID: <20211018174302.1CBF43858C27@sourceware.org> (raw) https://gcc.gnu.org/g:f70d3226e4df319f0b109c6e1e6505879c38be23 commit f70d3226e4df319f0b109c6e1e6505879c38be23 Author: Michael Meissner <meissner@linux.ibm.com> Date: Mon Oct 18 13:42:24 2021 -0400 Revert patches. 2021-10-18 Michael Meissner <meissner@the-meissners.org> gcc/ Revert patches. * config/rs6000/constraints.md (eP): New constraint. * config/rs6000/predicates.md (easy_fp_constant): Add support for generating XXSPLTIDP. (vsx_prefixed_constant): New predicate. (easy_vector_constant): Add support for generating XXSPLTIDP. * config/rs6000/rs6000-protos.h (prefixed_xxsplti_p): New declaration. (VECTOR_CONST_*): New macros. (rs6000_vec_const): New structure to hold information about vector constants. (vec_const_to_bytes): New function. (vec_const_use_xxspltidp): New function. * config/rs6000/rs6000.c (output_vec_const_move): Add support for XXSPLTIDP. (prefixed_xxsplti_p): New function. (vec_const_integer): New helper function. (vec_const_floating_point): New helper function. (vec_const_use_xxspltidp): New function. (vec_const_to_bytes): New function. * config/rs6000/rs6000.md (UNSPEC_VSX_PREFIXED_CONST): New unspec. (prefixed attribute): Add support for prefixed instructions to load * constants into VSX registers. (movsf_hardfloat): Add support for XXSPLTIDP. (mov<mode>_hardfloat32, FMOVE64 iterator): Likewise. (mov<mode>_hardfloat64, FMOVE64 iterator): Likewise. (xxspltidp_<mode>_internal): New insns. (splitter for VSX prefix constants): New splitters. * config/rs6000/rs6000.opt (-mxxspltidp): New debug option. * config/rs6000/vsx.md (vsx_mov<mode>_64bit): Add support for XXSPLTIDP. (vsx_mov<mode>_32bit): Likewise. * doc/md.texi (PowerPC and IBM RS6000 constraints): Document the eP constraint. gcc/testsuite/ Revert patches. * gcc.target/powerpc/pr86731-fwrapv-longlong.c: Update insn regex for power10. * gcc.target/powerpc/vec-splat-constant-df.c: New test. * gcc.target/powerpc/vec-splat-constant-sf.c: New test. * gcc.target/powerpc/vec-splat-constant-v2df.c: New test. * gcc.target/powerpc/vec-splat-constant-v2di.c: New test. * gcc.target/powerpc/vec-splati-runnable.c: Update insn counts. Diff: --- gcc/config/rs6000/constraints.md | 6 - gcc/config/rs6000/predicates.md | 51 --- gcc/config/rs6000/rs6000-protos.h | 27 -- gcc/config/rs6000/rs6000.c | 387 --------------------- gcc/config/rs6000/rs6000.md | 82 +---- gcc/config/rs6000/rs6000.opt | 4 - gcc/config/rs6000/vsx.md | 32 +- gcc/doc/md.texi | 4 - .../gcc.target/powerpc/pr86731-fwrapv-longlong.c | 9 +- .../gcc.target/powerpc/vec-splat-constant-df.c | 60 ---- .../gcc.target/powerpc/vec-splat-constant-sf.c | 60 ---- .../gcc.target/powerpc/vec-splat-constant-v2df.c | 64 ---- .../gcc.target/powerpc/vec-splat-constant-v2di.c | 50 --- .../gcc.target/powerpc/vec-splati-runnable.c | 2 +- 14 files changed, 29 insertions(+), 809 deletions(-) diff --git a/gcc/config/rs6000/constraints.md b/gcc/config/rs6000/constraints.md index 7d594872a78..c8cff1a3038 100644 --- a/gcc/config/rs6000/constraints.md +++ b/gcc/config/rs6000/constraints.md @@ -213,12 +213,6 @@ "A signed 34-bit integer constant if prefixed instructions are supported." (match_operand 0 "cint34_operand")) -;; A SF/DF scalar constant or a vector constant that can be loaded into vector -;; registers with one prefixed instruction such as XXSPLTIDP. -(define_constraint "eP" - "A constant that can be loaded into a VSX register with one prefixed insn." - (match_operand 0 "vsx_prefixed_constant")) - ;; Floating-point constraints. These two are defined so that insn ;; length attributes can be calculated exactly. diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md index 4b2bbdf40e8..956e42bc514 100644 --- a/gcc/config/rs6000/predicates.md +++ b/gcc/config/rs6000/predicates.md @@ -601,15 +601,6 @@ if (TARGET_VSX && op == CONST0_RTX (mode)) return 1; - /* Constants that can be generated with ISA 3.1 instructions are easy. */ - rs6000_vec_const vec_const; - - if (TARGET_POWER10 && vec_const_to_bytes (op, mode, &vec_const)) - { - if (vec_const_use_xxspltidp (&vec_const)) - return true; - } - /* Otherwise consider floating point constants hard, so that the constant gets pushed to memory during the early RTL phases. This has the advantage that double precision constants that can be @@ -618,38 +609,6 @@ return 0; }) -;; Return 1 if the operand is a 64-bit floating point scalar constant or a -;; vector constant that can be loaded to a VSX register with one prefixed -;; instruction, such as XXSPLTIDP. -;; -;; In addition regular constants, we also recognize constants formed with the -;; VEC_DUPLICATE insn from scalar constants. -;; -;; We don't handle scalar integer constants here because the assumption is the -;; normal integer constants will be loaded into GPR registers. For the -;; constants that need to be loaded into vector registers, the instructions -;; don't work well with TImode variables assigned a constant. This is because -;; the 64-bit scalar constants are splatted into both halves of the register. - -(define_predicate "vsx_prefixed_constant" - (match_code "const_double,const_vector,vec_duplicate") -{ - rs6000_vec_const vec_const; - - /* Do we have prefixed instructions and are VSX registers available? Is the - constant recognized? */ - if (!TARGET_PREFIXED || !TARGET_VSX) - return false; - - if (!vec_const_to_bytes (op, mode, &vec_const)) - return false; - - if (vec_const_use_xxspltidp (&vec_const)) - return true; - - return false; -}) - ;; Return 1 if the operand is a constant that can loaded with a XXSPLTIB ;; instruction and then a VUPKHSB, VECSB2W or VECSB2D instruction. @@ -698,16 +657,6 @@ && xxspltib_constant_p (op, mode, &num_insns, &value)) return true; - /* See if the constant can be generated with the ISA 3.1 - instructions. */ - rs6000_vec_const vec_const; - - if (TARGET_POWER10 && vec_const_to_bytes (op, mode, &vec_const)) - { - if (vec_const_use_xxspltidp (&vec_const)) - return true; - } - return easy_altivec_constant (op, mode); } diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h index 8eef955237a..14f6b313105 100644 --- a/gcc/config/rs6000/rs6000-protos.h +++ b/gcc/config/rs6000/rs6000-protos.h @@ -198,7 +198,6 @@ enum non_prefixed_form reg_to_non_prefixed (rtx reg, machine_mode mode); extern bool prefixed_load_p (rtx_insn *); extern bool prefixed_store_p (rtx_insn *); extern bool prefixed_paddi_p (rtx_insn *); -extern bool prefixed_xxsplti_p (rtx_insn *); extern void rs6000_asm_output_opcode (FILE *); extern void output_pcrel_opt_reloc (rtx); extern void rs6000_final_prescan_insn (rtx_insn *, rtx [], int); @@ -223,32 +222,6 @@ address_is_prefixed (rtx addr, return (iform == INSN_FORM_PREFIXED_NUMERIC || iform == INSN_FORM_PCREL_LOCAL); } - -/* Functions and data structures relating to 128-bit vector constants. All - fields are kept in big endian order. */ -#define VECTOR_CONST_BITS 128 -#define VECTOR_CONST_BYTES (VECTOR_CONST_BITS / 8) -#define VECTOR_CONST_HALF_WORDS (VECTOR_CONST_BITS / 16) -#define VECTOR_CONST_WORDS (VECTOR_CONST_BITS / 32) -#define VECTOR_CONST_DOUBLE_WORDS (VECTOR_CONST_BITS / 64) - -typedef struct { - /* Vector constant as various sized items. */ - unsigned HOST_WIDE_INT double_words[VECTOR_CONST_DOUBLE_WORDS]; - unsigned int words[VECTOR_CONST_WORDS]; - unsigned short half_words[VECTOR_CONST_HALF_WORDS]; - unsigned char bytes[VECTOR_CONST_BYTES]; - - unsigned int xxspltidp_immediate; /* Immediate value for XXSPLTIDP. */ - bool fp_constant_p; /* Is the constant floating point? */ - bool all_double_words_same; /* Are the double words all equal? */ - bool all_words_same; /* Are the words all equal? */ - bool all_half_words_same; /* Are the halft words all equal? */ - bool all_bytes_same; /* Are the bytes all equal? */ -} rs6000_vec_const; - -extern bool vec_const_to_bytes (rtx, machine_mode, rs6000_vec_const *); -extern bool vec_const_use_xxspltidp (rs6000_vec_const *); #endif /* RTX_CODE */ #ifdef TREE_CODE diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 353ec2b572d..acba4d9f26c 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -6990,16 +6990,6 @@ output_vec_const_move (rtx *operands) gcc_unreachable (); } - rs6000_vec_const vec_const; - if (TARGET_POWER10 && vec_const_to_bytes (vec, mode, &vec_const)) - { - if (vec_const_use_xxspltidp (&vec_const)) - { - operands[2] = GEN_INT (vec_const.xxspltidp_immediate); - return "xxspltidp %x0,%2"; - } - } - if (TARGET_P9_VECTOR && xxspltib_constant_p (vec, mode, &num_insns, &xxspltib_value)) { @@ -26734,41 +26724,6 @@ prefixed_paddi_p (rtx_insn *insn) return (iform == INSN_FORM_PCREL_EXTERNAL || iform == INSN_FORM_PCREL_LOCAL); } -/* Whether a permute type instruction is a prefixed XXSPLTI* instruction. - This is called from the prefixed attribute processing. */ - -bool -prefixed_xxsplti_p (rtx_insn *insn) -{ - rtx set = single_set (insn); - if (!set) - return false; - - rtx dest = SET_DEST (set); - rtx src = SET_SRC (set); - machine_mode mode = GET_MODE (dest); - - if (!REG_P (dest) && !SUBREG_P (dest)) - return false; - - if (GET_CODE (src) == UNSPEC) - { - int unspec = XINT (src, 1); - return (unspec == UNSPEC_XXSPLTIW - || unspec == UNSPEC_XXSPLTIDP - || unspec == UNSPEC_XXSPLTI32DX); - } - - rs6000_vec_const vec_const; - if (vec_const_to_bytes (src, mode, &vec_const)) - { - if (vec_const_use_xxspltidp (&vec_const)) - return true; - } - - return false; -} - /* Whether the next instruction needs a 'p' prefix issued before the instruction is printed out. */ static bool prepend_p_to_next_insn; @@ -28632,348 +28587,6 @@ rs6000_output_addr_vec_elt (FILE *file, int value) fprintf (file, "\n"); } -\f -/* Copy an integer constant to the vector constant structure. */ - -static void -vec_const_integer (rtx op, - machine_mode mode, - size_t byte_num, - rs6000_vec_const *vec_const) -{ - unsigned HOST_WIDE_INT uvalue = UINTVAL (op); - unsigned bitsize = GET_MODE_BITSIZE (mode); - - for (int shift = bitsize - 8; shift >= 0; shift -= 8) - vec_const->bytes[byte_num++] = (uvalue >> shift) & 0xff; -} - -/* Copy an floating point constant to the vector constant structure. */ - -static void -vec_const_floating_point (rtx op, - machine_mode mode, - size_t byte_num, - rs6000_vec_const *vec_const) -{ - unsigned bitsize = GET_MODE_BITSIZE (mode); - unsigned num_words = bitsize / 32; - const REAL_VALUE_TYPE *rtype = CONST_DOUBLE_REAL_VALUE (op); - long real_words[VECTOR_CONST_WORDS]; - - /* Make sure we don't overflow the real_words array and that it is - filled completely. */ - gcc_assert (bitsize <= VECTOR_CONST_BITS && (bitsize % 32) == 0); - - real_to_target (real_words, rtype, mode); - - /* Iterate over each 32-bit word in the floating point constant. The - real_to_target function puts out words in endian fashion. We need - to arrange so the words are written in big endian order. */ - for (unsigned num = 0; num < num_words; num++) - { - unsigned endian_num = (BYTES_BIG_ENDIAN - ? num - : num_words - 1 - num); - - unsigned uvalue = real_words[endian_num]; - for (int shift = 32 - 8; shift >= 0; shift -= 8) - vec_const->bytes[byte_num++] = (uvalue >> shift) & 0xff; - } - - /* Mark that this constant involes floating point. */ - vec_const->fp_constant_p = true; -} - -/* Determine if a vector constant can be loaded with XXSPLTIDP. If so, - fill out the fields used to generate the instruction. */ - -bool -vec_const_use_xxspltidp (rs6000_vec_const *vec_const) -{ - if (!TARGET_XXSPLTIDP || !TARGET_PREFIXED || !TARGET_VSX) - return false; - - /* Make sure that the two 64-bit segments are the same. */ - if (!vec_const->all_double_words_same) - return false; - - /* If the bytes, half words, or words are all the same, don't use XXSPLTIDP. - Use a simpler instruction (XXSPLTIB, VSPLTISB, VSPLTISH, or VSPLTISW). */ - if (vec_const->all_bytes_same - || vec_const->all_half_words_same - || vec_const->all_words_same) - return false; - - unsigned HOST_WIDE_INT value = vec_const->double_words[0]; - - /* Avoid values that look like DFmode NaN's, except for the normal NaN bit - pattern and the signalling NaN bit pattern. Recognize infinity and - negative infinity. */ - - /* Bit representation of DFmode normal quiet NaN. */ -#define VECTOR_CONST_DF_NAN HOST_WIDE_INT_UC (0x7ff8000000000000) - - /* Bit representation of DFmode normal signaling NaN. */ -#define VECTOR_CONST_DF_NANS HOST_WIDE_INT_UC (0x7ff4000000000000) - - /* Bit representation of DFmode positive infinity. */ -#define VECTOR_CONST_DF_INF HOST_WIDE_INT_UC (0x7ff0000000000000) - - /* Bit representation of DFmode negative infinity. */ -#define VECTOR_CONST_DF_NEG_INF HOST_WIDE_INT_UC (0xfff0000000000000) - - if (value != VECTOR_CONST_DF_NAN - && value != VECTOR_CONST_DF_NANS - && value != VECTOR_CONST_DF_INF - && value != VECTOR_CONST_DF_NEG_INF) - { - /* The IEEE 754 64-bit floating format has 1 bit for sign, 11 bits for - the exponent, and 52 bits for the mantissa (not counting the hidden - bit used for normal numbers). NaN values have the exponent set to all - 1 bits, and the mantissa non-zero (mantissa == 0 is infinity). */ - - int df_exponent = (value >> 52) & 0x7ff; - unsigned HOST_WIDE_INT df_mantissa - = value & ((HOST_WIDE_INT_1U << 52) - HOST_WIDE_INT_1U); - - if (df_exponent == 0x7ff && df_mantissa != 0) /* other NaNs. */ - return false; - - /* Avoid values that are DFmode subnormal values. Subnormal numbers have - the exponent all 0 bits, and the mantissa non-zero. If the value is - subnormal, then the hidden bit in the mantissa is not set. */ - if (df_exponent == 0 && df_mantissa != 0) /* subnormal. */ - return false; - } - - /* Change the representation to DFmode constant. */ - long df_words[2] = { vec_const->words[0], vec_const->words[1] }; - - /* real_from_target takes the target words in target order. */ - if (!BYTES_BIG_ENDIAN) - std::swap (df_words[0], df_words[1]); - - REAL_VALUE_TYPE rv_type; - real_from_target (&rv_type, df_words, DFmode); - - const REAL_VALUE_TYPE *rv = &rv_type; - - /* Validate that the number can be stored as a SFmode value. */ - if (!exact_real_truncate (SFmode, rv)) - return false; - - /* Validate that the number is not a SFmode subnormal value (exponent is 0, - mantissa field is non-zero) which is undefined for the XXSPLTIDP - instruction. */ - long sf_value; - real_to_target (&sf_value, rv, SFmode); - - /* IEEE 754 32-bit values have 1 bit for the sign, 8 bits for the exponent, - and 23 bits for the mantissa. Subnormal numbers have the exponent all - 0 bits, and the mantissa non-zero. */ - long sf_exponent = (sf_value >> 23) & 0xFF; - long sf_mantissa = sf_value & 0x7FFFFF; - - if (sf_exponent == 0 && sf_mantissa != 0) - return false; - - /* Record the information in the vec_const structure for XXSPLTIDP. */ - vec_const->xxspltidp_immediate = sf_value; - - return true; -} - -/* Convert a vector constant to an internal structure, breaking it out to - bytes, half words, words, and double words. Return true if we have - successfully broken it out. */ - -bool -vec_const_to_bytes (rtx op, - machine_mode mode, - rs6000_vec_const *vec_const) -{ - /* Initialize vec const structure. */ - memset ((void *)vec_const, 0, sizeof (rs6000_vec_const)); - - /* Set up the vector bits. */ - switch (GET_CODE (op)) - { - /* Integer constants, default to double word. */ - case CONST_INT: - { - /* Scalars are treated as 64-bit integers. */ - if (mode == VOIDmode) - mode = DImode; - - vec_const_integer (op, mode, 0, vec_const); - - /* Splat the constant to the rest of the vector constant structure. */ - unsigned size = GET_MODE_SIZE (mode); - gcc_assert (size <= VECTOR_CONST_BYTES); - gcc_assert ((VECTOR_CONST_BYTES % size) == 0); - - for (size_t splat = size; splat < VECTOR_CONST_BYTES; splat += size) - memcpy ((void *) &vec_const->bytes[splat], - (void *) &vec_const->bytes[0], - size); - break; - } - - /* Floating point constants. */ - case CONST_DOUBLE: - { - /* Fail if the floating point constant is the wrong mode. */ - if (mode == VOIDmode) - mode = GET_MODE (op); - - else if (GET_MODE (op) != mode) - return false; - - /* SFmode stored as scalars are stored in DFmode format. */ - if (mode == SFmode) - mode = DFmode; - - vec_const_floating_point (op, mode, 0, vec_const); - - /* Splat the constant to the rest of the vector constant structure. */ - unsigned size = GET_MODE_SIZE (mode); - gcc_assert (size <= VECTOR_CONST_BYTES); - gcc_assert ((VECTOR_CONST_BYTES % size) == 0); - - for (size_t splat = size; splat < VECTOR_CONST_BYTES; splat += size) - memcpy ((void *) &vec_const->bytes[splat], - (void *) &vec_const->bytes[0], - size); - break; - } - - /* Vector constants, iterate each element. On little endian systems, we - have to reverse the element numbers. */ - case CONST_VECTOR: - { - /* Fail if the vector constant is the wrong mode. */ - if (mode == VOIDmode) - mode = GET_MODE (op); - - else if (GET_MODE (op) != mode) - return false; - - machine_mode ele_mode = GET_MODE_INNER (mode); - size_t nunits = GET_MODE_NUNITS (mode); - size_t size = GET_MODE_SIZE (ele_mode); - - for (size_t num = 0; num < nunits; num++) - { - rtx ele = (GET_CODE (op) == VEC_DUPLICATE - ? XEXP (op, 0) - : CONST_VECTOR_ELT (op, num)); - size_t byte_num = (BYTES_BIG_ENDIAN - ? num - : nunits - 1 - num) * size; - - if (CONST_INT_P (ele)) - vec_const_integer (ele, ele_mode, byte_num, vec_const); - else if (CONST_DOUBLE_P (ele)) - vec_const_floating_point (ele, ele_mode, byte_num, vec_const); - else - return false; - } - - break; - } - - /* Treat VEC_DUPLICATE of a constant just like a vector constant. */ - case VEC_DUPLICATE: - { - /* Fail if the vector duplicate is the wrong mode. */ - if (mode == VOIDmode) - mode = GET_MODE (op); - - else if (GET_MODE (op) != mode) - return false; - - machine_mode ele_mode = GET_MODE_INNER (mode); - size_t nunits = GET_MODE_NUNITS (mode); - size_t size = GET_MODE_SIZE (ele_mode); - rtx ele = XEXP (op, 0); - - if (!CONST_INT_P (ele) && !CONST_DOUBLE_P (ele)) - return false; - - for (size_t num = 0; num < nunits; num++) - { - size_t byte_num = num * size; - - if (CONST_INT_P (ele)) - vec_const_integer (ele, ele_mode, byte_num, vec_const); - else - vec_const_floating_point (ele, ele_mode, byte_num, vec_const); - } - - break; - } - - /* Any thing else, just return failure. */ - default: - return false; - } - - /* Pack half words together. */ - for (size_t i = 0; i < VECTOR_CONST_HALF_WORDS; i++) - vec_const->half_words[i] = ((vec_const->bytes[2*i] << 8) - | vec_const->bytes[(2 * i) + 1]); - - /* Pack words together. */ - for (size_t i = 0; i < VECTOR_CONST_WORDS; i++) - { - unsigned word = 0; - for (size_t j = 0; j < 4; j++) - word = (word << 8) | vec_const->bytes[(4 * i) + j]; - - vec_const->words[i] = word; - } - - /* Pack double words together. */ - for (size_t i = 0; i < VECTOR_CONST_DOUBLE_WORDS; i++) - { - unsigned HOST_WIDE_INT d_word = 0; - for (size_t j = 0; j < 8; j++) - d_word = (d_word << 8) | vec_const->bytes[(8 * i) + j]; - - vec_const->double_words[i] = d_word; - } - - /* Determine if the double words, words, half words, and bytes are all - equal. */ - unsigned HOST_WIDE_INT first_dword = vec_const->double_words[0]; - vec_const->all_double_words_same = true; - for (size_t i = 1; i < VECTOR_CONST_DOUBLE_WORDS; i++) - if (first_dword != vec_const->double_words[i]) - vec_const->all_double_words_same = false; - - unsigned int first_word = vec_const->words[0]; - vec_const->all_words_same = true; - for (size_t i = 1; i < VECTOR_CONST_WORDS; i++) - if (first_word != vec_const->words[i]) - vec_const->all_words_same = false; - - unsigned short first_hword = vec_const->half_words[0]; - vec_const->all_half_words_same = true; - for (size_t i = 1; i < VECTOR_CONST_HALF_WORDS; i++) - if (first_hword != vec_const->half_words[i]) - vec_const->all_half_words_same = false; - - unsigned char first_byte = vec_const->bytes[0]; - vec_const->all_bytes_same = true; - for (size_t i = 1; i < VECTOR_CONST_BYTES; i++) - if (first_byte != vec_const->bytes[i]) - vec_const->all_bytes_same = false; - - return true; -} - -\f struct gcc_target targetm = TARGET_INITIALIZER; #include "gt-rs6000.h" diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index b0ead908fe9..6bec2bddbde 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -156,7 +156,6 @@ UNSPEC_PEXTD UNSPEC_HASHST UNSPEC_HASHCHK - UNSPEC_VSX_PREFIXED_CONST ]) ;; @@ -315,11 +314,6 @@ (eq_attr "type" "integer,add") (if_then_else (match_test "prefixed_paddi_p (insn)") - (const_string "yes") - (const_string "no")) - - (eq_attr "type" "vecperm") - (if_then_else (match_test "prefixed_xxsplti_p (insn)") (const_string "yes") (const_string "no"))] @@ -7765,17 +7759,17 @@ ;; ;; LWZ LFS LXSSP LXSSPX STFS STXSSP ;; STXSSPX STW XXLXOR LI FMR XSCPSGNDP -;; MR MT<x> MF<x> NOP XXSPLTIDP +;; MR MT<x> MF<x> NOP (define_insn "movsf_hardfloat" [(set (match_operand:SF 0 "nonimmediate_operand" "=!r, f, v, wa, m, wY, Z, m, wa, !r, f, wa, - !r, *c*l, !r, *h, wa") + !r, *c*l, !r, *h") (match_operand:SF 1 "input_operand" "m, m, wY, Z, f, v, wa, r, j, j, f, wa, - r, r, *h, 0, eP"))] + r, r, *h, 0"))] "(register_operand (operands[0], SFmode) || register_operand (operands[1], SFmode)) && TARGET_HARD_FLOAT @@ -7797,16 +7791,15 @@ mr %0,%1 mt%0 %1 mf%1 %0 - nop - #" + nop" [(set_attr "type" "load, fpload, fpload, fpload, fpstore, fpstore, fpstore, store, veclogical, integer, fpsimple, fpsimple, - *, mtjmpr, mfjmpr, *, vecperm") + *, mtjmpr, mfjmpr, *") (set_attr "isa" "*, *, p9v, p8v, *, p9v, p8v, *, *, *, *, *, - *, *, *, *, p10")]) + *, *, *, *")]) ;; LWZ LFIWZX STW STFIWX MTVSRWZ MFVSRWZ ;; FMR MR MT%0 MF%1 NOP @@ -8066,18 +8059,18 @@ ;; STFD LFD FMR LXSD STXSD ;; LXSD STXSD XXLOR XXLXOR GPR<-0 -;; LWZ STW MR XXSPLTIDP +;; LWZ STW MR (define_insn "*mov<mode>_hardfloat32" [(set (match_operand:FMOVE64 0 "nonimmediate_operand" "=m, d, d, <f64_p9>, wY, <f64_av>, Z, <f64_vsx>, <f64_vsx>, !r, - Y, r, !r, wa") + Y, r, !r") (match_operand:FMOVE64 1 "input_operand" "d, m, d, wY, <f64_p9>, Z, <f64_av>, <f64_vsx>, <zero_fp>, <zero_fp>, - r, Y, r, eP"))] + r, Y, r"))] "! TARGET_POWERPC64 && TARGET_HARD_FLOAT && (gpc_reg_operand (operands[0], <MODE>mode) || gpc_reg_operand (operands[1], <MODE>mode))" @@ -8094,21 +8087,20 @@ # # # - # #" [(set_attr "type" "fpstore, fpload, fpsimple, fpload, fpstore, fpload, fpstore, veclogical, veclogical, two, - store, load, two, vecperm") + store, load, two") (set_attr "size" "64") (set_attr "length" "*, *, *, *, *, *, *, *, *, 8, - 8, 8, 8, *") + 8, 8, 8") (set_attr "isa" "*, *, *, p9v, p9v, p7v, p7v, *, *, *, - *, *, *, p10")]) + *, *, *")]) ;; STW LWZ MR G-const H-const F-const @@ -8135,19 +8127,19 @@ ;; STFD LFD FMR LXSD STXSD ;; LXSDX STXSDX XXLOR XXLXOR LI 0 ;; STD LD MR MT{CTR,LR} MF{CTR,LR} -;; NOP MFVSRD MTVSRD XXSPLTIDP +;; NOP MFVSRD MTVSRD (define_insn "*mov<mode>_hardfloat64" [(set (match_operand:FMOVE64 0 "nonimmediate_operand" "=m, d, d, <f64_p9>, wY, <f64_av>, Z, <f64_vsx>, <f64_vsx>, !r, YZ, r, !r, *c*l, !r, - *h, r, <f64_dm>, wa") + *h, r, <f64_dm>") (match_operand:FMOVE64 1 "input_operand" "d, m, d, wY, <f64_p9>, Z, <f64_av>, <f64_vsx>, <zero_fp>, <zero_fp>, r, YZ, r, r, *h, - 0, <f64_dm>, r, eP"))] + 0, <f64_dm>, r"))] "TARGET_POWERPC64 && TARGET_HARD_FLOAT && (gpc_reg_operand (operands[0], <MODE>mode) || gpc_reg_operand (operands[1], <MODE>mode))" @@ -8169,19 +8161,18 @@ mf%1 %0 nop mfvsrd %0,%x1 - mtvsrd %x0,%1 - #" + mtvsrd %x0,%1" [(set_attr "type" "fpstore, fpload, fpsimple, fpload, fpstore, fpload, fpstore, veclogical, veclogical, integer, store, load, *, mtjmpr, mfjmpr, - *, mfvsr, mtvsr, vecperm") + *, mfvsr, mtvsr") (set_attr "size" "64") (set_attr "isa" "*, *, *, p9v, p9v, p7v, p7v, *, *, *, *, *, *, *, *, - *, p8v, p8v, p10")]) + *, p8v, p8v")]) ;; STD LD MR MT<SPR> MF<SPR> G-const ;; H-const F-const Special @@ -8215,43 +8206,6 @@ (set_attr "length" "*, *, *, *, *, 8, 12, 16, *")]) - -;; Split the VSX prefixed instruction to support SFmode and DFmode scalar -;; constants that look like DFmode floating point values where both elements -;; are the same. The constant has to be expressible as a SFmode constant that -;; is not a SFmode denormal value. -;; -;; We don't need splitters for the 128-bit types, since the function -;; rs6000_output_move_128bit handles the generation of XXSPLTIDP. -(define_insn "*xxspltidp_<mode>_internal" - [(set (match_operand:SFDF 0 "register_operand" "=wa") - (unspec:SFDF [(match_operand:SI 1 "c32bit_cint_operand" "n")] - UNSPEC_VSX_PREFIXED_CONST))] - "TARGET_POWER10" - "xxspltidp %x0,%1" - [(set_attr "type" "vecperm") - (set_attr "prefixed" "yes")]) - -(define_split - [(set (match_operand:SFDF 0 "vsx_register_operand") - (match_operand:SFDF 1 "vsx_prefixed_constant"))] - "TARGET_POWER10" - [(set (match_dup 0) - (unspec:SFDF [(match_dup 2)] UNSPEC_VSX_PREFIXED_CONST))] -{ - rtx src = operands[1]; - rs6000_vec_const vec_const; - - if (!vec_const_to_bytes (src, <MODE>mode, &vec_const)) - gcc_unreachable (); - - if (vec_const_use_xxspltidp (&vec_const)) - operands[2] = GEN_INT (vec_const.xxspltidp_immediate); - - else - gcc_unreachable (); -}) - \f (define_expand "mov<mode>" [(set (match_operand:FMOVE128 0 "general_operand") diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt index 1d7ce4cc94a..9d7878f144a 100644 --- a/gcc/config/rs6000/rs6000.opt +++ b/gcc/config/rs6000/rs6000.opt @@ -640,10 +640,6 @@ mprivileged Target Var(rs6000_privileged) Init(0) Generate code that will run in privileged state. -mxxspltidp -Target Undocumented Var(TARGET_XXSPLTIDP) Init(1) Save -Generate (do not generate) XXSPLTIDP instructions. - -param=rs6000-density-pct-threshold= Target Undocumented Joined UInteger Var(rs6000_density_pct_threshold) Init(85) IntegerRange(0, 100) Param When costing for loop vectorization, we probably need to penalize the loop body diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md index c8518496339..bf033e31c1c 100644 --- a/gcc/config/rs6000/vsx.md +++ b/gcc/config/rs6000/vsx.md @@ -1192,19 +1192,16 @@ ;; VSX store VSX load VSX move VSX->GPR GPR->VSX LQ (GPR) ;; STQ (GPR) GPR load GPR store GPR move XXSPLTIB VSPLTISW -;; XXLSPLTIDP ;; VSX 0/-1 VMX const GPR const LVX (VMX) STVX (VMX) (define_insn "vsx_mov<mode>_64bit" [(set (match_operand:VSX_M 0 "nonimmediate_operand" "=ZwO, wa, wa, r, we, ?wQ, ?&r, ??r, ??Y, <??r>, wa, v, - wa, ?wa, v, <??r>, wZ, v") (match_operand:VSX_M 1 "input_operand" "wa, ZwO, wa, we, r, r, wQ, Y, r, r, wE, jwM, - eP, ?jwM, W, <nW>, v, wZ"))] "TARGET_POWERPC64 && VECTOR_MEM_VSX_P (<MODE>mode) @@ -1216,47 +1213,36 @@ [(set_attr "type" "vecstore, vecload, vecsimple, mtvsr, mfvsr, load, store, load, store, *, vecsimple, vecsimple, - vecperm, vecsimple, *, *, vecstore, vecload") (set_attr "num_insns" "*, *, *, 2, *, 2, 2, 2, 2, 2, *, *, - *, *, 5, 2, *, *") (set_attr "max_prefixed_insns" "*, *, *, *, *, 2, 2, 2, 2, 2, *, *, - *, *, *, *, *, *") (set_attr "length" "*, *, *, 8, *, 8, 8, 8, 8, 8, *, *, - *, *, 20, 8, *, *") (set_attr "isa" "<VSisa>, <VSisa>, <VSisa>, *, *, *, *, *, *, *, p9v, *, - p10, <VSisa>, *, *, *, *")]) ;; VSX store VSX load VSX move GPR load GPR store GPR move -;; XXSPLTIB VSPLTISW VSX 0/-1 -;; XXSPLTIDP -;; VMX const GPR const +;; XXSPLTIB VSPLTISW VSX 0/-1 VMX const GPR const ;; LVX (VMX) STVX (VMX) (define_insn "*vsx_mov<mode>_32bit" [(set (match_operand:VSX_M 0 "nonimmediate_operand" "=ZwO, wa, wa, ??r, ??Y, <??r>, - wa, v, ?wa, - wa, - v, <??r>, + wa, v, ?wa, v, <??r>, wZ, v") (match_operand:VSX_M 1 "input_operand" "wa, ZwO, wa, Y, r, r, - wE, jwM, ?jwM, - eP, - W, <nW>, + wE, jwM, ?jwM, W, <nW>, v, wZ"))] "!TARGET_POWERPC64 && VECTOR_MEM_VSX_P (<MODE>mode) @@ -1267,21 +1253,15 @@ } [(set_attr "type" "vecstore, vecload, vecsimple, load, store, *, - vecsimple, vecsimple, vecsimple, - vecperm, - *, *, + vecsimple, vecsimple, vecsimple, *, *, vecstore, vecload") (set_attr "length" "*, *, *, 16, 16, 16, - *, *, *, - *, - 20, 16, + *, *, *, 20, 16, *, *") (set_attr "isa" "<VSisa>, <VSisa>, <VSisa>, *, *, *, - p9v, *, <VSisa>, - p10, - *, *, + p9v, *, <VSisa>, *, *, *, *")]) ;; Explicit load/store expanders for the builtin functions diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi index 13b56279565..41f1850bf6e 100644 --- a/gcc/doc/md.texi +++ b/gcc/doc/md.texi @@ -3336,10 +3336,6 @@ A constant whose negation is a signed 16-bit constant. @item eI A signed 34-bit integer constant if prefixed instructions are supported. -@item eP -A scalar floating point constant or a vector constant that can be -loaded with one prefixed instruction to a VSX register. - @ifset INTERNALS @item G A floating point constant that can be loaded into a register with one diff --git a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c index dcb30e1d886..bd1502bb30a 100644 --- a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c +++ b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv-longlong.c @@ -24,12 +24,11 @@ vector signed long long splats4(void) return (vector signed long long) vec_sl(mzero, mzero); } -/* Codegen will consist of splat and shift instructions for most types. If - folding is enabled, the vec_sl tests using vector long long type will - generate a lvx instead of a vspltisw+vsld pair. On power10, it will - generate a xxspltidp instruction instead of the lvx. */ +/* Codegen will consist of splat and shift instructions for most types. + If folding is enabled, the vec_sl tests using vector long long type will + generate a lvx instead of a vspltisw+vsld pair. */ /* { dg-final { scan-assembler-times {\mvspltis[bhw]\M} 0 } } */ /* { dg-final { scan-assembler-times {\mvsl[bhwd]\M} 0 } } */ -/* { dg-final { scan-assembler-times {\mp?lxv\M|\mlxv\M|\mlxvd2x\M|\mxxspltidp\M} 2 } } */ +/* { dg-final { scan-assembler-times {\mp?lxv\M|\mlxv\M|\mlxvd2x\M} 2 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c deleted file mode 100644 index 8f6e176f9af..00000000000 --- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-df.c +++ /dev/null @@ -1,60 +0,0 @@ -/* { dg-do compile } */ -/* { dg-require-effective-target power10_ok } */ -/* { dg-options "-mdejagnu-cpu=power10 -O2" } */ - -#include <math.h> - -/* Test generating DFmode constants with the ISA 3.1 (power10) XXSPLTIDP - instruction. */ - -double -scalar_double_0 (void) -{ - return 0.0; /* XXSPLTIB or XXLXOR. */ -} - -double -scalar_double_1 (void) -{ - return 1.0; /* XXSPLTIDP. */ -} - -#ifndef __FAST_MATH__ -double -scalar_double_m0 (void) -{ - return -0.0; /* XXSPLTIDP. */ -} - -double -scalar_double_nan (void) -{ - return __builtin_nan (""); /* XXSPLTIDP. */ -} - -double -scalar_double_inf (void) -{ - return __builtin_inf (); /* XXSPLTIDP. */ -} - -double -scalar_double_m_inf (void) /* XXSPLTIDP. */ -{ - return - __builtin_inf (); -} -#endif - -double -scalar_double_pi (void) -{ - return M_PI; /* PLFD. */ -} - -double -scalar_double_denorm (void) -{ - return 0x1p-149f; /* PLFD. */ -} - -/* { dg-final { scan-assembler-times {\mxxspltidp\M} 5 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c deleted file mode 100644 index 72504bdfbbd..00000000000 --- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-sf.c +++ /dev/null @@ -1,60 +0,0 @@ -/* { dg-do compile } */ -/* { dg-require-effective-target power10_ok } */ -/* { dg-options "-mdejagnu-cpu=power10 -O2" } */ - -#include <math.h> - -/* Test generating SFmode constants with the ISA 3.1 (power10) XXSPLTIDP - instruction. */ - -float -scalar_float_0 (void) -{ - return 0.0f; /* XXSPLTIB or XXLXOR. */ -} - -float -scalar_float_1 (void) -{ - return 1.0f; /* XXSPLTIDP. */ -} - -#ifndef __FAST_MATH__ -float -scalar_float_m0 (void) -{ - return -0.0f; /* XXSPLTIDP. */ -} - -float -scalar_float_nan (void) -{ - return __builtin_nanf (""); /* XXSPLTIDP. */ -} - -float -scalar_float_inf (void) -{ - return __builtin_inff (); /* XXSPLTIDP. */ -} - -float -scalar_float_m_inf (void) /* XXSPLTIDP. */ -{ - return - __builtin_inff (); -} -#endif - -float -scalar_float_pi (void) -{ - return (float)M_PI; /* XXSPLTIDP. */ -} - -float -scalar_float_denorm (void) -{ - return 0x1p-149f; /* PLFS. */ -} - -/* { dg-final { scan-assembler-times {\mxxspltidp\M} 6 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c deleted file mode 100644 index 82ffc86f8aa..00000000000 --- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2df.c +++ /dev/null @@ -1,64 +0,0 @@ -/* { dg-do compile } */ -/* { dg-require-effective-target power10_ok } */ -/* { dg-options "-mdejagnu-cpu=power10 -O2" } */ - -#include <math.h> - -/* Test generating V2DFmode constants with the ISA 3.1 (power10) XXSPLTIDP - instruction. */ - -vector double -v2df_double_0 (void) -{ - return (vector double) { 0.0, 0.0 }; /* XXSPLTIB or XXLXOR. */ -} - -vector double -v2df_double_1 (void) -{ - return (vector double) { 1.0, 1.0 }; /* XXSPLTIDP. */ -} - -#ifndef __FAST_MATH__ -vector double -v2df_double_m0 (void) -{ - return (vector double) { -0.0, -0.0 }; /* XXSPLTIDP. */ -} - -vector double -v2df_double_nan (void) -{ - return (vector double) { __builtin_nan (""), - __builtin_nan ("") }; /* XXSPLTIDP. */ -} - -vector double -v2df_double_inf (void) -{ - return (vector double) { __builtin_inf (), - __builtin_inf () }; /* XXSPLTIDP. */ -} - -vector double -v2df_double_m_inf (void) -{ - return (vector double) { - __builtin_inf (), - - __builtin_inf () }; /* XXSPLTIDP. */ -} -#endif - -vector double -v2df_double_pi (void) -{ - return (vector double) { M_PI, M_PI }; /* PLVX. */ -} - -vector double -v2df_double_denorm (void) -{ - return (vector double) { (double)0x1p-149f, - (double)0x1p-149f }; /* PLVX. */ -} - -/* { dg-final { scan-assembler-times {\mxxspltidp\M} 5 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2di.c b/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2di.c deleted file mode 100644 index 4d44f943d26..00000000000 --- a/gcc/testsuite/gcc.target/powerpc/vec-splat-constant-v2di.c +++ /dev/null @@ -1,50 +0,0 @@ -/* { dg-do compile } */ -/* { dg-require-effective-target power10_ok } */ -/* { dg-options "-mdejagnu-cpu=power10 -O2" } */ - -/* Test generating V2DImode constants that have the same bit pattern as - V2DFmode constants that can be loaded with the XXSPLTIDP instruction with - the ISA 3.1 (power10). */ - -vector long long -vector_0 (void) -{ - /* XXSPLTIB or XXLXOR. */ - return (vector long long) { 0LL, 0LL }; -} - -vector long long -vector_1 (void) -{ - /* XXSPLTIB and VEXTSB2D. */ - return (vector long long) { 1LL, 1LL }; -} - -/* 0x8000000000000000LL is the bit pattern for -0.0, which can be generated - with XXSPLTISDP. */ -vector long long -vector_float_neg_0 (void) -{ - /* XXSPLTIDP. */ - return (vector long long) { 0x8000000000000000LL, 0x8000000000000000LL }; -} - -/* 0x3ff0000000000000LL is the bit pattern for 1.0 which can be generated with - XXSPLTISDP. */ -vector long long -vector_float_1_0 (void) -{ - /* XXSPLTIDP. */ - return (vector long long) { 0x3ff0000000000000LL, 0x3ff0000000000000LL }; -} - -/* 0x400921fb54442d18LL is the bit pattern for PI, which cannot be generated - with XXSPLTIDP. */ -vector long long -scalar_pi (void) -{ - /* PLXV. */ - return (vector long long) { 0x400921fb54442d18LL, 0x400921fb54442d18LL }; -} - -/* { dg-final { scan-assembler-times {\mxxspltidp\M} 2 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c b/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c index 5f84930e1a7..a135279b1d7 100644 --- a/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c +++ b/gcc/testsuite/gcc.target/powerpc/vec-splati-runnable.c @@ -150,7 +150,7 @@ main (int argc, char *argv []) } /* { dg-final { scan-assembler-times {\mxxspltiw\M} 2 } } */ -/* { dg-final { scan-assembler-times {\mxxspltidp\M} 3 } } */ +/* { dg-final { scan-assembler-times {\mxxspltidp\M} 2 } } */ /* { dg-final { scan-assembler-times {\mxxsplti32dx\M} 3 } } */
next reply other threads:[~2021-10-18 17:43 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-18 17:43 Michael Meissner [this message] -- strict thread matches above, loose matches on Subject: below -- 2021-10-29 22:31 Michael Meissner 2021-10-21 2:51 Michael Meissner 2021-10-21 2:27 Michael Meissner 2021-10-21 0:37 Michael Meissner 2021-10-20 22:26 Michael Meissner 2021-10-20 21:21 Michael Meissner 2021-10-20 17:56 Michael Meissner 2021-10-18 18:49 Michael Meissner 2021-10-18 14:07 Michael Meissner 2021-10-15 23:44 Michael Meissner 2021-10-15 15:12 Michael Meissner 2021-10-15 5:23 Michael Meissner 2021-10-14 23:43 Michael Meissner 2021-10-14 16:47 Michael Meissner 2021-10-14 15:35 Michael Meissner 2021-10-14 13:43 Michael Meissner 2021-10-14 2:59 Michael Meissner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211018174302.1CBF43858C27@sourceware.org \ --to=meissner@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).