cross platform windows fix

Author: drblallo

CMakeLists.txt

@@ -43,7 +43,6 @@ SET(BENCHMARK_FORCE_WERROR OFF CACHE INTERNAL "")
 SET(BENCHMARK_ENABLE_WERROR ON CACHE INTERNAL "")
 SET(BENCHMARK_USE_BUNDLED_GTEST CACHE INTERNAL "")
 
-add_subdirectory(benchmark)
 
 ##############################
 ###        Project         ###
@@ -54,6 +53,9 @@ enable_testing()
 include("CPack")
 include(CTest)
 set(CMAKE_DEBUG_POSTFIX "-d")
+set(CXX_STANDARD 20)
+
+add_subdirectory(benchmark)
 
 ##############################
 ###        Globals         ###
@@ -63,9 +65,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable -Wno-unused-parameter -Wno-comment -Wno-unused-function -Wno-deprecated-this-capture")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-implicit-int-float-conversion")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-implicit-int-float-conversion -Wno-reserved-macro-identifier -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-old-style-cast -Wno-sign-conversion -Wshadow-field-in-constructor -Wno-language-extension-token")
 
 set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
+set(EXEEXT ${CMAKE_EXECUTABLE_SUFFIX})
+set(LIBEXT ${CMAKE_STATIC_LIBRARY_SUFFIX})
+set(SHAREDEXT ${CMAKE_SHARED_LIBRARY_SUFFIX})
 
 set_tests_properties(${noArgsTests} PROPERTIES TIMEOUT 10)
 include(macros.cmake)

build.py

