[llvm] 5a95be2 - GlobalISel: Make LLT constructors constexpr
Arsenault, Matthew via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 17 06:37:19 PDT 2020
[AMD Official Use Only - Internal Distribution Only]
It made writing some unit tests that are still waiting for review more convenient
________________________________
From: Hans Wennborg <hans at chromium.org>
Sent: Wednesday, June 17, 2020 6:36 AM
To: Arsenault, Matthew <Matthew.Arsenault at amd.com>; Matt Arsenault <llvmlistbot at llvm.org>
Cc: llvm-commits <llvm-commits at lists.llvm.org>
Subject: Re: [llvm] 5a95be2 - GlobalISel: Make LLT constructors constexpr
Sadly it seems GCC 5.3 can't handle this, and since it's listed as a
compiler we support
(https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fllvm.org%2Fdocs%2FGettingStarted.html%23host-c-toolchain-both-compiler-and-standard-library&data=02%7C01%7CMatthew.Arsenault%40amd.com%7C89be14bd01414409144308d812c36abd%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637279977804480228&sdata=1tIx9aWe5R2LIAN9bmJ5zCA5uV44K2slS4wJdDiQyfs%3D&reserved=0)
I've reverted in 81cbe0ca83c2f912ff612ddb65629a108197b0d1
The commit message also didn't really have a motivation, just more
constexpr is better?
On Tue, Jun 16, 2020 at 5:05 PM Matt Arsenault via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
>
> Author: Matt Arsenault
> Date: 2020-06-16T11:04:46-04:00
> New Revision: 5a95be22d248be654b992dfb25e3850dbb182a14
>
> URL: https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fllvm%2Fllvm-project%2Fcommit%2F5a95be22d248be654b992dfb25e3850dbb182a14&data=02%7C01%7CMatthew.Arsenault%40amd.com%7C89be14bd01414409144308d812c36abd%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637279977804480228&sdata=NCUSDiciVVaXdc5y0xY13DG1BTfTuq1zryk4ngnuiXw%3D&reserved=0
> DIFF: https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fllvm%2Fllvm-project%2Fcommit%2F5a95be22d248be654b992dfb25e3850dbb182a14.diff&data=02%7C01%7CMatthew.Arsenault%40amd.com%7C89be14bd01414409144308d812c36abd%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637279977804480228&sdata=A%2Bkp1AC7t18A3DYen6aaHW1%2Fac1iFaaXbVW453LY0SU%3D&reserved=0
>
> LOG: GlobalISel: Make LLT constructors constexpr
>
> Added:
>
>
> Modified:
> llvm/include/llvm/Support/LowLevelTypeImpl.h
> llvm/unittests/CodeGen/LowLevelTypeTest.cpp
>
> Removed:
>
>
>
> ################################################################################
> diff --git a/llvm/include/llvm/Support/LowLevelTypeImpl.h b/llvm/include/llvm/Support/LowLevelTypeImpl.h
> index 6959957cfc37..8e248342e017 100644
> --- a/llvm/include/llvm/Support/LowLevelTypeImpl.h
> +++ b/llvm/include/llvm/Support/LowLevelTypeImpl.h
> @@ -39,14 +39,14 @@ class raw_ostream;
> class LLT {
> public:
> /// Get a low-level scalar or aggregate "bag of bits".
> - static LLT scalar(unsigned SizeInBits) {
> + static constexpr LLT scalar(unsigned SizeInBits) {
> assert(SizeInBits > 0 && "invalid scalar size");
> return LLT{/*isPointer=*/false, /*isVector=*/false, /*NumElements=*/0,
> SizeInBits, /*AddressSpace=*/0};
> }
>
> /// Get a low-level pointer in the given address space.
> - static LLT pointer(unsigned AddressSpace, unsigned SizeInBits) {
> + static constexpr LLT pointer(unsigned AddressSpace, unsigned SizeInBits) {
> assert(SizeInBits > 0 && "invalid pointer size");
> return LLT{/*isPointer=*/true, /*isVector=*/false, /*NumElements=*/0,
> SizeInBits, AddressSpace};
> @@ -54,7 +54,7 @@ class LLT {
>
> /// Get a low-level vector of some number of elements and element width.
> /// \p NumElements must be at least 2.
> - static LLT vector(uint16_t NumElements, unsigned ScalarSizeInBits) {
> + static constexpr LLT vector(uint16_t NumElements, unsigned ScalarSizeInBits) {
> assert(NumElements > 1 && "invalid number of vector elements");
> assert(ScalarSizeInBits > 0 && "invalid vector element size");
> return LLT{/*isPointer=*/false, /*isVector=*/true, NumElements,
> @@ -62,7 +62,7 @@ class LLT {
> }
>
> /// Get a low-level vector of some number of elements and element type.
> - static LLT vector(uint16_t NumElements, LLT ScalarTy) {
> + static constexpr LLT vector(uint16_t NumElements, LLT ScalarTy) {
> assert(NumElements > 1 && "invalid number of vector elements");
> assert(!ScalarTy.isVector() && "invalid vector element type");
> return LLT{ScalarTy.isPointer(), /*isVector=*/true, NumElements,
> @@ -70,33 +70,34 @@ class LLT {
> ScalarTy.isPointer() ? ScalarTy.getAddressSpace() : 0};
> }
>
> - static LLT scalarOrVector(uint16_t NumElements, LLT ScalarTy) {
> + static constexpr LLT scalarOrVector(uint16_t NumElements, LLT ScalarTy) {
> return NumElements == 1 ? ScalarTy : LLT::vector(NumElements, ScalarTy);
> }
>
> - static LLT scalarOrVector(uint16_t NumElements, unsigned ScalarSize) {
> + static constexpr LLT scalarOrVector(uint16_t NumElements, unsigned ScalarSize) {
> return scalarOrVector(NumElements, LLT::scalar(ScalarSize));
> }
>
> - explicit LLT(bool isPointer, bool isVector, uint16_t NumElements,
> - unsigned SizeInBits, unsigned AddressSpace) {
> + explicit constexpr LLT(bool isPointer, bool isVector, uint16_t NumElements,
> + unsigned SizeInBits, unsigned AddressSpace)
> + : LLT() {
> init(isPointer, isVector, NumElements, SizeInBits, AddressSpace);
> }
> - explicit LLT() : IsPointer(false), IsVector(false), RawData(0) {}
> + explicit constexpr LLT() : IsPointer(false), IsVector(false), RawData(0) {}
>
> explicit LLT(MVT VT);
>
> - bool isValid() const { return RawData != 0; }
> + constexpr bool isValid() const { return RawData != 0; }
>
> - bool isScalar() const { return isValid() && !IsPointer && !IsVector; }
> + constexpr bool isScalar() const { return isValid() && !IsPointer && !IsVector; }
>
> - bool isPointer() const { return isValid() && IsPointer && !IsVector; }
> + constexpr bool isPointer() const { return isValid() && IsPointer && !IsVector; }
>
> - bool isVector() const { return isValid() && IsVector; }
> + constexpr bool isVector() const { return isValid() && IsVector; }
>
> /// Returns the number of elements in a vector LLT. Must only be called on
> /// vector types.
> - uint16_t getNumElements() const {
> + constexpr uint16_t getNumElements() const {
> assert(IsVector && "cannot get number of elements on scalar/aggregate");
> if (!IsPointer)
> return getFieldValue(VectorElementsFieldInfo);
> @@ -105,7 +106,7 @@ class LLT {
> }
>
> /// Returns the total size of the type. Must only be called on sized types.
> - unsigned getSizeInBits() const {
> + constexpr unsigned getSizeInBits() const {
> if (isPointer() || isScalar())
> return getScalarSizeInBits();
> return getScalarSizeInBits() * getNumElements();
> @@ -113,17 +114,17 @@ class LLT {
>
> /// Returns the total size of the type in bytes, i.e. number of whole bytes
> /// needed to represent the size in bits. Must only be called on sized types.
> - unsigned getSizeInBytes() const {
> + constexpr unsigned getSizeInBytes() const {
> return (getSizeInBits() + 7) / 8;
> }
>
> - LLT getScalarType() const {
> + constexpr LLT getScalarType() const {
> return isVector() ? getElementType() : *this;
> }
>
> /// If this type is a vector, return a vector with the same number of elements
> /// but the new element type. Otherwise, return the new element type.
> - LLT changeElementType(LLT NewEltTy) const {
> + constexpr LLT changeElementType(LLT NewEltTy) const {
> return isVector() ? LLT::vector(getNumElements(), NewEltTy) : NewEltTy;
> }
>
> @@ -157,9 +158,9 @@ class LLT {
> return scalar(getSizeInBits() / Factor);
> }
>
> - bool isByteSized() const { return (getSizeInBits() & 7) == 0; }
> + constexpr bool isByteSized() const { return (getSizeInBits() & 7) == 0; }
>
> - unsigned getScalarSizeInBits() const {
> + constexpr unsigned getScalarSizeInBits() const {
> assert(RawData != 0 && "Invalid Type");
> if (!IsVector) {
> if (!IsPointer)
> @@ -174,7 +175,7 @@ class LLT {
> }
> }
>
> - unsigned getAddressSpace() const {
> + constexpr unsigned getAddressSpace() const {
> assert(RawData != 0 && "Invalid Type");
> assert(IsPointer && "cannot get address space of non-pointer type");
> if (!IsVector)
> @@ -184,7 +185,7 @@ class LLT {
> }
>
> /// Returns the vector's element type. Only valid for vector types.
> - LLT getElementType() const {
> + constexpr LLT getElementType() const {
> assert(isVector() && "cannot get element type of scalar/aggregate");
> if (IsPointer)
> return pointer(getAddressSpace(), getScalarSizeInBits());
> @@ -201,12 +202,12 @@ class LLT {
> }
> #endif
>
> - bool operator==(const LLT &RHS) const {
> + constexpr bool operator==(const LLT &RHS) const {
> return IsPointer == RHS.IsPointer && IsVector == RHS.IsVector &&
> RHS.RawData == RawData;
> }
>
> - bool operator!=(const LLT &RHS) const { return !(*this == RHS); }
> + constexpr bool operator!=(const LLT &RHS) const { return !(*this == RHS); }
>
> friend struct DenseMapInfo<LLT>;
> friend class GISelInstProfileBuilder;
> @@ -257,23 +258,24 @@ class LLT {
> uint64_t IsVector : 1;
> uint64_t RawData : 62;
>
> - static uint64_t getMask(const BitFieldInfo FieldInfo) {
> + static constexpr uint64_t getMask(const BitFieldInfo FieldInfo) {
> const int FieldSizeInBits = FieldInfo[0];
> return (((uint64_t)1) << FieldSizeInBits) - 1;
> }
> - static uint64_t maskAndShift(uint64_t Val, uint64_t Mask, uint8_t Shift) {
> + static constexpr uint64_t maskAndShift(uint64_t Val, uint64_t Mask, uint8_t Shift) {
> assert(Val <= Mask && "Value too large for field");
> return (Val & Mask) << Shift;
> }
> - static uint64_t maskAndShift(uint64_t Val, const BitFieldInfo FieldInfo) {
> + static constexpr uint64_t maskAndShift(uint64_t Val, const BitFieldInfo FieldInfo) {
> return maskAndShift(Val, getMask(FieldInfo), FieldInfo[1]);
> }
> - uint64_t getFieldValue(const BitFieldInfo FieldInfo) const {
> +
> + constexpr uint64_t getFieldValue(const BitFieldInfo FieldInfo) const {
> return getMask(FieldInfo) & (RawData >> FieldInfo[1]);
> }
>
> - void init(bool IsPointer, bool IsVector, uint16_t NumElements,
> - unsigned SizeInBits, unsigned AddressSpace) {
> + constexpr void init(bool IsPointer, bool IsVector, uint16_t NumElements,
> + unsigned SizeInBits, unsigned AddressSpace) {
> this->IsPointer = IsPointer;
> this->IsVector = IsVector;
> if (!IsVector) {
> @@ -295,7 +297,7 @@ class LLT {
> }
> }
>
> - uint64_t getUniqueRAWLLTData() const {
> + constexpr uint64_t getUniqueRAWLLTData() const {
> return ((uint64_t)RawData) << 2 | ((uint64_t)IsPointer) << 1 |
> ((uint64_t)IsVector);
> }
>
> diff --git a/llvm/unittests/CodeGen/LowLevelTypeTest.cpp b/llvm/unittests/CodeGen/LowLevelTypeTest.cpp
> index 7ba678dad0cb..3d70ccff0acb 100644
> --- a/llvm/unittests/CodeGen/LowLevelTypeTest.cpp
> +++ b/llvm/unittests/CodeGen/LowLevelTypeTest.cpp
> @@ -258,4 +258,16 @@ TEST(LowLevelTypeTest, Divide) {
> LLT::vector(4, LLT::pointer(1, 64)).divide(2));
> }
>
> +constexpr LLT CELLT = LLT();
> +constexpr LLT CES32 = LLT::scalar(32);
> +constexpr LLT CEV2S32 = LLT::vector(2, 32);
> +constexpr LLT CEP0 = LLT::pointer(0, 32);
> +
> +TEST(LowLevelTypeTest, ConstExpr) {
> + EXPECT_EQ(LLT(), CELLT);
> + EXPECT_EQ(LLT::scalar(32), CES32);
> + EXPECT_EQ(LLT::vector(2, 32), CEV2S32);
> + EXPECT_EQ(LLT::pointer(0, 32), CEP0);
> +}
> +
> }
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.llvm.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fllvm-commits&data=02%7C01%7CMatthew.Arsenault%40amd.com%7C89be14bd01414409144308d812c36abd%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637279977804480228&sdata=4pj6lzj0R6olo2f%2BgTcPneDG6hV%2B2B2BOoBdafz0z8A%3D&reserved=0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200617/35c3bf3a/attachment.html>
More information about the llvm-commits
mailing list