Integrate LLVM at llvm/llvm-project@564bcf9d0243 Updates LLVM usage to match [564bcf9d0243](https://github.com/llvm/llvm-project/commit/564bcf9d0243) PiperOrigin-RevId: 419967596
diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt index 2084db7..085d686 100644 --- a/SUBMODULE_VERSIONS.txt +++ b/SUBMODULE_VERSIONS.txt
@@ -4,7 +4,7 @@ aa533abfd4232b01f9e57041d70114d5a77e6de0 third_party/googletest 88b845dee001723c4a0db1fe5477de735b6d3bb0 third_party/liburing f8f760f7387d2cc56a2fc7b1be313a3bf3f7f58c third_party/libyaml -b5149f4e66a49a98b67e8e2de4e24a4af8e2781b third_party/llvm-project +564bcf9d0243ef4f3f5ed848f7195fd0489c77a5 third_party/llvm-project a7e5c968021bd946f97daf2938588aa88d955180 third_party/mlir-hlo 3f701faace7addc75d16dea8a6cd769fa5b3f260 third_party/musl 59aa99860c60bd171b9565e9920f125fdb749267 third_party/pybind11
diff --git a/iree/compiler/Codegen/LLVMCPU/ConvertToLLVM.cpp b/iree/compiler/Codegen/LLVMCPU/ConvertToLLVM.cpp index 2415004..31d8632 100644 --- a/iree/compiler/Codegen/LLVMCPU/ConvertToLLVM.cpp +++ b/iree/compiler/Codegen/LLVMCPU/ConvertToLLVM.cpp
@@ -601,9 +601,10 @@ op, "failed to convert interface.binding.subspan result to memref type"); } - auto memRefDesc = abi.loadBinding( - op->getLoc(), newOperands.binding().getInt(), newOperands.byte_offset(), - memRefType, newOperands.dynamic_dims(), rewriter); + auto memRefDesc = + abi.loadBinding(op->getLoc(), newOperands.bindingAttr().getInt(), + newOperands.byte_offset(), memRefType, + newOperands.dynamic_dims(), rewriter); rewriter.replaceOp(op, {memRefDesc}); return success(); }
diff --git a/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/ConvertStreamToHAL.cpp b/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/ConvertStreamToHAL.cpp index d7e2f4a..06aa3fc 100644 --- a/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/ConvertStreamToHAL.cpp +++ b/iree/compiler/Dialect/HAL/Conversion/StreamToHAL/ConvertStreamToHAL.cpp
@@ -536,8 +536,7 @@ } auto loc = exportOp.getLoc(); - auto tensorType = - adaptor.source_encoding().getValue().cast<RankedTensorType>(); + auto tensorType = adaptor.source_encoding().cast<RankedTensorType>(); auto dynamicDims = adaptor.source_encoding_dims(); // NOTE: we should have verified supported encodings/types at entry into the
diff --git a/iree/compiler/Dialect/Stream/Conversion/FlowToStream/ConvertFlowToStream.cpp b/iree/compiler/Dialect/Stream/Conversion/FlowToStream/ConvertFlowToStream.cpp index 1325b69..1725c45 100644 --- a/iree/compiler/Dialect/Stream/Conversion/FlowToStream/ConvertFlowToStream.cpp +++ b/iree/compiler/Dialect/Stream/Conversion/FlowToStream/ConvertFlowToStream.cpp
@@ -280,7 +280,7 @@ rewriter.replaceOpWithNewOp<IREE::Stream::AsyncDispatchOp>( op, resultTypes, adaptor.workgroup_count(), adaptor.entry_point(), dispatchOperands, dispatchOperandSizes, resultSizes, - adaptor.tied_operands(), + adaptor.tied_operandsAttr(), /*affinity=*/nullptr); return success(); }
diff --git a/iree/compiler/Dialect/Stream/Conversion/UtilToStream/ConvertUtilToStream.cpp b/iree/compiler/Dialect/Stream/Conversion/UtilToStream/ConvertUtilToStream.cpp index e50a0f8..22c6cdf 100644 --- a/iree/compiler/Dialect/Stream/Conversion/UtilToStream/ConvertUtilToStream.cpp +++ b/iree/compiler/Dialect/Stream/Conversion/UtilToStream/ConvertUtilToStream.cpp
@@ -149,8 +149,7 @@ ConversionPatternRewriter &rewriter) const override { // Only apply to expanded types (tensors/etc). if (!isExpandedType(loadOp.getType())) return failure(); - auto &expandedGlobal = - expansionState->globalMap[adaptor.global().getValue()]; + auto &expandedGlobal = expansionState->globalMap[adaptor.global()]; // Insert a load/transfer to the unknown resource lifetime. auto unknownType = IREE::Stream::ResourceType::get(rewriter.getContext()); @@ -181,8 +180,7 @@ ConversionPatternRewriter &rewriter) const override { // Only apply to expanded types (tensors/etc). if (!isExpandedType(storeOp.value().getType())) return failure(); - auto &expandedGlobal = - expansionState->globalMap[adaptor.global().getValue()]; + auto &expandedGlobal = expansionState->globalMap[adaptor.global()]; // Insert a transfer/store to the global with unknown lifetime. Lifetime // refinement will make this go away if possible.
diff --git a/iree/compiler/Dialect/VM/Conversion/StandardToVM/ConvertStandardToVM.cpp b/iree/compiler/Dialect/VM/Conversion/StandardToVM/ConvertStandardToVM.cpp index a1d28f0..238b277 100644 --- a/iree/compiler/Dialect/VM/Conversion/StandardToVM/ConvertStandardToVM.cpp +++ b/iree/compiler/Dialect/VM/Conversion/StandardToVM/ConvertStandardToVM.cpp
@@ -732,8 +732,8 @@ auto invertedCondition = rewriter.createOrFold<IREE::VM::XorI32Op>( srcOp.getLoc(), adaptor.getArg().getType(), adaptor.getArg(), rewriter.createOrFold<IREE::VM::ConstI32Op>(srcOp.getLoc(), 1)); - rewriter.replaceOpWithNewOp<IREE::VM::CondFailOp>( - srcOp, invertedCondition, status, adaptor.getMsg().getValue()); + rewriter.replaceOpWithNewOp<IREE::VM::CondFailOp>(srcOp, invertedCondition, + status, adaptor.getMsg()); return success(); } };
diff --git a/iree/compiler/InputConversion/MHLO/BroadcastingToLinalgPatterns.cpp b/iree/compiler/InputConversion/MHLO/BroadcastingToLinalgPatterns.cpp index 9f29da7..88ebfaa 100644 --- a/iree/compiler/InputConversion/MHLO/BroadcastingToLinalgPatterns.cpp +++ b/iree/compiler/InputConversion/MHLO/BroadcastingToLinalgPatterns.cpp
@@ -428,7 +428,7 @@ chlo::BroadcastCompareOpAdaptor adaptor(operands, op->getAttrDictionary()); return builder.create<mhlo::CompareOp>( loc, resultType, broadcastValues.first, broadcastValues.second, - adaptor.comparison_direction(), adaptor.compare_type()); + adaptor.comparison_direction(), adaptor.compare_typeAttr()); } };
diff --git a/llvm-external-projects/iree-dialects/lib/Dialect/PyDM/Transforms/ToIREE/LoweringPatterns.cpp b/llvm-external-projects/iree-dialects/lib/Dialect/PyDM/Transforms/ToIREE/LoweringPatterns.cpp index 7bac2c6..37a6f9a 100644 --- a/llvm-external-projects/iree-dialects/lib/Dialect/PyDM/Transforms/ToIREE/LoweringPatterns.cpp +++ b/llvm-external-projects/iree-dialects/lib/Dialect/PyDM/Transforms/ToIREE/LoweringPatterns.cpp
@@ -211,7 +211,7 @@ if (auto pyIntegerType = pyLeftType.dyn_cast<PYDM::IntegerType>()) { bool isSigned = pyIntegerType.isSigned(); Value converted = - convertIntegerOp(srcOp.getLoc(), adaptor.dunder_name().getValue(), + convertIntegerOp(srcOp.getLoc(), adaptor.dunder_name(), adaptor.left(), adaptor.right(), isSigned, rewriter); if (!converted) return rewriter.notifyMatchFailure(srcOp, "unsupported operation"); @@ -219,8 +219,8 @@ return success(); } else if (leftType.isa<mlir::FloatType>()) { Value converted = - convertFloatOp(srcOp.getLoc(), adaptor.dunder_name().getValue(), - adaptor.left(), adaptor.right(), rewriter); + convertFloatOp(srcOp.getLoc(), adaptor.dunder_name(), adaptor.left(), + adaptor.right(), rewriter); if (!converted) return rewriter.notifyMatchFailure(srcOp, "unsupported operation"); rewriter.replaceOp(srcOp, converted); @@ -285,7 +285,7 @@ } if (leftType.isa<mlir::IntegerType>()) { bool isSigned = true; // TODO: Unsigned. - auto predicate = convertIntegerComparePredicate(adaptor.dunder_name(), + auto predicate = convertIntegerComparePredicate(adaptor.dunder_nameAttr(), isSigned, rewriter); if (!predicate) return rewriter.notifyMatchFailure(srcOp, "unsupported predicate"); @@ -294,7 +294,7 @@ return success(); } else if (leftType.isa<mlir::FloatType>()) { auto predicate = - convertFpComparePredicate(adaptor.dunder_name(), rewriter); + convertFpComparePredicate(adaptor.dunder_nameAttr(), rewriter); if (!predicate) return rewriter.notifyMatchFailure(srcOp, "unsupported predicate"); rewriter.replaceOpWithNewOp<arith::CmpFOp>(
diff --git a/third_party/llvm-project b/third_party/llvm-project index b5149f4..564bcf9 160000 --- a/third_party/llvm-project +++ b/third_party/llvm-project
@@ -1 +1 @@ -Subproject commit b5149f4e66a49a98b67e8e2de4e24a4af8e2781b +Subproject commit 564bcf9d0243ef4f3f5ed848f7195fd0489c77a5