Update build

.clangd

@@ -1,5 +1,21 @@
-CompileFlags:
-  CompilationDatabase: ./circt/build
-Diagnostics:
-  Suppress: 
-    - "misc-definitions-in-headers"
+If:
+  PathMatch: "rtlil-emit/*"
+  CompileFlags:
+    CompilationDatabase: "rtlil-emit/build"
+
+---
+
+If:
+  PathMatch: "circt/*"
+  CompileFlags:
+    CompilationDatabase: "circt/build"
+  Diagnostics:
+    Suppress:
+      - "misc-definitions-in-headers"
+
+---
+
+If:
+  PathMatch: "circt/llvm/*"
+  CompileFlags:
+    CompilationDatabase: "circt/llvm/build"

.gitignore

@@ -1 +1,3 @@
-rtlil-emit/build
+rtlil-emit/build
+rtlil-emit/.cache
+.direnv

build.sh

@@ -1,31 +1,24 @@
+set -euo pipefail
 #LLVM
-
-mkdir -p ./circt/llvm/build;
-pushd ./circt/llvm/build;
-cmake -G Ninja ../llvm \
+mkdir -p ./circt/llvm/build
+cmake -S ./circt/llvm/llvm -B ./circt/llvm/build -G Ninja \
   -DLLVM_ENABLE_PROJECTS="mlir"  \
   -DLLVM_TARGETS_TO_BUILD="host"   \
   -DLLVM_ENABLE_ASSERTIONS=ON  \
   -DCMAKE_BUILD_TYPE=DEBUG   \
   -DLLVM_USE_SPLIT_DWARF=ON   \
   -DLLVM_ENABLE_LLD=ON \
   -DLLVM_PARALLEL_LINK_JOBS=1 \
-  -DLLVM_PARALLEL_COMPILE_JOBS=16 \
-  -DLLVM_OPTIMIZED_TABLEGEN=ON;
-ninja;
-popd;
+  -DLLVM_OPTIMIZED_TABLEGEN=ON \
+  -DLLVM_CCACHE_BUILD=ON
+ninja -C ./circt/llvm/build
 
 #CIRCT
-mkdir -p ./circt/build;
-pushd ./circt/build;
-cmake .. --preset debug;
-ninja;
-popd;
+mkdir -p ./circt/build
+cmake -S ./circt -B ./circt/build --preset debug
+ninja -C ./circt/build
 
 #rtlil-emit
-
-mkdir -p ./rtlil-emit/build;
-pushd ./rtlil-emit/build;
-cmake .. --preset debug;
-ninja;
-popd;
+mkdir -p ./rtlil-emit/build
+cmake -S ./rtlil-emit -B ./rtlil-emit/build --preset debug
+ninja -C ./rtlil-emit/build;

nix/overlay.nix

@@ -7,16 +7,19 @@ final: prev: rec {
     }).overrideAttrs
       (
         finalAttrs: previousAttrs: {
-          version = "0.55";
+          version = "0.57";
           src = prev.fetchFromGitHub {
             owner = "YosysHQ";
             repo = "yosys";
-            tag = "v${finalAttrs.version}";
-            hash = "sha256-GddNbAtH5SPm7KTa5kCm/vGq4xOczx+jCnOSQl55gUI=";
+            rev = "83fa0448107e31360393366ba4bef15a713ba5f4";
+            hash = "sha256-FZ1h3p0NS3W/eqHgROvpOdib73qX+gsUGwGYJUA9uVg=";
             fetchSubmodules = true;
             leaveDotGit = true;
             inherit (previousAttrs.src) postFetch; # Preserve the postFetch script
           };
+          patches = [
+            (builtins.elemAt previousAttrs.patches 1)
+          ];
           doCheck = false;
           makeFlags = previousAttrs.makeFlags ++ [
             "ENABLE_ABC=0"

rtlil-emit/CMakeLists.txt

@@ -17,6 +17,8 @@ if(POLICY CMP0116)
 endif()
 
 project(mlir-emit LANGUAGES CXX C)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(CIRCT REQUIRED CONFIG PATHS ../circt/build)
 
 list(APPEND CMAKE_MODULE_PATH "${MLIR_CMAKE_DIR}")
@@ -90,4 +92,4 @@ target_link_libraries(rtlil-emit PRIVATE ${LIBS})
 
 
 # mlir_check_all_link_libraries(rtlil-opt)
-mlir_check_all_link_libraries(rtlil-emit)
+mlir_check_all_link_libraries(rtlil-emit)

rtlil-emit/CMakePresets.json

@@ -14,12 +14,12 @@
         "LLVM_USE_SPLIT_DWARF": "ON",
         "LLVM_ENABLE_LLD": "ON",
         "LLVM_PARALLEL_LINK_JOBS": "1",
-        "LLVM_PARALLEL_COMPILE_JOBS": "16",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "1",
         "CMAKE_C_COMPILER": "clang",
         "CMAKE_CXX_COMPILER": "clang++"
       },
       "binaryDir": "${sourceDir}/build"
     }
   ]
-}
+}
+