[libc][benchmarks] Link the memory benchmark exes to functions from L…

…LVM libc. Summary: To get the target order correct, the benchmarks directory has been moved one level higher. Previously, it was living in the utils directory. The utils directory is a collection of utils which are to be used by the tests and implementations. However, benchmarks *use* the implementations. So, moving it out of utils helps us setup proper target level dependencies. Reviewers: gchatelet Differential Revision: https://reviews.llvm.org/D81910
llvm · Jun 17, 2020 · 438f7fc · 438f7fc
1 parent 5c24411
commit 438f7fc
Show file tree

Hide file tree

Showing 22 changed files with 18 additions and 8 deletions.
diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
@@ -99,3 +99,5 @@ if(LLVM_INCLUDE_TESTS)
   add_subdirectory(test)
   add_subdirectory(fuzzing)
 endif()
+
+add_subdirectory(benchmarks)
diff --git a/libc/utils/benchmarks/CMakeLists.txt → libc/benchmarks/CMakeLists.txt b/libc/utils/benchmarks/CMakeLists.txt → libc/benchmarks/CMakeLists.txt
@@ -174,20 +174,21 @@ function(add_libc_benchmark_configuration target configuration)
     add_libc_benchmark_analysis(${conf_target} ${run_target})
 endfunction()
 
-function(add_libc_benchmark name file)
+function(add_libc_benchmark name file entrypoint_target)
     set(libc_target libc-${name}-benchmark)
     add_executable(${libc_target}
         EXCLUDE_FROM_ALL
         ${file}
         LibcMemoryBenchmarkMain.h
         LibcMemoryBenchmarkMain.cpp
     )
-    target_link_libraries(${libc_target} PUBLIC json)
+
+    get_target_property(entrypoint_object_file ${entrypoint_target} "OBJECT_FILE_RAW")
+    target_link_libraries(${libc_target} PUBLIC json ${entrypoint_object_file})
     foreach(configuration "small" "big")
         add_libc_benchmark_configuration(${libc_target} ${configuration})
     endforeach()
 endfunction()
 
-add_libc_benchmark(memcpy Memcpy.cpp)
-add_libc_benchmark(memcmp Memcmp.cpp)
-add_libc_benchmark(memset Memset.cpp)
+add_libc_benchmark(memcpy Memcpy.cpp libc.src.string.memcpy)
+add_libc_benchmark(memset Memset.cpp libc.src.string.memset)
diff --git a/libc/utils/benchmarks/JSON.cpp → libc/benchmarks/JSON.cpp b/libc/utils/benchmarks/JSON.cpp → libc/benchmarks/JSON.cpp
diff --git a/libc/utils/benchmarks/JSON.h → libc/benchmarks/JSON.h b/libc/utils/benchmarks/JSON.h → libc/benchmarks/JSON.h
diff --git a/libc/utils/benchmarks/JSONTest.cpp → libc/benchmarks/JSONTest.cpp b/libc/utils/benchmarks/JSONTest.cpp → libc/benchmarks/JSONTest.cpp
diff --git a/libc/utils/benchmarks/LibcBenchmark.cpp → libc/benchmarks/LibcBenchmark.cpp b/libc/utils/benchmarks/LibcBenchmark.cpp → libc/benchmarks/LibcBenchmark.cpp
diff --git a/libc/utils/benchmarks/LibcBenchmark.h → libc/benchmarks/LibcBenchmark.h b/libc/utils/benchmarks/LibcBenchmark.h → libc/benchmarks/LibcBenchmark.h
diff --git a/libc/utils/benchmarks/LibcBenchmarkTest.cpp → libc/benchmarks/LibcBenchmarkTest.cpp b/libc/utils/benchmarks/LibcBenchmarkTest.cpp → libc/benchmarks/LibcBenchmarkTest.cpp
diff --git a/.../utils/benchmarks/LibcMemoryBenchmark.cpp → libc/benchmarks/LibcMemoryBenchmark.cpp b/.../utils/benchmarks/LibcMemoryBenchmark.cpp → libc/benchmarks/LibcMemoryBenchmark.cpp
diff --git a/libc/utils/benchmarks/LibcMemoryBenchmark.h → libc/benchmarks/LibcMemoryBenchmark.h b/libc/utils/benchmarks/LibcMemoryBenchmark.h → libc/benchmarks/LibcMemoryBenchmark.h
diff --git a/...ls/benchmarks/LibcMemoryBenchmarkMain.cpp → libc/benchmarks/LibcMemoryBenchmarkMain.cpp b/...ls/benchmarks/LibcMemoryBenchmarkMain.cpp → libc/benchmarks/LibcMemoryBenchmarkMain.cpp
diff --git a/...tils/benchmarks/LibcMemoryBenchmarkMain.h → libc/benchmarks/LibcMemoryBenchmarkMain.h b/...tils/benchmarks/LibcMemoryBenchmarkMain.h → libc/benchmarks/LibcMemoryBenchmarkMain.h
diff --git a/...ls/benchmarks/LibcMemoryBenchmarkTest.cpp → libc/benchmarks/LibcMemoryBenchmarkTest.cpp b/...ls/benchmarks/LibcMemoryBenchmarkTest.cpp → libc/benchmarks/LibcMemoryBenchmarkTest.cpp
diff --git a/libc/utils/benchmarks/Memcmp.cpp → libc/benchmarks/Memcmp.cpp b/libc/utils/benchmarks/Memcmp.cpp → libc/benchmarks/Memcmp.cpp
diff --git a/libc/utils/benchmarks/Memcpy.cpp → libc/benchmarks/Memcpy.cpp b/libc/utils/benchmarks/Memcpy.cpp → libc/benchmarks/Memcpy.cpp
@@ -13,6 +13,10 @@
 #include "llvm/Support/raw_ostream.h"
 #include <memory>
 
