[Comb] Handle type aliases in comb.concat (#6588)

* [Comb] Handle type aliases in `comb.concat` * [Comb] Add regression test (#5772) * [Comb] Adhere to convention * [Comb] Test for presence of `comb.concat` in output
llvm · Jan 19, 2024 · 86a6b74 · 86a6b74
1 parent 28d430d
commit 86a6b74
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/Dialect/Comb/CombOps.cpp b/lib/Dialect/Comb/CombOps.cpp
@@ -237,7 +237,7 @@ bool XorOp::isBinaryNot() {
 static unsigned getTotalWidth(ValueRange inputs) {
   unsigned resultWidth = 0;
   for (auto input : inputs) {
-    resultWidth += input.getType().cast<IntegerType>().getWidth();
+    resultWidth += hw::type_cast<IntegerType>(input.getType()).getWidth();
   }
   return resultWidth;
 }

diff --git a/test/Dialect/Comb/basic.mlir b/test/Dialect/Comb/basic.mlir
@@ -0,0 +1,12 @@
+// RUN: circt-opt %s | FileCheck %s
+
+hw.type_scope @__hw_typedecls {
+  hw.typedecl @foo : i1
+}
+
+// https://github.com/llvm/circt/issues/5772
+// CHECK-LABEL: @Issue5772
+hw.module @Issue5772(in %arg0: !hw.typealias<@__hw_typedecls::@foo,i1>) {
+  // CHECK: comb.concat %arg0 : !hw.typealias<@__hw_typedecls::@foo, i1>
+  %0 = comb.concat %arg0 : !hw.typealias<@__hw_typedecls::@foo,i1>
+}