Revert r363658 "[SVE][IR] Scalable Vector IR Type with pr42210 fix"

We saw a 70% ThinLTO link time increase in Chromium for Android, see
crbug.com/978817. Sounds like more of PR42210.

> Recommit of D32530 with a few small changes:
>   - Stopped recursively walking through aggregates in
>     the verifier, so that we don't impose too much
>     overhead on large modules under LTO (see PR42210).
>   - Changed tests to match; the errors are slightly
>     different since they only report the array or
>     struct that actually contains a scalable vector,
>     rather than all aggregates which contain one in
>     a nested member.
>   - Corrected an older comment
>
> Reviewers: thakis, rengolin, sdesmalen
>
> Reviewed By: sdesmalen
>
> Differential Revision: https://reviews.llvm.org/D63321

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@364543 91177308-0d34-0410-b5e6-96231b3b80d8

docs/LangRef.rst

@@ -675,9 +675,6 @@ an optional list of attached :ref:`metadata <metadata>`.
 Variables and aliases can have a
 :ref:`Thread Local Storage Model <tls_model>`.
 
-:ref:`Scalable vectors <t_vector>` cannot be global variables or members of
-structs or arrays because their size is unknown at compile time.
-
 Syntax::
 
       @<GlobalVarName> = [Linkage] [PreemptionSpecifier] [Visibility]
@@ -2738,40 +2735,30 @@ Vector Type
 A vector type is a simple derived type that represents a vector of
 elements. Vector types are used when multiple primitive data are
 operated in parallel using a single instruction (SIMD). A vector type
-requires a size (number of elements), an underlying primitive data type,
-and a scalable property to represent vectors where the exact hardware
-vector length is unknown at compile time. Vector types are considered
-:ref:`first class <t_firstclass>`.
+requires a size (number of elements) and an underlying primitive data
+type. Vector types are considered :ref:`first class <t_firstclass>`.
 
 :Syntax:
 
 ::
 
-      < <# elements> x <elementtype> >          ; Fixed-length vector
-      < vscale x <# elements> x <elementtype> > ; Scalable vector
+      < <# elements> x <elementtype> >
 
 The number of elements is a constant integer value larger than 0;
 elementtype may be any integer, floating-point or pointer type. Vectors
-of size zero are not allowed. For scalable vectors, the total number of
-elements is a constant multiple (called vscale) of the specified number
-of elements; vscale is a positive integer that is unknown at compile time
-and the same hardware-dependent constant for all scalable vectors at run
-time. The size of a specific scalable vector type is thus constant within
-IR, even if the exact size in bytes cannot be determined until run time.
+of size zero are not allowed.
 
 :Examples:
 
-+------------------------+----------------------------------------------------+
-| ``<4 x i32>``          | Vector of 4 32-bit integer values.                 |
-+------------------------+----------------------------------------------------+
-| ``<8 x float>``        | Vector of 8 32-bit floating-point values.          |
-+------------------------+----------------------------------------------------+
-| ``<2 x i64>``          | Vector of 2 64-bit integer values.                 |
-+------------------------+----------------------------------------------------+
-| ``<4 x i64*>``         | Vector of 4 pointers to 64-bit integer values.     |
-+------------------------+----------------------------------------------------+
-| ``<vscale x 4 x i32>`` | Vector with a multiple of 4 32-bit integer values. |
-+------------------------+----------------------------------------------------+
++-------------------+--------------------------------------------------+
+| ``<4 x i32>``     | Vector of 4 32-bit integer values.               |
++-------------------+--------------------------------------------------+
+| ``<8 x float>``   | Vector of 8 32-bit floating-point values.        |
++-------------------+--------------------------------------------------+
+| ``<2 x i64>``     | Vector of 2 64-bit integer values.               |
++-------------------+--------------------------------------------------+
+| ``<4 x i64*>``    | Vector of 4 pointers to 64-bit integer values.   |
++-------------------+--------------------------------------------------+
 
 .. _t_label:
 
@@ -8194,7 +8181,6 @@ Syntax:
 ::
 
       <result> = extractelement <n x <ty>> <val>, <ty2> <idx>  ; yields <ty>
-      <result> = extractelement <vscale x n x <ty>> <val>, <ty2> <idx> ; yields <ty>
 
 Overview:
 """""""""
@@ -8215,9 +8201,7 @@ Semantics:
 
 The result is a scalar of the same type as the element type of ``val``.
 Its value is the value at position ``idx`` of ``val``. If ``idx``
-exceeds the length of ``val`` for a fixed-length vector, the result is a
-:ref:`poison value <poisonvalues>`. For a scalable vector, if the value
-of ``idx`` exceeds the runtime length of the vector, the result is a
+exceeds the length of ``val``, the result is a
 :ref:`poison value <poisonvalues>`.
 
 Example:
@@ -8238,7 +8222,6 @@ Syntax:
 ::
 
       <result> = insertelement <n x <ty>> <val>, <ty> <elt>, <ty2> <idx>    ; yields <n x <ty>>
-      <result> = insertelement <vscale x n x <ty>> <val>, <ty> <elt>, <ty2> <idx> ; yields <vscale x n x <ty>>
 
 Overview:
 """""""""
