[clang] [clang][Neon] Extract code shared by classic and CIR codegen (NFC) (PR #186448)

[via cfe-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff origin/main HEAD --extensions h,cpp -- clang/include/clang/Basic/AArch64CodeGenUtils.h clang/lib/CIR/CodeGen/CIRGenBuiltinAArch64.cpp clang/lib/CodeGen/TargetBuiltins/ARM.cpp --diff_from_common_commit
``````````

:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/clang/include/clang/Basic/AArch64CodeGenUtils.h b/clang/include/clang/Basic/AArch64CodeGenUtils.h
index 812914315..9a97f0001 100644
--- a/clang/include/clang/Basic/AArch64CodeGenUtils.h
+++ b/clang/include/clang/Basic/AArch64CodeGenUtils.h
@@ -68,12 +68,13 @@ struct ARMVectorIntrinsicInfo {
   {#NameBase, NEON::BI__builtin_neon_##NameBase, 0, 0, 0}
 
 #define NEONMAP1(NameBase, LLVMIntrinsic, TypeModifier)                        \
-  {#NameBase, NEON::BI__builtin_neon_##NameBase, llvm::Intrinsic::LLVMIntrinsic, 0,  \
-   TypeModifier}
+  {#NameBase, NEON::BI__builtin_neon_##NameBase,                               \
+   llvm::Intrinsic::LLVMIntrinsic, 0, TypeModifier}
 
 #define NEONMAP2(NameBase, LLVMIntrinsic, AltLLVMIntrinsic, TypeModifier)      \
-  {#NameBase, NEON::BI__builtin_neon_##NameBase, llvm::Intrinsic::LLVMIntrinsic,     \
-    llvm::Intrinsic::AltLLVMIntrinsic, TypeModifier}
+  {#NameBase, NEON::BI__builtin_neon_##NameBase,                               \
+   llvm::Intrinsic::LLVMIntrinsic, llvm::Intrinsic::AltLLVMIntrinsic,          \
+   TypeModifier}
 
 // clang-format off
 const inline ARMVectorIntrinsicInfo AArch64SIMDIntrinsicMap [] = {
diff --git a/clang/lib/CIR/CodeGen/CIRGenBuiltinAArch64.cpp b/clang/lib/CIR/CodeGen/CIRGenBuiltinAArch64.cpp
index fe1e788cb..a2d662a5d 100644
--- a/clang/lib/CIR/CodeGen/CIRGenBuiltinAArch64.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenBuiltinAArch64.cpp
@@ -12,8 +12,8 @@
 
 #include "CIRGenBuilder.h"
 #include "CIRGenFunction.h"
-#include "clang/Basic/TargetBuiltins.h"
 #include "clang/Basic/AArch64CodeGenUtils.h"
+#include "clang/Basic/TargetBuiltins.h"
 #include "clang/CIR/MissingFeatures.h"
 
 // TODO(cir): once all builtins are covered, decide whether we still
diff --git a/clang/lib/CodeGen/TargetBuiltins/ARM.cpp b/clang/lib/CodeGen/TargetBuiltins/ARM.cpp
index 02ce12882..ed157c198 100644
--- a/clang/lib/CodeGen/TargetBuiltins/ARM.cpp
+++ b/clang/lib/CodeGen/TargetBuiltins/ARM.cpp
@@ -14,8 +14,8 @@
 #include "CGBuiltin.h"
 #include "CGDebugInfo.h"
 #include "TargetInfo.h"
-#include "clang/Basic/TargetBuiltins.h"
 #include "clang/Basic/AArch64CodeGenUtils.h"
+#include "clang/Basic/TargetBuiltins.h"
 #include "llvm/IR/InlineAsm.h"
 #include "llvm/IR/IntrinsicsAArch64.h"
 #include "llvm/IR/IntrinsicsARM.h"

``````````

</details>


https://github.com/llvm/llvm-project/pull/186448