[SVE] Remove VectorType::getBitWidth()

[ctetreau]

Summary

• VectorType::getBitWidth() is just an unsafe version of

getPrimitiveSizeInBits() that assumes all vectors are fixed width.

[efriedma]

Makes sense.

llvm/lib/IR/Type.cpp

75

This seems a little messy. Maybe separate the vector/vector case from the vector/mmx case?

[ctetreau]

address code review issues

[efriedma]

LGTM

[ctetreau]

rebase

[ctetreau]

rebase

[ctetreau]

rebase

[ctetreau]

Make this commit not depend on the existence of FixedVectorType

[efriedma]

llvm/lib/IR/Type.cpp

77

I think you broke this in the process of making it not depend on FixedVectorType?

[ctetreau]

catch stragglers

[ctetreau]

llvm/lib/IR/Type.cpp

77

Yes I did, good catch. If only there were a FixedVectorType :)

[ctetreau]

fix dumdum

[efriedma]

LGTM. Please make a note to clean up Type::canLosslesslyBitCastTo later.

[ctetreau]

In D77833#1995390, @efriedma wrote:

LGTM. Please make a note to clean up Type::canLosslesslyBitCastTo later.

It's cleaned up in D77587 which I plan to merge right after this goes in

llvm/include/llvm/IR/DerivedTypes.h

public:
   }
 
   /// Returns whether or not this is a scalable vector (meaning the total
   /// element count is a multiple of the minimum).
   bool isScalable() const {
     return Scalable;
   }
 
-  /// Return the minimum number of bits in the Vector type.
-  /// Returns zero when the vector is a vector of pointers.
-  unsigned getBitWidth() const {
-    return getNumElements() * getElementType()->getPrimitiveSizeInBits();
-  }
-
   /// Methods for support type inquiry through isa, cast, and dyn_cast.
   static bool classof(const Type *T) {
     return T->getTypeID() == VectorTyID;
   }
 };
 
 bool Type::isVectorTy() const { return isa<VectorType>(this); }
 

llvm/lib/IR/Type.cpp

bool Type::canLosslesslyBitCastTo(Type *Ty) const {
   if (this == Ty)
     return true;
 
   // They are not convertible unless they are at least first class types
   if (!this->isFirstClassType() || !Ty->isFirstClassType())
     return false;
 
   // Vector -> Vector conversions are always lossless if the two vector types
-  // have the same size, otherwise not.  Also, 64-bit vector types can be
-  // converted to x86mmx.
-  if (auto *thisPTy = dyn_cast<VectorType>(this)) {
-    if (auto *thatPTy = dyn_cast<VectorType>(Ty))
-      return thisPTy->getBitWidth() == thatPTy->getBitWidth();
-    if (Ty->getTypeID() == Type::X86_MMXTyID &&
-        thisPTy->getBitWidth() == 64)
-      return true;
-  }
-
-  if (this->getTypeID() == Type::X86_MMXTyID)
-    if (auto *thatPTy = dyn_cast<VectorType>(Ty))
-      if (thatPTy->getBitWidth() == 64)
-        return true;
+  // have the same size, otherwise not.
+  if (isa<VectorType>(this) && isa<VectorType>(Ty))
+    return getPrimitiveSizeInBits() == Ty->getPrimitiveSizeInBits();
+
+  //  64-bit fixed width vector types can be losslessly converted to x86mmx.
+  if (((isa<VectorType>(this) &&
+        !cast<VectorType>(this)->getElementCount().Scalable) &&
+       Ty->isX86_MMXTy()) &&
+      getPrimitiveSizeInBits().getFixedSize() == 64)
+  if ((isX86_MMXTy() && (isa<VectorType>(Ty) &&
+                         !cast<VectorType>(Ty)->getElementCount().Scalable)) &&
+      Ty->getPrimitiveSizeInBits().getFixedSize() == 64)
 
   // At this point we have only various mismatches of the first class types
   // remaining and ptr->ptr. Just select the lossless conversions. Everything
   // else is not lossless. Conservatively assume we can't losslessly convert
   // between pointers with different address spaces.
   if (auto *PTy = dyn_cast<PointerType>(this)) {
     if (auto *OtherPTy = dyn_cast<PointerType>(Ty))
       return PTy->getAddressSpace() == OtherPTy->getAddressSpace();
TypeSize Type::getPrimitiveSizeInBits() const {
   case Type::X86_FP80TyID: return TypeSize::Fixed(80);
   case Type::FP128TyID: return TypeSize::Fixed(128);
   case Type::PPC_FP128TyID: return TypeSize::Fixed(128);
   case Type::X86_MMXTyID: return TypeSize::Fixed(64);
   case Type::IntegerTyID:
     return TypeSize::Fixed(cast<IntegerType>(this)->getBitWidth());
   case Type::VectorTyID: {
     const VectorType *VTy = cast<VectorType>(this);
-    return TypeSize(VTy->getBitWidth(), VTy->isScalable());
+    ElementCount EC = VTy->getElementCount();
+    TypeSize ETS = VTy->getElementType()->getPrimitiveSizeInBits();
+    assert(!ETS.isScalable() && "Vector type should have fixed-width elements");
+    return {ETS.getFixedSize() * EC.Min, EC.Scalable};
   }
   default: return TypeSize::Fixed(0);
   }
 }
 
 unsigned Type::getScalarSizeInBits() const {
   // It is safe to assume that the scalar types have a fixed size.
   return getScalarType()->getPrimitiveSizeInBits().getFixedSize();

llvm/unittests/AsmParser/AsmParserTest.cpp

TEST(AsmParserTest, TypeWithSlotMappingParsing) {
   // Check we properly parse vector types.
   Ty = parseType("<5 x i32>", Error, M, &Mapping);
   ASSERT_TRUE(Ty);
   ASSERT_TRUE(Ty->isVectorTy());
 
   // Check the details of the vector.
   VectorType *VT = cast<VectorType>(Ty);
   ASSERT_TRUE(VT->getNumElements() == 5);
-  ASSERT_TRUE(VT->getBitWidth() == 160);
+  ASSERT_TRUE(VT->getPrimitiveSizeInBits().getFixedSize() == 160);
   Ty = VT->getElementType();
   ASSERT_TRUE(Ty->isIntegerTy());
   ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
 
   // Opaque struct.
   Ty = parseType("%opaque", Error, M, &Mapping);
   ASSERT_TRUE(Ty);
   ASSERT_TRUE(Ty->isStructTy());
TEST(AsmParserTest, TypeAtBeginningWithSlotMappingParsing) {
   Ty = parseTypeAtBeginning("<5 x i32>", Read, Error, M, &Mapping);
   ASSERT_TRUE(Ty);
   ASSERT_TRUE(Ty->isVectorTy());
   ASSERT_TRUE(Read == 9);
 
   // Check the details of the vector.
   VectorType *VT = cast<VectorType>(Ty);
   ASSERT_TRUE(VT->getNumElements() == 5);
-  ASSERT_TRUE(VT->getBitWidth() == 160);
+  ASSERT_TRUE(VT->getPrimitiveSizeInBits().getFixedSize() == 160);
   Ty = VT->getElementType();
   ASSERT_TRUE(Ty->isIntegerTy());
   ASSERT_TRUE(Ty->getPrimitiveSizeInBits() == 32);
 
   // Opaque struct.
   Ty = parseTypeAtBeginning("%opaque", Read, Error, M, &Mapping);
   ASSERT_TRUE(Ty);
   ASSERT_TRUE(Ty->isStructTy());