feat: bump package version (#71)

Including:

- bump nix flake
- verilator 5.040 -> 5.044
- clang default (18 on ubuntu 24.04, or 14 on ubuntu 22.04) -> 19
- openjdk 11 -> 21

Also:

- add llvmPackages.bolt in nix devshell for pgo
- print clang version in nix devshell

Close #70

Author: ngc7331

flake.lock

@@ -27,6 +27,7 @@
         gcc # host toolchain
         pkgsCross.riscv64.buildPackages.gcc # riscv64-unknown-elf-xxx toolchain
         llvm # for pgo
+        llvmPackages.bolt # for pgo
         clang
         gnumake # make
         dtc # device tree compiler
@@ -42,14 +43,17 @@
           };
         }))
         (verilator.overrideAttrs (finalAttrs: previousAttrs: {
-          version = "5.040";
+          version = "5.044";
           VERILATOR_SRC_VERSION = "v${finalAttrs.version}";
           src = fetchFromGitHub {
             owner = "verilator";
             repo = "verilator";
             rev = "v${finalAttrs.version}";
-            hash = "sha256-S+cDnKOTPjLw+sNmWL3+Ay6+UM8poMadkyPSGd3hgnc=";
+            hash = "sha256-z3jYNzhnZ+OocDAbmsRBWHNNPXLLvExKK1TLDi9JzPQ=";
           };
+          # drop patch https://github.com/NixOS/nixpkgs/commit/06be23d66287c004cb8ef933a9ff6589276ab104
+          # since it's already included in 5.044
+          patches = [];
           doCheck = false;
         }))
 
@@ -70,6 +74,7 @@
         echo "- $(mill --version | head -n 1)"
         echo "- $(gcc --version | head -n 1)"
         echo "- $(riscv64-unknown-linux-gnu-gcc --version | head -n 1)"
+        echo "- $(clang --version | head -n 1)"
         echo "- $(java -version 2>&1 | head -n 1)"
         echo "You can press Ctrl + D to exit devshell."
         export LD_LIBRARY_PATH="${pkgs.zlib}/lib:${pkgs.stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH"

flake.nix

@@ -2,19 +2,25 @@
 
 export DEBIAN_FRONTEND=noninteractive
 
-apt-get install -y git help2man perl python3 make autoconf g++ flex bison clang
+apt-get install -y git help2man perl python3 make autoconf g++ flex bison
 apt-get install -y libgoogle-perftools-dev numactl perl-doc
 apt-get install -y libfl2  # Ubuntu only (ignore if gives error)
 apt-get install -y libfl-dev  # Ubuntu only (ignore if gives error)
 apt-get install -y zlibc zlib1g zlib1g-dev  # Ubuntu only (ignore if gives error)
 
+# we recommend using clang-19 for the moment, but it's not default behavior of ubuntu 24.04
+# so check if clang is installed before actually calling apt install to avoid multiple versions conflict
+if ! command -v clang >/dev/null 2>&1; then
+    apt-get install -y clang
+fi
+
 git clone https://github.com/verilator/verilator
 
 # Every time you need to build:
 unset VERILATOR_ROOT  # For bash
 cd verilator
 
-git checkout v5.040
+git checkout v5.044
 
 autoconf        # Create ./configure script
 # Configure and create Makefile

install-verilator.sh

@@ -13,14 +13,11 @@ apt install -y \
     tmux \
     make \
     g++ \
-    clang \
-    llvm \
     time \
     curl \
     libreadline6-dev \
     libsdl2-dev \
     g++-riscv64-linux-gnu \
-    openjdk-11-jre \
     zlib1g-dev \
     device-tree-compiler \
     flex \
@@ -35,8 +32,25 @@ apt install -y \
     python3-grpc-tools \
     rsync
 
-# Install llvm-bolt if available
-apt install -y llvm-bolt || echo "Skipping llvm-bolt installation, not available in apt repos"
+# GSIM requires clang 19+
+if apt list "clang*" | grep clang-19; then
+    apt install -y clang-19
+    apt install -y bolt-19 || echo "Skipping bolt-19 installation, not available in apt repos"
+    for bin in $(ls /usr/bin/*-19); do
+        base=$(basename $bin)
+        alt=${base%-19}
+        update-alternatives --install /usr/bin/$alt $alt /usr/bin/$base 100
+        update-alternatives --set $alt /usr/bin/$base
+    done
+else
+    echo "Warning: clang-19 is not available, falling back to default clang."
+    echo "This may be because you are not using the Ubuntu version we recommend."
+    apt install -y clang
+    apt install -y llvm-bolt || echo "Skipping llvm-bolt installation, not available in apt repos"
+fi
+
+# openjdk has better performance with newer versions
+apt install -y openjdk-21-jre || apt install -y openjdk-11-jre
 
 sh -c "curl -L https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/1.0.4/mill-dist-1.0.4-mill.sh > /usr/local/bin/mill && chmod +x /usr/local/bin/mill"