浏览代码

[SelectionDAG] Assert on the width of DemandedElts argument to computeKnownBits for all vector typed operations not just build_vector.

Fix AArch64 unit test that fails with the assertion added.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@346437 91177308-0d34-0410-b5e6-96231b3b80d8
Craig Topper 6 年之前
父节点
当前提交
46ec29de7d
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. 3 2
      lib/CodeGen/SelectionDAG/SelectionDAG.cpp
  2. 2 2
      unittests/CodeGen/AArch64SelectionDAGTest.cpp

+ 3 - 2
lib/CodeGen/SelectionDAG/SelectionDAG.cpp

@@ -2195,6 +2195,9 @@ KnownBits SelectionDAG::computeKnownBits(SDValue Op, const APInt &DemandedElts,
 
 
   KnownBits Known2;
   KnownBits Known2;
   unsigned NumElts = DemandedElts.getBitWidth();
   unsigned NumElts = DemandedElts.getBitWidth();
+  assert(!Op.getValueType().isVector() ||
+         NumElts == Op.getValueType().getVectorNumElements() &&
+         "Unexpected vector size");
 
 
   if (!DemandedElts)
   if (!DemandedElts)
     return Known;  // No demanded elts, better to assume we don't know anything.
     return Known;  // No demanded elts, better to assume we don't know anything.
@@ -2203,8 +2206,6 @@ KnownBits SelectionDAG::computeKnownBits(SDValue Op, const APInt &DemandedElts,
   switch (Opcode) {
   switch (Opcode) {
   case ISD::BUILD_VECTOR:
   case ISD::BUILD_VECTOR:
     // Collect the known bits that are shared by every demanded vector element.
     // Collect the known bits that are shared by every demanded vector element.
-    assert(NumElts == Op.getValueType().getVectorNumElements() &&
-           "Unexpected vector size");
     Known.Zero.setAllBits(); Known.One.setAllBits();
     Known.Zero.setAllBits(); Known.One.setAllBits();
     for (unsigned i = 0, e = Op.getNumOperands(); i != e; ++i) {
     for (unsigned i = 0, e = Op.getNumOperands(); i != e; ++i) {
       if (!DemandedElts[i])
       if (!DemandedElts[i])

+ 2 - 2
unittests/CodeGen/AArch64SelectionDAGTest.cpp

@@ -88,7 +88,7 @@ TEST_F(AArch64SelectionDAGTest, computeKnownBits_ZERO_EXTEND_VECTOR_INREG) {
   auto OutVecVT = EVT::getVectorVT(Context, Int16VT, 2);
   auto OutVecVT = EVT::getVectorVT(Context, Int16VT, 2);
   auto InVec = DAG->getConstant(0, Loc, InVecVT);
   auto InVec = DAG->getConstant(0, Loc, InVecVT);
   auto Op = DAG->getNode(ISD::ZERO_EXTEND_VECTOR_INREG, Loc, OutVecVT, InVec);
   auto Op = DAG->getNode(ISD::ZERO_EXTEND_VECTOR_INREG, Loc, OutVecVT, InVec);
-  auto DemandedElts = APInt(4, 15);
+  auto DemandedElts = APInt(2, 3);
   KnownBits Known;
   KnownBits Known;
   DAG->computeKnownBits(Op, Known, DemandedElts);
   DAG->computeKnownBits(Op, Known, DemandedElts);
   EXPECT_TRUE(Known.isZero());
   EXPECT_TRUE(Known.isZero());
@@ -120,7 +120,7 @@ TEST_F(AArch64SelectionDAGTest, ComputeNumSignBits_SIGN_EXTEND_VECTOR_INREG) {
   auto OutVecVT = EVT::getVectorVT(Context, Int16VT, 2);
   auto OutVecVT = EVT::getVectorVT(Context, Int16VT, 2);
   auto InVec = DAG->getConstant(1, Loc, InVecVT);
   auto InVec = DAG->getConstant(1, Loc, InVecVT);
   auto Op = DAG->getNode(ISD::SIGN_EXTEND_VECTOR_INREG, Loc, OutVecVT, InVec);
   auto Op = DAG->getNode(ISD::SIGN_EXTEND_VECTOR_INREG, Loc, OutVecVT, InVec);
-  auto DemandedElts = APInt(4, 15);
+  auto DemandedElts = APInt(2, 3);
   EXPECT_EQ(DAG->ComputeNumSignBits(Op, DemandedElts), 15u);
   EXPECT_EQ(DAG->ComputeNumSignBits(Op, DemandedElts), 15u);
 }
 }