Integrate LLVM at llvm/llvm-project@1a6ec906fb37 (#16753)
- Cherry pick
https://github.com/llvm/llvm-project/commit/bb82092de71466728630050691fa9c20796b3cbc
diff --git a/compiler/src/iree/compiler/Codegen/LLVMGPU/test/convert_to_rocdl.mlir b/compiler/src/iree/compiler/Codegen/LLVMGPU/test/convert_to_rocdl.mlir
index 0999766..4692e2a 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMGPU/test/convert_to_rocdl.mlir
+++ b/compiler/src/iree/compiler/Codegen/LLVMGPU/test/convert_to_rocdl.mlir
@@ -97,7 +97,7 @@
}
}
// CHECK-LABEL: llvm.func @simple_barrier
-// CHECK: llvm.inline_asm has_side_effects asm_dialect = att "s_waitcnt lgkmcnt(0)\0As_barrier", "" : () -> ()
+// CHECK: llvm.inline_asm has_side_effects asm_dialect = att ";;;WARNING: BREAKS DEBUG WATCHES\0As_waitcnt lgkmcnt(0)\0As_barrier", "" : () -> ()
// -----
#pipeline_layout = #hal.pipeline.layout<push_constants = 0, sets = [
diff --git a/compiler/src/iree/compiler/Dialect/Flow/Transforms/RegionOpUtils.cpp b/compiler/src/iree/compiler/Dialect/Flow/Transforms/RegionOpUtils.cpp
index a2ca29b..465b02f 100644
--- a/compiler/src/iree/compiler/Dialect/Flow/Transforms/RegionOpUtils.cpp
+++ b/compiler/src/iree/compiler/Dialect/Flow/Transforms/RegionOpUtils.cpp
@@ -451,7 +451,8 @@
}
}
- rewriter.replaceUsesWithinBlock(target, clonedTarget->getResults(), &body);
+ rewriter.replaceOpUsesWithinBlock(target, clonedTarget->getResults(),
+ &body);
}
FailureOr<IREE::Flow::DispatchRegionOp> newRegionOp =
diff --git a/third_party/llvm-project b/third_party/llvm-project
index 3d50e75..a36e85f 160000
--- a/third_party/llvm-project
+++ b/third_party/llvm-project
@@ -1 +1 @@
-Subproject commit 3d50e75db58dfd2ef6c35a588ed4e5b03ce53efa
+Subproject commit a36e85f10497924ed996c1a9b82f26d004713d54
