[libc-commits] [libc] de21f34 - [libc] Add memmove benchmarks
Guillaume Chatelet via libc-commits
libc-commits at lists.llvm.org
Tue Nov 30 02:46:25 PST 2021
Author: Guillaume Chatelet
Date: 2021-11-30T10:46:16Z
New Revision: de21f346913cf777436ab0ac0fb707ac04eb3300
URL: https://github.com/llvm/llvm-project/commit/de21f346913cf777436ab0ac0fb707ac04eb3300
DIFF: https://github.com/llvm/llvm-project/commit/de21f346913cf777436ab0ac0fb707ac04eb3300.diff
LOG: [libc] Add memmove benchmarks
This patch enables the benchmarking of `memmove`.
Ideally, this should be submitted before D114637.
Differential Revision: https://reviews.llvm.org/D114694
Added:
Modified:
libc/benchmarks/CMakeLists.txt
libc/benchmarks/LibcDefaultImplementations.cpp
libc/benchmarks/LibcFunctionPrototypes.h
libc/benchmarks/LibcMemoryBenchmark.cpp
libc/benchmarks/LibcMemoryBenchmark.h
libc/benchmarks/LibcMemoryBenchmarkMain.cpp
libc/benchmarks/LibcMemoryGoogleBenchmarkMain.cpp
libc/benchmarks/automemcpy/lib/CodeGen.cpp
libc/src/string/CMakeLists.txt
Removed:
################################################################################
diff --git a/libc/benchmarks/CMakeLists.txt b/libc/benchmarks/CMakeLists.txt
index 01aab0585bbf7..9f01afecef122 100644
--- a/libc/benchmarks/CMakeLists.txt
+++ b/libc/benchmarks/CMakeLists.txt
@@ -172,11 +172,12 @@ function(add_libc_multi_impl_benchmark name)
endforeach()
endfunction()
-add_libc_multi_impl_benchmark(memcpy)
-add_libc_multi_impl_benchmark(memset)
+add_libc_multi_impl_benchmark(bcmp)
add_libc_multi_impl_benchmark(bzero)
add_libc_multi_impl_benchmark(memcmp)
-add_libc_multi_impl_benchmark(bcmp)
+add_libc_multi_impl_benchmark(memcpy)
+add_libc_multi_impl_benchmark(memmove)
+add_libc_multi_impl_benchmark(memset)
#==============================================================================
# Google Benchmarking tool
@@ -199,6 +200,7 @@ target_link_libraries(libc.benchmarks.memory_functions.opt_host
libc.src.string.memcpy_opt_host
libc.src.string.memset_opt_host
libc.src.string.bzero_opt_host
+ libc.src.string.memmove_opt_host
benchmark_main
)
diff --git a/libc/benchmarks/LibcDefaultImplementations.cpp b/libc/benchmarks/LibcDefaultImplementations.cpp
index 75ee6cf7a31bc..2448a6b404f96 100644
--- a/libc/benchmarks/LibcDefaultImplementations.cpp
+++ b/libc/benchmarks/LibcDefaultImplementations.cpp
@@ -5,6 +5,7 @@
namespace __llvm_libc {
extern void *memcpy(void *__restrict, const void *__restrict, size_t);
+extern void *memmove(void *, const void *, size_t);
extern void *memset(void *, int, size_t);
extern void bzero(void *, size_t);
extern int memcmp(const void *, const void *, size_t);
@@ -17,6 +18,7 @@ extern int bcmp(const void *, const void *, size_t);
using llvm::libc_benchmarks::BzeroConfiguration;
using llvm::libc_benchmarks::MemcmpOrBcmpConfiguration;
using llvm::libc_benchmarks::MemcpyConfiguration;
+using llvm::libc_benchmarks::MemmoveConfiguration;
using llvm::libc_benchmarks::MemsetConfiguration;
llvm::ArrayRef<MemcpyConfiguration> getMemcpyConfigurations() {
@@ -24,6 +26,11 @@ llvm::ArrayRef<MemcpyConfiguration> getMemcpyConfigurations() {
{__llvm_libc::memcpy, "__llvm_libc::memcpy"}};
return llvm::makeArrayRef(kMemcpyConfigurations);
}
+llvm::ArrayRef<MemmoveConfiguration> getMemmoveConfigurations() {
+ static constexpr MemmoveConfiguration kMemmoveConfigurations[] = {
+ {__llvm_libc::memmove, "__llvm_libc::memmove"}};
+ return llvm::makeArrayRef(kMemmoveConfigurations);
+}
llvm::ArrayRef<MemcmpOrBcmpConfiguration> getMemcmpConfigurations() {
static constexpr MemcmpOrBcmpConfiguration kMemcmpConfiguration[] = {
{__llvm_libc::memcmp, "__llvm_libc::memcmp"}};
diff --git a/libc/benchmarks/LibcFunctionPrototypes.h b/libc/benchmarks/LibcFunctionPrototypes.h
index 561795a379db9..91d56cb58fe98 100644
--- a/libc/benchmarks/LibcFunctionPrototypes.h
+++ b/libc/benchmarks/LibcFunctionPrototypes.h
@@ -14,6 +14,12 @@ struct MemcpyConfiguration {
llvm::StringRef Name;
};
+using MemmoveFunction = void *(*)(void *, const void *, size_t);
+struct MemmoveConfiguration {
+ MemmoveFunction Function;
+ llvm::StringRef Name;
+};
+
using MemsetFunction = void *(*)(void *, int, size_t);
struct MemsetConfiguration {
MemsetFunction Function;
diff --git a/libc/benchmarks/LibcMemoryBenchmark.cpp b/libc/benchmarks/LibcMemoryBenchmark.cpp
index d1e16e8d586a0..50fb86ee774a6 100644
--- a/libc/benchmarks/LibcMemoryBenchmark.cpp
+++ b/libc/benchmarks/LibcMemoryBenchmark.cpp
@@ -108,6 +108,9 @@ CopySetup::CopySetup()
: ParameterBatch(2), SrcBuffer(ParameterBatch::BufferSize),
DstBuffer(ParameterBatch::BufferSize) {}
+MoveSetup::MoveSetup()
+ : ParameterBatch(3), Buffer(ParameterBatch::BufferSize * 3) {}
+
ComparisonSetup::ComparisonSetup()
: ParameterBatch(2), LhsBuffer(ParameterBatch::BufferSize),
RhsBuffer(ParameterBatch::BufferSize) {
diff --git a/libc/benchmarks/LibcMemoryBenchmark.h b/libc/benchmarks/LibcMemoryBenchmark.h
index 0c4b49f5dc878..b3f0f94cd3143 100644
--- a/libc/benchmarks/LibcMemoryBenchmark.h
+++ b/libc/benchmarks/LibcMemoryBenchmark.h
@@ -206,6 +206,24 @@ struct CopySetup : public ParameterBatch {
AlignedBuffer DstBuffer;
};
+/// Provides source and destination buffers for the Move operation as well as
+/// the associated size distributions.
+struct MoveSetup : public ParameterBatch {
+ MoveSetup();
+
+ inline static const ArrayRef<MemorySizeDistribution> getDistributions() {
+ return getMemmoveSizeDistributions();
+ }
+
+ inline void *Call(ParameterType Parameter, MemmoveFunction Memmove) {
+ return Memmove(Buffer + ParameterBatch::BufferSize / 3,
+ Buffer + Parameter.OffsetBytes, Parameter.SizeBytes);
+ }
+
+private:
+ AlignedBuffer Buffer;
+};
+
/// Provides destination buffer for the Set operation as well as the associated
/// size distributions.
struct SetSetup : public ParameterBatch {
diff --git a/libc/benchmarks/LibcMemoryBenchmarkMain.cpp b/libc/benchmarks/LibcMemoryBenchmarkMain.cpp
index 8539402a8cdaa..f5752573e0f0f 100644
--- a/libc/benchmarks/LibcMemoryBenchmarkMain.cpp
+++ b/libc/benchmarks/LibcMemoryBenchmarkMain.cpp
@@ -24,6 +24,7 @@
namespace __llvm_libc {
extern void *memcpy(void *__restrict, const void *__restrict, size_t);
+extern void *memmove(void *, const void *, size_t);
extern void *memset(void *, int, size_t);
extern void bzero(void *, size_t);
extern int memcmp(const void *, const void *, size_t);
@@ -68,6 +69,9 @@ static cl::opt<uint32_t>
#if defined(LIBC_BENCHMARK_FUNCTION_MEMCPY)
#define LIBC_BENCHMARK_FUNCTION LIBC_BENCHMARK_FUNCTION_MEMCPY
using BenchmarkSetup = CopySetup;
+#elif defined(LIBC_BENCHMARK_FUNCTION_MEMMOVE)
+#define LIBC_BENCHMARK_FUNCTION LIBC_BENCHMARK_FUNCTION_MEMMOVE
+using BenchmarkSetup = MoveSetup;
#elif defined(LIBC_BENCHMARK_FUNCTION_MEMSET)
#define LIBC_BENCHMARK_FUNCTION LIBC_BENCHMARK_FUNCTION_MEMSET
using BenchmarkSetup = SetSetup;
diff --git a/libc/benchmarks/LibcMemoryGoogleBenchmarkMain.cpp b/libc/benchmarks/LibcMemoryGoogleBenchmarkMain.cpp
index 1d7ab328965a7..1e7f35b9c3d7c 100644
--- a/libc/benchmarks/LibcMemoryGoogleBenchmarkMain.cpp
+++ b/libc/benchmarks/LibcMemoryGoogleBenchmarkMain.cpp
@@ -17,8 +17,10 @@ using llvm::libc_benchmarks::ComparisonSetup;
using llvm::libc_benchmarks::CopySetup;
using llvm::libc_benchmarks::MemcmpOrBcmpConfiguration;
using llvm::libc_benchmarks::MemcpyConfiguration;
+using llvm::libc_benchmarks::MemmoveConfiguration;
using llvm::libc_benchmarks::MemorySizeDistribution;
using llvm::libc_benchmarks::MemsetConfiguration;
+using llvm::libc_benchmarks::MoveSetup;
using llvm::libc_benchmarks::OffsetDistribution;
using llvm::libc_benchmarks::SetSetup;
@@ -94,6 +96,10 @@ extern llvm::ArrayRef<MemcpyConfiguration> getMemcpyConfigurations();
BENCHMARK_MEMORY_FUNCTION(BM_Memcpy, CopySetup, MemcpyConfiguration,
getMemcpyConfigurations());
+extern llvm::ArrayRef<MemmoveConfiguration> getMemmoveConfigurations();
+BENCHMARK_MEMORY_FUNCTION(BM_Memmove, MoveSetup, MemmoveConfiguration,
+ getMemmoveConfigurations());
+
extern llvm::ArrayRef<MemcmpOrBcmpConfiguration> getMemcmpConfigurations();
BENCHMARK_MEMORY_FUNCTION(BM_Memcmp, ComparisonSetup, MemcmpOrBcmpConfiguration,
getMemcmpConfigurations());
diff --git a/libc/benchmarks/automemcpy/lib/CodeGen.cpp b/libc/benchmarks/automemcpy/lib/CodeGen.cpp
index 28bd62044c549..f294a58efc8f0 100644
--- a/libc/benchmarks/automemcpy/lib/CodeGen.cpp
+++ b/libc/benchmarks/automemcpy/lib/CodeGen.cpp
@@ -548,6 +548,7 @@ static void Serialize(raw_ostream &Stream,
Stream << "using llvm::libc_benchmarks::BzeroConfiguration;\n";
Stream << "using llvm::libc_benchmarks::MemcmpOrBcmpConfiguration;\n";
Stream << "using llvm::libc_benchmarks::MemcpyConfiguration;\n";
+ Stream << "using llvm::libc_benchmarks::MemmoveConfiguration;\n";
Stream << "using llvm::libc_benchmarks::MemsetConfiguration;\n";
Stream << "\n";
Stream << "namespace __llvm_libc {\n";
@@ -599,6 +600,11 @@ template <BzeroStub Foo> void Wrap(void *dst, size_t size) {
}
)";
codegen::configurations::Serialize(Stream, FunctionType::BZERO, Descriptors);
+ Stream << R"(
+llvm::ArrayRef<MemmoveConfiguration> getMemmoveConfigurations() {
+ return {};
+}
+)";
Stream << "// Functions : " << Descriptors.size() << "\n";
}
diff --git a/libc/src/string/CMakeLists.txt b/libc/src/string/CMakeLists.txt
index 84af6b144107b..2d52b3689161c 100644
--- a/libc/src/string/CMakeLists.txt
+++ b/libc/src/string/CMakeLists.txt
@@ -37,17 +37,6 @@ add_entrypoint_object(
.string_utils
)
-add_entrypoint_object(
- memmove
- SRCS
- memmove.cpp
- HDRS
- memmove.h
- DEPENDS
- libc.src.__support.integer_operations
- .memory_utils.memcpy_implementation
-)
-
add_entrypoint_object(
memrchr
SRCS
@@ -404,6 +393,42 @@ else()
add_memcpy(memcpy)
endif()
+# ------------------------------------------------------------------------------
+# memmove
+# ------------------------------------------------------------------------------
+
+function(add_memmove memmove_name)
+ add_implementation(memmove ${memmove_name}
+ SRCS ${LIBC_SOURCE_DIR}/src/string/memmove.cpp
+ HDRS ${LIBC_SOURCE_DIR}/src/string/memmove.h
+ DEPENDS
+ .memory_utils.memory_utils
+ .memory_utils.memcpy_implementation
+ libc.include.string
+ COMPILE_OPTIONS
+ -fno-builtin
+ ${ARGN}
+ )
+endfunction()
+
+if(${LIBC_TARGET_ARCHITECTURE_IS_X86})
+ add_memmove(memmove_x86_64_opt_sse2 COMPILE_OPTIONS -march=k8 REQUIRE SSE2)
+ add_memmove(memmove_x86_64_opt_sse4 COMPILE_OPTIONS -march=nehalem REQUIRE SSE4_2)
+ add_memmove(memmove_x86_64_opt_avx2 COMPILE_OPTIONS -march=haswell REQUIRE AVX2)
+ add_memmove(memmove_x86_64_opt_avx512 COMPILE_OPTIONS -march=skylake-avx512 REQUIRE AVX512F)
+ add_memmove(memmove_opt_host COMPILE_OPTIONS ${LIBC_COMPILE_OPTIONS_NATIVE})
+ add_memmove(memmove)
+elseif(${LIBC_TARGET_ARCHITECTURE_IS_AARCH64})
+ # Disable tail merging as it leads to lower performance.
+ # Note that '-mllvm' needs to be prefixed with 'SHELL:' to prevent CMake flag deduplication.
+ add_memmove(memmove_opt_host COMPILE_OPTIONS ${LIBC_COMPILE_OPTIONS_NATIVE}
+ COMPILE_OPTIONS "SHELL:-mllvm --tail-merge-threshold=0")
+ add_memmove(memmove COMPILE_OPTIONS "SHELL:-mllvm --tail-merge-threshold=0")
+else()
+ add_memmove(memmove_opt_host COMPILE_OPTIONS ${LIBC_COMPILE_OPTIONS_NATIVE})
+ add_memmove(memmove)
+endif()
+
# ------------------------------------------------------------------------------
# memset
# ------------------------------------------------------------------------------
More information about the libc-commits
mailing list