[llvm] 9c0ef04 - [SVE] Fix warnings in SelectInst::areInvalidOperands

[David Sherwood via llvm-commits]

Author: David Sherwood
Date: 2020-05-29T07:50:47+01:00
New Revision: 9c0ef044beb4850ad9626cb81a1ede4f3bbda4a7

URL: https://github.com/llvm/llvm-project/commit/9c0ef044beb4850ad9626cb81a1ede4f3bbda4a7
DIFF: https://github.com/llvm/llvm-project/commit/9c0ef044beb4850ad9626cb81a1ede4f3bbda4a7.diff

LOG: [SVE] Fix warnings in SelectInst::areInvalidOperands

We should be comparing the element counts rather than the
numbers of elements.

Differential Revision: https://reviews.llvm.org/D80634

Added: 
    llvm/test/CodeGen/AArch64/sve-bad-select.ll

Modified: 
    llvm/lib/IR/Instructions.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/IR/Instructions.cpp b/llvm/lib/IR/Instructions.cpp
index 957db32d6085..3c7b79512908 100644
--- a/llvm/lib/IR/Instructions.cpp
+++ b/llvm/lib/IR/Instructions.cpp
@@ -81,7 +81,7 @@ const char *SelectInst::areInvalidOperands(Value *Op0, Value *Op1, Value *Op2) {
     VectorType *ET = dyn_cast<VectorType>(Op1->getType());
     if (!ET)
       return "selected values for vector select must be vectors";
-    if (ET->getNumElements() != VT->getNumElements())
+    if (ET->getElementCount() != VT->getElementCount())
       return "vector select requires selected vectors to have "
                    "the same vector length as select condition";
   } else if (Op0->getType() != Type::getInt1Ty(Op0->getContext())) {

diff  --git a/llvm/test/CodeGen/AArch64/sve-bad-select.ll b/llvm/test/CodeGen/AArch64/sve-bad-select.ll
new file mode 100644
index 000000000000..2dbc4ea8c7cd
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/sve-bad-select.ll
@@ -0,0 +1,10 @@
+; RUN: not llc -mtriple=aarch64-linux-gnu -mattr=+sve < %s 2>&1 | FileCheck %s
+
+define <vscale x 16 x i8> @badsel1_nxv16i8(<16 x i1> %p,
+                                           <vscale x 16 x i8> %dst,
+                                           <vscale x 16 x i8> %a) {
+  %sel = select <16 x i1> %p, <vscale x 16 x i8> %a, <vscale x 16 x i8> %dst
+  ret <vscale x 16 x i8> %sel
+}
+
+; CHECK: error: vector select requires selected vectors to have the same vector length as select condition