[llvm] 1c3d9c2 - [SVE] Remove IITDescriptor::ScalableVecArgument
David Sherwood via llvm-commits
llvm-commits at lists.llvm.org
Thu May 21 00:15:37 PDT 2020
Author: David Sherwood
Date: 2020-05-21T08:15:10+01:00
New Revision: 1c3d9c2f3629c758db859b55e839dc97734fa171
URL: https://github.com/llvm/llvm-project/commit/1c3d9c2f3629c758db859b55e839dc97734fa171
DIFF: https://github.com/llvm/llvm-project/commit/1c3d9c2f3629c758db859b55e839dc97734fa171.diff
LOG: [SVE] Remove IITDescriptor::ScalableVecArgument
I have refactored the code so that we no longer need the
ScalableVecArgument descriptor - the scalable property of vectors is
now encoded using the ElementCount class in IITDescriptor. This means
that when matching intrinsics we know precisely how to match the
arguments and return values.
Differential Revision: https://reviews.llvm.org/D80107
Added:
Modified:
llvm/include/llvm/IR/Intrinsics.h
llvm/include/llvm/Support/TypeSize.h
llvm/lib/IR/Function.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/IR/Intrinsics.h b/llvm/include/llvm/IR/Intrinsics.h
index 58e7725fc0df..ca2bc26e50b3 100644
--- a/llvm/include/llvm/IR/Intrinsics.h
+++ b/llvm/include/llvm/IR/Intrinsics.h
@@ -18,6 +18,7 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/None.h"
#include "llvm/ADT/Optional.h"
+#include "llvm/Support/TypeSize.h"
#include <string>
namespace llvm {
@@ -99,21 +100,40 @@ namespace Intrinsic {
/// intrinsic. This is returned by getIntrinsicInfoTableEntries.
struct IITDescriptor {
enum IITDescriptorKind {
- Void, VarArg, MMX, Token, Metadata, Half, Float, Double, Quad,
- Integer, Vector, Pointer, Struct,
- Argument, ExtendArgument, TruncArgument, HalfVecArgument,
- SameVecWidthArgument, PtrToArgument, PtrToElt, VecOfAnyPtrsToElt,
- VecElementArgument, ScalableVecArgument, Subdivide2Argument,
- Subdivide4Argument, VecOfBitcastsToInt
+ Void,
+ VarArg,
+ MMX,
+ Token,
+ Metadata,
+ Half,
+ Float,
+ Double,
+ Quad,
+ Integer,
+ Vector,
+ Pointer,
+ Struct,
+ Argument,
+ ExtendArgument,
+ TruncArgument,
+ HalfVecArgument,
+ SameVecWidthArgument,
+ PtrToArgument,
+ PtrToElt,
+ VecOfAnyPtrsToElt,
+ VecElementArgument,
+ Subdivide2Argument,
+ Subdivide4Argument,
+ VecOfBitcastsToInt
} Kind;
union {
unsigned Integer_Width;
unsigned Float_Width;
- unsigned Vector_Width;
unsigned Pointer_AddressSpace;
unsigned Struct_NumElements;
unsigned Argument_Info;
+ ElementCount Vector_Width;
};
enum ArgKind {
@@ -165,6 +185,14 @@ namespace Intrinsic {
IITDescriptor Result = {K, {Field}};
return Result;
}
+
+ static IITDescriptor getVector(unsigned Width, bool IsScalable) {
+ IITDescriptor Result;
+ Result.Kind = Vector;
+ Result.Vector_Width.Min = Width;
+ Result.Vector_Width.Scalable = IsScalable;
+ return Result;
+ }
};
/// Return the IIT table descriptor for the specified intrinsic into an array
diff --git a/llvm/include/llvm/Support/TypeSize.h b/llvm/include/llvm/Support/TypeSize.h
index 91f42ede3db3..b4c869fcb9e4 100644
--- a/llvm/include/llvm/Support/TypeSize.h
+++ b/llvm/include/llvm/Support/TypeSize.h
@@ -30,6 +30,8 @@ class ElementCount {
bool Scalable; // If true, NumElements is a multiple of 'Min' determined
// at runtime rather than compile time.
+ ElementCount() = default;
+
ElementCount(unsigned Min, bool Scalable)
: Min(Min), Scalable(Scalable) {}
diff --git a/llvm/lib/IR/Function.cpp b/llvm/lib/IR/Function.cpp
index cb444292b95a..c7eec1f77fd9 100644
--- a/llvm/lib/IR/Function.cpp
+++ b/llvm/lib/IR/Function.cpp
@@ -754,6 +754,12 @@ static void DecodeIITType(unsigned &NextElt, ArrayRef<unsigned char> Infos,
SmallVectorImpl<Intrinsic::IITDescriptor> &OutputTable) {
using namespace Intrinsic;
+ bool IsScalableVector = false;
+ if (NextElt > 0) {
+ IIT_Info LastInfo = IIT_Info(Infos[NextElt - 1]);
+ IsScalableVector = (LastInfo == IIT_SCALABLE_VEC);
+ }
+
IIT_Info Info = IIT_Info(Infos[NextElt++]);
unsigned StructElts = 2;
@@ -804,43 +810,43 @@ static void DecodeIITType(unsigned &NextElt, ArrayRef<unsigned char> Infos,
OutputTable.push_back(IITDescriptor::get(IITDescriptor::Integer, 128));
return;
case IIT_V1:
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::Vector, 1));
+ OutputTable.push_back(IITDescriptor::getVector(1, IsScalableVector));
DecodeIITType(NextElt, Infos, OutputTable);
return;
case IIT_V2:
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::Vector, 2));
+ OutputTable.push_back(IITDescriptor::getVector(2, IsScalableVector));
DecodeIITType(NextElt, Infos, OutputTable);
return;
case IIT_V4:
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::Vector, 4));
+ OutputTable.push_back(IITDescriptor::getVector(4, IsScalableVector));
DecodeIITType(NextElt, Infos, OutputTable);
return;
case IIT_V8:
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::Vector, 8));
+ OutputTable.push_back(IITDescriptor::getVector(8, IsScalableVector));
DecodeIITType(NextElt, Infos, OutputTable);
return;
case IIT_V16:
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::Vector, 16));
+ OutputTable.push_back(IITDescriptor::getVector(16, IsScalableVector));
DecodeIITType(NextElt, Infos, OutputTable);
return;
case IIT_V32:
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::Vector, 32));
+ OutputTable.push_back(IITDescriptor::getVector(32, IsScalableVector));
DecodeIITType(NextElt, Infos, OutputTable);
return;
case IIT_V64:
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::Vector, 64));
+ OutputTable.push_back(IITDescriptor::getVector(64, IsScalableVector));
DecodeIITType(NextElt, Infos, OutputTable);
return;
case IIT_V128:
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::Vector, 128));
+ OutputTable.push_back(IITDescriptor::getVector(128, IsScalableVector));
DecodeIITType(NextElt, Infos, OutputTable);
return;
case IIT_V512:
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::Vector, 512));
+ OutputTable.push_back(IITDescriptor::getVector(512, IsScalableVector));
DecodeIITType(NextElt, Infos, OutputTable);
return;
case IIT_V1024:
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::Vector, 1024));
+ OutputTable.push_back(IITDescriptor::getVector(1024, IsScalableVector));
DecodeIITType(NextElt, Infos, OutputTable);
return;
case IIT_PTR:
@@ -935,8 +941,6 @@ static void DecodeIITType(unsigned &NextElt, ArrayRef<unsigned char> Infos,
return;
}
case IIT_SCALABLE_VEC: {
- OutputTable.push_back(IITDescriptor::get(IITDescriptor::ScalableVecArgument,
- 0));
DecodeIITType(NextElt, Infos, OutputTable);
return;
}
@@ -1008,7 +1012,8 @@ static Type *DecodeFixedType(ArrayRef<Intrinsic::IITDescriptor> &Infos,
case IITDescriptor::Integer:
return IntegerType::get(Context, D.Integer_Width);
case IITDescriptor::Vector:
- return VectorType::get(DecodeFixedType(Infos, Tys, Context),D.Vector_Width);
+ return VectorType::get(DecodeFixedType(Infos, Tys, Context),
+ D.Vector_Width);
case IITDescriptor::Pointer:
return PointerType::get(DecodeFixedType(Infos, Tys, Context),
D.Pointer_AddressSpace);
@@ -1081,10 +1086,6 @@ static Type *DecodeFixedType(ArrayRef<Intrinsic::IITDescriptor> &Infos,
case IITDescriptor::VecOfAnyPtrsToElt:
// Return the overloaded type (which determines the pointers address space)
return Tys[D.getOverloadArgNumber()];
- case IITDescriptor::ScalableVecArgument: {
- auto *Ty = cast<FixedVectorType>(DecodeFixedType(Infos, Tys, Context));
- return ScalableVectorType::get(Ty->getElementType(), Ty->getNumElements());
- }
}
llvm_unreachable("unhandled");
}
@@ -1187,10 +1188,8 @@ static bool matchIntrinsicType(
case IITDescriptor::Quad: return !Ty->isFP128Ty();
case IITDescriptor::Integer: return !Ty->isIntegerTy(D.Integer_Width);
case IITDescriptor::Vector: {
- // FIXME: We shouldn't be assuming all Vector types are fixed width.
- // This will be fixed soon in another future patch.
- FixedVectorType *VT = dyn_cast<FixedVectorType>(Ty);
- return !VT || VT->getNumElements() != D.Vector_Width ||
+ VectorType *VT = dyn_cast<VectorType>(Ty);
+ return !VT || VT->getElementCount() != D.Vector_Width ||
matchIntrinsicType(VT->getElementType(), Infos, ArgTys,
DeferredChecks, IsDeferredCheck);
}
@@ -1363,16 +1362,6 @@ static bool matchIntrinsicType(
}
return true;
}
- case IITDescriptor::ScalableVecArgument: {
- if (!isa<ScalableVectorType>(Ty))
- return true;
- ScalableVectorType *STy = cast<ScalableVectorType>(Ty);
- unsigned MinElts = STy->getMinNumElements();
- FixedVectorType *FVTy =
- FixedVectorType::get(STy->getElementType(), MinElts);
- return matchIntrinsicType(FVTy, Infos, ArgTys, DeferredChecks,
- IsDeferredCheck);
- }
case IITDescriptor::VecOfBitcastsToInt: {
if (D.getArgumentNumber() >= ArgTys.size())
return IsDeferredCheck || DeferCheck(Ty);
More information about the llvm-commits
mailing list