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.

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

Integrate LLVM at 73f11ac #19941

Merged
merged 6 commits into from
Feb 10, 2025
Merged

Conversation

bjacob
Copy link
Contributor

@bjacob bjacob commented Feb 10, 2025

We had previously cherry-picked llvm/llvm-project@73f11ac in #19939.

Now we're integrating up to that commit, so it's no longer a cherry-pick.

Reverting llvm/llvm-project#125789 because it breaks TorchToTosa, in torch-mlir. We will need to wait for this to be resolved in torch-mlir, then simultaneously bump torch-mlir and drop the revert.

Chery-pick a Bazel fix: llvm/llvm-project@4df287a

@bjacob bjacob force-pushed the integrates/llvm-20250207 branch 2 times, most recently from b1733b6 to 3ca98e0 Compare February 10, 2025 03:26
…] Use explicit namespace for OpTrait. (#126286) (Scott Todd on 2025-02-07 11:04:09 -0800) (11 of 15)

Signed-off-by: Benoit Jacob <[email protected]>
@bjacob bjacob force-pushed the integrates/llvm-20250207 branch from 3ca98e0 to bb93eb4 Compare February 10, 2025 03:27
Signed-off-by: Benoit Jacob <[email protected]>
@bjacob bjacob marked this pull request as ready for review February 10, 2025 03:36
Copy link
Member

@ScottTodd ScottTodd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM if CI passes. Thanks!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverting llvm/llvm-project#125789 because it breaks TorchToTosa, in torch-mlir. We will need to wait for this to be resolved in torch-mlir, then simultaneously bump torch-mlir and drop the revert.

My change that we had cherrypicked was also due to changes in TorchToTosa. We don't currently use that component from torch-mlir in IREE AFAICT but we still pull in the source files. We may want to propose/implement a TORCH_MLIR_ENABLE_TOSA like TORCH_MLIR_ENABLE_STABLEHLO.

Signed-off-by: Benoit Jacob <[email protected]>
Signed-off-by: Benoit Jacob <[email protected]>
@bjacob bjacob enabled auto-merge (squash) February 10, 2025 11:01
@bjacob bjacob disabled auto-merge February 10, 2025 11:03
@bjacob bjacob enabled auto-merge (squash) February 10, 2025 11:03
Copy link
Member

@kuhar kuhar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Signed-off-by: Benoit Jacob <[email protected]>
Signed-off-by: Benoit Jacob <[email protected]>
@bjacob bjacob merged commit e4c683f into iree-org:main Feb 10, 2025
41 of 42 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants