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

Bump LLVM to d13da154a7c7eff77df8686b2de1cfdfa7cc7029 #2545

Merged
merged 3 commits into from
Oct 3, 2023
Merged

Bump LLVM to d13da154a7c7eff77df8686b2de1cfdfa7cc7029 #2545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9272e5
refactor: bump llvm
Oct 2, 2023
38fe088
Merge branch 'main' into bump_llvm_d13da15
sorenlassen Oct 2, 2023
da1352d
Merge branch 'main' into bump_llvm_d13da15
sorenlassen Oct 3, 2023
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 docs/BuildOnLinuxOSX.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Firstly, install MLIR (as a part of LLVM-Project):
``` bash
git clone -n https://github.com/llvm/llvm-project.git
# Check out a specific branch that is known to work with ONNX-MLIR.
cd llvm-project && git checkout f66cd9e9556a53142a26a5c21a72e21f1579217c && cd ..
cd llvm-project && git checkout d13da154a7c7eff77df8686b2de1cfdfa7cc7029 && cd ..
```

[same-as-file]: <> (utils/build-mlir.sh)
Expand Down
2 changes: 1 addition & 1 deletion docs/BuildOnWindows.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Install MLIR (as a part of LLVM-Project):
```shell
git clone -n https://github.com/llvm/llvm-project.git
# Check out a specific branch that is known to work with ONNX-MLIR.
cd llvm-project && git checkout f66cd9e9556a53142a26a5c21a72e21f1579217c && cd ..
cd llvm-project && git checkout d13da154a7c7eff77df8686b2de1cfdfa7cc7029 && cd ..
```

[same-as-file]: <> (utils/build-mlir.cmd)
Expand Down
13 changes: 6 additions & 7 deletions src/Conversion/KrnlToAffine/ConvertKrnlToAffine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,12 @@ class LoopBodyMover {
// Find the forOp associated with loopRef, get ready to insert into
// forOp body.
// Cast to affine.forOp or affine.parallelOp
Block &loopBody = dyn_cast_or_null<AffineForOp>(loopRefToOp[loopRef])
? llvm::cast<AffineForOp>(loopRefToOp[loopRef])
.getLoopBody()
.front()
: llvm::cast<AffineParallelOp>(loopRefToOp[loopRef])
.getLoopBody()
.front();
Block &loopBody =
dyn_cast_or_null<AffineForOp>(loopRefToOp[loopRef])
? llvm::cast<AffineForOp>(loopRefToOp[loopRef]).getRegion().front()
: llvm::cast<AffineParallelOp>(loopRefToOp[loopRef])
.getRegion()
.front();
auto insertPt = loopBody.begin();

// Find the ops to transfer (saved into a Movable) associated with
Expand Down
4 changes: 3 additions & 1 deletion src/Dialect/Krnl/KrnlOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,9 @@ ParseResult KrnlIterateOp::parse(OpAsmParser &parser, OperationState &result) {
return success();
}

Region &KrnlIterateOp::getLoopBody() { return getBodyRegion(); }
::llvm::SmallVector<mlir::Region *> KrnlIterateOp::getLoopRegions() {
return {&getBodyRegion()};
}

LogicalResult KrnlIterateOp::verify() {
// TODO: Verify number of induction variable bounds matches the number of
Expand Down
2 changes: 1 addition & 1 deletion src/Dialect/ONNX/Rewrite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ class InputOutputTransposer {

void transposeInput(MutableOperandRange operand, ArrayAttr perm) {
assert(operand.size() == 1 && "should be called with singleton range");
Value input = operand[0];
Value input = operand[0].get();
if (!input.getType().isa<NoneType>()) {
Value transposed = transpose(input, perm);
operand.assign(transposed);
Expand Down
2 changes: 1 addition & 1 deletion utils/clone-mlir.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
git clone -n https://github.com/llvm/llvm-project.git
# Check out a specific branch that is known to work with ONNX-MLIR.
cd llvm-project && git checkout f66cd9e9556a53142a26a5c21a72e21f1579217c && cd ..
cd llvm-project && git checkout d13da154a7c7eff77df8686b2de1cfdfa7cc7029 && cd ..
Loading