[NFC] rename tool to spirv-to-ir-wrapper

Author: mdtoguchi

llvm/test/CMakeLists.txt

@@ -135,7 +135,7 @@ set(LLVM_TEST_DEPENDS
           opt
           sancov
           sanstats
-          spir-to-ir-wrapper
+          spirv-to-ir-wrapper
           sycl-post-link
           split-file
           verify-uselistorder

llvm/test/tools/spir-to-ir-wrapper/spir-to-ir-wrapper.ll renamed to llvm/test/tools/spirv-to-ir-wrapper/spirv-to-ir-wrapper.ll

@@ -1,12 +1,12 @@
 ; Check for passthrough abilities
 ; RUN: llvm-as %s -o %t.bc
-; RUN: spir-to-ir-wrapper %t.bc -o %t_1.bc
+; RUN: spirv-to-ir-wrapper %t.bc -o %t_1.bc
 ; RUN: llvm-dis %t_1.bc -o %t_1.ll
 ; RUN: FileCheck %s --input-file %t_1.ll
 
 ; Check for SPIR-V conversion
 ; RUN: llvm-spirv %t.bc -o %t.spv
-; RUN: spir-to-ir-wrapper %t.spv -o %t_2.bc
+; RUN: spirv-to-ir-wrapper %t.spv -o %t_2.bc
 ; RUN: llvm-dis %t_2.bc -o %t_2.ll
 ; RUN: FileCheck %s --input-file %t_2.ll
 

llvm/tools/spir-to-ir-wrapper/CMakeLists.txt renamed to llvm/tools/spirv-to-ir-wrapper/CMakeLists.txt

@@ -8,6 +8,6 @@ include_directories(
   ${LLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR}/include
   )
 
-add_llvm_tool(spir-to-ir-wrapper
-  spir-to-ir-wrapper.cpp
+add_llvm_tool(spirv-to-ir-wrapper
+  spirv-to-ir-wrapper.cpp
   )

llvm/tools/spir-to-ir-wrapper/spir-to-ir-wrapper.cpp renamed to llvm/tools/spirv-to-ir-wrapper/spirv-to-ir-wrapper.cpp

@@ -1,12 +1,12 @@
-//===--- spir-to-ir-wrapper.cpp - Utility to convert to ir if needed ------===//
+//===--- spirv-to-ir-wrapper.cpp - Utility to convert to ir if needed -----===//
 //
 // 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 utility checks if the input file is SPIR based.  If so, convert to IR
+// This utility checks if the input file is SPIR-V based.  If so, convert to IR
 // The input can be either SPIR-V or LLVM-IR.  When LLVM-IR, copy the file to
 // the specified output.
 //
@@ -15,7 +15,7 @@
 // The output file is used to allow for proper input and output flow within
 // the driver toolchain.
 //
-// Usage: spir-to-ir-wrapper input.spv -o output.bc
+// Usage: spirv-to-ir-wrapper input.spv -o output.bc
 //
 //===----------------------------------------------------------------------===//
 
@@ -47,14 +47,14 @@ static cl::opt<std::string>
                   cl::desc("options to pass to llvm-spirv"));
 
 static void error(const Twine &Message) {
-  llvm::errs() << "spir-to-ir-wrapper: " << Message << '\n';
+  llvm::errs() << "spirv-to-ir-wrapper: " << Message << '\n';
   exit(1);
 }
 
 // Convert the SPIR-V to LLVM-IR.
 static int convertSPIRVToLLVMIR(const char *Argv0) {
   // Find llvm-spirv.  It is expected this resides in the same directory
-  // as spir-to-ir-wrapper.
+  // as spirv-to-ir-wrapper.
   StringRef ParentPath = llvm::sys::path::parent_path(Argv0);
   llvm::ErrorOr<std::string> LlvmSpirvBinary =
       llvm::sys::findProgramByName("llvm-spirv", ParentPath);
@@ -123,7 +123,7 @@ int main(int argc, char **argv) {
   InitLLVM X(argc, argv);
 
   LLVMContext Context;
-  cl::ParseCommandLineOptions(argc, argv, "spir-to-ir-wrapper\n");
+  cl::ParseCommandLineOptions(argc, argv, "spirv-to-ir-wrapper\n");
 
   if (InputFilename.empty())
     error("No input file provided");

sycl/CMakeLists.txt

@@ -229,7 +229,7 @@ add_custom_target(sycl-compiler
           llvm-spirv
           llvm-link
           llvm-objcopy
-          spir-to-ir-wrapper
+          spirv-to-ir-wrapper
           sycl-post-link
           opencl-aot
 )
@@ -293,7 +293,7 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
      llvm-spirv
      llvm-link
      llvm-objcopy
-     spir-to-ir-wrapper
+     spirv-to-ir-wrapper
      sycl-post-link
      sycl-ls
      clang-resource-headers