[llvm-branch-commits] [SPIRV] Move NewPM pass definitions to SPIRV.h (PR #218205)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Sat Aug 22 23:03:33 PDT 2026


llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-backend-spir-v

Author: Aiden Grossman (boomanaiden154)

<details>
<summary>Changes</summary>

To be consistent with all the other targets that have been ported to the
NewPM (BPF, WebAssembly, X86, Lanai, MSP430). These definitions are
pretty lightweight and putting them in a central place avoids a lot of
per-header boilerplate (namespaces, forward declarations, includes) that
one would otherwise need.


---

Patch is 26.09 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/218205.diff


28 Files Affected:

- (modified) llvm/lib/Target/SPIRV/SPIRV.h (+106) 
- (modified) llvm/lib/Target/SPIRV/SPIRVCBufferAccess.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVCBufferAccess.h (-22) 
- (modified) llvm/lib/Target/SPIRV/SPIRVCtorDtorLowering.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVCtorDtorLowering.h (-27) 
- (modified) llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.h (-29) 
- (modified) llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.h (-34) 
- (modified) llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.h (-24) 
- (modified) llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.h (-29) 
- (modified) llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.h (-29) 
- (modified) llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.h (-24) 
- (modified) llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.h (-29) 
- (modified) llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.h (-23) 
- (modified) llvm/lib/Target/SPIRV/SPIRVPushConstantAccess.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVPushConstantAccess.h (-28) 
- (modified) llvm/lib/Target/SPIRV/SPIRVRegularizer.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVRegularizer.h (-23) 
- (modified) llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp (-1) 
- (removed) llvm/lib/Target/SPIRV/SPIRVStructurizerWrapper.h (-29) 
- (modified) llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp (-13) 


``````````diff
diff --git a/llvm/lib/Target/SPIRV/SPIRV.h b/llvm/lib/Target/SPIRV/SPIRV.h
index 17559ba6ed080..688a72151d892 100644
--- a/llvm/lib/Target/SPIRV/SPIRV.h
+++ b/llvm/lib/Target/SPIRV/SPIRV.h
@@ -20,21 +20,127 @@ class SPIRVSubtarget;
 class InstructionSelector;
 class RegisterBankInfo;
 
+class SPIRVPrepareFunctions
+    : public RequiredPassInfoMixin<SPIRVPrepareFunctions> {
+  const SPIRVTargetMachine &TM;
+
+public:
+  explicit SPIRVPrepareFunctions(const SPIRVTargetMachine &TM) : TM(TM) {}
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+
 ModulePass *createSPIRVPrepareFunctionsPass(const SPIRVTargetMachine &TM);
+
+class SPIRVStructurizerWrapper
+    : public RequiredPassInfoMixin<SPIRVStructurizerWrapper> {
+public:
+  PreservedAnalyses run(Function &M, FunctionAnalysisManager &AM);
+};
+
 FunctionPass *createSPIRVStructurizerPass();
+
+class SPIRVCBufferAccess : public RequiredPassInfoMixin<SPIRVCBufferAccess> {
+public:
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+
 ModulePass *createSPIRVCBufferAccessLegacyPass();
+
+class SPIRVPushConstantAccess
+    : public RequiredPassInfoMixin<SPIRVPushConstantAccess> {
+  const SPIRVTargetMachine &TM;
+
+public:
+  SPIRVPushConstantAccess(const SPIRVTargetMachine &TM) : TM(TM) {}
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+
 ModulePass *createSPIRVPushConstantAccessLegacyPass(SPIRVTargetMachine *TM);
+
+class SPIRVMergeRegionExitTargets
+    : public RequiredPassInfoMixin<SPIRVMergeRegionExitTargets> {
+public:
+  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+};
+
 FunctionPass *createSPIRVMergeRegionExitTargetsPass();
+
+class SPIRVLegalizeImplicitBinding
+    : public RequiredPassInfoMixin<SPIRVLegalizeImplicitBinding> {
+public:
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+
 ModulePass *createSPIRVLegalizeImplicitBindingPass();
+
+class SPIRVLegalizeZeroSizeArrays
+    : public RequiredPassInfoMixin<SPIRVLegalizeZeroSizeArrays> {
+  const SPIRVTargetMachine &TM;
+
+public:
+  SPIRVLegalizeZeroSizeArrays(const SPIRVTargetMachine &TM) : TM(TM) {}
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+
 ModulePass *createSPIRVLegalizeZeroSizeArraysPass(const SPIRVTargetMachine &TM);
+
+class SPIRVFinalizeShaderLinkage
+    : public RequiredPassInfoMixin<SPIRVFinalizeShaderLinkage> {
+  const SPIRVTargetMachine &TM;
+
+public:
+  SPIRVFinalizeShaderLinkage(const SPIRVTargetMachine &TM) : TM(TM) {}
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+
 ModulePass *createSPIRVFinalizeShaderLinkagePass(const SPIRVTargetMachine &TM);
+
+class SPIRVLegalizePointerCast
+    : public RequiredPassInfoMixin<SPIRVLegalizePointerCast> {
+  const SPIRVTargetMachine &TM;
+
+public:
+  explicit SPIRVLegalizePointerCast(const SPIRVTargetMachine &TM) : TM(TM) {}
+  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+};
+
 FunctionPass *createSPIRVLegalizePointerCastPass(SPIRVTargetMachine *TM);
+
+class SPIRVRegularizer : public RequiredPassInfoMixin<SPIRVRegularizer> {
+public:
+  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
+};
+
 FunctionPass *createSPIRVRegularizerPass();
 FunctionPass *createSPIRVPreLegalizerCombiner();
 FunctionPass *createSPIRVPreLegalizerPass();
 FunctionPass *createSPIRVPostLegalizerPass();
+
+class SPIRVEmitIntrinsicsPass
+    : public RequiredPassInfoMixin<SPIRVEmitIntrinsicsPass> {
+  const SPIRVTargetMachine &TM;
+
+public:
+  SPIRVEmitIntrinsicsPass(const SPIRVTargetMachine &TM) : TM(TM) {}
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+
 ModulePass *createSPIRVEmitIntrinsicsPass(const SPIRVTargetMachine &TM);
+
+class SPIRVPrepareGlobals : public RequiredPassInfoMixin<SPIRVPrepareGlobals> {
+public:
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+
 ModulePass *createSPIRVPrepareGlobalsPass();
+
+/// Lower llvm.global_ctors and llvm.global_dtors to special kernels.
+class SPIRVCtorDtorLoweringPass
+    : public RequiredPassInfoMixin<SPIRVCtorDtorLoweringPass> {
+public:
+  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
+};
+
 ModulePass *createSPIRVCtorDtorLoweringLegacyPass();
 InstructionSelector *
 createSPIRVInstructionSelector(const SPIRVTargetMachine &TM,
diff --git a/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.cpp b/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.cpp
index b23947d0e4931..a47aa264ec251 100644
--- a/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.cpp
@@ -29,7 +29,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SPIRVCBufferAccess.h"
 #include "SPIRV.h"
 #include "llvm/Frontend/HLSL/CBuffer.h"
 #include "llvm/IR/IRBuilder.h"
diff --git a/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.h b/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.h
deleted file mode 100644
index 1097d75c406d2..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVCBufferAccess.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- SPIRVCBufferAccess.h - Translate CBuffer Loads ----------*- 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
-//
-
-#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVCBUFFERACCESS_H
-#define LLVM_LIB_TARGET_SPIRV_SPIRVCBUFFERACCESS_H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-
-class SPIRVCBufferAccess : public RequiredPassInfoMixin<SPIRVCBufferAccess> {
-public:
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
-};
-
-} // namespace llvm
-
-#endif // LLVM_LIB_TARGET_SPIRV_SPIRVCBUFFERACCESS_H
diff --git a/llvm/lib/Target/SPIRV/SPIRVCtorDtorLowering.cpp b/llvm/lib/Target/SPIRV/SPIRVCtorDtorLowering.cpp
index 89212d3e3cfc0..59ed117f3fa83 100644
--- a/llvm/lib/Target/SPIRV/SPIRVCtorDtorLowering.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVCtorDtorLowering.cpp
@@ -11,7 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SPIRVCtorDtorLowering.h"
 #include "MCTargetDesc/SPIRVBaseInfo.h"
 #include "SPIRV.h"
 #include "llvm/ADT/STLFunctionalExtras.h"
diff --git a/llvm/lib/Target/SPIRV/SPIRVCtorDtorLowering.h b/llvm/lib/Target/SPIRV/SPIRVCtorDtorLowering.h
deleted file mode 100644
index 2cbe590cde8a3..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVCtorDtorLowering.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//===-- SPIRVCtorDtorLowering.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
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVCTORDTORLOWERING_H
-#define LLVM_LIB_TARGET_SPIRV_SPIRVCTORDTORLOWERING_H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-class Module;
-class PassRegistry;
-
-/// Lower llvm.global_ctors and llvm.global_dtors to special kernels.
-class SPIRVCtorDtorLoweringPass
-    : public RequiredPassInfoMixin<SPIRVCtorDtorLoweringPass> {
-public:
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
-};
-
-} // namespace llvm
-
-#endif // LLVM_LIB_TARGET_SPIRV_SPIRVCTORDTORLOWERING_H
diff --git a/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp b/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp
index 0f097c742fac2..50719572e0b0d 100644
--- a/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp
@@ -11,7 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SPIRVEmitIntrinsics.h"
 #include "SPIRV.h"
 #include "SPIRVBuiltins.h"
 #include "SPIRVSubtarget.h"
diff --git a/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.h b/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.h
deleted file mode 100644
index a31f9d32761f3..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//===- SPIRVEmitIntrinsics.h - Emit SPIRV intrinsics *- 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
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVEMITINTRINSICS_H
-#define LLVM_LIB_TARGET_SPIRV_SPIRVEMITINTRINSICS_H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-
-class SPIRVTargetMachine;
-
-class SPIRVEmitIntrinsicsPass
-    : public RequiredPassInfoMixin<SPIRVEmitIntrinsicsPass> {
-  const SPIRVTargetMachine &TM;
-
-public:
-  SPIRVEmitIntrinsicsPass(const SPIRVTargetMachine &TM) : TM(TM) {}
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
-};
-
-} // namespace llvm
-
-#endif // LLVM_LIB_TARGET_SPIRV_SPIRVEMITINTRINSICS_H
diff --git a/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.cpp b/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.cpp
index 554d0f0e151d6..3448587c8a4d5 100644
--- a/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.cpp
@@ -11,7 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SPIRVFinalizeShaderLinkage.h"
 #include "SPIRV.h"
 #include "SPIRVSubtarget.h"
 #include "SPIRVTargetMachine.h"
diff --git a/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.h b/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.h
deleted file mode 100644
index 340ce914bcc9a..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVFinalizeShaderLinkage.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//===- SPIRVFinalizeShaderLinkage.h - Finalize shader linkage --*- 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
-//
-//===----------------------------------------------------------------------===//
-///
-/// Shader-only analogue of DXILFinalizeLinkage: internalizes non-entry,
-/// non-exported HLSL helper functions and erases the resulting dead ones.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVFINALIZESHADERLINKAGE_H
-#define LLVM_LIB_TARGET_SPIRV_SPIRVFINALIZESHADERLINKAGE_H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-
-class SPIRVTargetMachine;
-
-class SPIRVFinalizeShaderLinkage
-    : public RequiredPassInfoMixin<SPIRVFinalizeShaderLinkage> {
-  const SPIRVTargetMachine &TM;
-
-public:
-  SPIRVFinalizeShaderLinkage(const SPIRVTargetMachine &TM) : TM(TM) {}
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
-};
-
-} // namespace llvm
-
-#endif // LLVM_LIB_TARGET_SPIRV_SPIRVFINALIZESHADERLINKAGE_H
diff --git a/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.cpp b/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.cpp
index 3e6dab880abca..2222c87a7a1ba 100644
--- a/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.cpp
@@ -13,7 +13,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SPIRVLegalizeImplicitBinding.h"
 #include "SPIRV.h"
 #include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/STLExtras.h"
diff --git a/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.h b/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.h
deleted file mode 100644
index 860c1b41087ce..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVLegalizeImplicitBinding.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//===- SPIRVLegalizeImplicitBinding.h - Legalize implicit bindings -*- 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
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVLEGALIZEIMPLICITBINDING_H
-#define LLVM_LIB_TARGET_SPIRV_SPIRVLEGALIZEIMPLICITBINDING_H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-
-class SPIRVLegalizeImplicitBinding
-    : public RequiredPassInfoMixin<SPIRVLegalizeImplicitBinding> {
-public:
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
-};
-
-} // namespace llvm
-
-#endif // LLVM_LIB_TARGET_SPIRV_SPIRVLEGALIZEIMPLICITBINDING_H
diff --git a/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp b/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp
index 847eda7880c03..0e88bfea55262 100644
--- a/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp
@@ -42,7 +42,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SPIRVLegalizePointerCast.h"
 #include "SPIRV.h"
 #include "SPIRVSubtarget.h"
 #include "SPIRVTargetMachine.h"
diff --git a/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.h b/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.h
deleted file mode 100644
index 408369f88b84f..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//===-- SPIRVLegalizePointerCast.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
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVLEGALIZEPOINTERCAST_H
-#define LLVM_LIB_TARGET_SPIRV_SPIRVLEGALIZEPOINTERCAST_H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-
-class SPIRVTargetMachine;
-
-class SPIRVLegalizePointerCast
-    : public RequiredPassInfoMixin<SPIRVLegalizePointerCast> {
-  const SPIRVTargetMachine &TM;
-
-public:
-  explicit SPIRVLegalizePointerCast(const SPIRVTargetMachine &TM) : TM(TM) {}
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
-};
-
-} // namespace llvm
-
-#endif // LLVM_LIB_TARGET_SPIRV_SPIRVLEGALIZEPOINTERCAST_H
diff --git a/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp b/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp
index 09697b59c374a..264b1d5926aa2 100644
--- a/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.cpp
@@ -11,7 +11,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SPIRVLegalizeZeroSizeArrays.h"
 #include "SPIRV.h"
 #include "SPIRVTargetMachine.h"
 #include "SPIRVUtils.h"
diff --git a/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.h b/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.h
deleted file mode 100644
index 86c840bf2f969..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVLegalizeZeroSizeArrays.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//===- SPIRVLegalizeZeroSizeArrays.h - Legalize zero-size arrays *- 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
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVLEGALIZEZEROSIZEARRAYS_H
-#define LLVM_LIB_TARGET_SPIRV_SPIRVLEGALIZEZEROSIZEARRAYS_H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-
-class SPIRVTargetMachine;
-
-class SPIRVLegalizeZeroSizeArrays
-    : public RequiredPassInfoMixin<SPIRVLegalizeZeroSizeArrays> {
-  const SPIRVTargetMachine &TM;
-
-public:
-  SPIRVLegalizeZeroSizeArrays(const SPIRVTargetMachine &TM) : TM(TM) {}
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
-};
-
-} // namespace llvm
-
-#endif // LLVM_LIB_TARGET_SPIRV_SPIRVLEGALIZEZEROSIZEARRAYS_H
diff --git a/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.cpp b/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.cpp
index 4a143b21f5f48..d734565a2184c 100644
--- a/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.cpp
@@ -12,7 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SPIRVMergeRegionExitTargets.h"
 #include "Analysis/SPIRVConvergenceRegionAnalysis.h"
 #include "SPIRV.h"
 #include "SPIRVSubtarget.h"
diff --git a/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.h b/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.h
deleted file mode 100644
index e3559932deb38..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVMergeRegionExitTargets.h
+++ /dev/null
@@ -1,24 +0,0 @@
-//===-- SPIRVMergeRegionExitTargets.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
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVMERGEREGIONEXITTARGETS_H
-#define LLVM_LIB_TARGET_SPIRV_SPIRVMERGEREGIONEXITTARGETS_H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-
-class SPIRVMergeRegionExitTargets
-    : public RequiredPassInfoMixin<SPIRVMergeRegionExitTargets> {
-public:
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM);
-};
-
-} // namespace llvm
-
-#endif // LLVM_LIB_TARGET_SPIRV_SPIRVMERGEREGIONEXITTARGETS_H
diff --git a/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp b/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
index e8355031f6587..624d8dd8c0383 100644
--- a/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.cpp
@@ -18,7 +18,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SPIRVPrepareFunctions.h"
 #include "SPIRV.h"
 #include "SPIRVBuiltins.h"
 #include "SPIRVSubtarget.h"
diff --git a/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.h b/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.h
deleted file mode 100644
index 49436f616f07e..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVPrepareFunctions.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//===-- SPIRVPrepareFunctions.h - modify function signatures ----*- 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
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_SPIRV_SPIRVPREPAREFUNCTIONS_H
-#define LLVM_LIB_TARGET_SPIRV_SPIRVPREPAREFUNCTIONS_H
-
-#include "llvm/IR/PassManager.h"
-
-namespace llvm {
-
-class SPIRVTargetMachine;
-
-class SPIRVPrepareFunctions
-    : public RequiredPassInfoMixin<SPIRVPrepareFunctions> {
-  const SPIRVTargetMachine &TM;
-
-public:
-  explicit SPIRVPrepareFunctions(const SPIRVTargetMachine &TM) : TM(TM) {}
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &AM);
-};
-
-} // namespace llvm
-
-#endif // LLVM_LIB_TARGET_SPIRV_SPIRVPREPAREFUNCTIONS_H
diff --git a/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.cpp b/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.cpp
index 25f3bb0950aa3..46208a94f7afe 100644
--- a/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.cpp
@@ -16,7 +16,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "SPIRVPrepareGlobals.h"
 #include "SPIRV.h"
 #include "SPIRVUtils.h"
 
diff --git a/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.h b/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.h
deleted file mode 100644
index 395a2fd7303cd..0000000000000
--- a/llvm/lib/Target/SPIRV/SPIRVPrepareGlobals.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//===-- SPIRVPrepareGlobals.h - Prepare IR SPIRV globals --------*- 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
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIB_TARGET_SP...
[truncated]

``````````

</details>


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


More information about the llvm-branch-commits mailing list