diff options
| author | dim <dim@FreeBSD.org> | 2014-05-26 20:45:44 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-05-26 20:45:44 +0000 |
| commit | a3e27ae6a965c81405d106372cb1f9d3a6da6626 (patch) | |
| tree | a889320dbbd323fb029d54cc5ef8a03ca448a203 /contrib/llvm/lib/Target/R600/SIInsertWaits.cpp | |
| parent | 0c09b104cdf0b55f5402b37cb18a67d0480c6a5f (diff) | |
| download | FreeBSD-src-a3e27ae6a965c81405d106372cb1f9d3a6da6626.zip FreeBSD-src-a3e27ae6a965c81405d106372cb1f9d3a6da6626.tar.gz | |
MFC r265925:
Upgrade our copy of llvm/clang to 3.4.1 release. This release contains
mostly fixes, for the following upstream bugs:
http://llvm.org/PR16365 http://llvm.org/PR17473 http://llvm.org/PR18000
http://llvm.org/PR18068 http://llvm.org/PR18102 http://llvm.org/PR18165
http://llvm.org/PR18260 http://llvm.org/PR18290 http://llvm.org/PR18316
http://llvm.org/PR18460 http://llvm.org/PR18473 http://llvm.org/PR18515
http://llvm.org/PR18526 http://llvm.org/PR18600 http://llvm.org/PR18762
http://llvm.org/PR18773 http://llvm.org/PR18860 http://llvm.org/PR18994
http://llvm.org/PR19007 http://llvm.org/PR19010 http://llvm.org/PR19033
http://llvm.org/PR19059 http://llvm.org/PR19144 http://llvm.org/PR19326
Diffstat (limited to 'contrib/llvm/lib/Target/R600/SIInsertWaits.cpp')
| -rw-r--r-- | contrib/llvm/lib/Target/R600/SIInsertWaits.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/llvm/lib/Target/R600/SIInsertWaits.cpp b/contrib/llvm/lib/Target/R600/SIInsertWaits.cpp index 7ef662e..695ec40 100644 --- a/contrib/llvm/lib/Target/R600/SIInsertWaits.cpp +++ b/contrib/llvm/lib/Target/R600/SIInsertWaits.cpp @@ -314,6 +314,12 @@ Counters SIInsertWaits::handleOperands(MachineInstr &MI) { Counters Result = ZeroCounts; + // S_SENDMSG implicitly waits for all outstanding LGKM transfers to finish, + // but we also want to wait for any other outstanding transfers before + // signalling other hardware blocks + if (MI.getOpcode() == AMDGPU::S_SENDMSG) + return LastIssued; + // For each register affected by this // instruction increase the result sequence for (unsigned i = 0, e = MI.getNumOperands(); i != e; ++i) { |
