This is an archive of the discontinued LLVM Phabricator instance.

Differential D80634

[SVE] Fix warnings in SelectInst::areInvalidOperands
ClosedPublic

Authored by david-arm on May 27 2020, 7:26 AM.

Details

Reviewers
sdesmalen
kmclaughlin
ctetreau
efriedma
Commits
rG9c0ef044beb4: [SVE] Fix warnings in SelectInst::areInvalidOperands
Summary

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

Diff Detail

Event Timeline

david-arm created this revision.May 27 2020, 7:26 AM
Herald added a reviewer: efriedma. · View Herald TranscriptMay 27 2020, 7:26 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, psnobl, rkruppe and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B58052: Diff 266532.May 27 2020, 9:11 AM
efriedma added inline comments.May 27 2020, 11:59 AM
llvm/lib/IR/Instructions.cpp
84

We probably want a testcase to make sure we don't accept select <2 x i1> zeroinitializer, <vscale x 2 x i64> zeroinitializer, <vscale x 2 x i64> zeroinitializer

david-arm updated this revision to Diff 266783.May 28 2020, 2:29 AM
david-arm marked an inline comment as done.
efriedma accepted this revision.May 28 2020, 1:31 PM

LGTM

This revision is now accepted and ready to land.May 28 2020, 1:31 PM
Closed by commit rG9c0ef044beb4: [SVE] Fix warnings in SelectInst::areInvalidOperands (authored by david-arm). · Explain WhyMay 29 2020, 12:30 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
IR/
2 lines
test/
CodeGen/
AArch64/
10 lines

Diff 267134

llvm/lib/IR/Instructions.cpp

Show First 20 Lines • Show All 75 Lines • ▼ Show 20 Linesconst char *SelectInst::areInvalidOperands(Value *Op0, Value *Op1, Value *Op2) {
if (VectorType *VT = dyn_cast<VectorType>(Op0->getType())) { if (VectorType *VT = dyn_cast<VectorType>(Op0->getType())) {
// Vector select. // Vector select.
if (VT->getElementType() != Type::getInt1Ty(Op0->getContext())) if (VT->getElementType() != Type::getInt1Ty(Op0->getContext()))
return "vector select condition element type must be i1"; return "vector select condition element type must be i1";
VectorType *ET = dyn_cast<VectorType>(Op1->getType()); VectorType *ET = dyn_cast<VectorType>(Op1->getType());
if (!ET) if (!ET)
return "selected values for vector select must be vectors"; return "selected values for vector select must be vectors";
if (ET->getNumElements() != VT->getNumElements()) if (ET->getElementCount() != VT->getElementCount())
efriedmaUnsubmitted
Done
ReplyInline Actions

We probably want a testcase to make sure we don't accept select <2 x i1> zeroinitializer, <vscale x 2 x i64> zeroinitializer, <vscale x 2 x i64> zeroinitializer

efriedma: We probably want a testcase to make sure we don't accept `select <2 x i1> zeroinitializer…
return "vector select requires selected vectors to have " return "vector select requires selected vectors to have "
"the same vector length as select condition"; "the same vector length as select condition";
} else if (Op0->getType() != Type::getInt1Ty(Op0->getContext())) { } else if (Op0->getType() != Type::getInt1Ty(Op0->getContext())) {
return "select condition must be i1 or <n x i1>"; return "select condition must be i1 or <n x i1>";
} }
return nullptr; return nullptr;
} }
▲ Show 20 Lines • Show All 4,337 Lines • Show Last 20 Lines

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

  • This file was added.
; 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