Skip to content
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

Jump to bottom

LLVM bump #6782

Merged
merged 2 commits into from
Mar 4, 2024
Merged

LLVM bump #6782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa5be87
LLVM bump
prithayan Mar 4, 2024
8b76a17
Update lit test
prithayan Mar 4, 2024
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
2 changes: 1 addition & 1 deletion lib/Conversion/LLHDToLLVM/LLHDToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ getOrInsertFunction(ModuleOp &module, ConversionPatternRewriter &rewriter,
OpBuilder moduleBuilder(module.getBodyRegion());
func = moduleBuilder.create<LLVM::LLVMFuncOp>(loc, name, signature);
if (insertBodyAndTerminator) {
func.addEntryBlock();
func.addEntryBlock(moduleBuilder);
OpBuilder b(func.getBody());
b.create<LLVM::ReturnOp>(loc, ValueRange());
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Dialect/Arc/Transforms/ArcCanonicalizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class ArcListener : public mlir::RewriterBase::Listener {
remove(op);
}

void notifyOperationRemoved(Operation *op) override { remove(op); }
void notifyOperationErased(Operation *op) override { remove(op); }

void notifyOperationInserted(Operation *op,
mlir::IRRewriter::InsertPoint) override {
Expand Down
4 changes: 3 additions & 1 deletion lib/Transforms/InsertMergeBlocks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,10 @@ struct FuncOpPattern : public OpConversionPattern<func::FuncOp> {
rewriter.startOpModification(op);

if (!op.isExternal())
if (failed(insertMergeBlocks(op.getRegion(), rewriter)))
if (failed(insertMergeBlocks(op.getRegion(), rewriter))) {
rewriter.cancelOpModification(op);
return failure();
}

rewriter.finalizeOpModification(op);
rewrittenFuncs.insert(op);
Expand Down
2 changes: 1 addition & 1 deletion llvm
Open in desktop
Submodule llvm updated 2025 files
8 changes: 4 additions & 4 deletions test/Dialect/HW/flatten-io.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ hw.module @level1(in %arg0 : i32, in %in : !Struct1, in %arg1: i32, out out0 : i
}

// BASIC-LABEL: hw.module @level2(in %in.aa.a : i1, in %in.aa.b : i2, in %in.bb.a : i1, in %in.bb.b : i2, out out.aa.a : i1, out out.aa.b : i2, out out.bb.a : i1, out out.bb.b : i2) {
// BASIC-NEXT: %0 = hw.struct_create (%in.aa.a, %in.aa.b) : !hw.struct<a: i1, b: i2>
// BASIC-NEXT: %1 = hw.struct_create (%in.bb.a, %in.bb.b) : !hw.struct<a: i1, b: i2>
// BASIC-NEXT: %2 = hw.struct_create (%0, %1) : !hw.struct<aa: !hw.struct<a: i1, b: i2>, bb: !hw.struct<a: i1, b: i2>>
// BASIC-NEXT: %aa, %bb = hw.struct_explode %2 : !hw.struct<aa: !hw.struct<a: i1, b: i2>, bb: !hw.struct<a: i1, b: i2>>
// BASIC-NEXT: %[[v1:.+]] = hw.struct_create (%in.bb.a, %in.bb.b) : !hw.struct<a: i1, b: i2>
// BASIC-NEXT: %[[v0:.+]] = hw.struct_create (%in.aa.a, %in.aa.b) : !hw.struct<a: i1, b: i2>
// BASIC-NEXT: %[[v2:.+]] = hw.struct_create (%[[v0]], %[[v1]]) : !hw.struct<aa: !hw.struct<a: i1, b: i2>, bb: !hw.struct<a: i1, b: i2>>
// BASIC-NEXT: %aa, %bb = hw.struct_explode %[[v2]] : !hw.struct<aa: !hw.struct<a: i1, b: i2>, bb: !hw.struct<a: i1, b: i2>>
// BASIC-NEXT: %a, %b = hw.struct_explode %aa : !hw.struct<a: i1, b: i2>
// BASIC-NEXT: %a_0, %b_1 = hw.struct_explode %bb : !hw.struct<a: i1, b: i2>
// BASIC-NEXT: hw.output %a, %b, %a_0, %b_1 : i1, i2, i1, i2
Expand Down
Loading