From 16c78b665aa4ce64af71b6ac7ebaa96c9807be4c Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 3 Jan 2018 21:39:33 +0000 Subject: [PATCH] Directly operate on CONST_VECTOR encoding This patch makes some pieces of code operate directly on the new CONST_VECTOR encoding. 2018-01-03 Richard Sandiford gcc/ * cse.c (hash_rtx_cb): Hash only the encoded elements. * cselib.c (cselib_hash_rtx): Likewise. * expmed.c (make_tree): Build VECTOR_CSTs directly from the CONST_VECTOR encoding. From-SVN: r256192 --- gcc/ChangeLog | 7 +++++++ gcc/cse.c | 4 ++-- gcc/cselib.c | 4 ++-- gcc/expmed.c | 9 +++++---- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7aa0920fc65..0ce136fc7a1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-01-03 Richard Sandiford + + * cse.c (hash_rtx_cb): Hash only the encoded elements. + * cselib.c (cselib_hash_rtx): Likewise. + * expmed.c (make_tree): Build VECTOR_CSTs directly from the + CONST_VECTOR encoding. + 2017-01-03 Jakub Jelinek Jeff Law diff --git a/gcc/cse.c b/gcc/cse.c index 81a40156327..fcfbba09283 100644 --- a/gcc/cse.c +++ b/gcc/cse.c @@ -2353,11 +2353,11 @@ hash_rtx_cb (const_rtx x, machine_mode mode, int units; rtx elt; - units = CONST_VECTOR_NUNITS (x); + units = const_vector_encoded_nelts (x); for (i = 0; i < units; ++i) { - elt = CONST_VECTOR_ELT (x, i); + elt = CONST_VECTOR_ENCODED_ELT (x, i); hash += hash_rtx_cb (elt, GET_MODE (elt), do_not_record_p, hash_arg_in_memory_p, have_reg_qty, cb); diff --git a/gcc/cselib.c b/gcc/cselib.c index 41e4317e337..ca4a53a8733 100644 --- a/gcc/cselib.c +++ b/gcc/cselib.c @@ -1163,11 +1163,11 @@ cselib_hash_rtx (rtx x, int create, machine_mode memmode) int units; rtx elt; - units = CONST_VECTOR_NUNITS (x); + units = const_vector_encoded_nelts (x); for (i = 0; i < units; ++i) { - elt = CONST_VECTOR_ELT (x, i); + elt = CONST_VECTOR_ENCODED_ELT (x, i); hash += cselib_hash_rtx (elt, 0, memmode); } diff --git a/gcc/expmed.c b/gcc/expmed.c index 60848fa5d23..be6a13854e6 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -5273,13 +5273,14 @@ make_tree (tree type, rtx x) case CONST_VECTOR: { - int units = CONST_VECTOR_NUNITS (x); + unsigned int npatterns = CONST_VECTOR_NPATTERNS (x); + unsigned int nelts_per_pattern = CONST_VECTOR_NELTS_PER_PATTERN (x); tree itype = TREE_TYPE (type); - int i; /* Build a tree with vector elements. */ - tree_vector_builder elts (type, units, 1); - for (i = 0; i < units; ++i) + tree_vector_builder elts (type, npatterns, nelts_per_pattern); + unsigned int count = elts.encoded_nelts (); + for (unsigned int i = 0; i < count; ++i) { rtx elt = CONST_VECTOR_ELT (x, i); elts.quick_push (make_tree (itype, elt)); -- 2.30.2