[llvm-reduce] Fix crash when reducing integer vectors to 1

[frasercrmck]

Summary

Integer vectors were previously ignored when reducing operands. When
6b8bd0f72 introduced support for reducing floating-point
scalars/vectors, the vector case was written to only handle
floating-point values. It would crash when creating an invalid
ConstantFP from the integer element type.

Instead of reinstating the old integer vector behaviour, we might as
well reduce integer vectors to all-one splats.

A couple of existing tests has also been renamed from "remove" to
"reduce" to better reflect the deltas they test.

[frasercrmck]

llvm/test/tools/llvm-reduce/remove-operands-int.ll

1 ↗

(On Diff #444204)

note: the delta seems to be called "reduce operands" but the floating-point test was called "remove" so I followed suit. Maybe they should both be renamed reduce-operands-*.ll?

[regehr]

I definitely support renaming any inaccurately named tests to be more accurate

[arsenm]

llvm/test/tools/llvm-reduce/remove-operands-int.ll

1 ↗

(On Diff #444204)

Probably should be reduce, the operands are replaced, not removed

61 ↗

(On Diff #444204)

Nonsplat constant is another case worth testing

[frasercrmck]

rename tests and add non-splat coverage

[frasercrmck]

llvm/test/tools/llvm-reduce/remove-operands-int.ll

1 ↗

(On Diff #444204)

Renamed this and the existing tests.

61 ↗

(On Diff #444204)

Good idea. I've added that now

llvm/test/tools/llvm-reduce/reduce-operands-fp.ll

 ; CHECK-INTERESTINGNESS: = fadd float
 
 ; CHECK-INTERESTINGNESS: = fadd <2 x float> %
 ; CHECK-INTERESTINGNESS: = fadd <2 x float>
 ; CHECK-INTERESTINGNESS: = fadd <2 x float>
 ; CHECK-INTERESTINGNESS: = fadd <2 x float>
 ; CHECK-INTERESTINGNESS: = fadd <2 x float>
 ; CHECK-INTERESTINGNESS: = fadd <2 x float>
+; CHECK-INTERESTINGNESS: = fadd <2 x float>
 
 ; CHECK-LABEL: define void @foo(
 
 
 ; ONE: %fadd0 = fadd float %arg0, 1.000000e+00
 ; ONE: %fadd1 = fadd float 1.000000e+00, 1.000000e+00
 ; ONE: %fadd2 = fadd float 1.000000e+00, 0.000000e+00
 ; ONE: %fadd3 = fadd float 1.000000e+00, 1.000000e+00
 ; ONE: %fadd4 = fadd float 1.000000e+00, 1.000000e+00
 ; ONE: %fadd5 = fadd float 1.000000e+00, 1.000000e+00
 ; ONE: %fadd6 = fadd <2 x float> %arg2, <float 1.000000e+00, float 1.000000e+00>
 ; ONE: %fadd7 = fadd <2 x float> <float 1.000000e+00, float 1.000000e+00>, <float 1.000000e+00, float 1.000000e+00>
 ; ONE: %fadd8 = fadd <2 x float> <float 1.000000e+00, float 1.000000e+00>, zeroinitializer
 ; ONE: %fadd9 = fadd <2 x float> <float 1.000000e+00, float 1.000000e+00>, <float 1.000000e+00, float 1.000000e+00>
 ; ONE: %fadd10 = fadd <2 x float> <float 1.000000e+00, float 1.000000e+00>, <float 1.000000e+00, float 1.000000e+00>
 ; ONE: %fadd11 = fadd <2 x float> <float 1.000000e+00, float 1.000000e+00>, <float 1.000000e+00, float 1.000000e+00>
+; ONE: %fadd12 = fadd <2 x float> <float 1.000000e+00, float 1.000000e+00>, <float 1.000000e+00, float 1.000000e+00>
 
 
 ; ZERO: %fadd0 = fadd float %arg0, 0.000000e+00
 ; ZERO: %fadd1 = fadd float 0.000000e+00, 0.000000e+00
 ; ZERO: %fadd2 = fadd float 0.000000e+00, 0.000000e+00
 ; ZERO: %fadd3 = fadd float 0.000000e+00, 0.000000e+00
 ; ZERO: %fadd4 = fadd float 0.000000e+00, 0.000000e+00
 ; ZERO: %fadd5 = fadd float 0.000000e+00, 0.000000e+00
 ; ZERO: %fadd6 = fadd <2 x float> %arg2, zeroinitializer
 ; ZERO: %fadd7 = fadd <2 x float> zeroinitializer, zeroinitializer
 ; ZERO: %fadd8 = fadd <2 x float> zeroinitializer, zeroinitializer
 ; ZERO: %fadd9 = fadd <2 x float> zeroinitializer, zeroinitializer
 ; ZERO: %fadd10 = fadd <2 x float> zeroinitializer, zeroinitializer
 ; ZERO: %fadd11 = fadd <2 x float> zeroinitializer, zeroinitializer
+; ZERO: %fadd12 = fadd <2 x float> zeroinitializer, zeroinitializer
 
 
 ; NAN: %fadd0 = fadd float %arg0, 0x7FF8000000000000
 ; NAN: %fadd1 = fadd float 0x7FF8000000000000, 0x7FF8000000000000
 ; NAN: %fadd2 = fadd float 0x7FF8000000000000, 0.000000e+00
 ; NAN: %fadd3 = fadd float 0x7FF8000000000000, 1.000000e+00
 ; NAN: %fadd4 = fadd float 0x7FF8000000000000, 0x7FF8000000000000
 ; NAN: %fadd5 = fadd float 0x7FF8000000000000, 0x7FF8000000000000
 ; NAN: %fadd6 = fadd <2 x float> %arg2, <float 0x7FF8000000000000, float 0x7FF8000000000000>
 ; NAN: %fadd7 = fadd <2 x float> <float 0x7FF8000000000000, float 0x7FF8000000000000>, <float 0x7FF8000000000000, float 0x7FF8000000000000>
 ; NAN: %fadd8 = fadd <2 x float> <float 0x7FF8000000000000, float 0x7FF8000000000000>, zeroinitializer
 ; NAN: %fadd9 = fadd <2 x float> <float 0x7FF8000000000000, float 0x7FF8000000000000>, <float 1.000000e+00, float 1.000000e+00>
 ; NAN: %fadd10 = fadd <2 x float> <float 0x7FF8000000000000, float 0x7FF8000000000000>, <float 0x7FF8000000000000, float 0x7FF8000000000000>
 ; NAN: %fadd11 = fadd <2 x float> <float 0x7FF8000000000000, float 0x7FF8000000000000>, <float 0x7FF8000000000000, float 0x7FF8000000000000>
+; NAN: %fadd12 = fadd <2 x float> <float 0x7FF8000000000000, float 0x7FF8000000000000>, <float 0x7FF8000000000000, float 0x7FF8000000000000>
 
 define void @foo(float %arg0, float %arg1, <2 x float> %arg2, <2 x float> %arg3) {
 bb0:
   %fadd0 = fadd float %arg0, %arg1
   %fadd1 = fadd float %arg0, %arg1
   %fadd2 = fadd float %arg0, 0.0
   %fadd3 = fadd float %arg0, 1.0
   %fadd4 = fadd float %arg0, 0x7FF8000000000000
   %fadd5 = fadd float %arg0, undef
   %fadd6 = fadd <2 x float> %arg2, %arg3
   %fadd7 = fadd <2 x float> %arg2, %arg3
   %fadd8 = fadd <2 x float> %arg2, zeroinitializer
   %fadd9 = fadd <2 x float> %arg2, <float 1.0, float 1.0>
   %fadd10 = fadd <2 x float> %arg2, undef
   %fadd11 = fadd <2 x float> %arg2, <float 0x7FF8000000000000, float 0x7FF8000000000000>
+  %fadd12 = fadd <2 x float> %arg2, <float 0x7FF8000000000000, float 2.0>
   ret void
 }

llvm/test/tools/llvm-reduce/reduce-operands-int.ll

+; Test that llvm-reduce can reduce floating point operands
+;
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=operands-one --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: FileCheck --check-prefixes=CHECK,ONE %s < %t
+
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=operands-zero --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: FileCheck --check-prefixes=CHECK,ZERO %s < %t
+
+; RUN: llvm-reduce --abort-on-invalid-reduction --test FileCheck --test-arg --check-prefixes=CHECK-INTERESTINGNESS --test-arg %s --test-arg --input-file %s -o %t
+; RUN: FileCheck --check-prefixes=CHECK,ZERO %s < %t
+
+; CHECK-INTERESTINGNESS: = add i32 %
+; CHECK-INTERESTINGNESS: = add i32
+; CHECK-INTERESTINGNESS: = add i32
+; CHECK-INTERESTINGNESS: = add i32
+; CHECK-INTERESTINGNESS: = add i32
+
+; CHECK-INTERESTINGNESS: = add <2 x i32> %
+; CHECK-INTERESTINGNESS: = add <2 x i32>
+; CHECK-INTERESTINGNESS: = add <2 x i32>
+; CHECK-INTERESTINGNESS: = add <2 x i32>
+; CHECK-INTERESTINGNESS: = add <2 x i32>
+; CHECK-INTERESTINGNESS: = add <2 x i32>
+
+; CHECK-LABEL: define void @foo(
+
+
+; ONE: %add0 = add i32 %arg0, 1
+; ONE: %add1 = add i32 1, 1
+; ONE: %add2 = add i32 1, 0
+; ONE: %add3 = add i32 1, 1
+; ONE: %add4 = add i32 1, 1
+; ONE: %add5 = add <2 x i32> %arg2, <i32 1, i32 1>
+; ONE: %add6 = add <2 x i32> <i32 1, i32 1>, <i32 1, i32 1>
+; ONE: %add7 = add <2 x i32> <i32 1, i32 1>, zeroinitializer
+; ONE: %add8 = add <2 x i32> <i32 1, i32 1>, <i32 1, i32 1>
+; ONE: %add9 = add <2 x i32> <i32 1, i32 1>, <i32 1, i32 1>
+; ONE: %add10 = add <2 x i32> <i32 1, i32 1>, <i32 1, i32 1>
+
+
+; ZERO: %add0 = add i32 %arg0, 0
+; ZERO: %add1 = add i32 0, 0
+; ZERO: %add2 = add i32 0, 0
+; ZERO: %add3 = add i32 0, 0
+; ZERO: %add4 = add i32 0, 0
+; ZERO: %add5 = add <2 x i32> %arg2, zeroinitializer
+; ZERO: %add6 = add <2 x i32> zeroinitializer, zeroinitializer
+; ZERO: %add7 = add <2 x i32> zeroinitializer, zeroinitializer
+; ZERO: %add8 = add <2 x i32> zeroinitializer, zeroinitializer
+; ZERO: %add9 = add <2 x i32> zeroinitializer, zeroinitializer
+; ZERO: %add10 = add <2 x i32> zeroinitializer, zeroinitializer
+
+define void @foo(i32 %arg0, i32 %arg1, <2 x i32> %arg2, <2 x i32> %arg3) {
+bb0:
+  %add0 = add i32 %arg0, %arg1
+  %add1 = add i32 %arg0, %arg1
+  %add2 = add i32 %arg0, 0
+  %add3 = add i32 %arg0, 1
+  %add4 = add i32 %arg0, undef
+  %add5 = add <2 x i32> %arg2, %arg3
+  %add6 = add <2 x i32> %arg2, %arg3
+  %add7 = add <2 x i32> %arg2, zeroinitializer
+  %add8 = add <2 x i32> %arg2, <i32 1, i32 1>
+  %add9 = add <2 x i32> %arg2, undef
+  %add10 = add <2 x i32> %arg2, <i32 4, i32 6>
+  ret void
+}

llvm/tools/llvm-reduce/deltas/ReduceOperands.cpp

if (auto *IntTy = dyn_cast<IntegerType>(Ty)) {
       // Don't replace existing ones and zeroes.
       return (isOne(Op) || isZero(Op)) ? nullptr : ConstantInt::get(IntTy, 1);
     }
 
     if (Ty->isFloatingPointTy())
       return isZeroOrOneFP(Op) ? nullptr : ConstantFP::get(Ty, 1.0);
 
     if (VectorType *VT = dyn_cast<VectorType>(Ty)) {
-      if (isZeroOrOneFP(Op))
+      if (isOne(Op) || isZero(Op) || isZeroOrOneFP(Op))
         return nullptr;
 
+      if (auto *IntTy = dyn_cast<IntegerType>(VT->getElementType()))
+        return ConstantVector::getSplat(VT->getElementCount(),
+                                        ConstantInt::get(IntTy, 1));
+
       return ConstantVector::getSplat(
           VT->getElementCount(), ConstantFP::get(VT->getElementType(), 1.0));
     }
 
     return nullptr;
   };
   runDeltaPass(Test, [ReduceValue](Oracle &O, Module &Program) {
     extractOperandsFromModule(O, Program, ReduceValue);