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 IREE to df5e5aab044ed5b6c5860b0b291c95eafe1c2522 #848

Merged
merged 1 commit into from
Oct 18, 2024
Merged

Bump IREE to df5e5aab044ed5b6c5860b0b291c95eafe1c2522 #848

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
7 changes: 2 additions & 5 deletions .github/workflows/ci-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,8 @@ jobs:

- name: Python deps
run: |
pip install "numpy<2" pyyaml "pybind11[global]==2.10.3" nanobind pytest

- name: Run Pytest
run: |
pytest build_tools/ci
pip install -r third_party/iree/runtime/bindings/python/iree/runtime/build_requirements.txt
pip install pyyaml

- name: Enable cache
uses: actions/cache/restore@v3
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/ci-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ jobs:
strategy:
fail-fast: false
matrix:
runs-on: [macos-12, macos-14]
runs-on: [
macos-12,
# broken because of https://github.com/iree-org/iree/blob/0c6a151c65285987f5daabc7f76fe57a82b45ab1/compiler/plugins/target/LLVMCPU/ResolveCPUAndCPUFeatures.cpp#L58-L64
# macos-14
]
env:
CACHE_DIR: ${{ github.workspace }}/.container-cache
CACHE_KEY: ${{ matrix.runs-on }}-build-test-cpp-asserts-v1-${{ format('{0}-{1}', github.ref_name, github.run_number) }}
Expand Down Expand Up @@ -70,7 +74,8 @@ jobs:

- name: Python deps
run: |
pip install "numpy<2" pyyaml "pybind11[global]==2.10.3" nanobind
pip install -r third_party/iree/runtime/bindings/python/iree/runtime/build_requirements.txt
pip install pytest

- name: Enable cache
uses: actions/cache/restore@v3
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ jobs:

- name: Python deps
run: |
pip install "numpy<2" pyyaml "pybind11[global]==2.10.3" nanobind
pip install -r third_party\iree\runtime\bindings\python\iree\runtime\build_requirements.txt
pip install pyyaml
- name: Enable cache
uses: actions/cache/restore@v3
Expand Down
4 changes: 2 additions & 2 deletions compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIECreateAIEWorkgroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#include "iree-amd-aie/IR/AMDAIEDialect.h"
#include "iree-amd-aie/IR/AMDAIEOps.h"
#include "iree-amd-aie/Transforms/Passes.h"
#include "iree/compiler/Codegen/TransformStrategies/GPU/Common.h"
#include "mlir/Dialect/Arith/Utils/Utils.h"
#include "mlir/Dialect/Func/IR/FuncOps.h"
#include "mlir/Dialect/Linalg/IR/Linalg.h"
#include "mlir/Dialect/SCF/IR/SCF.h"

#define DEBUG_TYPE "iree-amdaie-create-aie-workgroup"
Expand Down Expand Up @@ -440,7 +440,7 @@ class AMDAIECreateAIEWorkgroupPass
}

AMDAIECreateAIEWorkgroupPass() = default;
AMDAIECreateAIEWorkgroupPass(const AMDAIECreateAIEWorkgroupPass &pass){};
AMDAIECreateAIEWorkgroupPass(const AMDAIECreateAIEWorkgroupPass &pass) {};
void runOnOperation() override;
};

Expand Down
17 changes: 12 additions & 5 deletions compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEInsertCores.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
#include "iree-amd-aie/IR/AMDAIEOps.h"
#include "iree-amd-aie/Transforms/AMDAIEOpUtils.h"
#include "iree-amd-aie/Transforms/Passes.h"
#include "iree/compiler/Codegen/TransformStrategies/GPU/Common.h"
#include "mlir/Dialect/GPU/IR/GPUDialect.h"
#include "mlir/Dialect/Linalg/IR/Linalg.h"
#include "mlir/Dialect/Linalg/IR/LinalgInterfaces.h"
#include "mlir/Dialect/MemRef/IR/MemRef.h"
#include "mlir/Dialect/Vector/IR/VectorOps.h"
Expand Down Expand Up @@ -79,13 +80,19 @@ LogicalResult insertCoreOps(mlir::ModuleOp moduleOp) {
auto parentOps = getInclusiveParentsOfType<scf::ForallOp>(forallOp);
DenseMap<Attribute, Value> attrMapping;
getAttributeMapping(parentOps, attrMapping);
if (!attrMapping.contains(gpu::threadX(forallOp->getContext())) ||
!attrMapping.contains(gpu::threadY(forallOp->getContext()))) {
mlir::gpu::GPUThreadMappingAttr threadXAttr =
mlir::gpu::GPUThreadMappingAttr::get(forallOp->getContext(),
mlir::gpu::MappingId::DimX);
mlir::gpu::GPUThreadMappingAttr threadYAttr =
mlir::gpu::GPUThreadMappingAttr::get(forallOp->getContext(),
mlir::gpu::MappingId::DimY);
if (!attrMapping.contains(threadXAttr) ||
!attrMapping.contains(threadYAttr)) {
forallOp.emitOpError() << "no forall with thread mapping found";
return WalkResult::interrupt();
}
Value threadX = attrMapping[gpu::threadX(forallOp->getContext())];
Value threadY = attrMapping[gpu::threadY(forallOp->getContext())];
Value threadX = attrMapping[threadXAttr];
Value threadY = attrMapping[threadYAttr];

// Find input and output DMAs that need to be added to the core.
SmallVector<Value> inputDmas;
Expand Down
2 changes: 1 addition & 1 deletion third_party/iree
Open in desktop
Submodule iree updated 118 files
Loading