Fixed varname convention per PR feedback; on reflection from PR feedback removing negative tests

Author: agorenstein-nvidia

llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp

@@ -544,10 +544,10 @@ Instruction *InstCombinerImpl::visitExtractElementInst(ExtractElementInst &EI) {
     } else if (auto *SVI = dyn_cast<ShuffleVectorInst>(I)) {
       // extractelt (shufflevector %v1, %v2, splat-mask) idx ->
       // extractelt %v1, splat-mask[0]
-      auto mask = SVI->getShuffleMask();
-      if (mask[0] != PoisonMaskElem && all_equal(mask))
+      auto Mask = SVI->getShuffleMask();
+      if (Mask[0] != PoisonMaskElem && all_equal(Mask))
         return ExtractElementInst::Create(SVI->getOperand(0),
-                                          Builder.getInt64(mask[0]));
+                                          Builder.getInt64(Mask[0]));
 
       // If this is extracting an element from a shufflevector, figure out where
       // it came from and extract from the appropriate input element instead.

llvm/test/Transforms/InstCombine/vec_extract_through_broadcast.ll

@@ -30,25 +30,3 @@ define float @extract_from_general_scalable_splat(<vscale x 2 x float> %1, i64 %
   %4 = extractelement <vscale x 4 x float> %3, i64 %idx
   ret float %4
 }
-
-define float @no_extract_from_general_no_splat_0(<2 x float> %1, i64 %idx) {
-; CHECK-LABEL: @no_extract_from_general_no_splat_0(
-; CHECK-NEXT:    [[TMP1:%.*]] = shufflevector <2 x float> [[W:%.*]], <2 x float> poison, <4 x i32> <i32 poison, i32 1, i32 1, i32 1>
-; CHECK-NEXT:    [[TMP2:%.*]] = extractelement <4 x float> [[TMP1]], i64 %idx
-; CHECK-NEXT:    ret float [[TMP2]]
-;
-  %3 = shufflevector <2 x float> %1, <2 x float> poison, <4 x i32> <i32 poison, i32 1, i32 1, i32 1>
-  %4 = extractelement <4 x float> %3, i64 %idx
-  ret float %4
-}
-
-define float @no_extract_from_general_no_splat_1(<2 x float> %1, i64 %idx) {
-; CHECK-LABEL: @no_extract_from_general_no_splat_1(
-; CHECK-NEXT:    [[TMP1:%.*]] = shufflevector <2 x float> [[W:%.*]], <2 x float> poison, <4 x i32> <i32 1, i32 poison, i32 1, i32 1>
-; CHECK-NEXT:    [[TMP2:%.*]] = extractelement <4 x float> [[TMP1]], i64 %idx
-; CHECK-NEXT:    ret float [[TMP2]]
-;
-  %3 = shufflevector <2 x float> %1, <2 x float> poison, <4 x i32> <i32 1, i32 poison, i32 1, i32 1>
-  %4 = extractelement <4 x float> %3, i64 %idx
-  ret float %4
-}