@@ -47,7 +47,8 @@ def build_rlc(
     build_type: str,
     llvm_install_dir,
     clang_path: str,
-    python_path: str
+    python_path: str,
+    is_windows: bool,
 ):
     assert_run_program(
         execution_dir,
@@ -61,8 +62,8 @@ def build_rlc(
         "-DMLIR_DIR={}/lib/cmake/mlir".format(llvm_install_dir),
         "-DLLVM_DIR={}/lib/cmake/llvm".format(llvm_install_dir),
         "-DClang_DIR={}/lib/cmake/clang".format(llvm_install_dir),
-        f"-DCMAKE_C_COMPILER={path.abspath(clang_path)}",
-        f"-DCMAKE_CXX_COMPILER={path.abspath(clang_path)}++",
+        f"-DCMAKE_C_COMPILER={path.abspath(clang_path)}{".exe" is_windows ""}",
+        f"-DCMAKE_CXX_COMPILER={path.abspath(clang_path)}++{".exe" is_windows ""}",
         "-DBUILD_SHARED_LIBS={}".format("ON" if build_shared else "OFF"),
         "-DCMAKE_BUILD_WITH_INSTALL_RPATH={}".format("OFF" if build_shared else "ON"),
         "-DHAVE_STD_REGEX=ON",
@@ -93,9 +94,9 @@ def build_llvm(
         "-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;libunwind",
         f"-DCMAKE_C_COMPILER={clang}",
         f"-DCMAKE_CXX_COMPILER={clang_plus_plus}",
+        "-DLLVM_ENABLE_RUNTIMES=libcxx",
         "-G",
         "Ninja",
         "-DBUILD_SHARED_LIBS={}".format("ON" if build_shared else "OFF"),
@@ -131,6 +132,11 @@ def main():
         help="does not build debug llvm",
         action="store_true",
     )
+    parser.add_argument(
+        "--no-debug-rlc",
+        help="does not build debug llvm",
+        action="store_true",
+    )
     parser.add_argument(
         "--dry-run",
         help="only prints the command that would be executing",
@@ -250,8 +256,11 @@ def main():
     else:
         build_shared = args.rlc_shared
 
+    is_windows = os.name == "nt"
+
     # build debug
-    build_rlc(
+    if not args.no_debug_rlc:
+      build_rlc(
         execution_dir=rlc_build_dir,
         cmake_path=cmake,
         rlc_source_dir=rlc_dir,
@@ -260,9 +269,10 @@ def main():
         build_type="Debug",
         llvm_install_dir=llvm_dir,
         clang_path=f"{llvm_install_release_dir}/bin/clang",
-        python_path=python
-    )
-    install(execution_dir=rlc_build_dir, ninja_path=ninja, run_tests=True)
+        python_path=python,
+        is_windows=is_windows,
+      )
+      install(execution_dir=rlc_build_dir, ninja_path=ninja, run_tests=True)
 
     build_rlc(
         execution_dir=rlc_release_dir,
@@ -273,8 +283,8 @@ def main():
         build_type="Release",
         llvm_install_dir=llvm_install_release_dir,
         clang_path=f"{llvm_install_release_dir}/bin/clang",
-        python_path=python
-
+        python_path=python,
+        is_windows=is_windows,
     )
     install(execution_dir=rlc_release_dir, ninja_path=ninja, run_tests=True)
 

environment.bat

@@ -0,0 +1,3 @@
+..\.venv\Scripts\activate.bat
+@set LIBPATH=%LIBPATH%;C:\Users\mofio\Documents\rlc-infrastructure\llvm-install-release\lib
+@set PATH=%PATH%;C:\Users\mofio\Documents\rlc-infrastructure\llvm-install-release\bin

googletest

@@ -33,6 +33,7 @@ limitations under the License.
 #include "llvm/Pass.h"
 #include "llvm/PassRegistry.h"
 #include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/FileSystem.h"
@@ -108,11 +109,25 @@ static void addFuzzerInstrumentationPass(llvm::ModulePassManager &MPM)
 	MPM.addPass(SanitizerCoveragePass(opts));
 }
 
+class AddWindowsDLLExportPass: public PassInfoMixin<AddWindowsDLLExportPass>
+{
+	public:
+	PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM)
+	{
+		if (F.getName().starts_with("rl__") or F.getName().starts_with("rl_m__"))
+			return PreservedAnalyses::none();
+
+		F.setDLLStorageClass(llvm::GlobalValue::DLLExportStorageClass);
+		return PreservedAnalyses::none();
+	};
+};
+
 static void runOptimizer(
 		llvm::Module &M,
 		bool optimize,
 		bool emitSanitizerInstrumentation,
-		bool linkAgainsFuzzer)
+		bool linkAgainsFuzzer,
+		bool targetIsWindows)
 {
 	// Create the analysis managers.
 	LoopAnalysisManager LAM;
@@ -139,10 +154,12 @@ static void runOptimizer(
 	{
 		ModulePassManager passManager;
 		FunctionPassManager functionPassManager;
+		if (targetIsWindows)
+			functionPassManager.addPass(AddWindowsDLLExportPass());
 		functionPassManager.addPass(llvm::PromotePass());
 		passManager.addPass(
 				createModuleToFunctionPassAdaptor(std::move(functionPassManager)));
-		if (emitSanitizerInstrumentation)
+		if (emitSanitizerInstrumentation and not targetIsWindows)
 			addFuzzerInstrumentationPass(passManager);
 		passManager.run(M, MAM);
 
@@ -163,7 +180,9 @@ static void runOptimizer(
 	{
 		ModulePassManager MPM =
 				PB.buildO0DefaultPipeline(OptimizationLevel::O0, true);
-		if (emitSanitizerInstrumentation)
+		if (targetIsWindows)
+			MPM.addPass(createModuleToFunctionPassAdaptor(AddWindowsDLLExportPass()));
+		if (emitSanitizerInstrumentation and not targetIsWindows)
 			addFuzzerInstrumentationPass(MPM);
 		MPM.run(M, MAM);
 	}
@@ -380,22 +399,37 @@ static int linkLibraries(
 		argSource.push_back("-fuse-ld=lld");
 		argSource.push_back("-Wl,-subsystem:console");
 	}
-	argSource.push_back("-o");
-	argSource.push_back(outputFile.str());
-	if (not info.isMacOS())
+	else if (not info.isMacOS())
 		argSource.push_back("-lm");
+
+	argSource.push_back("-o");
 	if (shared)
 	{
-		argSource.push_back("--shared");
-		if (not info.isWindows())
+		if (info.isWindows())
+		{
+			argSource.push_back(outputFile.str() + ".dll");
+		}
+		else
+		{
+			argSource.push_back(outputFile.str());
 			argSource.push_back("-fPIE");
+		}
+		argSource.push_back("--shared");
 	}
 	else
 	{
-		if (not info.isWindows())
+		if (info.isWindows())
+		{
+			argSource.push_back(outputFile.str() + ".exe");
+		}
+		else
+		{
+			argSource.push_back(outputFile.str());
 			argSource.push_back("-no-pie");
+		}
 	}
-	if (emitSanitizerInstrumentation or linkAgainstFuzzer)
+	if ((emitSanitizerInstrumentation or linkAgainstFuzzer) and
+			not info.isWindows())
 	{
 		std::string arg("-fsanitize=");
 		if (emitSanitizerInstrumentation)
@@ -405,11 +439,13 @@ static int linkLibraries(
 		if (linkAgainstFuzzer)
 			arg += "fuzzer";
 		argSource.push_back(arg);
+		if (info.isWindows())
+		{
+			argSource.push_back("-Wl,/NODEFAULTLIB:libcmt");
+			argSource.push_back("-Wl,-defaultlib:msvcrt");
+		}
 	}
 
-	for (auto rpathEntry : rpaths)
-		argSource.push_back("-Wl,-rpath," + rpathEntry);
-
 	for (auto extraObject : extraObjectFiles)
 		argSource.push_back(extraObject);
 
@@ -441,7 +477,12 @@ namespace mlir::rlc
 			assert(Module);
 			Module->setTargetTriple(llvm::sys::getDefaultTargetTriple());
 
-			runOptimizer(*Module, targetInfo->optimize(), emitSanitizer, emitFuzzer);
+			runOptimizer(
+					*Module,
+					targetInfo->optimize(),
+					emitSanitizer,
+					emitFuzzer,
+					targetInfo->isWindows());
 
 			if (dumpIR)
 			{

lib/backend/src/BackEnd.cpp

@@ -646,7 +646,7 @@ namespace mlir::python
 			auto lib = builder.create<mlir::rlc::python::CTypesLoad>(
 					getOperation().getLoc(),
 					mlir::rlc::python::CDLLType::get(&getContext()),
-					"lib.so");
+					target_is_windows ? "lib.dll" : "lib.so");
 			mlir::ConversionTarget target(getContext());
 
 			mlir::TypeConverter ctypesConverter;

lib/conversions/src/RLCToPython.cpp

@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+#include "any"
 #include "gtest/gtest.h"
 
 #include "rlc/dialect/ActionArgumentAnalysis.hpp"

lib/dialect/test/src/DialectTest.cpp

@@ -87,7 +87,8 @@ namespace mlir::rlc
 		{
 			manager.addPass(mlir::rlc::createSortTypeDeclarationsPass());
 			manager.addPass(mlir::python::createRLCTypesToPythonTypesPass());
-			manager.addPass(mlir::python::createRLCToPythonPass());
+			manager.addPass(
+					mlir::python::createRLCToPythonPass({ targetInfo->isWindows() }));
 			if (request == Request::dumpPythonAST)
 				manager.addPass(mlir::rlc::createPrintIRPass({ OS, hidePosition }));
 			else

lib/driver/src/Driver.cpp

@@ -618,6 +618,11 @@ Token Lexer::nextWithoutTrailingConsume()
 			indentStack.pop_back();
 			return Token::Deindent;
 		}
+		while (deindentToEmit != 0)
+		{
+			deindentToEmit--;
+			return Token::Deindent;
+		}
 		return Token::End;
 	}
 

lib/parser/src/Lexer.cpp

@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
+#include "any"
 #include "gtest/gtest.h"
 
 #include "rlc/parser/Lexer.hpp"