3 files changed, 18 insertions, 50 deletions
diff --git a/llvm/test/CodeGen/Hexagon/autohvx/isel-vec-ext.ll b/llvm/test/CodeGen/Hexagon/autohvx/isel-vec-ext.ll
index d7574a277de..ba1d57f0489 100644
--- a/llvm/test/CodeGen/Hexagon/autohvx/isel-vec-ext.ll
+++ b/llvm/test/CodeGen/Hexagon/autohvx/isel-vec-ext.ll
@@ -4,7 +4,7 @@ target datalayout = "e-m:e-p:32:32:32-a:0-n16:32-i64:64:64-i32:32:32-i16:16:16-i
 target triple = "hexagon"
 
 ; CHECK-LABEL: danny:
-; CHECK: vsxt
+; CHECK: vunpack
 ; CHECK-NOT: vinsert
 define void @danny() local_unnamed_addr #0 {
 b2:
@@ -15,7 +15,7 @@ b2:
 }
 
 ; CHECK-LABEL: sammy:
-; CHECK: vsxt
+; CHECK: vunpack
 ; CHECK-NOT: vinsert
 define void @sammy() local_unnamed_addr #1 {
 b2:
diff --git a/llvm/test/CodeGen/Hexagon/autohvx/vext-128b.ll b/llvm/test/CodeGen/Hexagon/autohvx/vext-128b.ll
index 3a0cd06578e..1b464a404e1 100644
--- a/llvm/test/CodeGen/Hexagon/autohvx/vext-128b.ll
+++ b/llvm/test/CodeGen/Hexagon/autohvx/vext-128b.ll
@@ -1,48 +1,36 @@
 ; RUN: llc -march=hexagon < %s | FileCheck %s
 
 ; CHECK-LABEL: test_00:
-; CHECK-DAG: v[[H00:[0-9]+]]:[[L00:[0-9]+]].h = vsxt(v0.b)
-; CHECK-DAG: r[[R00:[0-9]+]] = #-2
-; CHECK: v1:0 = vshuff(v[[H00]],v[[L00]],r[[R00]])
+; CHECK: v1:0.h = vunpack(v0.b)
 define <128 x i16> @test_00(<128 x i8> %v0) #0 {
   %p = sext <128 x i8> %v0 to <128 x i16>
   ret <128 x i16> %p
 }
 
 ; CHECK-LABEL: test_01:
-; CHECK-DAG: v[[H10:[0-9]+]]:[[L10:[0-9]+]].w = vsxt(v0.h)
-; CHECK-DAG: r[[R10:[0-9]+]] = #-4
-; CHECK: v1:0 = vshuff(v[[H10]],v[[L10]],r[[R10]])
+; CHECK: v1:0.w = vunpack(v0.h)
 define <64 x i32> @test_01(<64 x i16> %v0) #0 {
   %p = sext <64 x i16> %v0 to <64 x i32>
   ret <64 x i32> %p
 }
 
 ; CHECK-LABEL: test_02:
-; CHECK-DAG: v[[H20:[0-9]+]]:[[L20:[0-9]+]].uh = vzxt(v0.ub)
-; CHECK-DAG: r[[R20:[0-9]+]] = #-2
-; CHECK: v1:0 = vshuff(v[[H20]],v[[L20]],r[[R20]])
+; CHECK: v1:0.uh = vunpack(v0.ub)
 define <128 x i16> @test_02(<128 x i8> %v0) #0 {
   %p = zext <128 x i8> %v0 to <128 x i16>
   ret <128 x i16> %p
 }
 
 ; CHECK-LABEL: test_03:
-; CHECK-DAG: v[[H30:[0-9]+]]:[[L30:[0-9]+]].uw = vzxt(v0.uh)
-; CHECK-DAG: r[[R30:[0-9]+]] = #-4
-; CHECK: v1:0 = vshuff(v[[H30]],v[[L30]],r[[R30]])
+; CHECK: v1:0.uw = vunpack(v0.uh)
 define <64 x i32> @test_03(<64 x i16> %v0) #0 {
   %p = zext <64 x i16> %v0 to <64 x i32>
   ret <64 x i32> %p
 }
 
 ; CHECK-LABEL: test_04:
-; CHECK-DAG: v[[H40:[0-9]+]]:[[L40:[0-9]+]].h = vsxt(v0.b)
-; CHECK-DAG: r[[R40:[0-9]+]] = #-2
-; CHECK-DAG: r[[R41:[0-9]+]] = #-4
-; CHECK: v[[H41:[0-9]+]]:[[L41:[0-9]+]] = vshuff(v[[H40]],v[[L40]],r[[R40]])
-; CHECK: v[[H42:[0-9]+]]:[[L42:[0-9]+]].w = vsxt(v[[L41]].h)
-; CHECK: v1:0 = vshuff(v[[H42]],v[[L42]],r[[R41]])
+; CHECK: v[[H40:[0-9]+]]:[[L40:[0-9]+]].h = vunpack(v0.b)
+; CHECK: v1:0.w = vunpack(v[[L40]].h)
 define <32 x i32> @test_04(<128 x i8> %v0) #0 {
   %x = sext <128 x i8> %v0 to <128 x i32>
   %p = shufflevector <128 x i32> %x, <128 x i32> undef, <32 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9, i32 10, i32 11, i32 12, i32 13, i32 14, i32 15, i32 16, i32 17, i32 18, i32 19, i32 20, i32 21, i32 22, i32 23, i32 24, i32 25, i32 26, i32 27, i32 28, i32 29, i32 30, i32 31>
@@ -50,12 +38,8 @@ define <32 x i32> @test_04(<128 x i8> %v0) #0 {
 }
 
 ; CHECK-LABEL: test_05:
-; CHECK-DAG: v[[H50:[0-9]+]]:[[L50:[0-9]+]].uh = vzxt(v0.ub)
-; CHECK-DAG: r[[R50:[0-9]+]] = #-2
-; CHECK-DAG: r[[R51:[0-9]+]] = #-4
-; CHECK: v[[H51:[0-9]+]]:[[L51:[0-9]+]] = vshuff(v[[H50]],v[[L50]],r[[R50]])
-; CHECK: v[[H52:[0-9]+]]:[[L52:[0-9]+]].uw = vzxt(v[[L51]].uh)
-; CHECK: v1:0 = vshuff(v[[H52]],v[[L52]],r[[R51]])
+; CHECK: v[[H50:[0-9]+]]:[[L50:[0-9]+]].uh = vunpack(v0.ub)
+; CHECK: v1:0.uw = vunpack(v[[L50]].uh)
 define <32 x i32> @test_05(<128 x i8> %v0) #0 {
   %x = zext <128 x i8> %v0 to <128 x i32>
   %p = shufflevector <128 x i32> %x, <128 x i32> undef, <32 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9, i32 10, i32 11, i32 12, i32 13, i32 14, i32 15, i32 16, i32 17, i32 18, i32 19, i32 20, i32 21, i32 22, i32 23, i32 24, i32 25, i32 26, i32 27, i32 28, i32 29, i32 30, i32 31>
diff --git a/llvm/test/CodeGen/Hexagon/autohvx/vext-64b.ll b/llvm/test/CodeGen/Hexagon/autohvx/vext-64b.ll
index ff246aebde3..7791fa4a81e 100644
--- a/llvm/test/CodeGen/Hexagon/autohvx/vext-64b.ll
+++ b/llvm/test/CodeGen/Hexagon/autohvx/vext-64b.ll
@@ -1,48 +1,36 @@
 ; RUN: llc -march=hexagon < %s | FileCheck %s
 
 ; CHECK-LABEL: test_00:
-; CHECK-DAG: v[[H00:[0-9]+]]:[[L00:[0-9]+]].h = vsxt(v0.b)
-; CHECK-DAG: r[[R00:[0-9]+]] = #-2
-; CHECK: v1:0 = vshuff(v[[H00]],v[[L00]],r[[R00]])
+; CHECK: v1:0.h = vunpack(v0.b)
 define <64 x i16> @test_00(<64 x i8> %v0) #0 {
   %p = sext <64 x i8> %v0 to <64 x i16>
   ret <64 x i16> %p
 }
 
 ; CHECK-LABEL: test_01:
