Cleanup compiler target plugin files. (#15898)

Progress on #15468 * Use descriptive file name instead of `LLVMPasses.h` * Update `ifndef` guards based on new paths * Delete unused `MetalSPIRVTarget.h` file
iree-org · Dec 13, 2023 · 138af17 · 138af17
1 parent 6e811ff
commit 138af17
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 46 deletions.
diff --git a/compiler/plugins/target/CUDA/BUILD.bazel b/compiler/plugins/target/CUDA/BUILD.bazel
@@ -24,7 +24,7 @@ iree_compiler_cc_library(
         "SetBlockIdsRangePass.cpp",
     ],
     hdrs = [
-        "LLVMPasses.h",
+        "SetBlockIdsRangePass.h",
     ],
     deps = [
         "//compiler/src/iree/compiler/Codegen",

diff --git a/compiler/plugins/target/CUDA/CMakeLists.txt b/compiler/plugins/target/CUDA/CMakeLists.txt
@@ -21,7 +21,7 @@ iree_cc_library(
   NAME
     CUDA
   HDRS
-    "LLVMPasses.h"
+    "SetBlockIdsRangePass.h"
   SRCS
     "CUDATarget.cpp"
     "SetBlockIdsRangePass.cpp"

diff --git a/compiler/plugins/target/CUDA/CUDATarget.cpp b/compiler/plugins/target/CUDA/CUDATarget.cpp
@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "./LLVMPasses.h"
+#include "./SetBlockIdsRangePass.h"
 #include "iree/compiler/Codegen/Dialect/IREECodegenDialect.h"
 #include "iree/compiler/Codegen/LLVMGPU/Passes.h"
 #include "iree/compiler/Dialect/HAL/Target/LLVMLinkerUtils.h"

diff --git a/compiler/plugins/target/CUDA/SetBlockIdsRangePass.cpp b/compiler/plugins/target/CUDA/SetBlockIdsRangePass.cpp
@@ -4,7 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "./LLVMPasses.h"
+#include "./SetBlockIdsRangePass.h"
+
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/InstIterator.h"
 #include "llvm/IR/Instructions.h"

diff --git a/compiler/plugins/target/CUDA/LLVMPasses.h → ...lugins/target/CUDA/SetBlockIdsRangePass.h b/compiler/plugins/target/CUDA/LLVMPasses.h → ...lugins/target/CUDA/SetBlockIdsRangePass.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_HAL_TARGET_CUDA_PASS_H_
-#define IREE_COMPILER_DIALECT_HAL_TARGET_CUDA_PASS_H_
+#ifndef IREE_COMPILER_PLUGINS_TARGET_CUDA_SETBLOCKIDSRANGEPASS_H_
+#define IREE_COMPILER_PLUGINS_TARGET_CUDA_SETBLOCKIDSRANGEPASS_H_
 
 #include "llvm/IR/PassManager.h"
 #include "llvm/Pass.h"
@@ -25,4 +25,4 @@ struct SetBlockIdsRangePass : PassInfoMixin<SetBlockIdsRangePass> {
 
 } // namespace llvm
 
-#endif // IREE_COMPILER_DIALECT_HAL_TARGET_CUDA_PASS_H_
+#endif // IREE_COMPILER_PLUGINS_TARGET_CUDA_SETBLOCKIDSRANGEPASS_H_
diff --git a/compiler/plugins/target/MetalSPIRV/BUILD.bazel b/compiler/plugins/target/MetalSPIRV/BUILD.bazel
@@ -20,7 +20,6 @@ iree_compiler_register_plugin(
 iree_compiler_cc_library(
     name = "MetalSPIRV",
     srcs = ["MetalSPIRVTarget.cpp"],
-    hdrs = ["MetalSPIRVTarget.h"],
     deps = [
         ":MSLToMetalLib",
         ":MetalTargetPlatform",

diff --git a/compiler/plugins/target/MetalSPIRV/CMakeLists.txt b/compiler/plugins/target/MetalSPIRV/CMakeLists.txt
@@ -20,8 +20,6 @@ iree_compiler_register_plugin(
 iree_cc_library(
   NAME
     MetalSPIRV
-  HDRS
-    "MetalSPIRVTarget.h"
   SRCS
     "MetalSPIRVTarget.cpp"
   DEPS

diff --git a/compiler/plugins/target/MetalSPIRV/MSLToMetalLib.h b/compiler/plugins/target/MetalSPIRV/MSLToMetalLib.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_HAL_TARGET_METALSPIRV_MSLTOMETALLIB_H_
-#define IREE_COMPILER_DIALECT_HAL_TARGET_METALSPIRV_MSLTOMETALLIB_H_
+#ifndef IREE_COMPILER_PLUGINS_TARGET_METALSPIRV_MSLTOMETALLIB_H_
+#define IREE_COMPILER_PLUGINS_TARGET_METALSPIRV_MSLTOMETALLIB_H_
 
 #include "./MetalTargetPlatform.h"
 #include "llvm/ADT/StringRef.h"
@@ -22,4 +22,4 @@ compileMSLToMetalLib(MetalTargetPlatform targetPlatform,
 
 } // namespace mlir::iree_compiler::IREE::HAL
 
-#endif // IREE_COMPILER_DIALECT_HAL_TARGET_METALSPIRV_MSLTOMETALLIB_H_
+#endif // IREE_COMPILER_PLUGINS_TARGET_METALSPIRV_MSLTOMETALLIB_H_
diff --git a/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.cpp b/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.cpp
@@ -4,8 +4,6 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "./MetalSPIRVTarget.h"
-
 #include "./MSLToMetalLib.h"
 #include "./MetalTargetPlatform.h"
 #include "./SPIRVToMSL.h"

diff --git a/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.h b/compiler/plugins/target/MetalSPIRV/MetalSPIRVTarget.h
diff --git a/compiler/plugins/target/MetalSPIRV/MetalTargetPlatform.h b/compiler/plugins/target/MetalSPIRV/MetalTargetPlatform.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_HAL_TARGET_METALSPIRV_METALTARGETPLATFORM_H_
-#define IREE_COMPILER_DIALECT_HAL_TARGET_METALSPIRV_METALTARGETPLATFORM_H_
+#ifndef IREE_COMPILER_PLUGINS_TARGET_METALSPIRV_METALTARGETPLATFORM_H_
+#define IREE_COMPILER_PLUGINS_TARGET_METALSPIRV_METALTARGETPLATFORM_H_
 
 #include <functional>
 
@@ -16,4 +16,4 @@ enum class MetalTargetPlatform { macOS, iOS, iOSSimulator };
 
 } // namespace mlir::iree_compiler::IREE::HAL
 
-#endif // IREE_COMPILER_DIALECT_HAL_TARGET_METALSPIRV_METALTARGETPLATFORM_H_
+#endif // IREE_COMPILER_PLUGINS_TARGET_METALSPIRV_METALTARGETPLATFORM_H_
diff --git a/compiler/plugins/target/MetalSPIRV/SPIRVToMSL.h b/compiler/plugins/target/MetalSPIRV/SPIRVToMSL.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_HAL_TARGET_METALSPIRV_SPIRVTOMSL_H_
-#define IREE_COMPILER_DIALECT_HAL_TARGET_METALSPIRV_SPIRVTOMSL_H_
+#ifndef IREE_COMPILER_PLUGINS_TARGET_METALSPIRV_SPIRVTOMSL_H_
+#define IREE_COMPILER_PLUGINS_TARGET_METALSPIRV_SPIRVTOMSL_H_
 
 #include <array>
 #include <optional>
@@ -37,4 +37,4 @@ crossCompileSPIRVToMSL(IREE::HAL::MetalTargetPlatform targetPlatform,
 
 } // namespace mlir::iree_compiler
 
-#endif // IREE_COMPILER_DIALECT_HAL_TARGET_METALSPIRV_SPIRVTOMSL_H_
+#endif // IREE_COMPILER_PLUGINS_TARGET_METALSPIRV_SPIRVTOMSL_H_
diff --git a/compiler/plugins/target/ROCM/ROCMTargetUtils.h b/compiler/plugins/target/ROCM/ROCMTargetUtils.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_HAL_TARGET_ROCM_ROCMTARGETUTILS_H_
-#define IREE_COMPILER_DIALECT_HAL_TARGET_ROCM_ROCMTARGETUTILS_H_
+#ifndef IREE_COMPILER_PLUGINS_TARGET_ROCM_ROCMTARGETUTILS_H_
+#define IREE_COMPILER_PLUGINS_TARGET_ROCM_ROCMTARGETUTILS_H_
 
 #include "iree/compiler/Dialect/HAL/Target/TargetBackend.h"
 #include "llvm/IR/Module.h"
@@ -21,4 +21,4 @@ std::string createHsaco(Location loc, const std::string isa, StringRef name);
 
 } // namespace mlir::iree_compiler::IREE::HAL
 
-#endif // IREE_COMPILER_DIALECT_HAL_TARGET_ROCM_ROCMTARGETUTILS_H_
+#endif // IREE_COMPILER_PLUGINS_TARGET_ROCM_ROCMTARGETUTILS_H_
diff --git a/compiler/plugins/target/WebGPU/SPIRVToWGSL.h b/compiler/plugins/target/WebGPU/SPIRVToWGSL.h
@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_COMPILER_DIALECT_HAL_TARGET_WEBGPU_SPIRVTOWGSL_H_
-#define IREE_COMPILER_DIALECT_HAL_TARGET_WEBGPU_SPIRVTOWGSL_H_
+#ifndef IREE_COMPILER_PLUGINS_TARGET_WEBGPU_SPIRVTOWGSL_H_
+#define IREE_COMPILER_PLUGINS_TARGET_WEBGPU_SPIRVTOWGSL_H_
 
 #include <optional>
 #include <string>
@@ -21,4 +21,4 @@ compileSPIRVToWGSL(llvm::ArrayRef<uint32_t> spvBinary);
 
 } // namespace mlir::iree_compiler::IREE::HAL
 
-#endif // IREE_COMPILER_DIALECT_HAL_TARGET_WEBGPU_SPIRVTOWGSL_H_
+#endif // IREE_COMPILER_PLUGINS_TARGET_WEBGPU_SPIRVTOWGSL_H_