Skip to content

[MooreToCore] Fix lowering of dynamic extracts of nested arrays #9257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fzi-hielscher merged 1 commit into from
Nov 24, 2025
Merged

[MooreToCore] Fix lowering of dynamic extracts of nested arrays #9257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions lib/Conversion/MooreToCore/MooreToCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,13 +1214,15 @@ struct DynExtractOpConversion : public OpConversionPattern<DynExtractOp> {
Value idx = adjustIntegerWidth(rewriter, adaptor.getLowBit(), idxWidth,
op->getLoc());

if (isa<hw::ArrayType>(resultType)) {
bool isSingleElementExtract = arrType.getElementType() == resultType;

if (isSingleElementExtract)
rewriter.replaceOpWithNewOp<hw::ArrayGetOp>(op, adaptor.getInput(),
idx);
else
rewriter.replaceOpWithNewOp<hw::ArraySliceOp>(op, resultType,
adaptor.getInput(), idx);
return success();
}

rewriter.replaceOpWithNewOp<hw::ArrayGetOp>(op, adaptor.getInput(), idx);
return success();
}

Expand Down Expand Up @@ -1257,14 +1259,17 @@ struct DynExtractRefOpConversion : public OpConversionPattern<DynExtractRefOp> {
rewriter, adaptor.getLowBit(),
llvm::Log2_64_Ceil(arrType.getNumElements()), op->getLoc());

if (isa<hw::ArrayType>(cast<llhd::RefType>(resultType).getNestedType())) {
auto resultNestedType = cast<llhd::RefType>(resultType).getNestedType();
bool isSingleElementExtract =
arrType.getElementType() == resultNestedType;

if (isSingleElementExtract)
rewriter.replaceOpWithNewOp<llhd::SigArrayGetOp>(op, adaptor.getInput(),
idx);
else
rewriter.replaceOpWithNewOp<llhd::SigArraySliceOp>(
op, resultType, adaptor.getInput(), idx);
return success();
}

rewriter.replaceOpWithNewOp<llhd::SigArrayGetOp>(op, adaptor.getInput(),
idx);
return success();
}

Expand Down
14 changes: 14 additions & 0 deletions test/Conversion/MooreToCore/basic.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,20 @@ func.func @ExtractRefArrayElement(%j: !moore.ref<array<1 x array<1 x l3>>>) -> (
return %0 : !moore.ref<array<1 x l3>>
}

// CHECK-LABEL: DynExtractArrayElement
func.func @DynExtractArrayElement(%j: !moore.array<2 x array<1 x l3>>, %idx: !moore.l1) -> (!moore.array<1 x l3>) {
// CHECK: hw.array_get
%0 = moore.dyn_extract %j from %idx : !moore.array<2 x array<1 x l3>>, !moore.l1 -> !moore.array<1 x l3>
return %0 : !moore.array<1 x l3>
}

// CHECK-LABEL: DynExtractRefArrayElement
func.func @DynExtractRefArrayElement(%j: !moore.ref<array<2 x array<1 x l3>>>, %idx: !moore.l1) -> (!moore.ref<array<1 x l3>>) {
// CHECK: llhd.sig.array_get
%0 = moore.dyn_extract_ref %j from %idx : <array<2 x array<1 x l3>>>, !moore.l1 -> <array<1 x l3>>
return %0 : !moore.ref<array<1 x l3>>
}

// CHECK-LABEL: func @AdvancedConversion
func.func @AdvancedConversion(%arg0: !moore.array<5 x struct<{exp_bits: i32, man_bits: i32}>>) -> (!moore.array<5 x struct<{exp_bits: i32, man_bits: i32}>>, !moore.i320) {
// CHECK: [[V0:%.+]] = hw.constant 3978585893941511189997889893581765703992223160870725712510875979948892565035285336817671 : i320
Expand Down