[llvm] 6c5757c - [NVPTX] Add NewPM boilerplate to NVPTXLowerAggrCopies (#215326)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 11 12:54:55 PDT 2026
Author: Alex MacLean
Date: 2026-08-11T12:54:49-07:00
New Revision: 6c5757c344eddf20149aee5a341dcd3e6d7578c5
URL: https://github.com/llvm/llvm-project/commit/6c5757c344eddf20149aee5a341dcd3e6d7578c5
DIFF: https://github.com/llvm/llvm-project/commit/6c5757c344eddf20149aee5a341dcd3e6d7578c5.diff
LOG: [NVPTX] Add NewPM boilerplate to NVPTXLowerAggrCopies (#215326)
Added:
Modified:
llvm/lib/Target/NVPTX/NVPTX.h
llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.cpp
llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
Removed:
llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.h
################################################################################
diff --git a/llvm/lib/Target/NVPTX/NVPTX.h b/llvm/lib/Target/NVPTX/NVPTX.h
index 7359c9b239218..d61c8dc897a20 100644
--- a/llvm/lib/Target/NVPTX/NVPTX.h
+++ b/llvm/lib/Target/NVPTX/NVPTX.h
@@ -58,6 +58,7 @@ FunctionPass *createNVPTXAllocaHoistingLegacyPass();
FunctionPass *createNVPTXLowerAllocaLegacyPass();
FunctionPass *createNVPTXLowerUnreachableLegacyPass(bool TrapUnreachable,
bool NoTrapAfterNoreturn);
+FunctionPass *createNVPTXLowerAggrCopiesLegacyPass();
FunctionPass *createNVPTXMarkKernelPtrsGlobalPass();
FunctionPass *createNVPTXTagInvariantLoadsPass();
FunctionPass *createNVPTXIRPeepholePass();
@@ -73,7 +74,7 @@ void initializeNVPTXAsmPrinterPass(PassRegistry &);
void initializeNVPTXAssignValidGlobalNamesLegacyPassPass(PassRegistry &);
void initializeNVPTXAtomicLowerLegacyPassPass(PassRegistry &);
void initializeNVPTXCtorDtorLoweringLegacyPass(PassRegistry &);
-void initializeNVPTXLowerAggrCopiesPass(PassRegistry &);
+void initializeNVPTXLowerAggrCopiesLegacyPassPass(PassRegistry &);
void initializeNVPTXLowerAllocaLegacyPassPass(PassRegistry &);
void initializeNVPTXLowerUnreachableLegacyPassPass(PassRegistry &);
void initializeNVPTXLowerArgsLegacyPassPass(PassRegistry &);
@@ -134,6 +135,12 @@ struct NVPTXCopyByValArgsPass : OptionalPassInfoMixin<NVPTXCopyByValArgsPass> {
PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
};
+class NVPTXLowerAggrCopiesPass
+ : public RequiredPassInfoMixin<NVPTXLowerAggrCopiesPass> {
+public:
+ PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
+};
+
struct NVPTXPromoteParamAlignPass
: OptionalPassInfoMixin<NVPTXPromoteParamAlignPass> {
PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
diff --git a/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.cpp b/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.cpp
index 1a2d9acf9c281..ec37c536547c5 100644
--- a/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.cpp
@@ -12,7 +12,6 @@
//
//===----------------------------------------------------------------------===//
-#include "NVPTXLowerAggrCopies.h"
#include "NVPTX.h"
#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/Analysis/TargetTransformInfo.h"
@@ -34,40 +33,15 @@
using namespace llvm;
-namespace {
-
-// actual analysis class, which is a functionpass
-struct NVPTXLowerAggrCopies : public FunctionPass {
- static char ID;
-
- NVPTXLowerAggrCopies() : FunctionPass(ID) {}
-
- void getAnalysisUsage(AnalysisUsage &AU) const override {
- AU.addPreserved<StackProtector>();
- AU.addRequired<TargetTransformInfoWrapperPass>();
- AU.addRequired<AAResultsWrapperPass>();
- }
+static const unsigned MaxAggrCopySize = 128;
- bool runOnFunction(Function &F) override;
-
- static const unsigned MaxAggrCopySize = 128;
-
- StringRef getPassName() const override {
- return "Lower aggregate copies/intrinsics into loops";
- }
-};
-
-char NVPTXLowerAggrCopies::ID = 0;
-
-bool NVPTXLowerAggrCopies::runOnFunction(Function &F) {
+static bool lowerAggrCopies(Function &F, const TargetTransformInfo &TTI,
+ AAResults &AA) {
SmallVector<LoadInst *, 4> AggrLoads;
SmallVector<MemIntrinsic *, 4> MemCalls;
const DataLayout &DL = F.getDataLayout();
LLVMContext &Context = F.getParent()->getContext();
- const TargetTransformInfo &TTI =
- getAnalysis<TargetTransformInfoWrapperPass>().getTTI(F);
- AAResults &AA = getAnalysis<AAResultsWrapperPass>().getAAResults();
// Collect all aggregate loads and mem* calls.
for (BasicBlock &BB : F) {
@@ -172,17 +146,54 @@ bool NVPTXLowerAggrCopies::runOnFunction(Function &F) {
return true;
}
+namespace {
+
+struct NVPTXLowerAggrCopiesLegacyPass : public FunctionPass {
+ static char ID;
+
+ NVPTXLowerAggrCopiesLegacyPass() : FunctionPass(ID) {}
+
+ void getAnalysisUsage(AnalysisUsage &AU) const override {
+ AU.addPreserved<StackProtector>();
+ AU.addRequired<TargetTransformInfoWrapperPass>();
+ AU.addRequired<AAResultsWrapperPass>();
+ }
+
+ bool runOnFunction(Function &F) override {
+ return lowerAggrCopies(
+ F, getAnalysis<TargetTransformInfoWrapperPass>().getTTI(F),
+ getAnalysis<AAResultsWrapperPass>().getAAResults());
+ }
+
+ StringRef getPassName() const override {
+ return "Lower aggregate copies/intrinsics into loops";
+ }
+};
+
+char NVPTXLowerAggrCopiesLegacyPass::ID = 0;
+
} // namespace
INITIALIZE_PASS_BEGIN(
- NVPTXLowerAggrCopies, "nvptx-lower-aggr-copies",
+ NVPTXLowerAggrCopiesLegacyPass, "nvptx-lower-aggr-copies",
"Lower aggregate copies, and llvm.mem* intrinsics into loops", false, false)
INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)
INITIALIZE_PASS_DEPENDENCY(TargetTransformInfoWrapperPass)
INITIALIZE_PASS_END(
- NVPTXLowerAggrCopies, "nvptx-lower-aggr-copies",
+ NVPTXLowerAggrCopiesLegacyPass, "nvptx-lower-aggr-copies",
"Lower aggregate copies, and llvm.mem* intrinsics into loops", false, false)
-FunctionPass *llvm::createLowerAggrCopies() {
- return new NVPTXLowerAggrCopies();
+FunctionPass *llvm::createNVPTXLowerAggrCopiesLegacyPass() {
+ return new NVPTXLowerAggrCopiesLegacyPass();
+}
+
+PreservedAnalyses NVPTXLowerAggrCopiesPass::run(Function &F,
+ FunctionAnalysisManager &FAM) {
+ if (!lowerAggrCopies(F, FAM.getResult<TargetIRAnalysis>(F),
+ FAM.getResult<AAManager>(F)))
+ return PreservedAnalyses::all();
+ // Copies are expanded into loops, so the CFG is not preserved.
+ PreservedAnalyses PA;
+ PA.preserve<SSPLayoutAnalysis>();
+ return PA;
}
diff --git a/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.h b/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.h
deleted file mode 100644
index 59d5ef40e9ac9..0000000000000
--- a/llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//===-- llvm/lib/Target/NVPTX/NVPTXLowerAggrCopies.h ------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains the declaration of the NVIDIA specific lowering of
-// aggregate copies
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_NVPTX_NVPTXLOWERAGGRCOPIES_H
-#define LLVM_LIB_TARGET_NVPTX_NVPTXLOWERAGGRCOPIES_H
-
-namespace llvm {
-class FunctionPass;
-
-FunctionPass *createLowerAggrCopies();
-}
-
-#endif
diff --git a/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def b/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
index 8fabe14a6325e..749504acff90c 100644
--- a/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
+++ b/llvm/lib/Target/NVPTX/NVPTXPassRegistry.def
@@ -44,6 +44,7 @@ FUNCTION_PASS("nvptx-image-optimizer", NVPTXImageOptimizerPass())
FUNCTION_PASS("nvptx-copy-byval-args", NVPTXCopyByValArgsPass())
FUNCTION_PASS("nvptx-atomic-lower", NVPTXAtomicLowerPass())
FUNCTION_PASS("nvptx-mark-kernel-ptrs-global", NVPTXMarkKernelPtrsGlobalPass())
+FUNCTION_PASS("nvptx-lower-aggr-copies", NVPTXLowerAggrCopiesPass())
FUNCTION_PASS("nvptx-tag-invariant-loads", NVPTXTagInvariantLoadsPass())
FUNCTION_PASS("nvptx-lower-unreachable",
NVPTXLowerUnreachablePass(Options.TrapUnreachable,
diff --git a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
index 4c8b5baa2566f..fd30ed88ebb3d 100644
--- a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
@@ -15,7 +15,6 @@
#include "NVPTXAliasAnalysis.h"
#include "NVPTXAsmPrinter.h"
#include "NVPTXCtorDtorLowering.h"
-#include "NVPTXLowerAggrCopies.h"
#include "NVPTXMachineFunctionInfo.h"
#include "NVPTXTargetObjectFile.h"
#include "NVPTXTargetTransformInfo.h"
@@ -109,7 +108,7 @@ extern "C" LLVM_ABI LLVM_EXTERNAL_VISIBILITY void LLVMInitializeNVPTXTarget() {
initializeNVPTXLowerAllocaLegacyPassPass(PR);
initializeNVPTXLowerUnreachableLegacyPassPass(PR);
initializeNVPTXCtorDtorLoweringLegacyPass(PR);
- initializeNVPTXLowerAggrCopiesPass(PR);
+ initializeNVPTXLowerAggrCopiesLegacyPassPass(PR);
initializeNVPTXProxyRegErasurePass(PR);
initializeNVPTXForwardParamsLegacyPassPass(PR);
initializeNVPTXAddressFolderLegacyPassPass(PR);
@@ -392,7 +391,7 @@ void NVPTXPassConfig::addIRPasses() {
}
bool NVPTXPassConfig::addInstSelector() {
- addPass(createLowerAggrCopies());
+ addPass(createNVPTXLowerAggrCopiesLegacyPass());
addPass(createNVPTXAllocaHoistingLegacyPass());
addPass(createNVPTXISelDag(getNVPTXTargetMachine(), getOptLevel()));
addPass(createNVPTXReplaceImageHandlesLegacyPass());
More information about the llvm-commits
mailing list