MIR Backend

.clang-format

@@ -26,8 +26,7 @@ BinPackArguments: true
 BinPackParameters: true
 BitFieldColonSpacing: None
 BreakBeforeBinaryOperators: NonAssignment
-BreakBeforeBraces: Custom
-BreakBeforeConceptDeclarations: false
+BreakBeforeConceptDeclarations: true
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: AfterComma
 BreakStringLiterals: true
@@ -58,10 +57,11 @@ IndentCaseBlocks: false
 IndentCaseLabels: true
 IndentExternBlock: AfterExternBlock
 IndentGotoLabels: true
-IndentPPDirectives: AfterHash
+IndentPPDirectives: BeforeHash
 IndentRequires: true
 IndentWidth: 4
 IndentWrappedFunctionNames: false
+InsertBraces: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: OuterScope
 MaxEmptyLinesToKeep: 2
@@ -78,6 +78,7 @@ PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 ReferenceAlignment: Left
 ReflowComments: true
+RequiresClausePosition: WithPreceding
 SortIncludes: CaseInsensitive
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks: '-*, readability-identifier-naming, clang-analyzer-*, clang-analyzer-cplusplus*, performance-*, bugprone-*, modernize-*, misc-unused-*,-bugprone-macro-parentheses, -modernize-use-trailing-return-type, -modernize-use-nodiscard, -modernize-use-default-member-init, -modernize-use-equals-default, -performance-unnecessary-value-param, -misc-unused-parameters, -bugprone-branch-clone, -modernize-avoid-c-arrays, -bugprone-easily-swappable-parameters'
+Checks: '-*, readability-identifier-naming, clang-analyzer-*, clang-analyzer-cplusplus*, performance-*, bugprone-*, modernize-*, misc-unused-*,-bugprone-macro-parentheses, -modernize-use-trailing-return-type, -modernize-use-nodiscard, -modernize-use-default-member-init, -modernize-use-equals-default, -modernize-raw-string-literal -performance-unnecessary-value-param, -misc-unused-parameters, -bugprone-branch-clone, -modernize-avoid-c-arrays, -bugprone-easily-swappable-parameters'
 WarningsAsErrors: ''
 HeaderFilterRegex: 'Corresponding Header'
 FormatStyle: file

.github/workflows/build.yml

@@ -10,9 +10,6 @@ on:
   pull_request:
   workflow_call:
 
-env:
-  cache-version: 0
-
 jobs:
   Build:
     name: ${{ matrix.os-name }} (${{ matrix.compiler }}, ${{ matrix.config }})
@@ -32,84 +29,63 @@ jobs:
           - name: windows-clang
             os: windows-latest
             os-name: windows
-            compiler: clang
+            compiler: clang-16
             cxx: clang-cl
             cc: clang-cl
           - name: linux-clang
             os: ubuntu-latest
             os-name: linux
-            compiler: clang
+            compiler: clang-16
             cxx: clang++
             cc: clang
           - name: linux-gcc
             os: ubuntu-latest
             os-name: linux
-            compiler: gcc
-            cxx: g++-10
-            cc: gcc-10
+            compiler: gcc-13
+            cxx: g++
+            cc: gcc
           - name: macos-clang
-            os: macos-latest
+            os: macos-14
             os-name: macos
-            compiler: clang
+            compiler: clang-16
             cxx: clang++
             cc: clang
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Init Submodules
-        uses: snickerbockers/submodules-init@v4
+        uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
 
       - name: Install dependencies
         if: ${{ matrix.os-name == 'linux'}}
         run: |
           sudo apt-get update
           sudo apt-get install -y build-essential xz-utils curl libx11-dev xorg-dev libglu1-mesa-dev
 
-      - uses: ilammy/msvc-dev-cmd@v1
-        if: ${{ matrix.compiler == 'msvc' }}
-
-      - name: Cache LLVM
-        if: ${{ matrix.compiler == 'clang' }}
-        id: cache-llvm
-        uses: actions/cache@v2
-        with:
-          path: ${{ runner.temp }}/llvm
-          key: llvm-15.0-${{ matrix.os-name }}
-      - name: Install LLVM
-        if: ${{ matrix.compiler == 'clang' }}
-        uses: KyleMayes/install-llvm-action@v1
+      - name: Setup Cpp
+        uses: aminya/setup-cpp@v1
         with:
