Support for building and loading AVX and non-AVX DLLs

Makefile

@@ -9,10 +9,10 @@ CXX := clang++
 MSBUILD := msbuild
 PRINCIPIA_CLANG_VERSION ?= 20
 PRINCIPIA_MACOS_VERSION_MIN ?= 13
-PRINCIPIA_TARGET ?= x64
-ifneq ($(PRINCIPIA_TARGET),x64_AVX_FMA)
-  ifneq ($(PRINCIPIA_TARGET),x64)
-    $(error PRINCIPIA_TARGET must be 'x64_AVX_FMA' or 'x64')
+PRINCIPIA_PLATFORM ?= x64
+ifneq ($(PRINCIPIA_PLATFORM),x64_AVX_FMA)
+  ifneq ($(PRINCIPIA_PLATFORM),x64)
+    $(error PRINCIPIA_PLATFORM must be 'x64_AVX_FMA' or 'x64')
 	endif
 endif
 
@@ -45,8 +45,8 @@ PROTO_HEADERS                           := $(PROTO_FILES:.proto=.pb.h)
 
 DEPS_DIRECTORY := deps/
 
-OBJ_DIRECTORY := obj/$(PRINCIPIA_TARGET)/
-BIN_DIRECTORY := bin/$(PRINCIPIA_TARGET)/
+OBJ_DIRECTORY := obj/$(PRINCIPIA_PLATFORM)/
+BIN_DIRECTORY := bin/$(PRINCIPIA_PLATFORM)/
 TOOLS_BIN     := $(BIN_DIRECTORY)tools
 
 GMOCK_TRANSLATION_UNITS := \
@@ -68,12 +68,11 @@ ADAPTER_CONFIGURATION := Release
 FINAL_PRODUCTS_DIR    := Release/
 ADAPTER               := $(ADAPTER_BUILD_DIR)$(ADAPTER_CONFIGURATION)/ksp_plugin_adapter.dll
 
-# TODO(phl): Change the OS names once the loader is ready.
 ifeq ($(UNAME_S),Linux)
-    PLUGIN_DIRECTORY      := $(FINAL_PRODUCTS_DIR)GameData/Principia/Linux64/
+    PLUGIN_DIRECTORY      := $(FINAL_PRODUCTS_DIR)GameData/Principia/Linux/$(PRINCIPIA_PLATFORM)/
 endif
 ifeq ($(UNAME_S),Darwin)
-    PLUGIN_DIRECTORY      := $(FINAL_PRODUCTS_DIR)GameData/Principia/MacOS64/
+    PLUGIN_DIRECTORY      := $(FINAL_PRODUCTS_DIR)GameData/Principia/macOS/$(PRINCIPIA_PLATFORM)/
 endif
 
 TEST_LIBS     := \
@@ -149,9 +148,10 @@ SHARED_ARGS   := \
 	-DPROJECT_DIR='std::filesystem::path("$(PROJECT_DIR)")'       \
 	-DSOLUTION_DIR='std::filesystem::path("$(SOLUTION_DIR)")'     \
 	-DTEMP_DIR='std::filesystem::path("/tmp")'                    \
+	-DPLATFORM_WITH_CPU_FEATURES='"$(PRINCIPIA_PLATFORM)"'        \
 	-DNDEBUG
 
-ifeq ($(PRINCIPIA_TARGET),x64_AVX_FMA)
+ifeq ($(PRINCIPIA_PLATFORM),x64_AVX_FMA)
     SHARED_ARGS += \
 	-DPRINCIPIA_REQUIRES_AVX=1 \
 	-DPRINCIPIA_REQUIRES_FMA=1 \

include_solution.props

@@ -8,7 +8,12 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir).;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SOLUTION_DIR=std::filesystem::path(R"literal($(SolutionDir))literal");TEMP_DIR=std::filesystem::path(R"literal($(SolutionDir)temp\$(Configuration)\$(Platform)\)literal");%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>
+        SOLUTION_DIR=std::filesystem::path(R"literal($(SolutionDir))literal");
+        TEMP_DIR=std::filesystem::path(R"literal($(SolutionDir)temp\$(Configuration)\$(Platform)\)literal");
+        PLATFORM_WITH_CPU_FEATURES=R"literal($(PlatformWithCPUFeatures))literal";
+        %(PreprocessorDefinitions)
+      </PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />

journal/player.cpp

@@ -13,6 +13,7 @@
 #include "glog/logging.h"
 #include "journal/profiles.hpp"  // 🧙 For generated profiles.
 
