caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libc] Improve qsort (with build fix) (#121482)

Browse Source
This commit is contained in:
Lukas Bergdoll
2025-01-04 23:10:41 +01:00
committed by GitHub
parent 7a76110096
commit a738d81cd2
17 changed files with 571 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libc/fuzzing/stdlib/CMakeLists.txt
View File

@@ -1,9 +1,9 @@
add_libc_fuzzer(
qsort_fuzz
quick_sort_fuzz
SRCS
qsort_fuzz.cpp
quick_sort_fuzz.cpp
DEPENDS
libc.src.stdlib.qsort
libc.src.stdlib.qsort_util
)
add_libc_fuzzer(

29
libc/fuzzing/stdlib/heap_sort_fuzz.cpp
View File

@@ -10,21 +10,10 @@
///
//===----------------------------------------------------------------------===//
#include "src/stdlib/heap_sort.h"
#include "src/stdlib/qsort_util.h"
#include <stdint.h>
static int int_compare(const void *l, const void *r) {
int li = *reinterpret_cast<const int *>(l);
int ri = *reinterpret_cast<const int *>(r);
if (li == ri)
return 0;
if (li > ri)
return 1;
return -1;
}
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
const size_t array_size = size / sizeof(int);
if (array_size == 0)
return 0;
@@ -34,14 +23,22 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
for (size_t i = 0; i < array_size; ++i)
array[i] = data_as_int[i];
auto arr = LIBC_NAMESPACE::internal::Array(
reinterpret_cast<uint8_t *>(array), array_size, sizeof(int), int_compare);
const auto is_less = [](const void *a_ptr,
const void *b_ptr) noexcept -> bool {
const int &a = *static_cast<const int *>(a_ptr);
const int &b = *static_cast<const int *>(b_ptr);
LIBC_NAMESPACE::internal::heap_sort(arr);
return a < b;
};
for (size_t i = 0; i < array_size - 1; ++i)
constexpr bool USE_QUICKSORT = false;
LIBC_NAMESPACE::internal::unstable_sort_impl<USE_QUICKSORT>(
array, array_size, sizeof(int), is_less);
for (size_t i = 0; i < array_size - 1; ++i) {
if (array[i] > array[i + 1])
__builtin_trap();
}
delete[] array;
return 0;

29
libc/fuzzing/stdlib/qsort_fuzz.cpp → libc/fuzzing/stdlib/quick_sort_fuzz.cpp
View File

@@ -1,4 +1,4 @@
//===-- qsort_fuzz.cpp ----------------------------------------------------===//
//===-- quick_sort_fuzz.cpp------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -6,24 +6,13 @@
//
//===----------------------------------------------------------------------===//
///
/// Fuzzing test for llvm-libc qsort implementation.
/// Fuzzing test for llvm-libc quick_sort implementation.
///
//===----------------------------------------------------------------------===//
#include "src/stdlib/qsort.h"
#include "src/stdlib/qsort_util.h"
#include <stdint.h>
static int int_compare(const void *l, const void *r) {
int li = *reinterpret_cast<const int *>(l);
int ri = *reinterpret_cast<const int *>(r);
if (li == ri)
return 0;
else if (li > ri)
return 1;
else
return -1;
}
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
const size_t array_size = size / sizeof(int);
if (array_size == 0)
@@ -34,7 +23,17 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
for (size_t i = 0; i < array_size; ++i)
array[i] = data_as_int[i];
LIBC_NAMESPACE::qsort(array, array_size, sizeof(int), int_compare);
const auto is_less = [](const void *a_ptr,
const void *b_ptr) noexcept -> bool {
const int &a = *static_cast<const int *>(a_ptr);
const int &b = *static_cast<const int *>(b_ptr);
return a < b;
};
constexpr bool USE_QUICKSORT = true;
LIBC_NAMESPACE::internal::unstable_sort_impl<USE_QUICKSORT>(
array, array_size, sizeof(int), is_less);
for (size_t i = 0; i < array_size - 1; ++i) {
if (array[i] > array[i + 1])