-          version: "15.0"
-          directory: ${{ runner.temp }}/llvm
-          cached: ${{ steps.cache-llvm.outputs.cache-hit }}
-
-
-      - name: Download pre-built development LLVM for Rift
-        run: |
-          curl -L -o "${{ runner.temp }}/rift-llvm.zip" https://github.com/piperift/rift-llvm/releases/download/v14.0.5/llvm-${{ matrix.os-name }}-${{ matrix.config }}.zip
-          7z x -o"${{ runner.temp }}/rift" "${{ runner.temp }}/rift-llvm.zip"
-
-      - name: Get CMake
-        uses: lukka/get-cmake@latest
-
+          compiler: ${{ matrix.compiler }}
+          vcvarsall: ${{ matrix.os-name == 'windows' }}
+          cmake: true
+          ninja: true
 
       - name: Cache Build
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: Build
           key: ${{ matrix.os-name }}-${{ matrix.compiler }}-${{ matrix.config }}-build-${{ secrets.VCACHE}}
 
       - name: Configure
-        run: cmake -S . -B Build -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DRIFT_LLVM_PATH='${{ runner.temp }}/rift/llvm'
+        run: cmake -GNinja -S . -B Build -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DRIFT_LLVM_PATH='${{ runner.temp }}/rift/llvm'
 
       - name: Build
         run: cmake --build Build --config ${{ matrix.config }}
 
       - name: Upload binaries as artifacts
-        uses: actions/upload-artifact@v2
-        if: ${{ matrix.config == 'Release' && matrix.compiler == 'clang' }} # Only clang artifacts are stored
+        uses: actions/upload-artifact@v3
+        if: ${{ matrix.config == 'Release' && contains(matrix.compiler, 'clang') }} # Only clang artifacts are stored
         with:
           name: rift-${{ matrix.os-name }}
           path: Build/Bin

.gitignore

@@ -3,7 +3,6 @@
 Build
 Saved
 Testing
-Extern/rift-llvm
 
 .vscode/c_cpp_properties.json
 /compile_commands.json

.vscode/settings.json

@@ -3,6 +3,7 @@
     "cmake.configureOnOpen": true,
     "cmake.buildDirectory": "${workspaceFolder}/Build",
     "files.associations": {
+        "*.tmpl": "html",
         "cmath": "cpp",
         "algorithm": "cpp",
         "any": "cpp",
@@ -155,7 +156,10 @@
         "splines": "cpp",
         "typeindex": "cpp",
         "qtalignedmalloc": "cpp",
-        "*.traits": "cpp"
+        "*.traits": "cpp",
+        "span": "cpp",
+        "stdfloat": "cpp",
+        "cuchar": "cpp"
     },
     "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
     "banditTestExplorer.testsuites": [
@@ -232,5 +236,8 @@
             "LLVM"
         ]
     },
-    "dotnet.defaultSolution": "disable"
+    "dotnet.defaultSolution": "disable",
+    "search.exclude": {
+        "**/.git": true
+    }
 }

Apps/CLI/CMakeLists.txt

@@ -1,17 +1,17 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
-add_executable(RiftCLIExe Src/main.cpp)
+add_executable(RiftCLI Src/main.cpp)
 