+#define PRINCIPIA_PLAYER_ALLOW_PLATFORM_MISMATCH 0
 #define PRINCIPIA_PLAYER_ALLOW_VERSION_MISMATCH 0
 
 namespace principia {
@@ -85,12 +86,19 @@ bool Player::Process(std::unique_ptr<serialization::Method> method_in,
         method_out_return->GetExtension(serialization::GetVersion::extension)
             .out();
     LOG_IF(FATAL,
-           !absl::StartsWith(Version, get_version_out.version())  &&
-               (PRINCIPIA_PLAYER_ALLOW_VERSION_MISMATCH == 0))
+           !absl::StartsWith(Version, get_version_out.version()) &&
+               PRINCIPIA_PLAYER_ALLOW_VERSION_MISMATCH == 0)
         << "Journal version is " << get_version_out.version()
         << ", running with a binary built at version " << Version
         << "; set PRINCIPIA_PLAYER_ALLOW_VERSION_MISMATCH to 1 in player.cpp "
         << "if this is intended.";
+    LOG_IF(FATAL,
+           get_version_out.platform() != PLATFORM_WITH_CPU_FEATURES &&
+               PRINCIPIA_PLAYER_ALLOW_PLATFORM_MISMATCH == 0)
+        << "Journal was produced on " << get_version_out.platform()
+        << ", running with a binary built for " << PLATFORM_WITH_CPU_FEATURES
+        << "; set PRINCIPIA_PLAYER_ALLOW_PLATFORM_MISMATCH to 1 in player.cpp "
+        << "if this is intended.";
   }
 
 #if 0

journal/player_test.cpp

@@ -84,7 +84,7 @@ TEST_F(PlayerTest, PlayTiny) {
   while (player.Play(count)) {
     ++count;
   }
-  EXPECT_EQ(3, count);
+  EXPECT_EQ(2, count);
 }
 
 TEST_F(PlayerTest, DISABLED_SECULAR_Benchmarks) {

journal/recorder.cpp

@@ -7,12 +7,14 @@
 #include "base/serialization.hpp"
 #include "base/version.hpp"
 #include "glog/logging.h"
+#include "ksp_plugin/interface.hpp"
 
 namespace principia {
 namespace journal {
 namespace _recorder {
 namespace internal {
 
+using interface::principia__GetVersion;
 using namespace principia::base::_array;
 using namespace principia::base::_hexadecimal;
 using namespace principia::base::_serialization;
@@ -39,16 +41,13 @@ void Recorder::Activate(not_null<Recorder*> const recorder) {
 
   // When the recorder gets activated, pretend that we got a GetVersion call.
   // This will record the version at the beginning of the journal, which is
-  // useful for forensics.
-  serialization::Method method;
-  not_null<serialization::GetVersion*> const get_version =
-      method.MutableExtension(serialization::GetVersion::extension);
-  active_recorder_->WriteAtConstruction(method);
-  not_null<serialization::GetVersion::Out*> const out =
-      get_version->mutable_out();
-  out->set_build_date(BuildDate);
-  out->set_version(Version);
-  active_recorder_->WriteAtDestruction(method);
+  // useful for forensics.  Note that this call doesn't register in the tests of
+  // the `journal` project, because there we have two `active_recorder`s, the
+  // one from the test and the one from the DLL.
+  char const* build_date;
+  char const* version;
+  char const* platform;
+  principia__GetVersion(&build_date, &version, &platform);
 }
 
 void Recorder::Deactivate() {

journal/recorder_test.cpp

@@ -89,24 +89,8 @@ TEST_F(RecorderTest, Recording) {
 
   std::vector<serialization::Method> const methods =
       ReadAll(test_name_ + ".journal.hex");
-  EXPECT_EQ(6, methods.size());
+  EXPECT_EQ(4, methods.size());
   auto it = methods.begin();
-  {
-    EXPECT_TRUE(it->HasExtension(serialization::GetVersion::extension));
-    auto const& extension =
-        it->GetExtension(serialization::GetVersion::extension);
-    EXPECT_FALSE(extension.has_out());
-  }
-  ++it;
-  {
-    EXPECT_TRUE(it->HasExtension(serialization::GetVersion::extension));
-    auto const& extension =
-        it->GetExtension(serialization::GetVersion::extension);
-    EXPECT_TRUE(extension.has_out());
-    EXPECT_EQ(BuildDate, extension.out().build_date());
-    EXPECT_EQ(Version, extension.out().version());
-  }
-  ++it;
   {
     EXPECT_TRUE(it->HasExtension(serialization::DeletePlugin::extension));
     auto const& extension =

ksp_plugin/interface.cpp

@@ -129,6 +129,8 @@ using namespace principia::quantities::_si;
 
 namespace {
 
+constexpr char platform_with_cpu_features[] = PLATFORM_WITH_CPU_FEATURES;
+
 constexpr char gipfeli_compressor[] = "gipfeli";
 
 constexpr char base64_encoder[] = "base64";
@@ -683,10 +685,12 @@ int __cdecl principia__GetVerboseLogging() {
 
 void __cdecl principia__GetVersion(
     char const** const build_date,
-    char const** const version) {
-  journal::Method<journal::GetVersion> m({build_date, version});
+    char const** const version,
+    char const** const platform) {
+  journal::Method<journal::GetVersion> m({build_date, version, platform});
   *CHECK_NOTNULL(build_date) = BuildDate;
   *CHECK_NOTNULL(version) = Version;
+  *CHECK_NOTNULL(platform) = platform_with_cpu_features;
   return m.Return();
 }