Integrate LLVM at llvm/llvm-project@24d707e215a1e2 (#18606)
Carrying local revert:
-
https://github.com/llvm/llvm-project/commit/9c48a04328f1dfa739985f64b33f20b67e085277
---------
Signed-off-by: hanhanW <hanhan0912@gmail.com>
diff --git a/compiler/src/iree/compiler/Codegen/LLVMCPU/DispatchABI.cpp b/compiler/src/iree/compiler/Codegen/LLVMCPU/DispatchABI.cpp
index b3e9002..5850742 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMCPU/DispatchABI.cpp
+++ b/compiler/src/iree/compiler/Codegen/LLVMCPU/DispatchABI.cpp
@@ -1120,15 +1120,18 @@
Value nullPtrValue = builder.create<LLVM::ZeroOp>(
loc, LLVM::LLVMPointerType::get(builder.getContext()));
+ SmallVector<Value> args = {
+ /*thunk_func_ptr=*/thunkPtrValue,
+ /*import_func_ptr=*/importFunc.first,
+ /*params=*/params,
+ /*context=*/importFunc.second,
+ /*reserved=*/nullPtrValue,
+ };
auto callOp =
- builder.create<LLVM::CallOp>(loc, TypeRange{builder.getI32Type()},
- ValueRange{
- /*thunk_func_ptr=*/thunkPtrValue,
- /*import_func_ptr=*/importFunc.first,
- /*params=*/params,
- /*context=*/importFunc.second,
- /*reserved=*/nullPtrValue,
- });
+ builder.create<LLVM::CallOp>(loc, TypeRange{builder.getI32Type()}, args);
+ callOp.getProperties().operandSegmentSizes = {
+ static_cast<int32_t>(args.size()), 0};
+ callOp.getProperties().op_bundle_sizes = builder.getDenseI32ArrayAttr({});
return callOp.getResult();
}
@@ -1296,6 +1299,9 @@
if (cConv == IREE::HAL::CallingConvention::Default) {
auto callOp = rewriter.create<LLVM::CallOp>(
loc, abiFunctionType->getReturnTypes(), allArgsList, forOp->getAttrs());
+ callOp.getProperties().operandSegmentSizes = {
+ static_cast<int32_t>(allArgsList.size()), 0};
+ callOp.getProperties().op_bundle_sizes = rewriter.getDenseI32ArrayAttr({});
return llvm::map_to_vector(callOp.getResults(),
[](OpResult v) -> Value { return v; });
}
diff --git a/third_party/llvm-project b/third_party/llvm-project
index cebb7c0..6580227 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit cebb7c010854e39a77065cfd681db91a79e7ce15
+Subproject commit 65802276c83f51abe354a94ee1d4e4e84c08ea62