fix windows build issues

Author: drblallo

CMakeLists.txt

@@ -14,6 +14,10 @@ SET(gtest_disable_pthreads OFF CACHE INTERNAL "")
 SET(gtest_hide_internal_symbols OFF CACHE INTERNAL "")
 SET(gtest_force_shared_crt OFF CACHE INTERNAL "")
 SET(GTEST_HAS_ABSL OFF CACHE INTERNAL "")
+SET(GTEST_HAS_RTTI OFF CACHE INTERNAL "")
+SET(GTEST_INTERNAL_HAS_ANY OFF CACHE INTERNAL "")
+SET(GTEST_LINKED_AS_SHARED_LIBRARY OFF CACHE INTERNAL "")
+SET(gtest_force_shared_crt ON CACHE INTERNAL "")
 
 add_subdirectory(googletest)
 #set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=memory -fsanitize-ignorelist=/home/massimo/Documents/example_rlc/rlc-infrastructure/rlc-debug/ignorelist.txt -fsanitize-recover=all")
@@ -71,6 +75,7 @@ list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
 include(AddLLVM)
 
 find_package(MLIR REQUIRED CONFIG)
+set(EXEEXT ${CMAKE_EXECUTABLE_SUFFIX})
 
 ##############################
 ###       Subfolders       ###

build.py

@@ -89,10 +89,10 @@ def build_llvm(
         "-DLLVM_INSTALL_UTILS=True",
         "-DCMAKE_BUILD_TYPE={}".format(build_type),
         "-DCMAKE_INSTALL_PREFIX={}".format(install_dir),
-        "-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra;mlir;compiler-rt;",
+        "-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra;mlir;compiler-rt;lld;",
         "-DLLVM_USE_LINKER=lld" if use_lld else "",
         "-DCMAKE_EXPORT_COMPILE_COMMANDS=True",
-        "-DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi;libunwind",
+        "-DLLVM_ENABLE_RUNTIMES=libcxx;libunwind",
         f"-DCMAKE_C_COMPILER={clang}",
         f"-DCMAKE_CXX_COMPILER={clang_plus_plus}",
         "-G",

lib/backend/include/rlc/backend/BackEnd.hpp

@@ -35,6 +35,7 @@ namespace mlir::rlc
 		bool optimize() const;
 		bool isShared() const;
 		bool isMacOS() const;
+		bool isWindows() const;
 		const llvm::DataLayout& getDataLayout() const;
 
 		TargetInfo(TargetInfo&& other): pimpl(other.pimpl)

lib/backend/src/BackEnd.cpp

@@ -226,6 +226,11 @@ bool mlir::rlc::TargetInfo::isMacOS() const
 	return pimpl->triple.isOSDarwin();
 }
 
+bool mlir::rlc::TargetInfo::isWindows() const
+{
+	return pimpl->triple.isOSWindows();
+}
+
 const llvm::DataLayout &mlir::rlc::TargetInfo::getDataLayout() const
 {
 	return *pimpl->datalayout;
@@ -276,7 +281,7 @@ static int linkLibraries(
 		bool linkAgainstFuzzer,
 		const std::vector<std::string> &extraObjectFiles,
 		const std::vector<std::string> &rpaths,
-		bool macOS)
+		const mlir::rlc::TargetInfo &info)
 {
 	auto failedToFindClang = false;
 	auto maybeRealPath =
@@ -296,18 +301,25 @@ static int linkLibraries(
 	llvm::SmallVector<std::string, 4> argSource;
 	argSource.push_back("clang");
 	argSource.push_back(library.getFilename().str());
+	if (info.isWindows())
+	{
+		argSource.push_back("-fuse-ld=lld");
+		argSource.push_back("-Wl,-subsystem:console");
+	}
 	argSource.push_back("-o");
 	argSource.push_back(outputFile.str());
-	if (not macOS)
+	if (not info.isMacOS())
 		argSource.push_back("-lm");
 	if (shared)
 	{
 		argSource.push_back("--shared");
-		argSource.push_back("-fPIE");
+		if (not info.isWindows())
+			argSource.push_back("-fPIE");
 	}
 	else
 	{
-		argSource.push_back("-no-pie");
+		if (not info.isWindows())
+			argSource.push_back("-no-pie");
 	}
 	if (emitSanitizerInstrumentation or linkAgainstFuzzer)
 	{
@@ -382,6 +394,7 @@ namespace mlir::rlc
 			}
 
 			compile(*targetInfo, std::move(Module), library.os());
+			library.os().close();
 
 			if (compileOnly)
 			{
@@ -398,7 +411,7 @@ namespace mlir::rlc
 							emitFuzzer,
 							*extraObjectFiles,
 							*rpaths,
-							targetInfo->isMacOS()) != 0)
+							*targetInfo) != 0)
 				signalPassFailure();
 		}
 	};

lib/dialect/src/Conversion.cpp

@@ -1499,7 +1499,7 @@ class FunctionRewriter
 		if (not op.isDeclaration() and op.getType().getResults().size() == 1 and
 				not op.getType().getResults().front().isa<mlir::rlc::VoidType>())
 			newF.getBody().front().insertArgument(
-					size_t(0), op.getType().getResults().front(), op.getLoc());
+					unsigned(0), op.getType().getResults().front(), op.getLoc());
 
 		rewriter.eraseOp(op);
 

