summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Northover <Tim.Northover@arm.com>2012-06-26 18:46:28 +0000
committerTim Northover <Tim.Northover@arm.com>2012-06-26 18:46:28 +0000
commitca578e7ba6b1e4ce955134e3fb1d5014942e5248 (patch)
treec14b547a238fe8ba65c1f36da3d605c8e773a9d4
parentda72dd2a01a9f3e686699d01f4d40b936a52eab6 (diff)
downloadllvm-ca578e7ba6b1e4ce955134e3fb1d5014942e5248.tar.gz
llvm-ca578e7ba6b1e4ce955134e3fb1d5014942e5248.tar.bz2
llvm-ca578e7ba6b1e4ce955134e3fb1d5014942e5248.tar.xz
Teach TableGen to put chains on more instructions
When generating selection tables for Pat instances, TableGen relied on an output Instruction's Pattern field being set to infer whether a chain should be added. This patch adds additional logic to check various flag fields so that correct code can be generated even if Pattern is unset. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159217 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--utils/TableGen/DAGISelMatcherGen.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/utils/TableGen/DAGISelMatcherGen.cpp b/utils/TableGen/DAGISelMatcherGen.cpp
index 2ac7b87e70..aed222c094 100644
--- a/utils/TableGen/DAGISelMatcherGen.cpp
+++ b/utils/TableGen/DAGISelMatcherGen.cpp
@@ -690,6 +690,13 @@ EmitResultInstructionAsOperand(const TreePatternNode *N,
bool NodeHasChain = InstPatNode &&
InstPatNode->TreeHasProperty(SDNPHasChain, CGP);
+ // Instructions which load and store from memory should have a chain,
+ // regardless of whether they happen to have an internal pattern saying so.
+ if (Pattern.getSrcPattern()->TreeHasProperty(SDNPHasChain, CGP)
+ && (II.hasCtrlDep || II.mayLoad || II.mayStore || II.canFoldAsLoad ||
+ II.hasSideEffects))
+ NodeHasChain = true;
+
bool isRoot = N == Pattern.getDstPattern();
// TreeHasOutGlue - True if this tree has glue.