diff options
| -rw-r--r-- | gcc/ChangeLog | 14 | ||||
| -rw-r--r-- | gcc/Makefile.in | 3 | ||||
| -rw-r--r-- | gcc/ggc-common.c | 17 | ||||
| -rw-r--r-- | gcc/mem-stats.h | 17 | ||||
| -rw-r--r-- | gcc/tree.c | 37 | ||||
| -rw-r--r-- | gcc/vec.c | 21 |
6 files changed, 71 insertions, 38 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 198a89d521c..88417f738ba 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +2018-01-12 Martin Liska <mliska@suse.cz> + + * Makefile.in: As qsort_chk is implemented in vec.c, add + vec.o to linkage of gencfn-macros. + * tree.c (build_new_poly_int_cst): Add CXX_MEM_STAT_INFO as it's + passing the info to record_node_allocation_statistics. + (test_vector_cst_patterns): Add CXX_MEM_STAT_INFO to declaration + and pass the info. + * ggc-common.c (struct ggc_usage): Add operator== and use + it in operator< and compare function. + * mem-stats.h (struct mem_usage): Likewise. + * vec.c (struct vec_usage): Remove operator< and compare + function. Can be simply inherited. + 2018-01-12 Martin Jambor <mjambor@suse.cz> PR target/81616 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index fb988cda9d1..f04b8a224c0 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2810,7 +2810,8 @@ genprog = $(genprogerr) check checksum condmd match build/genautomata$(build_exeext) : BUILD_LIBS += -lm build/genrecog$(build_exeext) : build/hash-table.o build/inchash.o -build/gencfn-macros$(build_exeext) : build/hash-table.o build/ggc-none.o +build/gencfn-macros$(build_exeext) : build/hash-table.o build/vec.o \ + build/ggc-none.o # For stage1 and when cross-compiling use the build libcpp which is # built with NLS disabled. For stage2+ use the host library and diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c index d435a4b0175..f83fc136d04 100644 --- a/gcc/ggc-common.c +++ b/gcc/ggc-common.c @@ -836,10 +836,22 @@ struct ggc_usage: public mem_usage : mem_usage (allocated, times, peak), m_freed (freed), m_collected (collected), m_overhead (overhead) {} + /* Equality operator. */ + inline bool + operator== (const ggc_usage &second) const + { + return (get_balance () == second.get_balance () + && m_peak == second.m_peak + && m_times == second.m_times); + } + /* Comparison operator. */ inline bool operator< (const ggc_usage &second) const { + if (*this == second) + return false; + return (get_balance () == second.get_balance () ? (m_peak == second.m_peak ? m_times < second.m_times : m_peak < second.m_peak) @@ -926,7 +938,10 @@ struct ggc_usage: public mem_usage const mem_pair_t f = *(const mem_pair_t *)first; const mem_pair_t s = *(const mem_pair_t *)second; - return (*f.second) < (*s.second); + if (*f.second == *s.second) + return 0; + + return *f.second < *s.second ? 1 : -1; } /* Compare rows in final GGC summary dump. */ diff --git a/gcc/mem-stats.h b/gcc/mem-stats.h index 00cb2b0aa9c..741c07301d9 100644 --- a/gcc/mem-stats.h +++ b/gcc/mem-stats.h @@ -163,10 +163,22 @@ struct mem_usage m_instances + second.m_instances); } + /* Equality operator. */ + inline bool + operator== (const mem_usage &second) const + { + return (m_allocated == second.m_allocated + && m_peak == second.m_peak + && m_allocated == second.m_allocated); + } + /* Comparison operator. */ inline bool operator< (const mem_usage &second) const { + if (*this == second) + return false; + return (m_allocated == second.m_allocated ? (m_peak == second.m_peak ? m_times < second.m_times : m_peak < second.m_peak) : m_allocated < second.m_allocated); @@ -181,7 +193,10 @@ struct mem_usage const mem_pair_t f = *(const mem_pair_t *)first; const mem_pair_t s = *(const mem_pair_t *)second; - return (*f.second) < (*s.second); + if (*f.second == *s.second) + return 0; + + return *f.second < *s.second ? 1 : -1; } /* Dump usage coupled to LOC location, where TOTAL is sum of all rows. */ diff --git a/gcc/tree.c b/gcc/tree.c index bed59d33bb2..722ce021b67 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -1332,7 +1332,8 @@ build_new_int_cst (tree type, const wide_int &cst) /* Return a new POLY_INT_CST with coefficients COEFFS and type TYPE. */ static tree -build_new_poly_int_cst (tree type, tree (&coeffs)[NUM_POLY_INT_COEFFS]) +build_new_poly_int_cst (tree type, tree (&coeffs)[NUM_POLY_INT_COEFFS] + CXX_MEM_STAT_INFO) { size_t length = sizeof (struct tree_poly_int_cst); record_node_allocation_statistics (POLY_INT_CST, length); @@ -14429,7 +14430,7 @@ check_vector_cst_stepped (vec<tree> expected, tree actual, /* Test the creation of VECTOR_CSTs. */ static void -test_vector_cst_patterns () +test_vector_cst_patterns (ALONE_CXX_MEM_STAT_INFO) { auto_vec<tree, 8> elements (8); elements.quick_grow (8); @@ -14440,24 +14441,28 @@ test_vector_cst_patterns () { 0, 1, 2, 3, 4, 5, 6, 7 }. */ for (unsigned int i = 0; i < 8; ++i) elements[i] = build_int_cst (element_type, i); - check_vector_cst_stepped (elements, build_vector (vector_type, elements), 1); + tree vector = build_vector (vector_type, elements PASS_MEM_STAT); + check_vector_cst_stepped (elements, vector, 1); /* Try the same with the first element replaced by 100: { 100, 1, 2, 3, 4, 5, 6, 7 }. */ elements[0] = build_int_cst (element_type, 100); - check_vector_cst_stepped (elements, build_vector (vector_type, elements), 1); + vector = build_vector (vector_type, elements PASS_MEM_STAT); + check_vector_cst_stepped (elements, vector, 1); /* Try a series that wraps around. { 100, 65531, 65532, 65533, 65534, 65535, 0, 1 }. */ for (unsigned int i = 1; i < 8; ++i) elements[i] = build_int_cst (element_type, (65530 + i) & 0xffff); - check_vector_cst_stepped (elements, build_vector (vector_type, elements), 1); + vector = build_vector (vector_type, elements PASS_MEM_STAT); + check_vector_cst_stepped (elements, vector, 1); /* Try a downward series: { 100, 79, 78, 77, 76, 75, 75, 73 }. */ for (unsigned int i = 1; i < 8; ++i) elements[i] = build_int_cst (element_type, 80 - i); - check_vector_cst_stepped (elements, build_vector (vector_type, elements), 1); + vector = build_vector (vector_type, elements PASS_MEM_STAT); + check_vector_cst_stepped (elements, vector, 1); /* Try two interleaved series with different bases and steps: { 100, 53, 66, 206, 62, 212, 58, 218 }. */ @@ -14467,39 +14472,43 @@ test_vector_cst_patterns () elements[i] = build_int_cst (element_type, 70 - i * 2); elements[i + 1] = build_int_cst (element_type, 200 + i * 3); } - check_vector_cst_stepped (elements, build_vector (vector_type, elements), 2); + vector = build_vector (vector_type, elements PASS_MEM_STAT); + check_vector_cst_stepped (elements, vector, 2); /* Try a duplicated value: { 100, 100, 100, 100, 100, 100, 100, 100 }. */ for (unsigned int i = 1; i < 8; ++i) elements[i] = elements[0]; - check_vector_cst_duplicate (elements, - build_vector (vector_type, elements), 1); + vector = build_vector (vector_type, elements PASS_MEM_STAT); + check_vector_cst_duplicate (elements, vector, 1); /* Try an interleaved duplicated value: { 100, 55, 100, 55, 100, 55, 100, 55 }. */ elements[1] = build_int_cst (element_type, 55); for (unsigned int i = 2; i < 8; ++i) elements[i] = elements[i - 2]; - check_vector_cst_duplicate (elements, - build_vector (vector_type, elements), 2); + vector = build_vector (vector_type, elements PASS_MEM_STAT); + check_vector_cst_duplicate (elements, vector, 2); /* Try a duplicated value with 2 exceptions { 41, 97, 100, 55, 100, 55, 100, 55 }. */ elements[0] = build_int_cst (element_type, 41); elements[1] = build_int_cst (element_type, 97); - check_vector_cst_fill (elements, build_vector (vector_type, elements), 2); + vector = build_vector (vector_type, elements PASS_MEM_STAT); + check_vector_cst_fill (elements, vector, 2); /* Try with and without a step { 41, 97, 100, 21, 100, 35, 100, 49 }. */ for (unsigned int i = 3; i < 8; i += 2) elements[i] = build_int_cst (element_type, i * 7); - check_vector_cst_stepped (elements, build_vector (vector_type, elements), 2); + vector = build_vector (vector_type, elements PASS_MEM_STAT); + check_vector_cst_stepped (elements, vector, 2); /* Try a fully-general constant: { 41, 97, 100, 21, 100, 9990, 100, 49 }. */ elements[5] = build_int_cst (element_type, 9990); - check_vector_cst_fill (elements, build_vector (vector_type, elements), 4); + vector = build_vector (vector_type, elements PASS_MEM_STAT); + check_vector_cst_fill (elements, vector, 4); } /* Verify that STRIP_NOPS (NODE) is EXPECTED. diff --git a/gcc/vec.c b/gcc/vec.c index 98a1d779a00..695cd1eba5a 100644 --- a/gcc/vec.c +++ b/gcc/vec.c @@ -60,15 +60,6 @@ struct vec_usage: public mem_usage : mem_usage (allocated, times, peak), m_items (items), m_items_peak (items_peak) {} - /* Comparison operator. */ - inline bool - operator< (const vec_usage &second) const - { - return (m_allocated == second.m_allocated ? - (m_peak == second.m_peak ? m_times < second.m_times - : m_peak < second.m_peak) : m_allocated < second.m_allocated); - } - /* Sum the usage with SECOND usage. */ vec_usage operator+ (const vec_usage &second) @@ -115,18 +106,6 @@ struct vec_usage: public mem_usage print_dash_line (); } - /* Compare wrapper used by qsort method. */ - static int - compare (const void *first, const void *second) - { - typedef std::pair<mem_location *, vec_usage *> mem_pair_t; - - const mem_pair_t f = *(const mem_pair_t *)first; - const mem_pair_t s = *(const mem_pair_t *)second; - - return (*f.second) < (*s.second); - } - /* Current number of items allocated. */ size_t m_items; /* Peak value of number of allocated items. */ |