[LLVM] Port a few InstCombine tests to use splat instead of shufflevector.

Author: paulwalker-arm

llvm/test/Transforms/InstCombine/scalable-const-fp-splat.ll

@@ -7,9 +7,8 @@ define <vscale x 2 x float> @shrink_splat_scalable_extend(<vscale x 2 x float> %
 ; CHECK-NEXT:    [[TMP1:%.*]] = fadd <vscale x 2 x float> [[A]], splat (float -1.000000e+00)
 ; CHECK-NEXT:    ret <vscale x 2 x float> [[TMP1]]
 ;
-  %1 = shufflevector <vscale x 2 x float> insertelement (<vscale x 2 x float> undef, float -1.000000e+00, i32 0), <vscale x 2 x float> undef, <vscale x 2 x i32> zeroinitializer
   %2 = fpext <vscale x 2 x float> %a to <vscale x 2 x double>
-  %3 = fpext <vscale x 2 x float> %1 to <vscale x 2 x double>
+  %3 = fpext <vscale x 2 x float> splat (float -1.000000e+00) to <vscale x 2 x double>
   %4 = fadd <vscale x 2 x double> %2, %3
   %5 = fptrunc <vscale x 2 x double> %4 to <vscale x 2 x float>
   ret <vscale x 2 x float> %5

llvm/test/Transforms/InstCombine/scalable-select.ll

@@ -9,9 +9,7 @@ define <vscale x 1 x i32> @select_opt(<vscale x 1 x i32> %b, <vscale x 1 x i1> %
 ; CHECK-NEXT:    [[D:%.*]] = select <vscale x 1 x i1> [[M:%.*]], <vscale x 1 x i32> [[C]], <vscale x 1 x i32> [[B]]
 ; CHECK-NEXT:    ret <vscale x 1 x i32> [[D]]
 ;
-  %head = insertelement <vscale x 1 x i32> undef, i32 2, i32 0
-  %splat = shufflevector <vscale x 1 x i32> %head, <vscale x 1 x i32> undef, <vscale x 1 x i32> zeroinitializer
-  %c = add nsw <vscale x 1 x i32> %b, %splat
+  %c = add nsw <vscale x 1 x i32> %b, splat (i32 2)
   %d = select <vscale x 1 x i1> %m, <vscale x 1 x i32> %c, <vscale x 1 x i32> %b
   ret <vscale x 1 x i32> %d
 }

llvm/test/Transforms/InstCombine/select-masked_gather.ll

@@ -42,8 +42,7 @@ define <vscale x 2 x i32> @masked_gather_and_zero_inactive_4(<vscale x 2 x ptr>
 ; CHECK-NEXT:    [[GATHER:%.*]] = call <vscale x 2 x i32> @llvm.masked.gather.nxv2i32.nxv2p0(<vscale x 2 x ptr> [[PTR:%.*]], i32 4, <vscale x 2 x i1> [[MASK]], <vscale x 2 x i32> zeroinitializer)
 ; CHECK-NEXT:    ret <vscale x 2 x i32> [[GATHER]]
 ;
-  %splat  = shufflevector <vscale x 2 x i1> insertelement (<vscale x 2 x i1> undef, i1 true, i32 0), <vscale x 2 x i1> undef, <vscale x 2 x i32> zeroinitializer
-  %mask = xor <vscale x 2 x i1> %inv_mask, %splat
+  %mask = xor <vscale x 2 x i1> %inv_mask, splat (i1 true)
   %gather = call <vscale x 2 x i32> @llvm.masked.gather.nxv2i32(<vscale x 2 x ptr> %ptr, i32 4, <vscale x 2 x i1> %mask, <vscale x 2 x i32> undef)
   %masked = select <vscale x 2 x i1> %inv_mask, <vscale x 2 x i32> zeroinitializer, <vscale x 2 x i32> %gather
   ret <vscale x 2 x i32> %masked
@@ -56,8 +55,7 @@ define <vscale x 2 x i32> @masked_gather_and_zero_inactive_5(<vscale x 2 x ptr>
 ; CHECK-NEXT:    [[GATHER:%.*]] = call <vscale x 2 x i32> @llvm.masked.gather.nxv2i32.nxv2p0(<vscale x 2 x ptr> [[PTR:%.*]], i32 4, <vscale x 2 x i1> [[MASK]], <vscale x 2 x i32> zeroinitializer)
 ; CHECK-NEXT:    ret <vscale x 2 x i32> [[GATHER]]
 ;
-  %splat  = shufflevector <vscale x 2 x i1> insertelement (<vscale x 2 x i1> undef, i1 true, i32 0), <vscale x 2 x i1> undef, <vscale x 2 x i32> zeroinitializer
-  %mask = xor <vscale x 2 x i1> %inv_mask, %splat
+  %mask = xor <vscale x 2 x i1> %inv_mask, splat (i1 true)
   %gather = call <vscale x 2 x i32> @llvm.masked.gather.nxv2i32(<vscale x 2 x ptr> %ptr, i32 4, <vscale x 2 x i1> %mask, <vscale x 2 x i32> zeroinitializer)
   %masked = select <vscale x 2 x i1> %inv_mask, <vscale x 2 x i32> zeroinitializer, <vscale x 2 x i32> %gather
   ret <vscale x 2 x i32> %masked
@@ -71,8 +69,7 @@ define <vscale x 2 x i32> @masked_gather_and_zero_inactive_6(<vscale x 2 x ptr>
 ; CHECK-NEXT:    [[MASKED:%.*]] = select <vscale x 2 x i1> [[INV_MASK]], <vscale x 2 x i32> zeroinitializer, <vscale x 2 x i32> [[GATHER]]
 ; CHECK-NEXT:    ret <vscale x 2 x i32> [[MASKED]]
 ;
-  %splat  = shufflevector <vscale x 2 x i1> insertelement (<vscale x 2 x i1> undef, i1 true, i32 0), <vscale x 2 x i1> undef, <vscale x 2 x i32> zeroinitializer
-  %mask = xor <vscale x 2 x i1> %inv_mask, %splat
+  %mask = xor <vscale x 2 x i1> %inv_mask, splat (i1 true)
   %gather = call <vscale x 2 x i32> @llvm.masked.gather.nxv2i32(<vscale x 2 x ptr> %ptr, i32 4, <vscale x 2 x i1> %mask, <vscale x 2 x i32> %passthrough)
   %masked = select <vscale x 2 x i1> %inv_mask, <vscale x 2 x i32> zeroinitializer, <vscale x 2 x i32> %gather
   ret <vscale x 2 x i32> %masked
@@ -99,8 +96,7 @@ define <vscale x 2 x float> @masked_gather_and_zero_inactive_8(<vscale x 2 x ptr
 ; CHECK-NEXT:    [[GATHER:%.*]] = call <vscale x 2 x float> @llvm.masked.gather.nxv2f32.nxv2p0(<vscale x 2 x ptr> [[PTR:%.*]], i32 4, <vscale x 2 x i1> [[PG]], <vscale x 2 x float> zeroinitializer)
 ; CHECK-NEXT:    ret <vscale x 2 x float> [[GATHER]]
 ;
-  %splat  = shufflevector <vscale x 2 x i1> insertelement (<vscale x 2 x i1> undef, i1 true, i32 0), <vscale x 2 x i1> undef, <vscale x 2 x i32> zeroinitializer
-  %mask = xor <vscale x 2 x i1> %inv_mask, %splat
+  %mask = xor <vscale x 2 x i1> %inv_mask, splat (i1 true)
   %pg = and <vscale x 2 x i1> %mask, %cond
   %gather = call <vscale x 2 x float> @llvm.masked.gather.nxv2f32(<vscale x 2 x ptr> %ptr, i32 4, <vscale x 2 x i1> %pg, <vscale x 2 x float> undef)
   %masked = select <vscale x 2 x i1> %inv_mask, <vscale x 2 x float> zeroinitializer, <vscale x 2 x float> %gather

llvm/test/Transforms/InstCombine/udiv-pow2-vscale.ll

@@ -1,27 +1,27 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
 ; RUN: opt -passes=instcombine -S < %s | FileCheck %s
 
-; This vscale udiv with a power-of-2 spalt on the rhs should not crash opt
+; This vscale udiv with a power-of-2 splat on the rhs should not crash opt
 
-; CHECK: define <vscale x 2 x i32> @udiv_pow2_vscale(<vscale x 2 x i32> %lhs)
 define <vscale x 2 x i32> @udiv_pow2_vscale(<vscale x 2 x i32> %lhs) {
-  %splatter = insertelement <vscale x 2 x i32> undef, i32 2, i32 0
-  %rhs = shufflevector <vscale x 2 x i32> %splatter,
-                       <vscale x 2 x i32> undef,
-                       <vscale x 2 x i32> zeroinitializer
-  %res = udiv <vscale x 2 x i32> %lhs, %rhs
+; CHECK-LABEL: define <vscale x 2 x i32> @udiv_pow2_vscale(
+; CHECK-SAME: <vscale x 2 x i32> [[LHS:%.*]]) {
+; CHECK-NEXT:    [[RES1:%.*]] = lshr <vscale x 2 x i32> [[LHS]], splat (i32 1)
+; CHECK-NEXT:    ret <vscale x 2 x i32> [[RES1]]
+;
+  %res = udiv <vscale x 2 x i32> %lhs, splat (i32 2)
   ret <vscale x 2 x i32> %res
 }
 
 ; This fixed width udiv with a power-of-2 splat on the rhs should also not
 ; crash, and instcombine should eliminate the udiv
 
-; CHECK-LABEL: define <2 x i32> @udiv_pow2_fixed(<2 x i32> %lhs)
-; CHECK-NOT: udiv
 define <2 x i32> @udiv_pow2_fixed(<2 x i32> %lhs) {
-  %splatter = insertelement <2 x i32> undef, i32 2, i32 0
-  %rhs = shufflevector <2 x i32> %splatter,
-                       <2 x i32> undef,
-                       <2 x i32> zeroinitializer
-  %res = udiv <2 x i32> %lhs, %rhs
+; CHECK-LABEL: define <2 x i32> @udiv_pow2_fixed(
+; CHECK-SAME: <2 x i32> [[LHS:%.*]]) {
+; CHECK-NEXT:    [[RES1:%.*]] = lshr <2 x i32> [[LHS]], splat (i32 1)
+; CHECK-NEXT:    ret <2 x i32> [[RES1]]
+;
+  %res = udiv <2 x i32> %lhs, splat (i32 2)
   ret <2 x i32> %res
 }

llvm/test/Transforms/InstCombine/vector_gep1.ll

@@ -66,9 +66,7 @@ define <vscale x 2 x i1> @test8() {
 ; CHECK-LABEL: @test8(
 ; CHECK-NEXT:    ret <vscale x 2 x i1> zeroinitializer
 ;
-  %ins = insertelement <vscale x 2 x i32> undef, i32 1, i32 0
-  %b = shufflevector <vscale x 2 x i32> %ins, <vscale x 2 x i32> undef, <vscale x 2 x i32> zeroinitializer
-  %c = inttoptr <vscale x 2 x i32> %b to <vscale x 2 x ptr>
+  %c = inttoptr <vscale x 2 x i32> splat (i32 1) to <vscale x 2 x ptr>
   %d = icmp ult <vscale x 2 x ptr> %c, zeroinitializer
   ret <vscale x 2 x i1> %d
 }

llvm/test/Transforms/InstSimplify/ConstProp/extractelement-vscale.ll

@@ -22,9 +22,7 @@ define i32 @extractconstant_shuffle_in_range(i32 %v) {
 ; CHECK-SAME: i32 [[V:%.*]]) {
 ; CHECK-NEXT:    ret i32 1024
 ;
-  %in = insertelement <vscale x 4 x i32> undef, i32 1024, i32 0
-  %splat = shufflevector <vscale x 4 x i32> %in, <vscale x 4 x i32> undef, <vscale x 4 x i32> zeroinitializer
-  %r = extractelement <vscale x 4 x i32> %splat, i32 1
+  %r = extractelement <vscale x 4 x i32> splat (i32 1024), i32 1
   ret i32 %r
 }
 
@@ -33,9 +31,7 @@ define i32 @extractconstant_shuffle_maybe_out_of_range(i32 %v) {
 ; CHECK-SAME: i32 [[V:%.*]]) {
 ; CHECK-NEXT:    ret i32 extractelement (<vscale x 4 x i32> splat (i32 1024), i32 4)
 ;
-  %in = insertelement <vscale x 4 x i32> undef, i32 1024, i32 0
-  %splat = shufflevector <vscale x 4 x i32> %in, <vscale x 4 x i32> undef, <vscale x 4 x i32> zeroinitializer
-  %r = extractelement <vscale x 4 x i32> %splat, i32 4
+  %r = extractelement <vscale x 4 x i32> splat (i32 1024), i32 4
   ret i32 %r
 }
 
@@ -44,8 +40,6 @@ define i32 @extractconstant_shuffle_invalid_index(i32 %v) {
 ; CHECK-SAME: i32 [[V:%.*]]) {
 ; CHECK-NEXT:    ret i32 extractelement (<vscale x 4 x i32> splat (i32 1024), i32 -1)
 ;
-  %in = insertelement <vscale x 4 x i32> undef, i32 1024, i32 0
-  %splat = shufflevector <vscale x 4 x i32> %in, <vscale x 4 x i32> undef, <vscale x 4 x i32> zeroinitializer
-  %r = extractelement <vscale x 4 x i32> %splat, i32 -1
+  %r = extractelement <vscale x 4 x i32> splat (i32 1024), i32 -1
   ret i32 %r
 }