Skip to content

🐛 Preserve static-qubit isolation during cleanup #2291

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
simon1hofmann merged 1 commit into from
Aug 31, 2026
Merged

🐛 Preserve static-qubit isolation during cleanup #2291

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
4 changes: 3 additions & 1 deletion mlir/lib/Dialect/QC/IR/QubitManagement/DeallocOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ struct HoistStaticQubit final : OpRewritePattern<StaticOp> {
LogicalResult matchAndRewrite(StaticOp op,
PatternRewriter& rewriter) const override {
auto funcOp = op->getParentOfType<func::FuncOp>();
if (!funcOp || op->getBlock() == &funcOp.getBody().front()) {
if (!funcOp ||
op->getParentWithTrait<OpTrait::IsIsolatedFromAbove>() != funcOp ||
op->getBlock() == &funcOp.getBody().front()) {
return failure();
}
rewriter.moveOpBefore(op, &funcOp.getBody().front(),
Expand Down
24 changes: 24 additions & 0 deletions mlir/unittests/Dialect/QC/IR/test_qc_ir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,30 @@ TEST_F(QCTest, CleanupHoistsAndCoalescesStaticQubits) {
EXPECT_EQ(staticOps, 2U);
}

TEST_F(QCTest, CleanupDoesNotHoistStaticQubitsAcrossIsolationBoundaries) {
auto module = parseSourceString<ModuleOp>(R"mlir(
module {
func.func @main() {
"builtin.module"() ({
%q = qc.static 0 : !qc.qubit
qc.x %q : !qc.qubit
}) : () -> ()
return
}
}
)mlir",
context.get());
ASSERT_TRUE(module);
ASSERT_TRUE(succeeded(verify(*module)));
ASSERT_TRUE(succeeded(runQCCleanupPipeline(*module)));
ASSERT_TRUE(succeeded(verify(*module)));

StaticOp staticOp;
module->walk([&](StaticOp op) { staticOp = op; });
ASSERT_TRUE(staticOp);
EXPECT_TRUE(isa<ModuleOp>(staticOp->getParentOp()));
}

TEST_F(QCTest, BuilderRejectsMixedStaticAndDynamicQubitAllocationModes) {
EXPECT_DEATH(
{
Expand Down
Loading