diff --git a/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp b/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
index c0f92042e5d..f422057c1c9 100644
--- a/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
+++ b/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp
@@ -1895,16 +1895,34 @@ OpRef HvxSelector::perfect(ShuffleMask SM, OpRef Va, ResultStack &Results) {
     }
   }
 
+  // From the cycles, construct the sequence of values that will
+  // then form the control values for vdealvdd/vshuffvdd, i.e.
+  // (M a1 a2)(M a3 a4 a5)... -> a1 a2 a3 a4 a5
+  // This essentially strips the M value from the cycles where
+  // it's present, and performs the insertion of M (then stripping)
+  // for cycles without M (as described in an earlier comment).
   SmallVector<unsigned,8> SwapElems;
-  if (HwLen == unsigned(VecLen))
+  // When the input is extended (i.e. single vector becomes a pair),
+  // this is done by using an "undef" vector as the second input.
+  // However, then we get
+  //   input 1: GOODBITS
+  //   input 2: ........
+  // but we need
+  //   input 1: ....BITS
+  //   input 2: ....GOOD
+  // Then at the end, this needs to be undone. To accomplish this,
+  // artificially add "LogLen-1" at both ends of the sequence.
+  if (Extend)
     SwapElems.push_back(LogLen-1);
-
   for (const CycleType &C : Cycles) {
+    // Do the transformation: (a1..an) -> (M a1..an)(M a1).
     unsigned First = (C[0] == LogLen-1) ? 1 : 0;
     SwapElems.append(C.begin()+First, C.end());
     if (First == 0)
       SwapElems.push_back(C[0]);
   }
+  if (Extend)
+    SwapElems.push_back(LogLen-1);
 
   const SDLoc &dl(Results.InpNode);
   OpRef Arg = !Extend ? Va
diff --git a/test/CodeGen/Hexagon/autohvx/isel-shuff-single.ll b/test/CodeGen/Hexagon/autohvx/isel-shuff-single.ll
new file mode 100644
index 00000000000..9ef4543790b
--- /dev/null
+++ b/test/CodeGen/Hexagon/autohvx/isel-shuff-single.ll
@@ -0,0 +1,22 @@
+; RUN: llc -march=hexagon < %s | FileCheck %s
+
+; Perfect shuffle with single input vector. Half of it first needs to be
+; transposed into the other vector before the generated shuffles can take
+; effect, lastly the first transpose needs to be undone (this last step
+; was missing).
+
+; CHECK-LABEL: f0:
+; CHECK-DAG:  r[[R0:[0-9]+]] = #66
+; CHECK-DAG:  r[[R1:[0-9]+]] = #40
+; CHECK-DAG:  r[[R2:[0-9]+]] = #85
+; CHECK:      v1:0 = vdeal(v{{[0-9]+}},v0,r[[R0]])
+; CHECK:      v1:0 = vshuff(v1,v0,r[[R1]])
+; CHECK:      v1:0 = vshuff(v1,v0,r[[R2]])
+; CHECK-NOT:       = v
+
+define <128 x i8> @f0(<128 x i8> %a0) #0 {
+  %v0 = shufflevector <128 x i8> %a0, <128 x i8> undef, <128 x i32> <i32 0, i32 32, i32 64, i32 96, i32 1, i32 33, i32 65, i32 97, i32 2, i32 34, i32 66, i32 98, i32 3, i32 35, i32 67, i32 99, i32 4, i32 36, i32 68, i32 100, i32 5, i32 37, i32 69, i32 101, i32 6, i32 38, i32 70, i32 102, i32 7, i32 39, i32 71, i32 103, i32 8, i32 40, i32 72, i32 104, i32 9, i32 41, i32 73, i32 105, i32 10, i32 42, i32 74, i32 106, i32 11, i32 43, i32 75, i32 107, i32 12, i32 44, i32 76, i32 108, i32 13, i32 45, i32 77, i32 109, i32 14, i32 46, i32 78, i32 110, i32 15, i32 47, i32 79, i32 111, i32 16, i32 48, i32 80, i32 112, i32 17, i32 49, i32 81, i32 113, i32 18, i32 50, i32 82, i32 114, i32 19, i32 51, i32 83, i32 115, i32 20, i32 52, i32 84, i32 116, i32 21, i32 53, i32 85, i32 117, i32 22, i32 54, i32 86, i32 118, i32 23, i32 55, i32 87, i32 119, i32 24, i32 56, i32 88, i32 120, i32 25, i32 57, i32 89, i32 121, i32 26, i32 58, i32 90, i32 122, i32 27, i32 59, i32 91, i32 123, i32 28, i32 60, i32 92, i32 124, i32 29, i32 61, i32 93, i32 125, i32 30, i32 62, i32 94, i32 126, i32 31, i32 63, i32 95, i32 127>
+  ret <128 x i8> %v0
+}
+
+attributes #0 = { nounwind readnone "target-cpu"="hexagonv66" "target-features"="+hvx,+hvx-length128b,-packets" }
diff --git a/test/CodeGen/Hexagon/isel-hvx-pred-bitcast-order.ll b/test/CodeGen/Hexagon/isel-hvx-pred-bitcast-order.ll
index fd3f84916c5..1fdf8a5fb0e 100644
--- a/test/CodeGen/Hexagon/isel-hvx-pred-bitcast-order.ll
+++ b/test/CodeGen/Hexagon/isel-hvx-pred-bitcast-order.ll
@@ -4,7 +4,7 @@
 
 ; CHECK: vdeal
 ; CHECK: vdeal
-; CHECK: v[[V1:[0-9]+]]:[[V0:[0-9]+]] = vdeal
+; CHECK: v[[V1:[0-9]+]]:[[V0:[0-9]+]] = vshuff
 ; CHECK-NEXT: }
 ; CHECK-NEXT: {
 ; CHECK-NEXT: vmem(r[[RA:[0-9]+]]+#0) = v[[V0]]