-; CHECK-DAG: v[[H10:[0-9]+]]:[[L10:[0-9]+]].w = vsxt(v0.h)
-; CHECK-DAG: r[[R10:[0-9]+]] = #-4
-; CHECK: v1:0 = vshuff(v[[H10]],v[[L10]],r[[R10]])
+; CHECK: v1:0.w = vunpack(v0.h)
 define <32 x i32> @test_01(<32 x i16> %v0) #0 {
   %p = sext <32 x i16> %v0 to <32 x i32>
   ret <32 x i32> %p
 }
 
 ; CHECK-LABEL: test_02:
-; CHECK-DAG: v[[H20:[0-9]+]]:[[L20:[0-9]+]].uh = vzxt(v0.ub)
-; CHECK-DAG: r[[R20:[0-9]+]] = #-2
-; CHECK: v1:0 = vshuff(v[[H20]],v[[L20]],r[[R20]])
+; CHECK: v1:0.uh = vunpack(v0.ub)
 define <64 x i16> @test_02(<64 x i8> %v0) #0 {
   %p = zext <64 x i8> %v0 to <64 x i16>
   ret <64 x i16> %p
 }
 
 ; CHECK-LABEL: test_03:
-; CHECK-DAG: v[[H30:[0-9]+]]:[[L30:[0-9]+]].uw = vzxt(v0.uh)
-; CHECK-DAG: r[[R30:[0-9]+]] = #-4
-; CHECK: v1:0 = vshuff(v[[H30]],v[[L30]],r[[R30]])
+; CHECK: v1:0.uw = vunpack(v0.uh)
 define <32 x i32> @test_03(<32 x i16> %v0) #0 {
   %p = zext <32 x i16> %v0 to <32 x i32>
   ret <32 x i32> %p
 }
 
 ; CHECK-LABEL: test_04:
-; CHECK-DAG: v[[H40:[0-9]+]]:[[L40:[0-9]+]].h = vsxt(v0.b)
-; CHECK-DAG: r[[R40:[0-9]+]] = #-2
-; CHECK-DAG: r[[R41:[0-9]+]] = #-4
-; CHECK: v[[H41:[0-9]+]]:[[L41:[0-9]+]] = vshuff(v[[H40]],v[[L40]],r[[R40]])
-; CHECK: v[[H42:[0-9]+]]:[[L42:[0-9]+]].w = vsxt(v[[L41]].h)
-; CHECK: v1:0 = vshuff(v[[H42]],v[[L42]],r[[R41]])
+; CHECK-DAG: v[[H40:[0-9]+]]:[[L40:[0-9]+]].h = vunpack(v0.b)
+; CHECK: v1:0.w = vunpack(v[[L40]].h)
 define <16 x i32> @test_04(<64 x i8> %v0) #0 {
   %x = sext <64 x i8> %v0 to <64 x i32>
   %p = shufflevector <64 x i32> %x, <64 x i32> undef, <16 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9, i32 10, i32 11, i32 12, i32 13, i32 14, i32 15>
@@ -50,12 +38,8 @@ define <16 x i32> @test_04(<64 x i8> %v0) #0 {
 }
 
 ; CHECK-LABEL: test_05:
-; CHECK-DAG: v[[H50:[0-9]+]]:[[L50:[0-9]+]].uh = vzxt(v0.ub)
-; CHECK-DAG: r[[R50:[0-9]+]] = #-2
-; CHECK-DAG: r[[R51:[0-9]+]] = #-4
-; CHECK: v[[H51:[0-9]+]]:[[L51:[0-9]+]] = vshuff(v[[H50]],v[[L50]],r[[R50]])
-; CHECK: v[[H52:[0-9]+]]:[[L52:[0-9]+]].uw = vzxt(v[[L51]].uh)
-; CHECK: v1:0 = vshuff(v[[H52]],v[[L52]],r[[R51]])
+; CHECK-DAG: v[[H50:[0-9]+]]:[[L50:[0-9]+]].uh = vunpack(v0.ub)
+; CHECK: v1:0.uw = vunpack(v[[L50]].uh)
 define <16 x i32> @test_05(<64 x i8> %v0) #0 {
   %x = zext <64 x i8> %v0 to <64 x i32>
   %p = shufflevector <64 x i32> %x, <64 x i32> undef, <16 x i32> <i32 0, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9, i32 10, i32 11, i32 12, i32 13, i32 14, i32 15>