[llvm] [DirectX] Simplify DXIL_OP_INTRINSIC_MAP tablegen'ed code (PR #101248)
Justin Bogner via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 30 19:24:26 PDT 2024
https://github.com/bogner updated https://github.com/llvm/llvm-project/pull/101248
>From a85ea5b6ba74b98b5dbed509aa6df4df56b9c7a9 Mon Sep 17 00:00:00 2001
From: Justin Bogner <mail at justinbogner.com>
Date: Tue, 30 Jul 2024 14:55:47 -0700
Subject: [PATCH 1/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20in?=
=?UTF-8?q?itial=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Created using spr 1.3.5-bogner
---
llvm/lib/Target/DirectX/DXILConstants.h | 1 -
llvm/lib/Target/DirectX/DXILOpLowering.cpp | 17 ++++----
llvm/utils/TableGen/DXILEmitter.cpp | 46 ++++++++++------------
3 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/llvm/lib/Target/DirectX/DXILConstants.h b/llvm/lib/Target/DirectX/DXILConstants.h
index f7e37ba16d68d..78a641df8e6ec 100644
--- a/llvm/lib/Target/DirectX/DXILConstants.h
+++ b/llvm/lib/Target/DirectX/DXILConstants.h
@@ -17,7 +17,6 @@ namespace dxil {
#define DXIL_OP_ENUM
#include "DXILOperation.inc"
-#undef DXIL_OP_ENUM
} // namespace dxil
} // namespace llvm
diff --git a/llvm/lib/Target/DirectX/DXILOpLowering.cpp b/llvm/lib/Target/DirectX/DXILOpLowering.cpp
index 1329308ffec26..0c0edde43a277 100644
--- a/llvm/lib/Target/DirectX/DXILOpLowering.cpp
+++ b/llvm/lib/Target/DirectX/DXILOpLowering.cpp
@@ -104,20 +104,19 @@ static void lowerIntrinsic(dxil::OpCode DXILOp, Function &F, Module &M) {
static bool lowerIntrinsics(Module &M) {
bool Updated = false;
-#define DXIL_OP_INTRINSIC_MAP
-#include "DXILOperation.inc"
-#undef DXIL_OP_INTRINSIC_MAP
-
for (Function &F : make_early_inc_range(M.functions())) {
if (!F.isDeclaration())
continue;
Intrinsic::ID ID = F.getIntrinsicID();
- if (ID == Intrinsic::not_intrinsic)
+ switch (ID) {
+ default:
continue;
- auto LowerIt = LowerMap.find(ID);
- if (LowerIt == LowerMap.end())
- continue;
- lowerIntrinsic(LowerIt->second, F, M);
+#define DXIL_OP_INTRINSIC(OpCode, Intrin) \
+ case Intrin: \
+ lowerIntrinsic(OpCode, F, M); \
+ break;
+#include "DXILOperation.inc"
+ }
Updated = true;
}
return Updated;
diff --git a/llvm/utils/TableGen/DXILEmitter.cpp b/llvm/utils/TableGen/DXILEmitter.cpp
index b6a2686cfde30..74c4fd50f37f0 100644
--- a/llvm/utils/TableGen/DXILEmitter.cpp
+++ b/llvm/utils/TableGen/DXILEmitter.cpp
@@ -434,12 +434,7 @@ static std::string getAttributeMaskString(const SmallVector<Record *> Recs) {
/// \param Output stream
static void emitDXILEnums(std::vector<DXILOperationDesc> &Ops,
raw_ostream &OS) {
- // Sort by OpCode
- llvm::sort(Ops, [](DXILOperationDesc &A, DXILOperationDesc &B) {
- return A.OpCode < B.OpCode;
- });
-
- OS << "#ifdef DXIL_OP_ENUM\n";
+ OS << "#ifdef DXIL_OP_ENUM\n\n";
OS << "// Enumeration for operations specified by DXIL\n";
OS << "enum class OpCode : unsigned {\n";
@@ -461,7 +456,8 @@ static void emitDXILEnums(std::vector<DXILOperationDesc> &Ops,
OS << C << ",\n";
}
OS << "\n};\n\n";
- OS << "#endif // DXIL_OP_ENUM\n";
+ OS << "#undef DXIL_OP_ENUM\n";
+ OS << "#endif\n\n";
}
/// Emit map of DXIL operation to LLVM or DirectX intrinsic
@@ -469,20 +465,17 @@ static void emitDXILEnums(std::vector<DXILOperationDesc> &Ops,
/// \param Output stream
static void emitDXILIntrinsicMap(std::vector<DXILOperationDesc> &Ops,
raw_ostream &OS) {
- OS << "\n#ifdef DXIL_OP_INTRINSIC_MAP\n";
-
- // FIXME: use array instead of SmallDenseMap.
- OS << "static const SmallDenseMap<Intrinsic::ID, dxil::OpCode> LowerMap = "
- "{\n";
- for (auto &Op : Ops) {
+ OS << "#ifdef DXIL_OP_INTRINSIC\n";
+ OS << "\n";
+ for (const auto &Op : Ops) {
if (Op.Intrinsic.empty())
continue;
- // {Intrinsic::sin, dxil::OpCode::Sin},
- OS << " { Intrinsic::" << Op.Intrinsic << ", dxil::OpCode::" << Op.OpName
- << "},\n";
+ OS << "DXIL_OP_INTRINSIC(dxil::OpCode::" << Op.OpName
+ << ", Intrinsic::" << Op.Intrinsic << ")\n";
}
- OS << "};\n\n";
- OS << "#endif // DXIL_OP_INTRINSIC_MAP\n";
+ OS << "\n";
+ OS << "#undef DXIL_OP_INTRINSIC\n";
+ OS << "#endif\n\n";
}
/// Emit DXIL operation table
@@ -490,11 +483,6 @@ static void emitDXILIntrinsicMap(std::vector<DXILOperationDesc> &Ops,
/// \param Output stream
static void emitDXILOperationTable(std::vector<DXILOperationDesc> &Ops,
raw_ostream &OS) {
- // Sort by OpCode.
- llvm::sort(Ops, [](DXILOperationDesc &A, DXILOperationDesc &B) {
- return A.OpCode < B.OpCode;
- });
-
// Collect Names.
SequenceToOffsetTable<std::string> OpClassStrings;
SequenceToOffsetTable<std::string> OpStrings;
@@ -601,7 +589,7 @@ static void emitDXILOperationTable(std::vector<DXILOperationDesc> &Ops,
OS << " };\n\n";
OS << " unsigned Index = Prop.ParameterTableOffset;\n";
OS << " return DXILOpParameterKindTable + Index;\n";
- OS << "}\n ";
+ OS << "}\n\n";
}
static void emitDXILOperationTableDataStructs(RecordKeeper &Records,
@@ -653,12 +641,18 @@ static void EmitDXILOperation(RecordKeeper &Records, raw_ostream &OS) {
for (auto *Record : OpIntrProps) {
DXILOps.emplace_back(DXILOperationDesc(Record));
}
+ // Sort by opcode.
+ llvm::sort(DXILOps, [](DXILOperationDesc &A, DXILOperationDesc &B) {
+ return A.OpCode < B.OpCode;
+ });
+
emitDXILEnums(DXILOps, OS);
emitDXILIntrinsicMap(DXILOps, OS);
- OS << "#ifdef DXIL_OP_OPERATION_TABLE\n";
+ OS << "#ifdef DXIL_OP_OPERATION_TABLE\n\n";
emitDXILOperationTableDataStructs(Records, OS);
emitDXILOperationTable(DXILOps, OS);
- OS << "#endif // DXIL_OP_OPERATION_TABLE\n";
+ OS << "#undef DXIL_OP_OPERATION_TABLE\n";
+ OS << "#endif\n\n";
}
static TableGen::Emitter::Opt X("gen-dxil-operation", EmitDXILOperation,
>From 1dbf0224ff13061a551748df9c816e4251ca5fbb Mon Sep 17 00:00:00 2001
From: Justin Bogner <mail at justinbogner.com>
Date: Tue, 30 Jul 2024 19:24:13 -0700
Subject: [PATCH 2/2] Add an early check for duplicate opcode mistakes
Created using spr 1.3.5-bogner
---
llvm/utils/TableGen/DXILEmitter.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/llvm/utils/TableGen/DXILEmitter.cpp b/llvm/utils/TableGen/DXILEmitter.cpp
index 74c4fd50f37f0..d7a3772f64414 100644
--- a/llvm/utils/TableGen/DXILEmitter.cpp
+++ b/llvm/utils/TableGen/DXILEmitter.cpp
@@ -645,6 +645,12 @@ static void EmitDXILOperation(RecordKeeper &Records, raw_ostream &OS) {
llvm::sort(DXILOps, [](DXILOperationDesc &A, DXILOperationDesc &B) {
return A.OpCode < B.OpCode;
});
+ int PrevOp = -1;
+ for (DXILOperationDesc &Desc : DXILOps) {
+ if (Desc.OpCode == PrevOp)
+ PrintFatalError(Twine("Duplicate opcode: ") + Twine(Desc.OpCode));
+ PrevOp = Desc.OpCode;
+ }
emitDXILEnums(DXILOps, OS);
emitDXILIntrinsicMap(DXILOps, OS);
More information about the llvm-commits
mailing list