From 7f81dd4dd630790070698816f03597279da67d45 Mon Sep 17 00:00:00 2001 From: Serge Pavlov Date: Fri, 24 Feb 2023 15:11:16 +0700 Subject: [PATCH] [NFC] Make FPClassTest a bitmask enumeration This is recommit of 2e416cdd52, fixed to be accepatble by GCC. The original commit message is below. With this change bitwise operations are allowed for FPClassTest enumeration, it must simplify using this type. Also some functions changed to get argument of type FPClassTest instead of unsigned. Differential Revision: https://reviews.llvm.org/D144241 --- llvm/include/llvm/ADT/BitmaskEnum.h | 6 +++--- llvm/include/llvm/ADT/FloatingPointMode.h | 13 +++++++++---- llvm/include/llvm/CodeGen/CodeGenCommonISel.h | 4 +++- llvm/include/llvm/CodeGen/TargetLowering.h | 2 +- llvm/lib/CodeGen/CodeGenCommonISel.cpp | 6 +++--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 3 ++- llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp | 4 ++-- llvm/lib/IR/Verifier.cpp | 2 +- llvm/unittests/ADT/BitmaskEnumTest.cpp | 2 ++ 9 files changed, 26 insertions(+), 16 deletions(-) diff --git a/llvm/include/llvm/ADT/BitmaskEnum.h b/llvm/include/llvm/ADT/BitmaskEnum.h index 1510d01..976fddd 100644 --- a/llvm/include/llvm/ADT/BitmaskEnum.h +++ b/llvm/include/llvm/ADT/BitmaskEnum.h @@ -56,15 +56,15 @@ /// The second parameter to LLVM_DECLARE_ENUM_AS_BITMASK specifies the largest /// bit value of the enum type. /// -/// LLVM_DECLARE_ENUM_AS_BITMASK should be used in global or llvm namespace. +/// LLVM_DECLARE_ENUM_AS_BITMASK should be used in llvm namespace. /// /// This a non-intrusive alternative for LLVM_MARK_AS_BITMASK_ENUM. It allows /// declaring more than one non-scoped enumerations as bitmask types in the same /// scope. Otherwise it provides the same functionality as /// LLVM_MARK_AS_BITMASK_ENUM. #define LLVM_DECLARE_ENUM_AS_BITMASK(Enum, LargestValue) \ - template <> struct llvm::is_bitmask_enum : std::true_type {}; \ - template <> struct llvm::largest_bitmask_enum_bit { \ + template <> struct is_bitmask_enum : std::true_type {}; \ + template <> struct largest_bitmask_enum_bit { \ static constexpr std::underlying_type_t value = LargestValue; \ } diff --git a/llvm/include/llvm/ADT/FloatingPointMode.h b/llvm/include/llvm/ADT/FloatingPointMode.h index 07f2739..a99f4f1 100644 --- a/llvm/include/llvm/ADT/FloatingPointMode.h +++ b/llvm/include/llvm/ADT/FloatingPointMode.h @@ -15,6 +15,7 @@ #ifndef LLVM_ADT_FLOATINGPOINTMODE_H #define LLVM_ADT_FLOATINGPOINTMODE_H +#include "llvm/ADT/BitmaskEnum.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/Support/raw_ostream.h" @@ -192,11 +193,11 @@ void DenormalMode::print(raw_ostream &OS) const { OS << denormalModeKindName(Output) << ',' << denormalModeKindName(Input); } -} // namespace llvm - /// Floating-point class tests, supported by 'is_fpclass' intrinsic. Actual /// test may be an OR combination of basic tests. -enum FPClassTest { +enum FPClassTest : unsigned { + fcNone = 0, + fcSNan = 0x0001, fcQNan = 0x0002, fcNegInf = 0x0004, @@ -216,7 +217,11 @@ enum FPClassTest { fcPosFinite = fcPosNormal | fcPosSubnormal | fcPosZero, fcNegFinite = fcNegNormal | fcNegSubnormal | fcNegZero, fcFinite = fcPosFinite | fcNegFinite, - fcAllFlags = fcNan | fcInf | fcFinite + fcAllFlags = fcNan | fcInf | fcFinite, }; +LLVM_DECLARE_ENUM_AS_BITMASK(FPClassTest, /* LargestValue */ fcPosInf); + +} // namespace llvm + #endif // LLVM_ADT_FLOATINGPOINTMODE_H diff --git a/llvm/include/llvm/CodeGen/CodeGenCommonISel.h b/llvm/include/llvm/CodeGen/CodeGenCommonISel.h index 3b11c84..d08ddbf 100644 --- a/llvm/include/llvm/CodeGen/CodeGenCommonISel.h +++ b/llvm/include/llvm/CodeGen/CodeGenCommonISel.h @@ -19,6 +19,8 @@ namespace llvm { class BasicBlock; +enum FPClassTest : unsigned; + /// Encapsulates all of the information needed to generate a stack protector /// check, and signals to isel when initialized that one needs to be generated. /// @@ -218,7 +220,7 @@ findSplitPointForStackProtector(MachineBasicBlock *BB, /// \param Test The test as specified in 'is_fpclass' intrinsic invocation. /// \returns The inverted test, or zero, if inversion does not produce simpler /// test. -unsigned getInvertedFPClassTest(unsigned Test); +FPClassTest getInvertedFPClassTest(FPClassTest Test); /// Assuming the instruction \p MI is going to be deleted, attempt to salvage /// debug users of \p MI by writing the effect of \p MI in a DIExpression. diff --git a/llvm/include/llvm/CodeGen/TargetLowering.h b/llvm/include/llvm/CodeGen/TargetLowering.h index 9a19a80..2afb05a 100644 --- a/llvm/include/llvm/CodeGen/TargetLowering.h +++ b/llvm/include/llvm/CodeGen/TargetLowering.h @@ -4962,7 +4962,7 @@ public: /// \param Test The test to perform. /// \param Flags The optimization flags. /// \returns The expansion result or SDValue() if it fails. - SDValue expandIS_FPCLASS(EVT ResultVT, SDValue Op, unsigned Test, + SDValue expandIS_FPCLASS(EVT ResultVT, SDValue Op, FPClassTest Test, SDNodeFlags Flags, const SDLoc &DL, SelectionDAG &DAG) const; diff --git a/llvm/lib/CodeGen/CodeGenCommonISel.cpp b/llvm/lib/CodeGen/CodeGenCommonISel.cpp index a521596..2b653f0 100644 --- a/llvm/lib/CodeGen/CodeGenCommonISel.cpp +++ b/llvm/lib/CodeGen/CodeGenCommonISel.cpp @@ -173,8 +173,8 @@ llvm::findSplitPointForStackProtector(MachineBasicBlock *BB, return SplitPoint; } -unsigned llvm::getInvertedFPClassTest(unsigned Test) { - unsigned InvertedTest = ~Test & fcAllFlags; +FPClassTest llvm::getInvertedFPClassTest(FPClassTest Test) { + FPClassTest InvertedTest = ~Test & fcAllFlags; switch (InvertedTest) { default: break; @@ -198,7 +198,7 @@ unsigned llvm::getInvertedFPClassTest(unsigned Test) { case fcNegFinite: return InvertedTest; } - return 0; + return fcNone; } static MachineOperand *getSalvageOpsForCopy(const MachineRegisterInfo &MRI, diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index 90dcf7e..c826c31 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -6509,7 +6509,8 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I, const DataLayout DLayout = DAG.getDataLayout(); EVT DestVT = TLI.getValueType(DLayout, I.getType()); EVT ArgVT = TLI.getValueType(DLayout, I.getArgOperand(0)->getType()); - unsigned Test = cast(I.getArgOperand(1))->getZExtValue(); + FPClassTest Test = static_cast( + cast(I.getArgOperand(1))->getZExtValue()); MachineFunction &MF = DAG.getMachineFunction(); const Function &F = MF.getFunction(); SDValue Op = getValue(I.getArgOperand(0)); diff --git a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp index 4096a95..49b1270 100644 --- a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp @@ -8004,7 +8004,7 @@ SDValue TargetLowering::expandFMINNUM_FMAXNUM(SDNode *Node, } SDValue TargetLowering::expandIS_FPCLASS(EVT ResultVT, SDValue Op, - unsigned Test, SDNodeFlags Flags, + FPClassTest Test, SDNodeFlags Flags, const SDLoc &DL, SelectionDAG &DAG) const { EVT OperandVT = Op.getValueType(); @@ -8027,7 +8027,7 @@ SDValue TargetLowering::expandIS_FPCLASS(EVT ResultVT, SDValue Op, // Some checks may be represented as inversion of simpler check, for example // "inf|normal|subnormal|zero" => !"nan". bool IsInverted = false; - if (unsigned InvertedCheck = getInvertedFPClassTest(Test)) { + if (FPClassTest InvertedCheck = getInvertedFPClassTest(Test)) { IsInverted = true; Test = InvertedCheck; } diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp index 97ab9d2..877c7d4 100644 --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -5070,7 +5070,7 @@ void Verifier::visitIntrinsicCall(Intrinsic::ID ID, CallBase &Call) { } case Intrinsic::is_fpclass: { const ConstantInt *TestMask = cast(Call.getOperand(1)); - Check((TestMask->getZExtValue() & ~fcAllFlags) == 0, + Check((TestMask->getZExtValue() & ~static_cast(fcAllFlags)) == 0, "unsupported bits for llvm.is.fpclass test mask"); break; } diff --git a/llvm/unittests/ADT/BitmaskEnumTest.cpp b/llvm/unittests/ADT/BitmaskEnumTest.cpp index 54af9fa..c78937c 100644 --- a/llvm/unittests/ADT/BitmaskEnumTest.cpp +++ b/llvm/unittests/ADT/BitmaskEnumTest.cpp @@ -27,7 +27,9 @@ static_assert(largest_bitmask_enum_bit::value == Flags::F4); enum Flags2 { V0 = 0, V1 = 1, V2 = 2, V3 = 4, V4 = 8 }; } // namespace +namespace llvm { LLVM_DECLARE_ENUM_AS_BITMASK(Flags2, V4); +} static_assert(is_bitmask_enum::value != 0); static_assert(largest_bitmask_enum_bit::value == Flags::F4); -- 2.7.4