[llvm] d96b5e6 - [TableGen] Add IntrNoMerge as intrinsic property
Krzysztof Parzyszek via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 2 09:05:25 PST 2021
Author: Krzysztof Parzyszek
Date: 2021-03-02T09:04:50-08:00
New Revision: d96b5e606add52157bf04c475049c8e1c5ebbfaa
URL: https://github.com/llvm/llvm-project/commit/d96b5e606add52157bf04c475049c8e1c5ebbfaa
DIFF: https://github.com/llvm/llvm-project/commit/d96b5e606add52157bf04c475049c8e1c5ebbfaa.diff
LOG: [TableGen] Add IntrNoMerge as intrinsic property
There is a function attribute 'nomerge' in addition to 'noduplicate'
and 'convergent'. Both 'noduplicate' and 'convergent' have corresponding
intrinsic properties. This patch adds an intrinsic property for the
'nomerge' attribute.
Differential Revision: https://reviews.llvm.org/D96364
Added:
llvm/test/TableGen/intrin-properties.td
Modified:
llvm/include/llvm/IR/Intrinsics.td
llvm/utils/TableGen/CodeGenIntrinsics.h
llvm/utils/TableGen/CodeGenTarget.cpp
llvm/utils/TableGen/IntrinsicEmitter.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/IR/Intrinsics.td b/llvm/include/llvm/IR/Intrinsics.td
index 582fe613f75c..5a4998e22126 100644
--- a/llvm/include/llvm/IR/Intrinsics.td
+++ b/llvm/include/llvm/IR/Intrinsics.td
@@ -134,10 +134,14 @@ def IntrWillReturn : IntrinsicProperty<1>;
// Parallels the cold attribute on LLVM IR functions.
def IntrCold : IntrinsicProperty;
-// IntrNoduplicate - Calls to this intrinsic cannot be duplicated.
+// IntrNoDuplicate - Calls to this intrinsic cannot be duplicated.
// Parallels the noduplicate attribute on LLVM IR functions.
def IntrNoDuplicate : IntrinsicProperty;
+// IntrNoMerge - Calls to this intrinsic cannot be merged
+// Parallels the nomerge attribute on LLVM IR functions.
+def IntrNoMerge : IntrinsicProperty;
+
// IntrConvergent - Calls to this intrinsic are convergent and may not be made
// control-dependent on any additional values.
// Parallels the convergent attribute on LLVM IR functions.
diff --git a/llvm/test/TableGen/intrin-properties.td b/llvm/test/TableGen/intrin-properties.td
new file mode 100644
index 000000000000..2e2e32d54fbf
--- /dev/null
+++ b/llvm/test/TableGen/intrin-properties.td
@@ -0,0 +1,24 @@
+// RUN: sed -e 's/<PROP>/ArgMemOnly/;s/<ATTR>/ArgMemOnly/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/Cold/;s/<ATTR>/Cold/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/Convergent/;s/<ATTR>/Convergent/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/InaccessibleMemOnly/;s/<ATTR>/InaccessibleMemOnly/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/InaccessibleMemOrArgMemOnly/;s/<ATTR>/InaccessibleMemOrArgMemOnly/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/NoDuplicate/;s/<ATTR>/NoDuplicate/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/NoFree/;s/<ATTR>/NoFree/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/NoMem/;s/<ATTR>/ReadNone/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/NoMerge/;s/<ATTR>/NoMerge/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/NoReturn/;s/<ATTR>/NoReturn/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/NoSync/;s/<ATTR>/NoSync/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/ReadMem/;s/<ATTR>/ReadOnly/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/Speculatable/;s/<ATTR>/Speculatable/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/WillReturn/;s/<ATTR>/WillReturn/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+// RUN: sed -e 's/<PROP>/WriteMem/;s/<ATTR>/WriteOnly/' < %s > %t; llvm-tblgen -gen-intrinsic-impl -I %p/../../include %t | FileCheck %t
+
+include "llvm/IR/Intrinsics.td"
+
+// CHECK: [[I:[0-9]+]], // llvm.tgtest.Intr<PROP>
+// CHECK: case [[I]]:
+// CHECK-NEXT: Atts[] = {{.*}}Attribute::<ATTR>
+def int_tgtest_Intr<PROP>:
+ Intrinsic<[llvm_i32_ty], [llvm_ptr_ty], [Intr<PROP>]>;
+
diff --git a/llvm/utils/TableGen/CodeGenIntrinsics.h b/llvm/utils/TableGen/CodeGenIntrinsics.h
index c469f662a42d..dbfad3bf6b17 100644
--- a/llvm/utils/TableGen/CodeGenIntrinsics.h
+++ b/llvm/utils/TableGen/CodeGenIntrinsics.h
@@ -120,6 +120,9 @@ struct CodeGenIntrinsic {
/// True if the intrinsic is marked as noduplicate.
bool isNoDuplicate;
+ /// True if the intrinsic is marked as nomerge.
+ bool isNoMerge;
+
/// True if the intrinsic is no-return.
bool isNoReturn;
diff --git a/llvm/utils/TableGen/CodeGenTarget.cpp b/llvm/utils/TableGen/CodeGenTarget.cpp
index 8f6d212df5ec..2c3e4decc58e 100644
--- a/llvm/utils/TableGen/CodeGenTarget.cpp
+++ b/llvm/utils/TableGen/CodeGenTarget.cpp
@@ -656,6 +656,7 @@ CodeGenIntrinsic::CodeGenIntrinsic(Record *R,
isWillReturn = false;
isCold = false;
isNoDuplicate = false;
+ isNoMerge = false;
isConvergent = false;
isSpeculatable = false;
hasSideEffects = false;
@@ -845,6 +846,8 @@ void CodeGenIntrinsic::setProperty(Record *R) {
canThrow = true;
else if (R->getName() == "IntrNoDuplicate")
isNoDuplicate = true;
+ else if (R->getName() == "IntrNoMerge")
+ isNoMerge = true;
else if (R->getName() == "IntrConvergent")
isConvergent = true;
else if (R->getName() == "IntrNoReturn")
diff --git a/llvm/utils/TableGen/IntrinsicEmitter.cpp b/llvm/utils/TableGen/IntrinsicEmitter.cpp
index 7835f644d192..aa844961b01f 100644
--- a/llvm/utils/TableGen/IntrinsicEmitter.cpp
+++ b/llvm/utils/TableGen/IntrinsicEmitter.cpp
@@ -584,6 +584,9 @@ struct AttributeComparator {
if (L->isNoDuplicate != R->isNoDuplicate)
return R->isNoDuplicate;
+ if (L->isNoMerge != R->isNoMerge)
+ return R->isNoMerge;
+
if (L->isNoReturn != R->isNoReturn)
return R->isNoReturn;
@@ -739,7 +742,8 @@ void IntrinsicEmitter::EmitAttributes(const CodeGenIntrinsicTable &Ints,
!intrinsic.hasSideEffects) ||
intrinsic.isNoReturn || intrinsic.isNoSync || intrinsic.isNoFree ||
intrinsic.isWillReturn || intrinsic.isCold || intrinsic.isNoDuplicate ||
- intrinsic.isConvergent || intrinsic.isSpeculatable) {
+ intrinsic.isNoMerge || intrinsic.isConvergent ||
+ intrinsic.isSpeculatable) {
OS << " const Attribute::AttrKind Atts[] = {";
ListSeparator LS(",");
if (!intrinsic.canThrow)
@@ -756,6 +760,8 @@ void IntrinsicEmitter::EmitAttributes(const CodeGenIntrinsicTable &Ints,
OS << LS << "Attribute::Cold";
if (intrinsic.isNoDuplicate)
OS << LS << "Attribute::NoDuplicate";
+ if (intrinsic.isNoMerge)
+ OS << LS << "Attribute::NoMerge";
if (intrinsic.isConvergent)
OS << LS << "Attribute::Convergent";
if (intrinsic.isSpeculatable)
More information about the llvm-commits
mailing list