Skip to content

[mlir][spirv] Fix ambiguous conversion between SmallVector and TypeRange #134087

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

Merged
merged 1 commit into from
Apr 2, 2025

Conversation

IgWod-IMG
Copy link
Contributor

This address buildbot failures caused by #133702.

@llvmbot
Copy link
Member

llvmbot commented Apr 2, 2025

@llvm/pr-subscribers-mlir

@llvm/pr-subscribers-mlir-spirv

Author: Igor Wodiany (IgWod-IMG)

Changes

This address buildbot failures caused by #133702.


Full diff: https://github.com/llvm/llvm-project/pull/134087.diff

1 Files Affected:

  • (modified) mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp (+1-1)
diff --git a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp
index db838fa68a38c..d471d9a8e3d6c 100644
--- a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp
+++ b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp
@@ -2065,7 +2065,7 @@ LogicalResult ControlFlowStructurizer::structurize() {
     // and remapping we have previously done should be preserved.
     builder.setInsertionPoint(&mergeBlock->front());
     auto selectionOp = builder.create<spirv::SelectionOp>(
-        location, TypeRange(outsideUses),
+        location, TypeRange(ValueRange(outsideUses)),
         static_cast<spirv::SelectionControl>(control));
     selectionOp->getRegion(0).takeBody(body);
 

@joker-eph
Copy link
Collaborator

Thanks for the quick fix!

Either this is ready to merge immediately (and so please do so), or revert the original PR in the meantime: getting the buildbot back to green should be the priority.

Copy link
Contributor

@jplehr jplehr left a comment

Choose a reason for hiding this comment

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

LGTM
(but have not tested on SLES)

@IgWod-IMG IgWod-IMG merged commit 200b589 into llvm:main Apr 2, 2025
10 of 13 checks passed
@IgWod-IMG
Copy link
Contributor Author

IgWod-IMG commented Apr 2, 2025

Looks like SLES and NVIDIA GCC build successfully now.

Again, apologies for breaking the buildbot :)

@IgWod-IMG IgWod-IMG deleted the img_build-fix branch April 2, 2025 14:33
@jplehr
Copy link
Contributor

jplehr commented Apr 2, 2025

Thank you for the quick fix!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants