[llvm-branch-commits] [llvm] [RISCV][NFC] Move ZacasABIFix Pass Declaration (PR #215680)

[Sam Elliott via llvm-branch-commits]

https://github.com/lenary updated https://github.com/llvm/llvm-project/pull/215680

>From 826edca71a20c8315d2519914d296c5681ae3333 Mon Sep 17 00:00:00 2001
From: Sam Elliott <aelliott at qti.qualcomm.com>
Date: Tue, 11 Aug 2026 14:44:53 -0700
Subject: [PATCH] [RISCV][NFC] Move ZacasABIFix Pass Declaration

This change moves them into their own header, as has been done for the
other NewPM passes.

Assisted-by: AI
---
 llvm/lib/Target/RISCV/RISCV.h                 | 12 ------
 .../Target/RISCV/RISCVCodeGenPassBuilder.cpp  |  1 +
 llvm/lib/Target/RISCV/RISCVTargetMachine.cpp  |  1 +
 llvm/lib/Target/RISCV/RISCVZacasABIFix.cpp    |  2 +-
 llvm/lib/Target/RISCV/RISCVZacasABIFix.h      | 40 +++++++++++++++++++
 5 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 llvm/lib/Target/RISCV/RISCVZacasABIFix.h

diff --git a/llvm/lib/Target/RISCV/RISCV.h b/llvm/lib/Target/RISCV/RISCV.h
index 7a9ba9fec4264..3ad270d7cb229 100644
--- a/llvm/lib/Target/RISCV/RISCV.h
+++ b/llvm/lib/Target/RISCV/RISCV.h
@@ -88,18 +88,6 @@ void initializeRISCVLoadStoreOptPass(PassRegistry &);
 FunctionPass *createRISCVPreAllocZilsdOptPass();
 void initializeRISCVPreAllocZilsdOptPass(PassRegistry &);
 
-class RISCVZacasABIFixPass
-    : public RequiredPassInfoMixin<RISCVZacasABIFixPass> {
-private:
-  const RISCVTargetMachine *TM;
-
-public:
-  RISCVZacasABIFixPass(const RISCVTargetMachine *TM) : TM(TM) {}
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
-};
-FunctionPass *createRISCVZacasABIFixPass();
-void initializeRISCVZacasABIFixLegacyPass(PassRegistry &);
-
 InstructionSelector *
 createRISCVInstructionSelector(const RISCVTargetMachine &,
                                const RISCVSubtarget &,
diff --git a/llvm/lib/Target/RISCV/RISCVCodeGenPassBuilder.cpp b/llvm/lib/Target/RISCV/RISCVCodeGenPassBuilder.cpp
index 56888653336be..a7f8f87afa7bb 100644
--- a/llvm/lib/Target/RISCV/RISCVCodeGenPassBuilder.cpp
+++ b/llvm/lib/Target/RISCV/RISCVCodeGenPassBuilder.cpp
@@ -18,6 +18,7 @@
 #include "RISCVTargetMachine.h"
 #include "RISCVVLOptimizer.h"
 #include "RISCVVectorPeephole.h"
+#include "RISCVZacasABIFix.h"
 #include "llvm/CodeGen/AtomicExpand.h"
 #include "llvm/CodeGen/BranchRelaxation.h"
 #include "llvm/CodeGen/InterleavedAccess.h"
diff --git a/llvm/lib/Target/RISCV/RISCVTargetMachine.cpp b/llvm/lib/Target/RISCV/RISCVTargetMachine.cpp
index 4f01bbc63c64d..b1958f746650a 100644
--- a/llvm/lib/Target/RISCV/RISCVTargetMachine.cpp
+++ b/llvm/lib/Target/RISCV/RISCVTargetMachine.cpp
@@ -23,6 +23,7 @@
 #include "RISCVTargetTransformInfo.h"
 #include "RISCVVLOptimizer.h"
 #include "RISCVVectorPeephole.h"
+#include "RISCVZacasABIFix.h"
 #include "TargetInfo/RISCVTargetInfo.h"
 #include "llvm/Analysis/TargetTransformInfo.h"
 #include "llvm/CodeGen/GlobalISel/CSEInfo.h"
diff --git a/llvm/lib/Target/RISCV/RISCVZacasABIFix.cpp b/llvm/lib/Target/RISCV/RISCVZacasABIFix.cpp
index 577ab5bebcaa9..8a3d3e0e804e5 100644
--- a/llvm/lib/Target/RISCV/RISCVZacasABIFix.cpp
+++ b/llvm/lib/Target/RISCV/RISCVZacasABIFix.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "RISCV.h"
+#include "RISCVZacasABIFix.h"
 #include "RISCVTargetMachine.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Analysis/ValueTracking.h"
diff --git a/llvm/lib/Target/RISCV/RISCVZacasABIFix.h b/llvm/lib/Target/RISCV/RISCVZacasABIFix.h
new file mode 100644
index 0000000000000..42ef984ed271a
--- /dev/null
+++ b/llvm/lib/Target/RISCV/RISCVZacasABIFix.h
@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// This file declares the RISC-V Zacas ABI fix passes.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIB_TARGET_RISCV_RISCVZACASABIFIX_H
+#define LLVM_LIB_TARGET_RISCV_RISCVZACASABIFIX_H
+
+#include "llvm/IR/PassManager.h"
+
+namespace llvm {
+
+class FunctionPass;
+class PassRegistry;
+class RISCVTargetMachine;
+
+class RISCVZacasABIFixPass
+    : public RequiredPassInfoMixin<RISCVZacasABIFixPass> {
+private:
+  const RISCVTargetMachine *TM;
+
+public:
+  RISCVZacasABIFixPass(const RISCVTargetMachine *TM) : TM(TM) {}
+  PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
+};
+
+FunctionPass *createRISCVZacasABIFixPass();
+void initializeRISCVZacasABIFixLegacyPass(PassRegistry &);
+
+} // namespace llvm
+
+#endif // LLVM_LIB_TARGET_RISCV_RISCVZACASABIFIX_H