+namespace __llvm_libc {
+extern void *memcpy(void *__restrict, const void *__restrict, size_t);
+} // namespace __llvm_libc
+
 namespace llvm {
 namespace libc_benchmarks {
 

diff --git a/libc/utils/benchmarks/Memset.cpp → libc/benchmarks/Memset.cpp b/libc/utils/benchmarks/Memset.cpp → libc/benchmarks/Memset.cpp
@@ -12,6 +12,10 @@
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/raw_ostream.h"
 
+namespace __llvm_libc {
+void *memset(void *, int, size_t);
+} // namespace __llvm_libc
+
 namespace llvm {
 namespace libc_benchmarks {
 
@@ -41,8 +45,8 @@ struct MemsetContext : public BenchmarkRunner {
 
   BenchmarkResult benchmark(const BenchmarkOptions &Options,
                             StringRef FunctionName, size_t Size) override {
-    FunctionPrototype Function =
-        StringSwitch<FunctionPrototype>(FunctionName).Case("memset", &::memset);
+    FunctionPrototype Function = StringSwitch<FunctionPrototype>(FunctionName)
+                                     .Case("memset", &__llvm_libc::memset);
     return llvm::libc_benchmarks::benchmark(
         Options, PP, [this, Function, Size](ParameterType p) {
           Function(DstBuffer + p.DstOffset, MemsetValue, Size);

diff --git a/libc/utils/benchmarks/RATIONALE.md → libc/benchmarks/RATIONALE.md b/libc/utils/benchmarks/RATIONALE.md → libc/benchmarks/RATIONALE.md
diff --git a/libc/utils/benchmarks/README.md → libc/benchmarks/README.md b/libc/utils/benchmarks/README.md → libc/benchmarks/README.md
diff --git a/libc/utils/benchmarks/configuration_big.json → libc/benchmarks/configuration_big.json b/libc/utils/benchmarks/configuration_big.json → libc/benchmarks/configuration_big.json
diff --git a/...utils/benchmarks/configuration_small.json → libc/benchmarks/configuration_small.json b/...utils/benchmarks/configuration_small.json → libc/benchmarks/configuration_small.json
diff --git a/libc/utils/benchmarks/render.py3 → libc/benchmarks/render.py3 b/libc/utils/benchmarks/render.py3 → libc/benchmarks/render.py3
diff --git a/libc/utils/CMakeLists.txt b/libc/utils/CMakeLists.txt
@@ -4,4 +4,3 @@ add_subdirectory(HdrGen)
 add_subdirectory(MPFRWrapper)
 add_subdirectory(testutils)
 add_subdirectory(UnitTest)
-add_subdirectory(benchmarks)