Bump LLVM to llvm-project@1823355d06b8 (#24251)
- Fixups for llvm/llvm-project@0b255fe83f17:
`DialectRegistry::getDialectNames()` was split upstream into
`getRegisteredDialectNames()` and `getDialectsToPreload()`. Both call
sites here want the list of registered dialects for `--help /
--show-dialects`.
- Fixups for llvm/llvm-project@8685fb10938f:
https://github.com/iree-org/iree/pull/24251/changes/74060b7291ab6ec60ba2454e1b812f4ba8052891
Carrying local patch for stablehlo because of llvm-project@1823355d06b8
-
https://github.com/iree-org/stablehlo/commit/fb869da27148c08c7f24602c3007fd5832a14cf3
---------
Signed-off-by: hanhanW <hanhan0912@gmail.com>
diff --git a/compiler/plugins/input/StableHLO/Conversion/Preprocessing/Canonicalization.cpp b/compiler/plugins/input/StableHLO/Conversion/Preprocessing/Canonicalization.cpp
index 510e2ee..a3a66da 100644
--- a/compiler/plugins/input/StableHLO/Conversion/Preprocessing/Canonicalization.cpp
+++ b/compiler/plugins/input/StableHLO/Conversion/Preprocessing/Canonicalization.cpp
@@ -91,7 +91,8 @@
if (isa<IntegerType>(elemTy)) {
if (Attribute res =
- constFoldBinaryOp<IntegerAttr, IntegerAttr::ValueType, void>(
+ constFoldBinaryOp<IntegerAttr, IntegerAttr, IntegerAttr::ValueType,
+ IntegerAttr::ValueType, void>(
operands, [&folder](const APInt &lhs, const APInt &rhs) {
return folder(lhs, rhs);
})) {
@@ -102,7 +103,8 @@
if (isa<FloatType>(elemTy)) {
if (Attribute res =
- constFoldBinaryOp<FloatAttr, FloatAttr::ValueType, void>(
+ constFoldBinaryOp<FloatAttr, FloatAttr, FloatAttr::ValueType,
+ FloatAttr::ValueType, void>(
operands, [&folder](const APFloat &lhs, const APFloat &rhs) {
return folder(lhs, rhs);
})) {
@@ -393,13 +395,13 @@
}
if (lhsAttr && rhsAttr) {
- if (Attribute res =
- constFoldBinaryOp<IntegerAttr, IntegerAttr::ValueType, void>(
- ArrayRef<Attribute>({lhsAttr, rhsAttr}), op.getType(),
- [direction, kind = *compType](const APInt &a,
- const APInt &b) {
- return calculateComp(kind, direction, a, b);
- })) {
+ if (Attribute res = constFoldBinaryOp<IntegerAttr, IntegerAttr,
+ IntegerAttr::ValueType,
+ IntegerAttr::ValueType, void>(
+ ArrayRef<Attribute>({lhsAttr, rhsAttr}), op.getType(),
+ [direction, kind = *compType](const APInt &a, const APInt &b) {
+ return calculateComp(kind, direction, a, b);
+ })) {
rewriter.replaceOpWithNewOp<mlir::stablehlo::ConstantOp>(op, res);
return success();
}
diff --git a/compiler/src/iree/compiler/API/Internal/IREEOptToolEntryPoint.cpp b/compiler/src/iree/compiler/API/Internal/IREEOptToolEntryPoint.cpp
index c94ca8d..da21598 100644
--- a/compiler/src/iree/compiler/API/Internal/IREEOptToolEntryPoint.cpp
+++ b/compiler/src/iree/compiler/API/Internal/IREEOptToolEntryPoint.cpp
@@ -84,7 +84,7 @@
std::string helpHeader = (toolName + "\nAvailable Dialects: ").str();
{
llvm::raw_string_ostream os(helpHeader);
- interleaveComma(registry.getDialectNames(), os,
+ interleaveComma(registry.getRegisteredDialectNames(), os,
[&](auto name) { os << name; });
}
@@ -126,7 +126,7 @@
// printRegisteredDialects and printRegisteredPassesAndReturn
if (config.shouldShowDialects()) {
llvm::outs() << "Available Dialects: ";
- interleave(registry.getDialectNames(), llvm::outs(), ",");
+ interleave(registry.getRegisteredDialectNames(), llvm::outs(), ",");
llvm::outs() << "\n";
return success();
}
diff --git a/third_party/llvm-project b/third_party/llvm-project
index ee3ed4a..1823355 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit ee3ed4a0f688ab6ad763126671390b63dee489ca
+Subproject commit 1823355d06b854854701a8ba430aa1f6be9994f4
diff --git a/third_party/stablehlo b/third_party/stablehlo
index a93085c..fb869da 160000
--- a/third_party/stablehlo
+++ b/third_party/stablehlo
@@ -1 +1 @@
-Subproject commit a93085ced0919a8b0071f54b431a8ed8c9c12c75
+Subproject commit fb869da27148c08c7f24602c3007fd5832a14cf3
