replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[libc] Memory function benchmarks: rename MemcmpConfiguration in MemcmpOrBcmpConfiguration 

This will help make sense of the double use of the same type in https://reviews.llvm.org/D111622#inline-1065560.

Differential Revision: https://reviews.llvm.org/D111868
This commit is contained in:
Guillaume Chatelet 2021-10-15 09:26:12 +00:00
parent 6678db00e6
commit 4a9bcb605b
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libc/benchmarks/LibcDefaultImplementations.cpp
View File

@ -15,7 +15,7 @@ extern int bcmp(const void *, const void *, size_t);
// List of implementations to test. // List of implementations to test.
using llvm::libc_benchmarks::BzeroConfiguration; using llvm::libc_benchmarks::BzeroConfiguration;
using llvm::libc_benchmarks::MemcmpConfiguration; using llvm::libc_benchmarks::MemcmpOrBcmpConfiguration;
using llvm::libc_benchmarks::MemcpyConfiguration; using llvm::libc_benchmarks::MemcpyConfiguration;
using llvm::libc_benchmarks::MemsetConfiguration; using llvm::libc_benchmarks::MemsetConfiguration;
@ -24,13 +24,13 @@ llvm::ArrayRef<MemcpyConfiguration> getMemcpyConfigurations() {
{__llvm_libc::memcpy, "__llvm_libc::memcpy"}}; {__llvm_libc::memcpy, "__llvm_libc::memcpy"}};
return llvm::makeArrayRef(kMemcpyConfigurations); return llvm::makeArrayRef(kMemcpyConfigurations);
} }
llvm::ArrayRef<MemcmpConfiguration> getMemcmpConfigurations() { llvm::ArrayRef<MemcmpOrBcmpConfiguration> getMemcmpConfigurations() {
static constexpr MemcmpConfiguration kMemcmpConfigurations[] = { static constexpr MemcmpOrBcmpConfiguration kMemcmpConfiguration[] = {
{__llvm_libc::memcmp, "__llvm_libc::memcmp"}}; {__llvm_libc::memcmp, "__llvm_libc::memcmp"}};
return llvm::makeArrayRef(kMemcmpConfigurations); return llvm::makeArrayRef(kMemcmpConfiguration);
} }
llvm::ArrayRef<MemcmpConfiguration> getBcmpConfigurations() { llvm::ArrayRef<MemcmpOrBcmpConfiguration> getBcmpConfigurations() {
static constexpr MemcmpConfiguration kBcmpConfigurations[] = { static constexpr MemcmpOrBcmpConfiguration kBcmpConfigurations[] = {
{__llvm_libc::bcmp, "__llvm_libc::bcmp"}}; {__llvm_libc::bcmp, "__llvm_libc::bcmp"}};
return llvm::makeArrayRef(kBcmpConfigurations); return llvm::makeArrayRef(kBcmpConfigurations);
} }
@ -43,4 +43,4 @@ llvm::ArrayRef<BzeroConfiguration> getBzeroConfigurations() {
static constexpr BzeroConfiguration kBzeroConfigurations[] = { static constexpr BzeroConfiguration kBzeroConfigurations[] = {
{__llvm_libc::bzero, "__llvm_libc::bzero"}}; {__llvm_libc::bzero, "__llvm_libc::bzero"}};
return llvm::makeArrayRef(kBzeroConfigurations); return llvm::makeArrayRef(kBzeroConfigurations);
} }

6
libc/benchmarks/LibcFunctionPrototypes.h
View File

@ -26,9 +26,9 @@ struct BzeroConfiguration {
llvm::StringRef Name; llvm::StringRef Name;
}; };
using MemcmpFunction = int (*)(const void *, const void *, size_t); using MemcmpOrBcmpFunction = int (*)(const void *, const void *, size_t);
struct MemcmpConfiguration { struct MemcmpOrBcmpConfiguration {
MemcmpFunction Function; MemcmpOrBcmpFunction Function;
llvm::StringRef Name; llvm::StringRef Name;
}; };

6
libc/benchmarks/LibcMemoryBenchmark.h
View File

@ -238,9 +238,9 @@ struct ComparisonSetup : public ParameterBatch {
return getMemcmpSizeDistributions(); return getMemcmpSizeDistributions();
} }
inline int Call(ParameterType Parameter, MemcmpFunction Memcmp) { inline int Call(ParameterType Parameter, MemcmpOrBcmpFunction MemcmpOrBcmp) {
return Memcmp(LhsBuffer + Parameter.OffsetBytes, return MemcmpOrBcmp(LhsBuffer + Parameter.OffsetBytes,
RhsBuffer + Parameter.OffsetBytes, Parameter.SizeBytes); RhsBuffer + Parameter.OffsetBytes, Parameter.SizeBytes);
} }
private: private:

10
libc/benchmarks/LibcMemoryGoogleBenchmarkMain.cpp
View File

@ -15,7 +15,7 @@ using llvm::Twine;
using llvm::libc_benchmarks::BzeroConfiguration; using llvm::libc_benchmarks::BzeroConfiguration;
using llvm::libc_benchmarks::ComparisonSetup; using llvm::libc_benchmarks::ComparisonSetup;
using llvm::libc_benchmarks::CopySetup; using llvm::libc_benchmarks::CopySetup;
using llvm::libc_benchmarks::MemcmpConfiguration; using llvm::libc_benchmarks::MemcmpOrBcmpConfiguration;
using llvm::libc_benchmarks::MemcpyConfiguration; using llvm::libc_benchmarks::MemcpyConfiguration;
using llvm::libc_benchmarks::MemorySizeDistribution; using llvm::libc_benchmarks::MemorySizeDistribution;
using llvm::libc_benchmarks::MemsetConfiguration; using llvm::libc_benchmarks::MemsetConfiguration;
@ -94,12 +94,12 @@ extern llvm::ArrayRef<MemcpyConfiguration> getMemcpyConfigurations();
BENCHMARK_MEMORY_FUNCTION(BM_Memcpy, CopySetup, MemcpyConfiguration, BENCHMARK_MEMORY_FUNCTION(BM_Memcpy, CopySetup, MemcpyConfiguration,
getMemcpyConfigurations()); getMemcpyConfigurations());
extern llvm::ArrayRef<MemcmpConfiguration> getMemcmpConfigurations(); extern llvm::ArrayRef<MemcmpOrBcmpConfiguration> getMemcmpConfigurations();
BENCHMARK_MEMORY_FUNCTION(BM_Memcmp, ComparisonSetup, MemcmpConfiguration, BENCHMARK_MEMORY_FUNCTION(BM_Memcmp, ComparisonSetup, MemcmpOrBcmpConfiguration,
getMemcmpConfigurations()); getMemcmpConfigurations());
extern llvm::ArrayRef<MemcmpConfiguration> getBcmpConfigurations(); extern llvm::ArrayRef<MemcmpOrBcmpConfiguration> getBcmpConfigurations();
BENCHMARK_MEMORY_FUNCTION(BM_Bcmp, ComparisonSetup, MemcmpConfiguration, BENCHMARK_MEMORY_FUNCTION(BM_Bcmp, ComparisonSetup, MemcmpOrBcmpConfiguration,
getBcmpConfigurations()); getBcmpConfigurations());
extern llvm::ArrayRef<MemsetConfiguration> getMemsetConfigurations(); extern llvm::ArrayRef<MemsetConfiguration> getMemsetConfigurations();