Merge branch 'chipsalliance:master' into feat/devcontainer_dec23
diff --git a/.github/bin/smoke-test.sh b/.github/bin/smoke-test.sh
index 16cecd9..8557cf4 100755
--- a/.github/bin/smoke-test.sh
+++ b/.github/bin/smoke-test.sh
@@ -140,19 +140,19 @@
ExpectedFailCount[syntax:opentitan]=101
ExpectedFailCount[lint:opentitan]=101
-ExpectedFailCount[project:opentitan]=1133
+ExpectedFailCount[project:opentitan]=1155
ExpectedFailCount[formatter:opentitan]=0
-ExpectedFailCount[preprocessor:opentitan]=3061
+ExpectedFailCount[preprocessor:opentitan]=3015
-ExpectedFailCount[syntax:sv-tests]=77
-ExpectedFailCount[lint:sv-tests]=76
-ExpectedFailCount[project:sv-tests]=187
-ExpectedFailCount[preprocessor:sv-tests]=139
+ExpectedFailCount[syntax:sv-tests]=74
+ExpectedFailCount[lint:sv-tests]=73
+ExpectedFailCount[project:sv-tests]=177
+ExpectedFailCount[preprocessor:sv-tests]=129
ExpectedFailCount[syntax:caliptra-rtl]=39
ExpectedFailCount[lint:caliptra-rtl]=38
ExpectedFailCount[project:caliptra-rtl]=440
-ExpectedFailCount[preprocessor:caliptra-rtl]=900
+ExpectedFailCount[preprocessor:caliptra-rtl]=901
ExpectedFailCount[syntax:Cores-VeeR-EH2]=2
ExpectedFailCount[lint:Cores-VeeR-EH2]=2
@@ -161,13 +161,13 @@
ExpectedFailCount[syntax:cva6]=7
ExpectedFailCount[lint:cva6]=7
-ExpectedFailCount[project:cva6]=91
+ExpectedFailCount[project:cva6]=92
ExpectedFailCount[preprocessor:cva6]=141
-ExpectedFailCount[syntax:uvm]=1
-ExpectedFailCount[lint:uvm]=1
-ExpectedFailCount[project:uvm]=43
-ExpectedFailCount[preprocessor:uvm]=115
+ExpectedFailCount[syntax:uvm]=0
+ExpectedFailCount[lint:uvm]=0
+ExpectedFailCount[project:uvm]=47
+ExpectedFailCount[preprocessor:uvm]=126
ExpectedFailCount[syntax:tnoc]=3
ExpectedFailCount[lint:tnoc]=3
@@ -197,8 +197,8 @@
ExpectedFailCount[project:nontrivial-mips]=81
ExpectedFailCount[preprocessor:nontrivial-mips]=78
-ExpectedFailCount[project:axi]=80
-ExpectedFailCount[preprocessor:axi]=77
+ExpectedFailCount[project:axi]=81
+ExpectedFailCount[preprocessor:axi]=78
ExpectedFailCount[syntax:rsd]=5
ExpectedFailCount[lint:rsd]=5
@@ -211,15 +211,15 @@
ExpectedFailCount[project:serv]=1
ExpectedFailCount[preprocessor:serv]=1
-ExpectedFailCount[syntax:basejump_stl]=490
-ExpectedFailCount[lint:basejump_stl]=490
-ExpectedFailCount[project:basejump_stl]=609
+ExpectedFailCount[syntax:basejump_stl]=495
+ExpectedFailCount[lint:basejump_stl]=495
+ExpectedFailCount[project:basejump_stl]=615
ExpectedFailCount[formatter:basejump_stl]=1
-ExpectedFailCount[preprocessor:basejump_stl]=648
+ExpectedFailCount[preprocessor:basejump_stl]=654
-ExpectedFailCount[syntax:opl3_fpga]=3
-ExpectedFailCount[lint:opl3_fpga]=3
-ExpectedFailCount[project:opl3_fpga]=5
+ExpectedFailCount[syntax:opl3_fpga]=2
+ExpectedFailCount[lint:opl3_fpga]=2
+ExpectedFailCount[project:opl3_fpga]=4
ExpectedFailCount[preprocessor:opl3_fpga]=4
# Ideally, we expect all tools to process all files with a zero exit code.
diff --git a/shell.nix b/shell.nix
index 5531a1a..defc2fd 100644
--- a/shell.nix
+++ b/shell.nix
@@ -5,8 +5,8 @@
{ pkgs ? import <nixpkgs> {} }:
let
verible_used_stdenv = pkgs.stdenv;
- #verible_used_stdenv = pkgs.gcc13Stdenv;
- #verible_used_stdenv = pkgs.clang17Stdenv;
+ #verible_used_stdenv = pkgs.gcc15Stdenv;
+ #verible_used_stdenv = pkgs.clang19Stdenv;
in
verible_used_stdenv.mkDerivation {
name = "verible-build-environment";
@@ -38,14 +38,13 @@
bazel-buildtools # buildifier
llvmPackages_19.clang-tools # for clang-tidy
- llvmPackages_17.clang-tools # for clang-format
+ llvmPackages_18.clang-tools # for clang-format
];
shellHook = ''
# clang tidy: use latest.
export CLANG_TIDY=${pkgs.llvmPackages_19.clang-tools}/bin/clang-tidy
- # There is too much volatility between even micro-versions of
- # later clang-format. Let's use stable 17 for now.
- export CLANG_FORMAT=${pkgs.llvmPackages_17.clang-tools}/bin/clang-format
+ # Last version that current github CI supports.
+ export CLANG_FORMAT=${pkgs.llvmPackages_18.clang-tools}/bin/clang-format
'';
}
