Merge pull request #4144 from eggrobin/clang-nanobenchmarks

Fix nanobenchmarks on clang
mockingbirdnest · Dec 30, 2024 · 2a4c4ac · 2a4c4ac
2 parents 4e38e35 + 58ad6fc
commit 2a4c4ac
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 9 deletions.
diff --git a/include_what_you_using_all_the_things.ps1 b/include_what_you_using_all_the_things.ps1
@@ -7,6 +7,7 @@
     --project:geometry `
     --project:integrators `
     --project:journal `
+    --project:nanobenchmarks `
     --project:ksp_plugin `
     --project:ksp_plugin_test `
     --project:mathematica `

diff --git a/nanobenchmarks/examples.cpp b/nanobenchmarks/examples.cpp
@@ -1,6 +1,6 @@
 #include <emmintrin.h>
 
-#include "nanobenchmarks/function_registry.hpp"
+#include "nanobenchmarks/function_registry.hpp"  // 🧙 For BENCHMARK_FUNCTION etc.
 #include "numerics/cbrt.hpp"
 
 namespace principia {

diff --git a/nanobenchmarks/function_registry.hpp b/nanobenchmarks/function_registry.hpp
@@ -5,8 +5,6 @@
 #include <string>
 #include <string_view>
 
-#include "base/macros.hpp"
-
 namespace principia {
 namespace nanobenchmarks {
 namespace _function_registry {

diff --git a/nanobenchmarks/main.cpp b/nanobenchmarks/main.cpp
@@ -20,13 +20,11 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
-#include "base/array.hpp"
-#include "base/cpuid.hpp"
 #include "mathematica/logger.hpp"
+#include "mathematica/mathematica.hpp"
 #include "nanobenchmarks/function_registry.hpp"
 #include "nanobenchmarks/microarchitectures.hpp"
 #include "nanobenchmarks/performance_settings_controller.hpp"
-#include "numerics/cbrt.hpp"
 #include "testing_utilities/statistics.hpp"
 
 ABSL_FLAG(std::size_t,

diff --git a/nanobenchmarks/microarchitectures.cpp b/nanobenchmarks/microarchitectures.cpp
@@ -6,13 +6,36 @@
 #include <vector>
 
 #include "base/cpuid.hpp"
+#include "base/macros.hpp"  // 🧙 For PRINCIPIA_COMPILER_CLANG.
 #include "glog/logging.h"
 
 BENCHMARK_EXTERN_C_FUNCTION(identity);
 BENCHMARK_EXTERN_C_FUNCTION(sqrtps_xmm0_xmm0);
 BENCHMARK_EXTERN_C_FUNCTION(sqrtsd_xmm0_xmm0);
 BENCHMARK_EXTERN_C_FUNCTION(mulsd_xmm0_xmm0);
 BENCHMARK_EXTERN_C_FUNCTION(mulsd_xmm0_xmm0_4x);
+#if PRINCIPIA_COMPILER_CLANG
+asm(R"(
+.intel_syntax
+identity:
+  ret
+sqrtps_xmm0_xmm0:
+  sqrtps xmm0, xmm0
+  ret
+sqrtsd_xmm0_xmm0:
+  sqrtsd xmm0, xmm0
+  ret
+mulsd_xmm0_xmm0:
+  mulsd xmm0, xmm0
+  ret
+mulsd_xmm0_xmm0_4x:
+  mulsd xmm0, xmm0
+  mulsd xmm0, xmm0
+  mulsd xmm0, xmm0
+  mulsd xmm0, xmm0
+  ret
+)");
+#endif
 
 namespace principia {
 namespace nanobenchmarks {

diff --git a/nanobenchmarks/performance_settings_controller.cpp b/nanobenchmarks/performance_settings_controller.cpp
@@ -6,13 +6,15 @@
 #include <utility>
 #include <string_view>
 
+#include "absl/flags/flag.h"
+#include "base/macros.hpp"  // 🧙 For OS_WIN.
+#include "glog/logging.h"
+
+#if OS_WIN
 #include <windows.h>
 #include <powersetting.h>
 #include <powrprof.h>
 
-#include "absl/flags/flag.h"
-#include "glog/logging.h"
-
 ABSL_FLAG(bool,
           keep_perf_boost,
           false,
@@ -23,12 +25,14 @@ ABSL_FLAG(bool,
           keep_throttling,
           false,
           "Whether to allow processor throttling during benchmark execution");
+#endif
 
 namespace principia {
 namespace nanobenchmarks {
 namespace _performance_settings_controller {
 namespace internal {
 
+#if OS_WIN
 class WindowsPerformanceSettingsController
     : public PerformanceSettingsController {
  public:
@@ -295,6 +299,14 @@ WindowsPerformanceSettingsController::ReadAndPrintAllowThrottlingACDC() const {
       "PROCESSOR_THROTTLE DC={} ({})", dc, ProcessorThrottleToString(dc));
   return {ac, dc};
 }
+#else
+
+not_null<std::unique_ptr<PerformanceSettingsController>>
+PerformanceSettingsController::New() {
+  return make_not_null_unique<PerformanceSettingsController>();
+}
+
+#endif
 
 }  // namespace internal
 }  // namespace _performance_settings_controller