stdlib/action.rl

@@ -19,6 +19,7 @@ import serialization.to_byte_vector
 import serialization.print
 import bounded_arg
 import math.numeric
+import algorithms.equal
 
 trait<FrameType, ActionType> ApplicableTo:
     fun apply(ActionType action, FrameType frame)
@@ -97,6 +98,7 @@ fun<FrameType, AllActionsVariant> gen_python_methods(FrameType state, AllActions
     from_byte_vector(x, serialized)
     parse_action_optimized(x, serialized, 0)
     enumerate(x).size()
+    equal(variant, variant)
     let v : Vector<Float>
     to_observation_tensor(state, 0, v)
     print(variant)

stdlib/algorithms/equal.rl

@@ -1,29 +1,34 @@
-trait<T> Comparable
-	fun custom_equal(T lhs, T rhs) -> Bool
+trait<T> Comparable:
+    fun custom_equal(T lhs, T rhs) -> Bool
 
 fun custom_equal(Int lhs, Int rhs) -> Bool:
-	return lhs == rhs
+    return lhs == rhs
 
 fun custom_equal(Bool lhs, Bool rhs) -> Bool:
-	return lhs == rhs
+    return lhs == rhs
 
 fun custom_equal(Byte lhs, Byte rhs) -> Bool:
-	return lhs == rhs
+    return lhs == rhs
 
 fun custom_equal(Float lhs, Float rhs) -> Bool:
-	return lhs == rhs
+    return lhs == rhs
 
-fun<T, Int X> custom_equal(T[X] lhs, T[X] rhs):
-	let counter = 0
-	while counter < X:
-		if !(lhs == rhs):
-			return false
-		counter = counter + 1
-	return true
+fun<T, Int X> custom_equal(T[X] lhs, T[X] rhs) -> Bool:
+    let counter = 0
+    while counter < X:
+        if !equal(lhs, rhs):
+            return false
+        counter = counter + 1
+    return true
 
 # to implement
-fun<T> equal(T lhs, T rhs):
-	if lhs is Comparable:
-		if rhs is Comparable:
-			return custom_equal(lhs, rhs)
-	for field of lhs
+fun<T> equal(T lhs, T rhs) -> Bool:
+    if lhs is Comparable:
+        if rhs is Comparable:
+            return custom_equal(lhs, rhs)
+    for field, field2 of lhs, rhs:
+        using T2 = type(field)
+        if field2 is T2:
+          if !equal(field, field2):
+            return false
+    return true

tool/rlc/src/Main.cpp

@@ -26,6 +26,7 @@ limitations under the License.
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Process.h"
+#include "llvm/Support/Path.h"
 #include "llvm/Support/Program.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetMachine.h"
@@ -290,6 +291,13 @@ static mlir::rlc::Driver::Request getRequest()
 	return Driver::Request::executable;
 }
 
+static std::string toNative(llvm::StringRef path) {
+  SmallVector<char> converted;
+  llvm::sys::path::native(Twine(path), converted);
+  std::string out(converted.begin(), converted.end()); 
+  return out;
+}
+
 static mlir::rlc::Driver configureDriver(
 		char *argv[],
 		llvm::SourceMgr &srcManager,
@@ -300,6 +308,7 @@ static mlir::rlc::Driver configureDriver(
 	auto pathToRlc = llvm::sys::fs::getMainExecutable(argv[0], (void *) &main);
 	auto rlcDirectory =
 			llvm::sys::path::parent_path(pathToRlc).str() + "/../lib/rlc/stdlib";
+    rlcDirectory = toNative(rlcDirectory);
 	llvm::SmallVector<std::string, 4> includes(
 			IncludeDirs.begin(), IncludeDirs.end());
 	auto directory = llvm::sys::path::parent_path(InputFilePath);
@@ -312,6 +321,7 @@ static mlir::rlc::Driver configureDriver(
 															 ? llvm::sys::path::parent_path(pathToRlc).str() +
 																		 "/../lib/" + FUZZER_LIBRARY_FILENAME
 															 : customFuzzerLibPath.getValue();
+        fuzzerLibPath = toNative(fuzzerLibPath);
 
 		ExtraObjectFiles.addValue(fuzzerLibPath);
 		RPath.addValue(llvm::sys::path::parent_path(fuzzerLibPath).str());
@@ -324,8 +334,8 @@ static mlir::rlc::Driver configureDriver(
 		if (envVal.has_value())
 			runtimeLibPath = *envVal;
 		else
-			runtimeLibPath = llvm::sys::path::parent_path(pathToRlc).str() +
-											 "/../lib/" + RUNTIME_LIBRARY_FILENAME;
+			runtimeLibPath = toNative(llvm::sys::path::parent_path(pathToRlc).str() +
+											 "/../lib/" + RUNTIME_LIBRARY_FILENAME);
 	}
 	ExtraObjectFiles.addValue(runtimeLibPath);