-target_include_directories(RiftCLIExe PUBLIC Include)
+target_include_directories(RiftCLI PUBLIC Include)
 file(GLOB_RECURSE CLI_SOURCE_FILES CONFIGURE_DEPENDS Src/*.cpp Src/*.h)
-target_sources(RiftCLIExe PRIVATE ${CLI_SOURCE_FILES})
+target_sources(RiftCLI PRIVATE ${CLI_SOURCE_FILES})
 
-target_link_libraries(RiftCLIExe PUBLIC
+target_link_libraries(RiftCLI PUBLIC
     CLI11
-    RiftAST
+    RiftASTLib
     RiftCompilerModules
 )
 
-rift_module(RiftCLIExe)
-set_target_properties(RiftCLIExe PROPERTIES OUTPUT_NAME "Rift")
-set_icon(RiftCLIExe ../../Resources/Icon.ico)
+rift_module(RiftCLI)
+set_target_properties(RiftCLI PROPERTIES OUTPUT_NAME "Rift")
+set_icon(RiftCLI Icon.ico)

Apps/CLI/Src/main.cpp

@@ -1,23 +1,23 @@
-// Copyright 2015-2023 Piperift - All rights reserved
+// Copyright 2015-2024 Piperift - All rights reserved
 
-#include <Pipe/Memory/NewDelete.h>
+#include <PipeNewDelete.h>
 //  Override as first include
 
 #include <AST/Utils/ModuleUtils.h>
 #include <ASTModule.h>
 #include <Compiler/Compiler.h>
 #include <Compiler/Utils/BackendUtils.h>
 #include <GraphViewModule.h>
-#include <LLVMBackendModule.h>
 #include <MIRBackendModule.h>
-#include <Pipe/Core/Profiler.h>
+#include <Pipe.h>
 #include <Pipe/Files/Paths.h>
-#include <Pipe/Pipe.h>
+#include <Pipe/Files/PlatformPaths.h>
+#include <PipeTime.h>
 #include <Rift.h>
 
 #include <chrono>
 #include <CLI/CLI.hpp>
-
+#include <thread>
 
 
 using namespace rift;
@@ -45,7 +45,7 @@ namespace rift
 		const Tag def = backends.IsEmpty() ? Tag::None() : backends[0]->GetName();
 		selected      = def.AsString();
 
-		auto stdDesc = Strings::Convert<std::string, TChar>(desc);
+		auto stdDesc = Strings::Convert<std::string, char>(desc);
 		app.add_option("-b,--backend", selected, stdDesc, true);
 	}
 
@@ -65,15 +65,40 @@ namespace rift
 
 int main(int argc, char** argv)
 {
-	p::Initialize("Saved/Logs");
+	p::Logger logger = p::Logger{.infoCallback = [](StringView msg) {
+		String text;
+		auto now = p::DateTime::Now();
+		now.ToString("[%Y/%m/%d %H:%M:%S]", text);
+		p::Strings::FormatTo(text, "[Info] {}\n", msg);
+		std::cout << text;
+	}, .warningCallback = [](StringView msg) {
+		String text;
+		auto now = p::DateTime::Now();
+		now.ToString("[%Y/%m/%d %H:%M:%S]", text);
+		p::Strings::FormatTo(text, "[Warning] {}\n", msg);
+		std::cout << text;
+	}, .errorCallback = [](StringView msg) {
+		String text;
+		auto now = p::DateTime::Now();
+		now.ToString("[%Y/%m/%d %H:%M:%S]", text);
+		p::Strings::FormatTo(text, "[Error] {}\n", msg);
+		std::cout << text;
+	}};
+
+	p::Initialize(&logger);
+	p::Info(p::PlatformPaths::GetUserSettingsPath());
 	EnableModule<ASTModule>();
-	EnableModule<LLVMBackendModule>();
 	EnableModule<MIRBackendModule>();
 	EnableModule<GraphViewModule>();
 
+	CompilerConfig config;
+
 	CLI::App app{"Rift compiler"};
 	String path;
 	app.add_option("-p,--project", path, "Project path")->required();
+	app.add_option("-v,--verbose", config.verbose, "Verbose")->required();
+	app.add_flag("-O0{0},-O1{1},-O2{2},-O3{3}", config.optimization, "Optimization")
+	    ->expected(0, 3);
 
 
 	String selectedBackendStr;
@@ -84,18 +109,15 @@ int main(int argc, char** argv)
 
 	TPtr<Backend> backend = FindBackendByName(availableBackends, Tag(selectedBackendStr));
 
-	ZoneScopedNC("CLI Execution", 0x459bd1);
+	ast::Tree ast;
+	ast::OpenProject(ast, path);
 
-	AST::Tree ast;
-	AST::OpenProject(ast, path);
-
-	if (!AST::HasProject(ast))
+	if (!ast::HasProject(ast))
 	{
 		p::Error("Couldn't open project '{}'", p::ToString(path));
 		return 1;
 	}
 
-	CompilerConfig config;
 	Build(ast, config, backend);
 
 	while (true)

Apps/Editor/CMakeLists.txt

@@ -1,18 +1,17 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
-add_executable(RiftEditorExe Src/main.cpp)
+add_executable(RiftEditor Src/main.cpp)
 
-target_include_directories(RiftEditorExe PUBLIC Include)
+target_include_directories(RiftEditor PUBLIC Include)
 file(GLOB_RECURSE RiftEditor_SOURCE_FILES CONFIGURE_DEPENDS Src/*.cpp Src/*.h)
-target_sources(RiftEditorExe PRIVATE ${RiftEditor_SOURCE_FILES})
+target_sources(RiftEditor PRIVATE ${RiftEditor_SOURCE_FILES})
 
-target_link_libraries(RiftEditorExe PUBLIC
+target_link_libraries(RiftEditor PUBLIC
     RiftCompilerModules
-    RiftEditor
+    RiftEditorLib
     RiftEditorModules
 )
-target_compile_definitions(RiftEditorExe PUBLIC RIFT_EDITOR=1)
+target_compile_definitions(RiftEditor PUBLIC RIFT_EDITOR=1)
 
-rift_module(RiftEditorExe)
-set_target_properties(RiftEditorExe PROPERTIES OUTPUT_NAME "RiftEditor")
-set_icon(RiftEditorExe Icon.ico)
+rift_module(RiftEditor)
+set_icon(RiftEditor Icon.ico)