diff options
| author | Luke Lau <luke@igalia.com> | 2023-09-18 16:18:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-18 16:18:36 +0100 |
| commit | 5aa8e43ccdb0b3c0661b75187cd0d78bbe7edc8e (patch) | |
| tree | 3375be0b9abd74f19b130fd460cbe07f4c23ce24 /llvm/lib/IR/IntrinsicInst.cpp | |
| parent | c354ee8d1822907f9e8fb464de149e12af1d5081 (diff) | |
| download | llvm-5aa8e43ccdb0b3c0661b75187cd0d78bbe7edc8e.zip llvm-5aa8e43ccdb0b3c0661b75187cd0d78bbe7edc8e.tar.gz llvm-5aa8e43ccdb0b3c0661b75187cd0d78bbe7edc8e.tar.bz2 | |
[VP] Add missing functional_intrinsic properties and add static_assert. NFC (#66199)
Some VP intrinsic definitions were missing the
VP_PROPERTY_FUNCTIONAL_INTRINSIC property. This patch fills them in, and
adds a static_assert that all VP intrinsics have an equivalent opcode or
intrinsic defined so we don't forget them in future.
Some VP intrinsics don't have an equivalent, namely merge and strided
load/store. For those, a new property was added to mark that they don't
have a non-VP equivalent.
This adds a helper method to get the ID of the functionally equivalent
intrinsic, similar to the existing getFunctionalOpcodeForVP and
getConstrainedIntrinsicIDForVP method.
Diffstat (limited to 'llvm/lib/IR/IntrinsicInst.cpp')
| -rw-r--r-- | llvm/lib/IR/IntrinsicInst.cpp | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/llvm/lib/IR/IntrinsicInst.cpp b/llvm/lib/IR/IntrinsicInst.cpp index 352af57..e4ddd57 100644 --- a/llvm/lib/IR/IntrinsicInst.cpp +++ b/llvm/lib/IR/IntrinsicInst.cpp @@ -503,7 +503,7 @@ std::optional<unsigned> VPIntrinsic::getMemoryDataParamPos(Intrinsic::ID VPID) { return std::nullopt; } -bool VPIntrinsic::isVPIntrinsic(Intrinsic::ID ID) { +constexpr bool isVPIntrinsic(Intrinsic::ID ID) { switch (ID) { default: break; @@ -515,34 +515,68 @@ bool VPIntrinsic::isVPIntrinsic(Intrinsic::ID ID) { return false; } +bool VPIntrinsic::isVPIntrinsic(Intrinsic::ID ID) { + return ::isVPIntrinsic(ID); +} + // Equivalent non-predicated opcode +constexpr static std::optional<unsigned> +getFunctionalOpcodeForVP(Intrinsic::ID ID) { + switch (ID) { + default: + break; +#define BEGIN_REGISTER_VP_INTRINSIC(VPID, ...) case Intrinsic::VPID: +#define VP_PROPERTY_FUNCTIONAL_OPC(OPC) return Instruction::OPC; +#define END_REGISTER_VP_INTRINSIC(VPID) break; +#include "llvm/IR/VPIntrinsics.def" + } + return std::nullopt; +} + std::optional<unsigned> VPIntrinsic::getFunctionalOpcodeForVP(Intrinsic::ID ID) { + return ::getFunctionalOpcodeForVP(ID); +} + +// Equivalent non-predicated intrinsic ID +constexpr static std::optional<Intrinsic::ID> +getFunctionalIntrinsicIDForVP(Intrinsic::ID ID) { switch (ID) { default: break; #define BEGIN_REGISTER_VP_INTRINSIC(VPID, ...) case Intrinsic::VPID: -#define VP_PROPERTY_FUNCTIONAL_OPC(OPC) return Instruction::OPC; +#define VP_PROPERTY_FUNCTIONAL_INTRINSIC(INTRIN) return Intrinsic::INTRIN; #define END_REGISTER_VP_INTRINSIC(VPID) break; #include "llvm/IR/VPIntrinsics.def" } return std::nullopt; } -// Equivalent non-predicated intrinsic std::optional<Intrinsic::ID> VPIntrinsic::getFunctionalIntrinsicIDForVP(Intrinsic::ID ID) { + return ::getFunctionalIntrinsicIDForVP(ID); +} + +constexpr static bool doesVPHaveNoFunctionalEquivalent(Intrinsic::ID ID) { switch (ID) { default: break; #define BEGIN_REGISTER_VP_INTRINSIC(VPID, ...) case Intrinsic::VPID: -#define VP_PROPERTY_FUNCTIONAL_INTRINSIC(INTRIN) return Intrinsic::INTRIN; +#define VP_PROPERTY_NO_FUNCTIONAL return true; #define END_REGISTER_VP_INTRINSIC(VPID) break; #include "llvm/IR/VPIntrinsics.def" } - return std::nullopt; + return false; } +// All VP intrinsics should have an equivalent non-VP opcode or intrinsic +// defined, or be marked that they don't have one. +#define BEGIN_REGISTER_VP_INTRINSIC(VPID, ...) \ + static_assert(doesVPHaveNoFunctionalEquivalent(Intrinsic::VPID) || \ + getFunctionalOpcodeForVP(Intrinsic::VPID) || \ + getFunctionalIntrinsicIDForVP(Intrinsic::VPID)); +#include "llvm/IR/VPIntrinsics.def" + // Equivalent non-predicated constrained intrinsic std::optional<Intrinsic::ID> VPIntrinsic::getConstrainedIntrinsicIDForVP(Intrinsic::ID ID) { |
