OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Expose stable sort algorithm to gcc_sort_r and add vec::stablesort 

This makes it possible to apply GCCs stable sort algorithm to vec<>
and also use it with the qsort_r compatible interface.

2021-06-10  Richard Biener  <rguenther@suse.de>

	* system.h (gcc_stablesort_r): Declare.
	* sort.cc (gcc_sort_r): Support stable sort.
	(gcc_stablesort_r): Define.
	* vec.h (vec<>::stablesort): Add.
This commit is contained in:
Richard Biener 2021-06-10 11:03:55 +02:00
parent 26dbe85a37
commit 367f52dcc2
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/sort.cc
View File

@ -277,8 +277,12 @@ gcc_sort_r (void *vbase, size_t n, size_t size, sort_r_cmp_fn *cmp, void *data)
{
if (n < 2)
return;
size_t nlim = 5;
bool stable = (ssize_t) size < 0;
if (stable)
nlim = 3, size = ~size;
char *base = (char *)vbase;
sort_r_ctx c = {data, cmp, base, n, size, 5};
sort_r_ctx c = {data, cmp, base, n, size, nlim};
long long scratch[32];
size_t bufsz = (n / 2) * size;
void *buf = bufsz <= sizeof scratch ? scratch : xmalloc (bufsz);
@ -296,3 +300,11 @@ gcc_stablesort (void *vbase, size_t n, size_t size, cmp_fn *cmp)
{
gcc_qsort (vbase, n, ~size, cmp);
}
/* Stable sort, signature-compatible to Glibc qsort_r. */
void
gcc_stablesort_r (void *vbase, size_t n, size_t size, sort_r_cmp_fn *cmp,
void *data)
{
gcc_sort_r (vbase, n, ~size, cmp, data);
}

1
gcc/system.h
View File

@ -1250,6 +1250,7 @@ void gcc_sort_r (void *, size_t, size_t, sort_r_cmp_fn *, void *);
void gcc_qsort (void *, size_t, size_t, int (*)(const void *, const void *));
void gcc_stablesort (void *, size_t, size_t,
int (*)(const void *, const void *));
void gcc_stablesort_r (void *, size_t, size_t, sort_r_cmp_fn *, void *data);
/* Redirect four-argument qsort calls to gcc_qsort; one-argument invocations
correspond to vec::qsort, and use C qsort internally. */
#define PP_5th(a1, a2, a3, a4, a5, ...) a5

24
gcc/vec.h
View File

@ -612,6 +612,7 @@ public:
void block_remove (unsigned, unsigned);
void qsort (int (*) (const void *, const void *));
void sort (int (*) (const void *, const void *, void *), void *);
void stablesort (int (*) (const void *, const void *, void *), void *);
T *bsearch (const void *key, int (*compar)(const void *, const void *));
T *bsearch (const void *key,
int (*compar)(const void *, const void *, void *), void *);
@ -1160,6 +1161,17 @@ vec<T, A, vl_embed>::sort (int (*cmp) (const void *, const void *, void *),
gcc_sort_r (address (), length (), sizeof (T), cmp, data);
}
/* Sort the contents of this vector with gcc_stablesort_r. CMP is the
comparison function to pass to qsort. */
template<typename T, typename A>
inline void
vec<T, A, vl_embed>::stablesort (int (*cmp) (const void *, const void *,
void *), void *data)
{
if (length () > 1)
gcc_stablesort_r (address (), length (), sizeof (T), cmp, data);
}
/* Search the contents of the sorted vector with a binary search.
CMP is the comparison function to pass to bsearch. */
@ -1488,6 +1500,7 @@ public:
void block_remove (unsigned, unsigned);
void qsort (int (*) (const void *, const void *));
void sort (int (*) (const void *, const void *, void *), void *);
void stablesort (int (*) (const void *, const void *, void *), void *);
T *bsearch (const void *key, int (*compar)(const void *, const void *));
T *bsearch (const void *key,
int (*compar)(const void *, const void *, void *), void *);
@ -2053,6 +2066,17 @@ vec<T, va_heap, vl_ptr>::sort (int (*cmp) (const void *, const void *,
m_vec->sort (cmp, data);
}
/* Sort the contents of this vector with gcc_stablesort_r. CMP is the
comparison function to pass to qsort. */
template<typename T>
inline void
vec<T, va_heap, vl_ptr>::stablesort (int (*cmp) (const void *, const void *,
void *), void *data)
{
if (m_vec)
m_vec->stablesort (cmp, data);
}
/* Search the contents of the sorted vector with a binary search.
CMP is the comparison function to pass to bsearch. */