[llvm] r301951 - [Hexagon] Make sure duplexed dealloc_returns are checked for double jumps

[Krzysztof Parzyszek via llvm-commits]

Author: kparzysz
Date: Tue May  2 13:03:08 2017
New Revision: 301951

URL: http://llvm.org/viewvc/llvm-project?rev=301951&view=rev
Log:
[Hexagon] Make sure duplexed dealloc_returns are checked for double jumps

Patch by Colin LeMahieu.

Added:
    llvm/trunk/test/MC/Hexagon/dealloc-return-jump.s
Modified:
    llvm/trunk/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp

Modified: llvm/trunk/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp?rev=301951&r1=301950&r2=301951&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp (original)
+++ llvm/trunk/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp Tue May  2 13:03:08 2017
@@ -336,6 +336,14 @@ bool HexagonShuffler::check() {
         ++jumps;
         foundBranches.push_back(ISJ);
       }
+      if (HexagonMCInstrInfo::getDesc(MCII, Inst0).isReturn()) {
+        ++deallocs, ++jumps, ++jump1; // DEALLOC_RETURN is of type LD.
+        foundBranches.push_back(ISJ);
+      }
+      if (HexagonMCInstrInfo::getDesc(MCII, Inst1).isReturn()) {
+        ++deallocs, ++jumps, ++jump1; // DEALLOC_RETURN is of type LD.
+        foundBranches.push_back(ISJ);
+      }
       break;
     }
     }

Added: llvm/trunk/test/MC/Hexagon/dealloc-return-jump.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Hexagon/dealloc-return-jump.s?rev=301951&view=auto
==============================================================================
--- llvm/trunk/test/MC/Hexagon/dealloc-return-jump.s (added)
+++ llvm/trunk/test/MC/Hexagon/dealloc-return-jump.s Tue May  2 13:03:08 2017
@@ -0,0 +1,7 @@
+# RUN: not llvm-mc -arch=hexagon -mcpu=hexagonv62 -filetype=obj -o - %s
+# Check that a duplex involving dealloc_return is correctly checked
+# dealloc_return cannot be involved in a double jump packet
+
+{ r0=add(r0,#-1)
+  p0=cmp.eq(r0,r0); if (p0.new) jump:nt 0
+  if (p0) dealloc_return }