From 9079905c36d6a395eacd09bb2c6db01f00930a82 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <kparzysz@codeaurora.org>
Date: Tue, 2 May 2017 17:58:52 +0000
Subject: [PATCH] [Hexagon] Remove unneeded code from HexagonShuffler

Patch by Colin LeMahieu.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@301947 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp | 16 +++++++---------
 lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.h   |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp b/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp
index eb303464555..4350c199e26 100644
--- a/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp
+++ b/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.cpp
@@ -273,8 +273,8 @@ bool HexagonShuffler::check() {
   unsigned memory = 0, loads = 0, load0 = 0, stores = 0, store0 = 0, store1 = 0;
   // Number of HVX loads, HVX stores.
   unsigned CVIloads = 0, CVIstores = 0;
-  // Number of duplex insns, solo insns.
-  unsigned duplex = 0, solo = 0;
+  // Number of duplex insns
+  unsigned duplex = 0;
   // Number of insns restricting other insns in the packet to A and X types,
   // which is neither A or X types.
   unsigned onlyAX = 0, neitherAnorX = 0;
@@ -295,12 +295,10 @@ bool HexagonShuffler::check() {
   for (iterator ISJ = begin(); ISJ != end(); ++ISJ) {
     MCInst const &ID = ISJ->getDesc();
 
-    if (HexagonMCInstrInfo::isSolo(MCII, ID))
-      solo++;
-    else if (HexagonMCInstrInfo::isSoloAX(MCII, ID))
-      onlyAX++;
+    if (HexagonMCInstrInfo::isSoloAX(MCII, ID))
+      ++onlyAX;
     else if (HexagonMCInstrInfo::isSoloAin1(MCII, ID))
-      onlyAin1++;
+      ++onlyAin1;
     neitherAnorX += countNeitherAnorX(MCII, ID);
     if (HexagonMCInstrInfo::prefersSlot3(MCII, ID)) {
       ++pSlot3Cnt;
@@ -409,8 +407,8 @@ bool HexagonShuffler::check() {
   }
 
   // Check if the packet is legal.
-  if ((load0 > 1 || store0 > 1 || CVIloads > 1 || CVIstores > 1) ||
-      (duplex > 1 || (duplex && memory)) || (solo && size() > 1) ||
+  if ((load0 > 1 || store0 > 1) ||
+      (duplex > 1 || (duplex && memory)) ||
       (onlyAX && neitherAnorX > 1) || (onlyAX && xtypeFloat)) {
     reportError(llvm::Twine("invalid instruction packet"));
     return false;
diff --git a/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.h b/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.h
index bd31c7be4c0..10a959008f4 100644
--- a/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.h
+++ b/lib/Target/Hexagon/MCTargetDesc/HexagonShuffler.h
@@ -105,8 +105,8 @@ class HexagonInstr {
 public:
   HexagonInstr(HexagonCVIResource::TypeUnitsAndLanes *T,
                MCInstrInfo const &MCII, MCInst const *id,
-               MCInst const *Extender, unsigned s, bool x = false)
-      : ID(id), Extender(Extender), Core(s), CVI(T, MCII, s, id) {}
+               MCInst const *Extender, unsigned s)
+      : ID(id), Extender(Extender), Core(s), CVI(T, MCII, s, id) {};
 
   MCInst const &getDesc() const { return *ID; };
 
-- 
2.11.0