Bump CIRC, fix CI build, add lifetime annotations (#252)

stefanlippuner · maerhart · web-flow · commit 6307db192e12 · 2025-06-30T11:20:55.000-07:00
* Bump CIRCT * Add missing libraries Build now works with rust 1.63 (when using backtrace = "=0.3.68") * Use ninja to build llvm and circt, pin Ubuntu version in CI Uing makefiles and parallel build seems to cause errors in CI. * Add missing lifetime annotations for trait objects This caused compiler errors for rust >= 1.65 * Pin Rust toolchain version to v1.66 Newer toolchains cause stack overflow errors in some tests. That may be related to a memory alignment change in Rust v1.67 (rust-lang/rust#102750) * test: Ignore error in common_cells (broken previously), remove old IGNOREs The common_cells test was already failing as of 37f9596 The removed ignores referenced issues that have been closed and the tests pass now. --------- Co-authored-by: Martin Erhart <maerhart@outlook.com>
diff --git a/.github/build-circt.sh b/.github/build-circt.sh
@@ -3,10 +3,11 @@ set -e
 
 mkdir -p circt/build
 cd circt/build
-cmake .. \
+cmake -G Ninja .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DMLIR_DIR=$PWD/../llvm/build/lib/cmake/mlir \
     -DLLVM_DIR=$PWD/../llvm/build/lib/cmake/llvm \
     -DLLVM_ENABLE_ASSERTIONS=ON
 
-cmake --build . -- -j$(nproc)
+ninja -j$(nproc)
+
diff --git a/.github/build-llvm.sh b/.github/build-llvm.sh
@@ -3,7 +3,7 @@ set -e
 
 mkdir -p circt/llvm/build
 cd circt/llvm/build
-cmake ../llvm \
+cmake -G Ninja ../llvm \
     -DCMAKE_BUILD_TYPE=Release \
     -DLLVM_BUILD_EXAMPLES=OFF \
     -DLLVM_ENABLE_ASSERTIONS=ON \
@@ -14,4 +14,4 @@ cmake ../llvm \
     -DLLVM_OPTIMIZED_TABLEGEN=ON \
     -DLLVM_TARGETS_TO_BUILD="host"
 
-cmake --build . -- -j$(nproc)
+ninja -j$(nproc)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ name: CI
 jobs:
   lints:
     name: Lints
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
@@ -14,7 +14,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: 1.66
           override: true
           components: rustfmt, clippy
 
@@ -32,7 +32,7 @@ jobs:
 
   check:
     name: Checks
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
@@ -43,7 +43,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: 1.66
           override: true
           components: rustfmt, clippy
 
@@ -64,7 +64,9 @@ jobs:
 
       - name: Rebuild LLVM
         if: steps.cache-llvm.outputs.cache-hit != 'true'
-        run: .github/build-llvm.sh
+        run: |
+          sudo apt-get install ninja-build
+          .github/build-llvm.sh
 
       - name: Upload LLVM to cache
         if: steps.cache-llvm.outputs.cache-hit != 'true'
@@ -83,7 +85,9 @@ jobs:
 
       - name: Rebuild CIRCT
         if: steps.cache-circt.outputs.cache-hit != 'true'
-        run: .github/build-circt.sh
+        run: |
+          sudo apt-get install ninja-build
+          .github/build-circt.sh
 
       - name: Upload CIRCT to cache
         if: steps.cache-circt.outputs.cache-hit != 'true'
diff --git a/circt b/circt
@@ -1 +1 @@
-Subproject commit e6290bbd4900ce9776581c53d8f07c44c73252c6
+Subproject commit 24d394b5c5821b1bc8dc90d3cf2576c1f37f8387
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.66"
+
diff --git a/src/circt-sys/build.rs b/src/circt-sys/build.rs
@@ -83,13 +83,17 @@ fn main() {
         "CIRCTMoore",
         "CIRCTSV",
         "CIRCTSeq",
+        "CIRCTSupport",
         "LLVMBinaryFormat",
         "LLVMBitstreamReader",
         "LLVMCore",
+        "LLVMDemangle",
         "LLVMRemarks",
         "LLVMSupport",
+        "LLVMTargetParser",
         "MLIRAnalysis",
-        "MLIRArithmeticDialect",
+        "MLIRArithDialect",
+        "MLIRArithValueBoundsOpInterfaceImpl",
         "MLIRCAPIFunc",
         "MLIRCAPIIR",
         "MLIRCAPIControlFlow",
@@ -99,6 +103,7 @@ fn main() {
         "MLIRFuncDialect",
         "MLIRIR",
         "MLIRInferTypeOpInterface",
+        "MLIRInferIntRangeCommon",
         "MLIRInferIntRangeInterface",
         "MLIRPDLToPDLInterp",
         "MLIRParser",
@@ -108,6 +113,9 @@ fn main() {
         "MLIRSupport",
         "MLIRTransformUtils",
         "MLIRTransforms",
+        "MLIRBytecodeWriter",
+        "MLIRAsmParser",
+        "MLIRBytecodeReader",
     ];
     for name in &lib_names {
         println!("cargo:rustc-link-lib=static={}", name);
diff --git a/src/circt-sys/wrapper.h b/src/circt-sys/wrapper.h
@@ -25,7 +25,6 @@
 #include "mlir-c/IR.h"
 #include "mlir-c/IntegerSet.h"
 #include "mlir-c/Pass.h"
-#include "mlir-c/Registration.h"
 #include "mlir-c/Support.h"
 #include "mlir-c/Transforms.h"
 
diff --git a/src/circt/src/cf.rs b/src/circt/src/cf.rs
@@ -30,13 +30,10 @@ impl CondBranchOp {
             state.add_operand(condition);
             state.add_successor(true_dest);
             state.add_successor(false_dest);
-            let vector_ty = unsafe {
-                mlirVectorTypeGet(1, [3].as_ptr(), get_integer_type(builder.cx, 32).raw())
-            };
-            let vector_attr = Attribute::from_raw(unsafe {
-                mlirDenseElementsAttrInt32Get(vector_ty, 3, [1, 0, 0].as_ptr())
+            let dense_array_attr = Attribute::from_raw(unsafe {
+                mlirDenseI32ArrayGet(builder.cx.raw(), 3, [1, 0, 0].as_ptr())
             });
-            state.add_attribute("operand_segment_sizes", vector_attr);
+            state.add_attribute("operand_segment_sizes", dense_array_attr);
         })
     }
 }
diff --git a/src/circt/src/llhd.rs b/src/circt/src/llhd.rs
@@ -229,14 +229,14 @@ impl InstanceOp {
         builder.build_with(|builder, state| {
             let num_inputs = inputs.into_iter().map(|v| state.add_operand(v)).count();
             let num_outputs = outputs.into_iter().map(|v| state.add_operand(v)).count();
-            let vector_attr = Attribute::from_raw(unsafe {
-                mlirDenseElementsAttrInt32Get(
-                    mlirVectorTypeGet(1, [2].as_ptr(), get_integer_type(builder.cx, 32).raw()),
+            let dense_array_attr = Attribute::from_raw(unsafe {
+                mlirDenseI32ArrayGet(
+                    builder.cx.raw(),
                     2,
                     [num_inputs as _, num_outputs as _].as_ptr(),
                 )
             });
-            state.add_attribute("operand_segment_sizes", vector_attr);
+            state.add_attribute("operand_segment_sizes", dense_array_attr);
             state.add_attribute("name", get_string_attr(builder.cx, name));
             state.add_attribute("callee", get_flat_symbol_ref_attr(builder.cx, module));
         })
@@ -383,17 +383,14 @@ impl WaitOp {
             if let Some(time) = time {
                 state.add_operand(time);
             }
-            let vector_ty = unsafe {
-                mlirVectorTypeGet(1, [3].as_ptr(), get_integer_type(builder.cx, 32).raw())
-            };
-            let vector_attr = Attribute::from_raw(unsafe {
-                mlirDenseElementsAttrInt32Get(
-                    vector_ty,
+            let dense_array_attr = Attribute::from_raw(unsafe {
+                mlirDenseI32ArrayGet(
+                    builder.cx.raw(),
                     3,
                     [observed.len() as _, time.is_some() as _, 0].as_ptr(),
                 )
             });
-            state.add_attribute("operand_segment_sizes", vector_attr);
+            state.add_attribute("operand_segment_sizes", dense_array_attr);
         })
     }
 }
diff --git a/src/circt/src/mlir/mod.rs b/src/circt/src/mlir/mod.rs
@@ -96,7 +96,7 @@ pub trait OperationExt: WrapRaw<RawType = MlirOperation> {
         unsafe {
             let flags = mlirOpPrintingFlagsCreate();
             if with_debug_info {
-                mlirOpPrintingFlagsEnableDebugInfo(flags, false);
+                mlirOpPrintingFlagsEnableDebugInfo(flags, with_debug_info, false);
             }
             mlirOperationPrintWithFlags(
                 self.raw(),
diff --git a/src/vhdl/debug.rs b/src/vhdl/debug.rs
@@ -131,13 +131,13 @@ impl<'b, 'a, 't: 'a> Alloc<'b, 't, konst2::IntegerConst<'t>> for &'a TypeVisitor
     }
 }
 
-impl<'a, 'b, 't: 'a> AllocOwned<'b, 't, konst2::Const2<'t>> for &'a TypeVisitor<'t> {
+impl<'a, 'b, 't: 'a> AllocOwned<'b, 't, konst2::Const2<'t> + 't> for &'a TypeVisitor<'t> {
     fn alloc_owned(&'b self, value: OwnedConst<'t>) -> &'t Const2<'t> {
         self.const_arena.alloc_owned(value)
     }
 }
 
-impl<'a, 'b, 't: 'a> AllocOwned<'b, 't, ty2::Type> for &'a TypeVisitor<'t> {
+impl<'a, 'b, 't: 'a> AllocOwned<'b, 't, ty2::Type + 't> for &'a TypeVisitor<'t> {
     fn alloc_owned(&'b self, value: ty2::OwnedType<'t>) -> &'t ty2::Type {
         self.type_arena.alloc_owned(value)
     }
diff --git a/src/vhdl/hir/expr.rs b/src/vhdl/hir/expr.rs
@@ -29,16 +29,16 @@ pub trait Expr2<'t>: Node<'t> {
 pub trait ExprContext<'t>:
     SessionContext
     + AllocInto<'t, IntegerConst<'t>>
-    + AllocOwnedInto<'t, Const2<'t>>
-    + AllocOwnedInto<'t, Type>
+    + AllocOwnedInto<'t, Const2<'t> + 't>
+    + AllocOwnedInto<'t, Type + 't>
 {
 }
 
 impl<'t, T> ExprContext<'t> for T where
     T: SessionContext
         + AllocInto<'t, IntegerConst<'t>>
-        + AllocOwnedInto<'t, Const2<'t>>
-        + AllocOwnedInto<'t, Type>
+        + AllocOwnedInto<'t, Const2<'t> + 't>
+        + AllocOwnedInto<'t, Type + 't>
 {
 }
 
diff --git a/src/vhdl/hir/lib.rs b/src/vhdl/hir/lib.rs
@@ -18,7 +18,7 @@ use crate::syntax::ast;
 #[derive(Debug)]
 pub struct Library<'t> {
     name: Name,
-    units: Vec<&'t LatentNode<'t, Node<'t>>>,
+    units: Vec<&'t LatentNode<'t, Node<'t> + 't>>,
     scope: &'t ScopeData<'t>,
 }
 
@@ -59,7 +59,7 @@ impl<'t> Library<'t> {
     }
 
     /// Return a slice of the design units in this library.
-    pub fn units(&self) -> &[&'t LatentNode<'t, Node<'t>>] {
+    pub fn units(&self) -> &[&'t LatentNode<'t, Node<'t> + 't>] {
         &self.units
     }
 
diff --git a/src/vhdl/hir/pkg.rs b/src/vhdl/hir/pkg.rs
@@ -11,7 +11,7 @@ pub struct Package2<'t> {
     id: NodeId,
     span: Span,
     name: Spanned<Name>,
-    decls: Vec<&'t LatentNode<'t, Decl2<'t>>>,
+    decls: Vec<&'t LatentNode<'t, Decl2<'t> + 't>>,
     scope: &'t ScopeData<'t>,
 }
 
@@ -22,7 +22,7 @@ impl<'t> Package2<'t> {
     }
 
     /// Return the declarations made in this package.
-    pub fn decls(&self) -> &[&'t LatentNode<'t, Decl2<'t>>] {
+    pub fn decls(&self) -> &[&'t LatentNode<'t, Decl2<'t> + 't>] {
         &self.decls
     }
 
diff --git a/src/vhdl/konst2/arena.rs b/src/vhdl/konst2/arena.rs
@@ -13,7 +13,7 @@ make_arenas!(
     }
 );
 
-impl<'t> AllocOwned<'t, 't, Const2<'t>> for ConstArena<'t> {
+impl<'t> AllocOwned<'t, 't, Const2<'t> + 't> for ConstArena<'t> {
     fn alloc_owned(&'t self, value: OwnedConst<'t>) -> &'t Const2<'t> {
         match value {
             OwnedConst::Integer(k) => self.alloc(k),
diff --git a/src/vhdl/scope2.rs b/src/vhdl/scope2.rs
@@ -23,7 +23,7 @@ use crate::score::ResolvableName;
 #[derive(Copy, Clone)]
 pub enum Def2<'t> {
     /// Any node.
-    Node(&'t hir::LatentNode<'t, Node<'t>>),
+    Node(&'t hir::LatentNode<'t, Node<'t> + 't>),
     /// A library.
     Lib(&'t hir::Library<'t>),
     /// A package.
diff --git a/src/vhdl/ty2/arena.rs b/src/vhdl/ty2/arena.rs
@@ -24,7 +24,7 @@ make_arenas!(
     }
 );
 
-impl<'t> AllocOwned<'t, 't, Type> for TypeArena<'t> {
+impl<'t> AllocOwned<'t, 't, Type + 't> for TypeArena<'t> {
     fn alloc_owned(&'t self, value: OwnedType<'t>) -> &'t Type {
         match value {
             OwnedType::IntegerBasetype(t) => self.alloc(t),
diff --git a/test/svlog/common_cells.sv b/test/svlog/common_cells.sv
@@ -1,4 +1,5 @@
 // RUN: moore %s -e foo -I ../third-party/common_cells/include ../third-party/common_cells/src/*.sv
+// IGNORE exp_backoff results in invalid signal widths
 
 module foo;
     typedef int unsigned addr_t;
diff --git a/test/svlog/funcs/call_free_args.sv b/test/svlog/funcs/call_free_args.sv
@@ -1,5 +1,4 @@
 // RUN: moore %s -e foo
-// IGNORE  part of #168
 
 function int bar(int a, int b);
     return a + b;
diff --git a/test/svlog/funcs/call_free_noargs.sv b/test/svlog/funcs/call_free_noargs.sv
@@ -1,5 +1,4 @@
 // RUN: moore %s -e foo
-// IGNORE  part of #168
 
 function int bar;
     return 42;
diff --git a/test/svlog/funcs/default_named.sv b/test/svlog/funcs/default_named.sv
@@ -1,6 +1,5 @@
 // RUN: moore %s -e foo
 // Default values for named arguments from IEEE 1800-2017 section 13.5.4
-// IGNORE  part of #213
 
 function bar(int j = 1, int s = 0);
 endfunction
diff --git a/test/svlog/funcs/default_pos.sv b/test/svlog/funcs/default_pos.sv
@@ -1,6 +1,5 @@
 // RUN: moore %s -e foo -Vcall-args
 // Default values for positional arguments from IEEE 1800-2017 section 13.5.3
-// IGNORE  part of #213
 
 function bar(int j = 0, int k, int data = 1);
 endfunction

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[toolchain]`
	`2`	`+channel = "1.66"`
	`3`	`+`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ pub trait OperationExt: WrapRaw<RawType = MlirOperation> {`
`96`	`96`	`unsafe {`
`97`	`97`	`let flags = mlirOpPrintingFlagsCreate();`
`98`	`98`	`if with_debug_info {`
`99`		`- mlirOpPrintingFlagsEnableDebugInfo(flags, false);`
	`99`	`+ mlirOpPrintingFlagsEnableDebugInfo(flags, with_debug_info, false);`
`100`	`100`	`}`
`101`	`101`	`mlirOperationPrintWithFlags(`
`102`	`102`	`self.raw(),`