@@ -8260,9 +8243,7 @@ Semantics:
 
 The result is a vector of the same type as ``val``. Its element values
 are those of ``val`` except at position ``idx``, where it gets the value
-``elt``. If ``idx`` exceeds the length of ``val`` for a fixed-length vector,
-the result is a :ref:`poison value <poisonvalues>`. For a scalable vector,
-if the value of ``idx`` exceeds the runtime length of the vector, the result
+``elt``. If ``idx`` exceeds the length of ``val``, the result
 is a :ref:`poison value <poisonvalues>`.
 
 Example:
@@ -8283,7 +8264,6 @@ Syntax:
 ::
 
       <result> = shufflevector <n x <ty>> <v1>, <n x <ty>> <v2>, <m x i32> <mask>    ; yields <m x <ty>>
-      <result> = shufflevector <vscale x n x <ty>> <v1>, <vscale x n x <ty>> v2, <vscale x m x i32> <mask>  ; yields <vscale x m x <ty>>
 
 Overview:
 """""""""
@@ -8315,10 +8295,6 @@ undef. If any element of the mask operand is undef, that element of the
 result is undef. If the shuffle mask selects an undef element from one
 of the input vectors, the resulting element is undef.
 
-For scalable vectors, the only valid mask values at present are
-``zeroinitializer`` and ``undef``, since we cannot write all indices as
-literals for a vector with a length unknown at compile time.
-
 Example:
 """"""""
 

include/llvm/ADT/DenseMapInfo.h

@@ -17,7 +17,6 @@
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/PointerLikeTypeTraits.h"
-#include "llvm/Support/ScalableSize.h"
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
@@ -269,21 +268,6 @@ template <> struct DenseMapInfo<hash_code> {
   static bool isEqual(hash_code LHS, hash_code RHS) { return LHS == RHS; }
 };
 
-template <> struct DenseMapInfo<ElementCount> {
-  static inline ElementCount getEmptyKey() { return {~0U, true}; }
-  static inline ElementCount getTombstoneKey() { return {~0U - 1, false}; }
-  static unsigned getHashValue(const ElementCount& EltCnt) {
-    if (EltCnt.Scalable)
-      return (EltCnt.Min * 37U) - 1U;
-
-    return EltCnt.Min * 37U;
-  }
-
-  static bool isEqual(const ElementCount& LHS, const ElementCount& RHS) {
-    return LHS == RHS;
-  }
-};
-
 } // end namespace llvm
 
 #endif // LLVM_ADT_DENSEMAPINFO_H

include/llvm/IR/DerivedTypes.h

@@ -23,7 +23,6 @@
 #include "llvm/IR/Type.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/Compiler.h"
-#include "llvm/Support/ScalableSize.h"
 #include <cassert>
 #include <cstdint>
 
@@ -388,8 +387,6 @@ public:
   SequentialType(const SequentialType &) = delete;
   SequentialType &operator=(const SequentialType &) = delete;
 
-  /// For scalable vectors, this will return the minimum number of elements
-  /// in the vector.
   uint64_t getNumElements() const { return NumElements; }
   Type *getElementType() const { return ContainedType; }
 
@@ -425,37 +422,14 @@ uint64_t Type::getArrayNumElements() const {
 
 /// Class to represent vector types.
 class VectorType : public SequentialType {
-  /// A fully specified VectorType is of the form <vscale x n x Ty>. 'n' is the
-  /// minimum number of elements of type Ty contained within the vector, and
-  /// 'vscale x' indicates that the total element count is an integer multiple
-  /// of 'n', where the multiple is either guaranteed to be one, or is
-  /// statically unknown at compile time.
-  ///
-  /// If the multiple is known to be 1, then the extra term is discarded in
-  /// textual IR:
-  ///
-  /// <4 x i32>          - a vector containing 4 i32s
-  /// <vscale x 4 x i32> - a vector containing an unknown integer multiple
-  ///                      of 4 i32s
-
-  VectorType(Type *ElType, unsigned NumEl, bool Scalable = false);
-  VectorType(Type *ElType, ElementCount EC);
-
-  // If true, the total number of elements is an unknown multiple of the
-  // minimum 'NumElements' from SequentialType. Otherwise the total number
-  // of elements is exactly equal to 'NumElements'.
-  bool Scalable;
+  VectorType(Type *ElType, unsigned NumEl);
 
 public:
   VectorType(const VectorType &) = delete;
   VectorType &operator=(const VectorType &) = delete;
 
   /// This static method is the primary way to construct an VectorType.
-  static VectorType *get(Type *ElementType, ElementCount EC);
-  static VectorType *get(Type *ElementType, unsigned NumElements,
-                         bool Scalable = false) {
-    return VectorType::get(ElementType, {NumElements, Scalable});
-  }
+  static VectorType *get(Type *ElementType, unsigned NumElements);
 
   /// This static method gets a VectorType with the same number of elements as
   /// the input type, and the element type is an integer type of the same width
@@ -464,7 +438,7 @@ public:
     unsigned EltBits = VTy->getElementType()->getPrimitiveSizeInBits();
     assert(EltBits && "Element size must be of a non-zero size");
     Type *EltTy = IntegerType::get(VTy->getContext(), EltBits);
-    return VectorType::get(EltTy, VTy->getElementCount());
+    return VectorType::get(EltTy, VTy->getNumElements());
   }
 
   /// This static method is like getInteger except that the element types are
@@ -472,7 +446,7 @@ public:
   static VectorType *getExtendedElementVectorType(VectorType *VTy) {
     unsigned EltBits = VTy->getElementType()->getPrimitiveSizeInBits();
     Type *EltTy = IntegerType::get(VTy->getContext(), EltBits * 2);
-    return VectorType::get(EltTy, VTy->getElementCount());
+    return VectorType::get(EltTy, VTy->getNumElements());
   }
 
   /// This static method is like getInteger except that the element types are
@@ -482,45 +456,29 @@ public:
     assert((EltBits & 1) == 0 &&
            "Cannot truncate vector element with odd bit-width");
     Type *EltTy = IntegerType::get(VTy->getContext(), EltBits / 2);
-    return VectorType::get(EltTy, VTy->getElementCount());
+    return VectorType::get(EltTy, VTy->getNumElements());
   }
 
   /// This static method returns a VectorType with half as many elements as the
   /// input type and the same element type.
   static VectorType *getHalfElementsVectorType(VectorType *VTy) {
-    auto EltCnt = VTy->getElementCount();
-    assert ((EltCnt.Min & 1) == 0 &&
+    unsigned NumElts = VTy->getNumElements();
+    assert ((NumElts & 1) == 0 &&
             "Cannot halve vector with odd number of elements.");
-    return VectorType::get(VTy->getElementType(), EltCnt/2);
+    return VectorType::get(VTy->getElementType(), NumElts/2);
   }
 
   /// This static method returns a VectorType with twice as many elements as the
   /// input type and the same element type.
   static VectorType *getDoubleElementsVectorType(VectorType *VTy) {
-    auto EltCnt = VTy->getElementCount();
-    assert((VTy->getNumElements() * 2ull) <= UINT_MAX &&
-           "Too many elements in vector");
-    return VectorType::get(VTy->getElementType(), EltCnt*2);
+    unsigned NumElts = VTy->getNumElements();
+    return VectorType::get(VTy->getElementType(), NumElts*2);
   }
 
   /// Return true if the specified type is valid as a element type.
   static bool isValidElementType(Type *ElemTy);
 
-  /// Return an ElementCount instance to represent the (possibly scalable)
-  /// number of elements in the vector.
-  ElementCount getElementCount() const {
-    uint64_t MinimumEltCnt = getNumElements();
-    assert(MinimumEltCnt <= UINT_MAX && "Too many elements in vector");
-    return { (unsigned)MinimumEltCnt, Scalable };
-  }
-
-  /// 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.
+  /// Return the number of bits in the Vector type.
   /// Returns zero when the vector is a vector of pointers.
   unsigned getBitWidth() const {
     return getNumElements() * getElementType()->getPrimitiveSizeInBits();
@@ -536,10 +494,6 @@ unsigned Type::getVectorNumElements() const {
   return cast<VectorType>(this)->getNumElements();
 }
 
-bool Type::getVectorIsScalable() const {
-  return cast<VectorType>(this)->isScalable();
-}
-
 /// Class to represent pointers.
 class PointerType : public Type {
   explicit PointerType(Type *ElType, unsigned AddrSpace);

include/llvm/IR/Type.h

@@ -366,7 +366,6 @@ public:
     return ContainedTys[0];
   }
 
-  inline bool getVectorIsScalable() const;
   inline unsigned getVectorNumElements() const;
   Type *getVectorElementType() const {
     assert(getTypeID() == VectorTyID);

include/llvm/Support/ScalableSize.h

@@ -1,43 +0,0 @@
-//===- ScalableSize.h - Scalable vector size info ---------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file provides a struct that can be used to query the size of IR types
-// which may be scalable vectors. It provides convenience operators so that
-// it can be used in much the same way as a single scalar value.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_SUPPORT_SCALABLESIZE_H
-#define LLVM_SUPPORT_SCALABLESIZE_H
-
-namespace llvm {
-
-class ElementCount {
-public:
-  unsigned Min;  // Minimum number of vector elements.
-  bool Scalable; // If true, NumElements is a multiple of 'Min' determined
-                 // at runtime rather than compile time.
-
-  ElementCount(unsigned Min, bool Scalable)
-  : Min(Min), Scalable(Scalable) {}
-
-  ElementCount operator*(unsigned RHS) {
-    return { Min * RHS, Scalable };
-  }
-  ElementCount operator/(unsigned RHS) {
-    return { Min / RHS, Scalable };
-  }
-
-  bool operator==(const ElementCount& RHS) const {
-    return Min == RHS.Min && Scalable == RHS.Scalable;
-  }
-};
-
-} // end namespace llvm
-
-#endif // LLVM_SUPPORT_SCALABLESIZE_H

lib/AsmParser/LLLexer.cpp

@@ -707,7 +707,6 @@ lltok::Kind LLLexer::LexIdentifier() {
   KEYWORD(xchg); KEYWORD(nand); KEYWORD(max); KEYWORD(min); KEYWORD(umax);
   KEYWORD(umin);
 
-  KEYWORD(vscale);
   KEYWORD(x);
   KEYWORD(blockaddress);
 

lib/AsmParser/LLParser.cpp

@@ -2743,18 +2743,7 @@ bool LLParser::ParseStructBody(SmallVectorImpl<Type*> &Body) {
 ///   Type
 ///     ::= '[' APSINTVAL 'x' Types ']'
 ///     ::= '<' APSINTVAL 'x' Types '>'
-///     ::= '<' 'vscale' 'x' APSINTVAL 'x' Types '>'
 bool LLParser::ParseArrayVectorType(Type *&Result, bool isVector) {
-  bool Scalable = false;
-
-  if (isVector && Lex.getKind() == lltok::kw_vscale) {
-    Lex.Lex(); // consume the 'vscale'
-    if (ParseToken(lltok::kw_x, "expected 'x' after vscale"))
-      return true;
-
-    Scalable = true;
-  }
-
   if (Lex.getKind() != lltok::APSInt || Lex.getAPSIntVal().isSigned() ||
       Lex.getAPSIntVal().getBitWidth() > 64)
     return TokError("expected number in address space");
@@ -2781,7 +2770,7 @@ bool LLParser::ParseArrayVectorType(Type *&Result, bool isVector) {
       return Error(SizeLoc, "size too large for vector");
     if (!VectorType::isValidElementType(EltTy))
       return Error(TypeLoc, "invalid vector element type");
-    Result = VectorType::get(EltTy, unsigned(Size), Scalable);
+    Result = VectorType::get(EltTy, unsigned(Size));
   } else {
     if (!ArrayType::isValidElementType(EltTy))
       return Error(TypeLoc, "invalid array element type");

lib/AsmParser/LLToken.h

@@ -37,7 +37,6 @@ enum Kind {
   bar,     // |
   colon,   // :
 
-  kw_vscale,
   kw_x,
   kw_true,
   kw_false,

lib/Bitcode/Reader/BitcodeReader.cpp

@@ -1836,8 +1836,7 @@ Error BitcodeReader::parseTypeTableBody() {
         return error("Invalid type");
       ResultTy = ArrayType::get(ResultTy, Record[0]);
       break;
-    case bitc::TYPE_CODE_VECTOR:    // VECTOR: [numelts, eltty] or
-                                    //         [numelts, eltty, scalable]
+    case bitc::TYPE_CODE_VECTOR:    // VECTOR: [numelts, eltty]
       if (Record.size() < 2)
         return error("Invalid record");
       if (Record[0] == 0)
@@ -1845,8 +1844,7 @@ Error BitcodeReader::parseTypeTableBody() {
       ResultTy = getTypeByID(Record[1]);
       if (!ResultTy || !StructType::isValidElementType(ResultTy))
         return error("Invalid type");
-      bool Scalable = Record.size() > 2 ? Record[2] : false;
-      ResultTy = VectorType::get(ResultTy, Record[0], Scalable);
+      ResultTy = VectorType::get(ResultTy, Record[0]);
       break;
     }
 

lib/Bitcode/Writer/BitcodeWriter.cpp

@@ -938,13 +938,10 @@ void ModuleBitcodeWriter::writeTypeTable() {
     }
     case Type::VectorTyID: {
       VectorType *VT = cast<VectorType>(T);
-      // VECTOR [numelts, eltty] or
-      //        [numelts, eltty, scalable]
+      // VECTOR [numelts, eltty]
       Code = bitc::TYPE_CODE_VECTOR;
       TypeVals.push_back(VT->getNumElements());
       TypeVals.push_back(VE.getTypeID(VT->getElementType()));
-      if (VT->isScalable())
-        TypeVals.push_back(VT->isScalable());
       break;
     }
     }

lib/IR/AsmWriter.cpp

@@ -620,10 +620,7 @@ void TypePrinting::print(Type *Ty, raw_ostream &OS) {
   }
   case Type::VectorTyID: {
     VectorType *PTy = cast<VectorType>(Ty);
-    OS << "<";
-    if (PTy->isScalable())
-      OS << "vscale x ";
-    OS << PTy->getNumElements() << " x ";
+    OS << "<" << PTy->getNumElements() << " x ";
     print(PTy->getElementType(), OS);
     OS << '>';
     return;

lib/IR/LLVMContextImpl.h

@@ -1334,7 +1334,7 @@ public:
   unsigned NamedStructTypesUniqueID = 0;
 
   DenseMap<std::pair<Type *, uint64_t>, ArrayType*> ArrayTypes;
-  DenseMap<std::pair<Type *, ElementCount>, VectorType*> VectorTypes;
+  DenseMap<std::pair<Type *, unsigned>, VectorType*> VectorTypes;
   DenseMap<Type*, PointerType*> PointerTypes;  // Pointers in AddrSpace = 0
   DenseMap<std::pair<Type*, unsigned>, PointerType*> ASPointerTypes;
 

lib/IR/Type.cpp

@@ -599,20 +599,21 @@ bool ArrayType::isValidElementType(Type *ElemTy) {
 //                          VectorType Implementation
 //===----------------------------------------------------------------------===//
 
-VectorType::VectorType(Type *ElType, ElementCount EC)
-  : SequentialType(VectorTyID, ElType, EC.Min), Scalable(EC.Scalable) {}
+VectorType::VectorType(Type *ElType, unsigned NumEl)
+  : SequentialType(VectorTyID, ElType, NumEl) {}
 
-VectorType *VectorType::get(Type *ElementType, ElementCount EC) {
-  assert(EC.Min > 0 && "#Elements of a VectorType must be greater than 0");
+VectorType *VectorType::get(Type *ElementType, unsigned NumElements) {
+  assert(NumElements > 0 && "#Elements of a VectorType must be greater than 0");
   assert(isValidElementType(ElementType) && "Element type of a VectorType must "
                                             "be an integer, floating point, or "
                                             "pointer type.");
 
   LLVMContextImpl *pImpl = ElementType->getContext().pImpl;
   VectorType *&Entry = ElementType->getContext().pImpl
-                                 ->VectorTypes[std::make_pair(ElementType, EC)];
+    ->VectorTypes[std::make_pair(ElementType, NumElements)];
+
   if (!Entry)
-    Entry = new (pImpl->Alloc) VectorType(ElementType, EC);
+    Entry = new (pImpl->Alloc) VectorType(ElementType, NumElements);
   return Entry;
 }
 

lib/IR/Verifier.cpp

@@ -43,7 +43,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "LLVMContextImpl.h"
 #include "llvm/IR/Verifier.h"
 #include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/APInt.h"
@@ -319,31 +318,6 @@ public:
 
   bool hasBrokenDebugInfo() const { return BrokenDebugInfo; }
 
-  void verifyTypes() {
-    LLVMContext &Ctx = M.getContext();
-    for (auto &Entry : Ctx.pImpl->ArrayTypes) {
-      Type *EltTy = Entry.second->getElementType();
-      if (auto *VTy = dyn_cast<VectorType>(EltTy))
-        if (VTy->isScalable())
-          CheckFailed("Arrays cannot contain scalable vectors",
-                      Entry.second, &M);
-    }
-
-    for (StructType* STy : Ctx.pImpl->AnonStructTypes)
-      for (Type *EltTy : STy->elements())
-        if (auto *VTy = dyn_cast<VectorType>(EltTy))
-          if (VTy->isScalable())
-            CheckFailed("Structs cannot contain scalable vectors", STy, &M);
-
-    for (auto &Entry : Ctx.pImpl->NamedStructTypes) {
-      StructType *STy = Entry.second;
-      for (Type *EltTy : STy->elements())
-        if (auto *VTy = dyn_cast<VectorType>(EltTy))
-          if (VTy->isScalable())
-            CheckFailed("Structs cannot contain scalable vectors", STy, &M);
-    }
-  }
-
   bool verify(const Function &F) {
     assert(F.getParent() == &M &&
            "An instance of this class only works with a specific module!");
@@ -413,8 +387,6 @@ public:
 
     verifyCompileUnits();
 
-    verifyTypes();
-
     verifyDeoptimizeCallingConvs();
     DISubprogramAttachments.clear();
     return !Broken;
@@ -719,13 +691,6 @@ void Verifier::visitGlobalVariable(const GlobalVariable &GV) {
                       "DIGlobalVariableExpression");
   }
 
-  // Scalable vectors cannot be global variables, since we don't know
-  // the runtime size. If the global is a struct or an array containing
-  // scalable vectors, that will be caught be verifyTypes instead.
-  if (auto *VTy = dyn_cast<VectorType>(GV.getValueType()))
-    if (VTy->isScalable())
-      CheckFailed("Globals cannot contain scalable vectors", &GV);
-
   if (!GV.hasInitializer()) {
     visitGlobalValue(GV);
     return;

test/Bitcode/compatibility.ll

@@ -917,10 +917,6 @@ define void @typesystem() {
   ; CHECK: %t7 = alloca x86_mmx
   %t8 = alloca %opaquety*
   ; CHECK: %t8 = alloca %opaquety*
-  %t9 = alloca <4 x i32>
-  ; CHECK: %t9 = alloca <4 x i32>
-  %t10 = alloca <vscale x 4 x i32>
-  ; CHECK: %t10 = alloca <vscale x 4 x i32>
 
   ret void
 }

test/Verifier/scalable-aggregates.ll

@@ -1,27 +0,0 @@
-; RUN: not opt -S -verify < %s 2>&1 | FileCheck %s
-
-;; Arrays and Structs cannot contain scalable vectors, since we don't
-;; know the size at compile time and the container types need to have
-;; a known size.
-
-; CHECK-DAG: Arrays cannot contain scalable vectors
-; CHECK-DAG:  [4 x <vscale x 256 x i1>]; ModuleID = '<stdin>'
-; CHECK-DAG: Arrays cannot contain scalable vectors
-; CHECK-DAG:  [2 x <vscale x 4 x i32>]; ModuleID = '<stdin>'
-; CHECK-DAG: Structs cannot contain scalable vectors
-; CHECK-DAG:  { i32, <vscale x 1 x i32> }; ModuleID = '<stdin>'
-;; CHECK-DAG: Structs cannot contain scalable vectors
-; CHECK-DAG: { <vscale x 16 x i8>, <vscale x 2 x double> }; ModuleID = '<stdin>'
-; CHECK-DAG: Structs cannot contain scalable vectors
-; CHECK-DAG:  %sty = type { i64, <vscale x 32 x i16> }; ModuleID = '<stdin>'
-
-%sty = type { i64, <vscale x 32 x i16> }
-
-define void @scalable_aggregates() {
-  %array = alloca [2 x <vscale x 4 x i32>]
-  %struct = alloca { <vscale x 16 x i8>, <vscale x 2 x double> }
-  %named_struct = alloca %sty
-  %s_in_a = alloca [2 x { i32, <vscale x 1 x i32> } ]
-  %a_in_s = alloca { i64, [4 x <vscale x 256 x i1> ] }
-  ret void
-}

test/Verifier/scalable-global-vars.ll

@@ -1,26 +0,0 @@
-; RUN: not opt -S -verify < %s 2>&1 | FileCheck %s
-
-;; Global variables cannot be scalable vectors, since we don't
-;; know the size at compile time.
-
-; CHECK: Globals cannot contain scalable vectors
-; CHECK-NEXT: <vscale x 4 x i32>* @ScalableVecGlobal
-@ScalableVecGlobal = global <vscale x 4 x i32> zeroinitializer
-
-;; Global _pointers_ to scalable vectors are fine
-; CHECK-NOT: Globals cannot contain scalable vectors
-@ScalableVecPtr = global <vscale x 8 x i16>* zeroinitializer
-
-;; The following errors don't explicitly mention global variables, but
-;; do still guarantee that the error will be caught.
-; CHECK-DAG: Arrays cannot contain scalable vectors
-; CHECK-DAG:  [64 x <vscale x 2 x double>]; ModuleID = '<stdin>'
-@ScalableVecGlobalArray = global [64 x <vscale x 2 x double>] zeroinitializer
-
-; CHECK-DAG: Structs cannot contain scalable vectors
-; CHECK-DAG:  { <vscale x 16 x i64>, <vscale x 16 x i1> }; ModuleID = '<stdin>'
-@ScalableVecGlobalStruct = global { <vscale x 16 x i64>, <vscale x 16 x i1> } zeroinitializer
-
-; CHECK-DAG: Structs cannot contain scalable vectors
-; CHECK-DAG  { <vscale x 4 x i64>, <vscale x 32 x i8> }; ModuleID = '<stdin>'
-@ScalableVecMixed = global { [4 x i32], [2 x { <vscale x 4 x i64>,  <vscale x 32 x i8> }]} zeroinitializer

unittests/IR/CMakeLists.txt

@@ -37,7 +37,6 @@ add_llvm_unittest(IRTests
   ValueHandleTest.cpp
   ValueMapTest.cpp
   ValueTest.cpp
-  VectorTypesTest.cpp
   VerifierTest.cpp
   WaymarkTest.cpp
   )

unittests/IR/VectorTypesTest.cpp

@@ -1,164 +0,0 @@
-//===--- llvm/unittest/IR/VectorTypesTest.cpp - vector types unit tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/ScalableSize.h"
-#include "gtest/gtest.h"
-using namespace llvm;
-
-namespace {
-TEST(VectorTypesTest, FixedLength) {
-  LLVMContext Ctx;
-
-  Type *Int16Ty = Type::getInt16Ty(Ctx);
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-  Type *Int64Ty = Type::getInt64Ty(Ctx);
-  Type *Float64Ty = Type::getDoubleTy(Ctx);
-
-  VectorType *V8Int32Ty = VectorType::get(Int32Ty, 8);
-  ASSERT_FALSE(V8Int32Ty->isScalable());
-  EXPECT_EQ(V8Int32Ty->getNumElements(), 8U);
-  EXPECT_EQ(V8Int32Ty->getElementType()->getScalarSizeInBits(), 32U);
-
-  VectorType *V8Int16Ty = VectorType::get(Int16Ty, {8, false});
-  ASSERT_FALSE(V8Int16Ty->isScalable());
-  EXPECT_EQ(V8Int16Ty->getNumElements(), 8U);
-  EXPECT_EQ(V8Int16Ty->getElementType()->getScalarSizeInBits(), 16U);
-
-  ElementCount EltCnt(4, false);
-  VectorType *V4Int64Ty = VectorType::get(Int64Ty, EltCnt);
-  ASSERT_FALSE(V4Int64Ty->isScalable());
-  EXPECT_EQ(V4Int64Ty->getNumElements(), 4U);
-  EXPECT_EQ(V4Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *V2Int64Ty = VectorType::get(Int64Ty, EltCnt/2);
-  ASSERT_FALSE(V2Int64Ty->isScalable());
-  EXPECT_EQ(V2Int64Ty->getNumElements(), 2U);
-  EXPECT_EQ(V2Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *V8Int64Ty = VectorType::get(Int64Ty, EltCnt*2);
-  ASSERT_FALSE(V8Int64Ty->isScalable());
-  EXPECT_EQ(V8Int64Ty->getNumElements(), 8U);
-  EXPECT_EQ(V8Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *V4Float64Ty = VectorType::get(Float64Ty, EltCnt);
-  ASSERT_FALSE(V4Float64Ty->isScalable());
-  EXPECT_EQ(V4Float64Ty->getNumElements(), 4U);
-  EXPECT_EQ(V4Float64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *ExtTy = VectorType::getExtendedElementVectorType(V8Int16Ty);
-  EXPECT_EQ(ExtTy, V8Int32Ty);
-  ASSERT_FALSE(ExtTy->isScalable());
-  EXPECT_EQ(ExtTy->getNumElements(), 8U);
-  EXPECT_EQ(ExtTy->getElementType()->getScalarSizeInBits(), 32U);
-
-  VectorType *TruncTy = VectorType::getTruncatedElementVectorType(V8Int32Ty);
-  EXPECT_EQ(TruncTy, V8Int16Ty);
-  ASSERT_FALSE(TruncTy->isScalable());
-  EXPECT_EQ(TruncTy->getNumElements(), 8U);
-  EXPECT_EQ(TruncTy->getElementType()->getScalarSizeInBits(), 16U);
-
-  VectorType *HalvedTy = VectorType::getHalfElementsVectorType(V4Int64Ty);
-  EXPECT_EQ(HalvedTy, V2Int64Ty);
-  ASSERT_FALSE(HalvedTy->isScalable());
-  EXPECT_EQ(HalvedTy->getNumElements(), 2U);
-  EXPECT_EQ(HalvedTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *DoubledTy = VectorType::getDoubleElementsVectorType(V4Int64Ty);
-  EXPECT_EQ(DoubledTy, V8Int64Ty);
-  ASSERT_FALSE(DoubledTy->isScalable());
-  EXPECT_EQ(DoubledTy->getNumElements(), 8U);
-  EXPECT_EQ(DoubledTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *ConvTy = VectorType::getInteger(V4Float64Ty);
-  EXPECT_EQ(ConvTy, V4Int64Ty);
-  ASSERT_FALSE(ConvTy->isScalable());
-  EXPECT_EQ(ConvTy->getNumElements(), 4U);
-  EXPECT_EQ(ConvTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  EltCnt = V8Int64Ty->getElementCount();
-  EXPECT_EQ(EltCnt.Min, 8U);
-  ASSERT_FALSE(EltCnt.Scalable);
-}
-
-TEST(VectorTypesTest, Scalable) {
-  LLVMContext Ctx;
-
-  Type *Int16Ty = Type::getInt16Ty(Ctx);
-  Type *Int32Ty = Type::getInt32Ty(Ctx);
-  Type *Int64Ty = Type::getInt64Ty(Ctx);
-  Type *Float64Ty = Type::getDoubleTy(Ctx);
-
-  VectorType *ScV8Int32Ty = VectorType::get(Int32Ty, 8, true);
-  ASSERT_TRUE(ScV8Int32Ty->isScalable());
-  EXPECT_EQ(ScV8Int32Ty->getNumElements(), 8U);
-  EXPECT_EQ(ScV8Int32Ty->getElementType()->getScalarSizeInBits(), 32U);
-
-  VectorType *ScV8Int16Ty = VectorType::get(Int16Ty, {8, true});
-  ASSERT_TRUE(ScV8Int16Ty->isScalable());
-  EXPECT_EQ(ScV8Int16Ty->getNumElements(), 8U);
-  EXPECT_EQ(ScV8Int16Ty->getElementType()->getScalarSizeInBits(), 16U);
-
-  ElementCount EltCnt(4, true);
-  VectorType *ScV4Int64Ty = VectorType::get(Int64Ty, EltCnt);
-  ASSERT_TRUE(ScV4Int64Ty->isScalable());
-  EXPECT_EQ(ScV4Int64Ty->getNumElements(), 4U);
-  EXPECT_EQ(ScV4Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *ScV2Int64Ty = VectorType::get(Int64Ty, EltCnt/2);
-  ASSERT_TRUE(ScV2Int64Ty->isScalable());
-  EXPECT_EQ(ScV2Int64Ty->getNumElements(), 2U);
-  EXPECT_EQ(ScV2Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *ScV8Int64Ty = VectorType::get(Int64Ty, EltCnt*2);
-  ASSERT_TRUE(ScV8Int64Ty->isScalable());
-  EXPECT_EQ(ScV8Int64Ty->getNumElements(), 8U);
-  EXPECT_EQ(ScV8Int64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *ScV4Float64Ty = VectorType::get(Float64Ty, EltCnt);
-  ASSERT_TRUE(ScV4Float64Ty->isScalable());
-  EXPECT_EQ(ScV4Float64Ty->getNumElements(), 4U);
-  EXPECT_EQ(ScV4Float64Ty->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *ExtTy = VectorType::getExtendedElementVectorType(ScV8Int16Ty);
-  EXPECT_EQ(ExtTy, ScV8Int32Ty);
-  ASSERT_TRUE(ExtTy->isScalable());
-  EXPECT_EQ(ExtTy->getNumElements(), 8U);
-  EXPECT_EQ(ExtTy->getElementType()->getScalarSizeInBits(), 32U);
-
-  VectorType *TruncTy = VectorType::getTruncatedElementVectorType(ScV8Int32Ty);
-  EXPECT_EQ(TruncTy, ScV8Int16Ty);
-  ASSERT_TRUE(TruncTy->isScalable());
-  EXPECT_EQ(TruncTy->getNumElements(), 8U);
-  EXPECT_EQ(TruncTy->getElementType()->getScalarSizeInBits(), 16U);
-
-  VectorType *HalvedTy = VectorType::getHalfElementsVectorType(ScV4Int64Ty);
-  EXPECT_EQ(HalvedTy, ScV2Int64Ty);
-  ASSERT_TRUE(HalvedTy->isScalable());
-  EXPECT_EQ(HalvedTy->getNumElements(), 2U);
-  EXPECT_EQ(HalvedTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *DoubledTy = VectorType::getDoubleElementsVectorType(ScV4Int64Ty);
-  EXPECT_EQ(DoubledTy, ScV8Int64Ty);
-  ASSERT_TRUE(DoubledTy->isScalable());
-  EXPECT_EQ(DoubledTy->getNumElements(), 8U);
-  EXPECT_EQ(DoubledTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  VectorType *ConvTy = VectorType::getInteger(ScV4Float64Ty);
-  EXPECT_EQ(ConvTy, ScV4Int64Ty);
-  ASSERT_TRUE(ConvTy->isScalable());
-  EXPECT_EQ(ConvTy->getNumElements(), 4U);
-  EXPECT_EQ(ConvTy->getElementType()->getScalarSizeInBits(), 64U);
-
-  EltCnt = ScV8Int64Ty->getElementCount();
-  EXPECT_EQ(EltCnt.Min, 8U);
-  ASSERT_TRUE(EltCnt.Scalable);
-}
-
-} // end anonymous namespace