Merge commit '64d75bd100ac' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 81bfefb8b274 · 2024-08-21T02:33:50.000Z
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/BUILD.gn
@@ -171,6 +171,7 @@ static_library("LLVMAMDGPUCodeGen") {
     "AMDGPUMachineModuleInfo.cpp",
     "AMDGPUMacroFusion.cpp",
     "AMDGPUMarkLastScratchLoad.cpp",
+    "AMDGPUMemoryUtils.cpp",
     "AMDGPUOpenCLEnqueuedBlockLowering.cpp",
     "AMDGPUPerfHintAnalysis.cpp",
     "AMDGPUPostLegalizerCombiner.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/Utils/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AMDGPU/Utils/BUILD.gn
@@ -34,7 +34,6 @@ static_library("Utils") {
     "AMDGPUAsmUtils.cpp",
     "AMDGPUBaseInfo.cpp",
     "AMDGPUDelayedMCExpr.cpp",
-    "AMDGPUMemoryUtils.cpp",
     "AMDGPUPALMetadata.cpp",
     "AMDKernelCodeTUtils.cpp",
   ]
