Skip to content

[DXIL] Simplify MDBuilder in resource unit tests. NFC #120275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2024

Conversation

bogner
Copy link
Contributor

@bogner bogner commented Dec 17, 2024

No description provided.

@llvmbot llvmbot added backend:DirectX llvm:analysis Includes value tracking, cost tables and constant folding labels Dec 17, 2024
@llvmbot
Copy link
Member

llvmbot commented Dec 17, 2024

@llvm/pr-subscribers-backend-directx

@llvm/pr-subscribers-llvm-analysis

Author: Justin Bogner (bogner)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/120275.diff

1 Files Affected:

  • (modified) llvm/unittests/Analysis/DXILResourceTest.cpp (+15-49)
diff --git a/llvm/unittests/Analysis/DXILResourceTest.cpp b/llvm/unittests/Analysis/DXILResourceTest.cpp
index 776c914b89a045d..8301458f1d18027 100644
--- a/llvm/unittests/Analysis/DXILResourceTest.cpp
+++ b/llvm/unittests/Analysis/DXILResourceTest.cpp
@@ -26,57 +26,23 @@ struct MDBuilder {
   MDBuilder(LLVMContext &Context, Type *Int32Ty, Type *Int1Ty)
       : Context(Context), Int32Ty(Int32Ty), Int1Ty(Int1Ty) {}
 
-  template <typename... Ts>
-  void appendMDs(SmallVectorImpl<Metadata *> &MDs, int V, Ts... More) {
-    MDs.push_back(ConstantAsMetadata::get(
-        Constant::getIntegerValue(Int32Ty, APInt(32, V))));
-    appendMDs(MDs, More...);
+  Metadata *toMD(unsigned int V) {
+    return ConstantAsMetadata::get(
+        Constant::getIntegerValue(Int32Ty, APInt(32, V)));
   }
-  template <typename... Ts>
-  void appendMDs(SmallVectorImpl<Metadata *> &MDs, unsigned int V, Ts... More) {
-    MDs.push_back(ConstantAsMetadata::get(
-        Constant::getIntegerValue(Int32Ty, APInt(32, V))));
-    appendMDs(MDs, More...);
+  Metadata *toMD(int V) { return toMD(static_cast<unsigned int>(V)); }
+  Metadata *toMD(bool V) {
+    return ConstantAsMetadata::get(
+        Constant::getIntegerValue(Int32Ty, APInt(1, V)));
   }
-  template <typename... Ts>
-  void appendMDs(SmallVectorImpl<Metadata *> &MDs, bool V, Ts... More) {
-    MDs.push_back(ConstantAsMetadata::get(
-        Constant::getIntegerValue(Int1Ty, APInt(1, V))));
-    appendMDs(MDs, More...);
-  }
-  template <typename... Ts>
-  void appendMDs(SmallVectorImpl<Metadata *> &MDs, Value *V, Ts... More) {
-    MDs.push_back(ValueAsMetadata::get(V));
-    appendMDs(MDs, More...);
-  }
-  template <typename... Ts>
-  void appendMDs(SmallVectorImpl<Metadata *> &MDs, const char *V, Ts... More) {
-    MDs.push_back(MDString::get(Context, V));
-    appendMDs(MDs, More...);
-  }
-  template <typename... Ts>
-  void appendMDs(SmallVectorImpl<Metadata *> &MDs, StringRef V, Ts... More) {
-    MDs.push_back(MDString::get(Context, V));
-    appendMDs(MDs, More...);
-  }
-  template <typename... Ts>
-  void appendMDs(SmallVectorImpl<Metadata *> &MDs, std::nullptr_t V,
-                 Ts... More) {
-    MDs.push_back(nullptr);
-    appendMDs(MDs, More...);
-  }
-  template <typename... Ts>
-  void appendMDs(SmallVectorImpl<Metadata *> &MDs, MDTuple *V, Ts... More) {
-    MDs.push_back(V);
-    appendMDs(MDs, More...);
-  }
-  void appendMDs(SmallVectorImpl<Metadata *> &MDs) {
-    // Base case, nothing to do.
-  }
-
-  template <typename... Ts> MDTuple *get(Ts... Data) {
-    SmallVector<Metadata *> MDs;
-    appendMDs(MDs, Data...);
+  Metadata *toMD(Value *V) { return ValueAsMetadata::get(V); }
+  Metadata *toMD(const char *V) { return MDString::get(Context, V); }
+  Metadata *toMD(StringRef V) { return MDString::get(Context, V); }
+  Metadata *toMD(std::nullptr_t V) { return nullptr; }
+  Metadata *toMD(MDTuple *V) { return V; }
+
+  template <typename... Ts> MDTuple *get(Ts... Vs) {
+    std::array<Metadata *, sizeof...(Vs)> MDs{toMD(std::forward<Ts>(Vs))...};
     return MDNode::get(Context, MDs);
   }
 };

@bogner bogner merged commit 65d2177 into llvm:main Dec 17, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend:DirectX llvm:analysis Includes value tracking, cost tables and constant folding
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants