Add windows support?

Xilinx · May 24, 2024 · 6ae574e · 6ae574e
1 parent ef6c37f
commit 6ae574e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -180,6 +180,8 @@ find_library(ELF_LIB elf)
 cmake_dependent_option(AIE_ENABLE_AIRBIN
   "Enables emitting AIRBIN ELF binaries." OFF "ELF_LIB" OFF)
 
+# If we need runtime libs, then statically link them.
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 add_flag_if_supported("-Werror=sign-compare" WERROR_SIGN_COMPARE)
 add_flag_if_supported("-Werror=unused" WERROR_USED)

diff --git a/tools/aie2xclbin/CMakeLists.txt b/tools/aie2xclbin/CMakeLists.txt
@@ -21,8 +21,6 @@ get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 configure_file(configure.h.in configure.h)
 target_include_directories(aie2xclbin PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 
-find_library (UUID uuid)
-
 target_link_libraries(aie2xclbin
   ${dialect_libs}
   MLIRParser

diff --git a/tools/aie2xclbin/XCLBinGen.cpp b/tools/aie2xclbin/XCLBinGen.cpp
@@ -40,14 +40,18 @@
 #include "llvm/Support/Program.h"
 #include "llvm/Support/ToolOutputFile.h"
 
-#include <uuid/uuid.h>
-
 #include <regex>
 #include <sstream>
 #include <unordered_map>
 
 #ifdef _WIN32
+#include "windows.h"
+// For UUID stuff
+#include "rpcdce.h"
+
 #define setenv(name, var, ignore) _putenv_s(name, var)
+#else
+#include <uuid/uuid.h>
 #endif
 
 using namespace llvm;
@@ -128,6 +132,28 @@ void xilinx::findVitis(XCLBinGenConfig &TK) {
   }
 }
 
+static std::string getUUIDString() {
+  std::string val;
+  #ifdef _WIN32
+    UUID *uuid;
+    RPC_STATUS status;
+    status = UuidCreate(uuid);
+    if(status != RPC_S_OK) errs() << "Failed to create UUID\n";
+    RPC_CSTR *uuidstring;
+    status = UuidToStringA(uuid, uuidstring);
+    if(status != RPC_S_OK) errs() << "Failed to convert UUID to string\n";
+    val = std::string(uuidstring);
+    status = RpcStringFreeA(uuidstring);
+    if(status != RPC_S_OK) errs() << "Failed to free UUID string\n";
+ #else
+    uuid_t binuuid;
+    uuid_generate_random(binuuid);
+    char uuid[37];
+    uuid_unparse_lower(binuuid, uuid);
+    val = std::string(uuid);
+  #endif
+  return val;
+}
 static void addAIELoweringPasses(OpPassManager &pm) {
   pm.addPass(createLowerAffinePass());
   pm.addPass(AIE::createAIECanonicalizeDevicePass());
@@ -455,11 +481,7 @@ static LogicalResult generateXCLBin(MLIRContext *context, ModuleOp moduleOp,
     if (!aiePartitionJsonOut)
       return moduleOp.emitOpError(errorMessage);
 
-    uuid_t binuuid;
-    uuid_generate_random(binuuid);
-    char uuid[37];
-    uuid_unparse_lower(binuuid, uuid);
-
+    std::string uuid_str = getUUIDString();
     std::string aie_partition_json_data = R"(
       {
         "aie_partition": {
@@ -475,7 +497,7 @@ static LogicalResult generateXCLBin(MLIRContext *context, ModuleOp moduleOp,
           },
           "PDIs": [
             {
-              "uuid": ")" + std::string(uuid) + R"(",
+              "uuid": ")" + uuid_str + R"(",
               "file_name": "./design.pdi",
               "cdo_groups": [
                 {