[Mlir-commits] [mlir] [mlir][LLVM] Add support for invariant group related intrinsics (PR #115877)
Sirui Mu
llvmlistbot at llvm.org
Tue Nov 12 07:00:49 PST 2024
https://github.com/Lancern created https://github.com/llvm/llvm-project/pull/115877
This PR adds support for the following LLVM intrinsics:
- `llvm.launder.invariant.group`
- `llvm.strip.invariant.group`
>From 61cbd493071f19548fabf9790d8aa2d75909f5be Mon Sep 17 00:00:00 2001
From: Sirui Mu <msrlancern at gmail.com>
Date: Tue, 12 Nov 2024 22:58:01 +0800
Subject: [PATCH] [mlir][LLVM] Add support for invariant group related
intrinsics
This patch adds support for the following LLVM intrinsics:
- `llvm.launder.invariant.group`
- `llvm.strip.invariant.group`
---
.../mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td | 18 ++++++++++++++
mlir/lib/Dialect/LLVMIR/IR/LLVMMemorySlot.cpp | 24 +++++++++++++++++++
mlir/test/Dialect/LLVMIR/roundtrip.mlir | 10 ++++++++
mlir/test/Target/LLVMIR/Import/intrinsic.ll | 11 +++++++++
.../test/Target/LLVMIR/llvmir-intrinsics.mlir | 9 +++++++
5 files changed, 72 insertions(+)
diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td
index d07ebbacc60434..b0d6148726f61c 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td
@@ -320,6 +320,24 @@ def LLVM_InvariantEndOp : LLVM_ZeroResultIntrOp<"invariant.end", [2],
"qualified(type($ptr))";
}
+def LLVM_LaunderInvariantGroupOp
+ : LLVM_OneResultIntrOp<"launder.invariant.group", [], [0],
+ [DeclareOpInterfaceMethods<PromotableOpInterface>,
+ SameOperandsAndResultType]> {
+ let arguments = (ins LLVM_AnyPointer:$ptr);
+ let results = (outs LLVM_AnyPointer:$res);
+ let assemblyFormat = "$ptr attr-dict `:` qualified(type($ptr))";
+}
+
+def LLVM_StripInvariantGroupOp
+ : LLVM_OneResultIntrOp<"strip.invariant.group", [], [0],
+ [DeclareOpInterfaceMethods<PromotableOpInterface>,
+ SameOperandsAndResultType]> {
+ let arguments = (ins LLVM_AnyPointer:$ptr);
+ let results = (outs LLVM_AnyPointer:$res);
+ let assemblyFormat = "$ptr attr-dict `:` qualified(type($ptr))";
+}
+
// Constrained Floating-Point Intrinsics.
class LLVM_ConstrainedIntr<string mnem, int numArgs,
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMMemorySlot.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMMemorySlot.cpp
index 5dc506c14ef96f..086abdc55fd235 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMMemorySlot.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMMemorySlot.cpp
@@ -590,6 +590,30 @@ DeletionKind LLVM::InvariantEndOp::removeBlockingUses(
return DeletionKind::Delete;
}
+bool LLVM::LaunderInvariantGroupOp::canUsesBeRemoved(
+ const SmallPtrSetImpl<OpOperand *> &blockingUses,
+ SmallVectorImpl<OpOperand *> &newBlockingUses,
+ const DataLayout &dataLayout) {
+ return true;
+}
+
+DeletionKind LLVM::LaunderInvariantGroupOp::removeBlockingUses(
+ const SmallPtrSetImpl<OpOperand *> &blockingUses, OpBuilder &builder) {
+ return DeletionKind::Delete;
+}
+
+bool LLVM::StripInvariantGroupOp::canUsesBeRemoved(
+ const SmallPtrSetImpl<OpOperand *> &blockingUses,
+ SmallVectorImpl<OpOperand *> &newBlockingUses,
+ const DataLayout &dataLayout) {
+ return true;
+}
+
+DeletionKind LLVM::StripInvariantGroupOp::removeBlockingUses(
+ const SmallPtrSetImpl<OpOperand *> &blockingUses, OpBuilder &builder) {
+ return DeletionKind::Delete;
+}
+
bool LLVM::DbgDeclareOp::canUsesBeRemoved(
const SmallPtrSetImpl<OpOperand *> &blockingUses,
SmallVectorImpl<OpOperand *> &newBlockingUses,
diff --git a/mlir/test/Dialect/LLVMIR/roundtrip.mlir b/mlir/test/Dialect/LLVMIR/roundtrip.mlir
index aa558bad2299ce..f8cd23dc4e723c 100644
--- a/mlir/test/Dialect/LLVMIR/roundtrip.mlir
+++ b/mlir/test/Dialect/LLVMIR/roundtrip.mlir
@@ -672,6 +672,16 @@ llvm.func @invariant(%p: !llvm.ptr) {
llvm.return
}
+// CHECK-LABEL: @invariant_group_intrinsics
+// CHECK-SAME: %[[P:.+]]: !llvm.ptr
+llvm.func @invariant_group_intrinsics(%p: !llvm.ptr) {
+ // CHECK: %{{.+}} = llvm.intr.launder.invariant.group %[[P]] : !llvm.ptr
+ %1 = llvm.intr.launder.invariant.group %p : !llvm.ptr
+ // CHECK: %{{.+}} = llvm.intr.strip.invariant.group %[[P]] : !llvm.ptr
+ %2 = llvm.intr.strip.invariant.group %p : !llvm.ptr
+ llvm.return
+}
+
// CHECK-LABEL: @vararg_func
llvm.func @vararg_func(%arg0: i32, ...) {
// CHECK: %[[C:.*]] = llvm.mlir.constant(1 : i32)
diff --git a/mlir/test/Target/LLVMIR/Import/intrinsic.ll b/mlir/test/Target/LLVMIR/Import/intrinsic.ll
index 606b11175f572f..64911b09ebc85d 100644
--- a/mlir/test/Target/LLVMIR/Import/intrinsic.ll
+++ b/mlir/test/Target/LLVMIR/Import/intrinsic.ll
@@ -802,6 +802,15 @@ define void @invariant(ptr %0) {
ret void
}
+; CHECK-LABEL: llvm.func @invariant_group
+define void @invariant_group(ptr %0) {
+ ; CHECK: %{{.+}} = llvm.intr.launder.invariant.group %{{.*}} : !llvm.ptr
+ %2 = call ptr @llvm.launder.invariant.group.p0(ptr %0)
+ ; CHECK: %{{.+}} = llvm.intr.strip.invariant.group %{{.*}} : !llvm.ptr
+ %3 = call ptr @llvm.strip.invariant.group.p0(ptr %0)
+ ret void
+}
+
; CHECK-LABEL: llvm.func @vector_insert
define void @vector_insert(<vscale x 4 x float> %0, <4 x float> %1) {
; CHECK: llvm.intr.vector.insert %{{.*}}, %{{.*}}[4] : vector<4xf32> into !llvm.vec<? x 4 x f32>
@@ -1191,6 +1200,8 @@ declare void @llvm.lifetime.start.p0(i64 immarg, ptr nocapture)
declare void @llvm.lifetime.end.p0(i64 immarg, ptr nocapture)
declare ptr @llvm.invariant.start.p0(i64 immarg, ptr nocapture)
declare void @llvm.invariant.end.p0(ptr, i64 immarg, ptr nocapture)
+declare ptr @llvm.launder.invariant.group.p0(ptr nocapture)
+declare ptr @llvm.strip.invariant.group.p0(ptr nocapture)
declare void @llvm.assume(i1)
declare float @llvm.ssa.copy.f32(float returned)
diff --git a/mlir/test/Target/LLVMIR/llvmir-intrinsics.mlir b/mlir/test/Target/LLVMIR/llvmir-intrinsics.mlir
index cb712eb4e1262d..059abed34cd5d1 100644
--- a/mlir/test/Target/LLVMIR/llvmir-intrinsics.mlir
+++ b/mlir/test/Target/LLVMIR/llvmir-intrinsics.mlir
@@ -1020,6 +1020,15 @@ llvm.func @invariant(%p: !llvm.ptr) {
llvm.return
}
+// CHECK-LABEL: @invariant_group
+llvm.func @invariant_group(%p: !llvm.ptr) {
+ // CHECK: call ptr @llvm.launder.invariant.group
+ %1 = llvm.intr.launder.invariant.group %p : !llvm.ptr
+ // CHECK: call ptr @llvm.strip.invariant.group
+ %2 = llvm.intr.strip.invariant.group %p : !llvm.ptr
+ llvm.return
+}
+
// CHECK-LABEL: @ssa_copy
llvm.func @ssa_copy(%arg: f32) -> f32 {
// CHECK: call float @llvm.ssa.copy
More information about the Mlir-commits
mailing list