[AMDGPU] Avoid using tuple where pair does suffice

[maurossi]

Summary

Fixes the following building errors, happening with official Android prebuilt clang 14 shipped with Android 13:

external/llvm-project/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp:5491:13: error: no viable constructor or deduction g
uide for deduction of template arguments of 'tuple'

? std::tuple(HSAMD::V3::AssemblerDirectiveBegin,
  ^

...
external/llvm-project/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp:5493:13: error: no viable constructor or deduction g
uide for deduction of template arguments of 'tuple'

: std::tuple(HSAMD::AssemblerDirectiveBegin,
  ^

Fixes: 6443c0e ("[AMDGPU] Stop using make_pair and make_tuple. NFC.")

[maurossi]

Hello,

I have two questions

Since the issue happens also in release/16.x branch will D142839 be backported to release/16.x branch ?

Why has "x64 debian" build failed?

[foad]

Why has "x64 debian" build failed?

Looks like the part that failed is checking that the lines you changed are formatted properly according to "clang-format". You can reproduce this locally by running .../llvm-project/clang/tools/clang-format/git-clang-format @^ and seeing if it updates any of the files you changed.

[maurossi]

Hi Jay,
here is the output of 'git-clang-format --diff'

utente@utente-3TB:~/r-x86_kernel/external/llvm-project$ ./clang/tools/clang-format/git-clang-format --diff
diff --git a/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp b/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
index c879b4914ee7..7ee1672049b3 100644
--- a/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
+++ b/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
@@ -5488,9 +5488,9 @@ bool AMDGPUAsmParser::ParseDirectiveHSAMetadata() {
   std::tie(AssemblerDirectiveBegin, AssemblerDirectiveEnd) =
       isHsaAbiVersion3AndAbove(&getSTI())
           ? std::pair(HSAMD::V3::AssemblerDirectiveBegin,
-                       HSAMD::V3::AssemblerDirectiveEnd)
+                      HSAMD::V3::AssemblerDirectiveEnd)
           : std::pair(HSAMD::AssemblerDirectiveBegin,
-                       HSAMD::AssemblerDirectiveEnd);
+                      HSAMD::AssemblerDirectiveEnd);
 
   if (getSTI().getTargetTriple().getOS() != Triple::AMDHSA) {
     return Error(getLoc(),

[maurossi]

Diff updated for conformance with git-clang-format