Skip to content

Conversation

@kazutakahirata
Copy link
Contributor

We can use "constexpr if" to combine the two variants of functions.

We can use "constexpr if" to combine the two variants of functions.
@llvmbot
Copy link
Member

llvmbot commented Apr 27, 2025

@llvm/pr-subscribers-backend-amdgpu

Author: Kazu Hirata (kazutakahirata)

Changes

We can use "constexpr if" to combine the two variants of functions.


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

1 Files Affected:

  • (modified) llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTUtils.cpp (+8-13)
diff --git a/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTUtils.cpp b/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTUtils.cpp
index b05696d2dfa05..8997911aa8ae1 100644
--- a/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTUtils.cpp
+++ b/llvm/lib/Target/AMDGPU/Utils/AMDKernelCodeTUtils.cpp
@@ -222,22 +222,17 @@ static int get_amd_kernel_code_t_FieldIndex(StringRef name) {
 
 class PrintField {
 public:
-  template <typename T, T AMDGPUMCKernelCodeT::*ptr,
-            typename std::enable_if_t<!std::is_integral_v<T>, T> * = nullptr>
+  template <typename T, T AMDGPUMCKernelCodeT::*ptr>
   static void printField(StringRef Name, const AMDGPUMCKernelCodeT &C,
                          raw_ostream &OS, MCContext &Ctx,
                          AMDGPUMCKernelCodeT::PrintHelper Helper) {
-    OS << Name << " = ";
-    const MCExpr *Value = C.*ptr;
-    Helper(Value, OS, Ctx.getAsmInfo());
-  }
-
-  template <typename T, T AMDGPUMCKernelCodeT::*ptr,
-            typename std::enable_if_t<std::is_integral_v<T>, T> * = nullptr>
-  static void printField(StringRef Name, const AMDGPUMCKernelCodeT &C,
-                         raw_ostream &OS, MCContext &,
-                         AMDGPUMCKernelCodeT::PrintHelper) {
-    OS << Name << " = " << (int)(C.*ptr);
+    if constexpr (!std::is_integral_v<T>) {
+      OS << Name << " = ";
+      const MCExpr *Value = C.*ptr;
+      Helper(Value, OS, Ctx.getAsmInfo());
+    } else {
+      OS << Name << " = " << (int)(C.*ptr);
+    }
   }
 };
 

@kazutakahirata kazutakahirata merged commit cbd3283 into llvm:main Apr 27, 2025
13 checks passed
@kazutakahirata kazutakahirata deleted the cleanup_001_constexpr_if_llvm_AMDGPU branch April 27, 2025 15:53
IanWood1 pushed a commit to IanWood1/llvm-project that referenced this pull request May 6, 2025
We can use "constexpr if" to combine the two variants of functions.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants