SYCL: Rename clang-offload-packager to llvm-offload-binary after 2499fe1 (#32651)

Corresponding changes in sycl for [Offload] Rename and move
'clang-offload-packager' -> 'llvm-offload-binary'
(llvm/llvm-project#161438)

Author: jsji

clang/lib/Driver/Action.cpp

@@ -47,7 +47,7 @@ const char *Action::getClassName(ActionClass AC) {
   case OffloadPackagerJobClass:
     return "llvm-offload-binary";
   case OffloadPackagerExtractJobClass:
-    return "clang-offload-packager-extract";
+    return "llvm-offload-binary-extract";
   case OffloadDepsJobClass:
     return "clang-offload-deps";
   case SPIRVTranslatorJobClass:

clang/lib/Driver/Driver.cpp

@@ -7766,7 +7766,7 @@ Action *Driver::BuildOffloadingActions(Compilation &C,
       for (StringRef Arch : getOffloadArchs(C, C.getArgs(), Kind, *TC)) {
         TCAndArchs.push_back(std::make_pair(TC, Arch));
         // Check if the InputArg is a preprocessed file that is created by the
-        // clang-offload-packager.
+        // llvm-offload-binary.
         if (InputType == types::TY_PP_CXX &&
             isOffloadBinaryFile(InputArg->getAsString(Args))) {
           // Extract the specific preprocessed file given the current arch
@@ -8187,7 +8187,7 @@ Action *Driver::ConstructPhaseAction(
         auto *ForEach = C.MakeAction<ForEachWrappingAction>(
             TypedExtractIRFilesAction, OutputAction);
         // This final job is mostly a no-op, but we need it to set the Action
-        // type to Tempfilelist which is expected by clang-offload-packager.
+        // type to Tempfilelist which is expected by llvm-offload-binary.
         auto *ExtractBCFiles = C.MakeAction<FileTableTformJobAction>(
             ForEach, types::TY_Tempfilelist, types::TY_Tempfilelist);
         ExtractBCFiles->addExtractColumnTform(FileTableTformJobAction::COL_ZERO,
@@ -9410,7 +9410,7 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
     llvm::replace(BoundArch, '*', '@');
   }
   // BoundArch may contain ',', which may create strings that interfere with
-  // the StringMap for the clang-offload-packager input values.
+  // the StringMap for the llvm-offload-binary input values.
   std::replace(BoundArch.begin(), BoundArch.end(), ',', '@');
 
   llvm::PrettyStackTraceString CrashInfo("Computing output path");

clang/lib/Driver/ToolChains/Clang.cpp

@@ -10305,7 +10305,7 @@ void OffloadPackager::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs, Inputs, Output));
 }
 
-// Use the clang-offload-packager to extract binaries from a packaged
+// Use the llvm-offload-binary to extract binaries from a packaged
 // binary.  This currently only supports single input/single output.
 void OffloadPackagerExtract::ConstructJob(Compilation &C, const JobAction &JA,
                                           const InputInfo &Output,

clang/lib/Driver/ToolChains/Clang.h

@@ -194,7 +194,7 @@ class LLVM_LIBRARY_VISIBILITY OffloadPackager final : public Tool {
 class LLVM_LIBRARY_VISIBILITY OffloadPackagerExtract final : public Tool {
 public:
   OffloadPackagerExtract(const ToolChain &TC)
-      : Tool("Offload::PackagerExtract", "clang-offload-packager", TC) {}
+      : Tool("Offload::PackagerExtract", "llvm-offload-binary", TC) {}
 
   bool hasIntegratedCPP() const override { return false; }
   void ConstructJob(Compilation &C, const JobAction &JA,

libdevice/CMakeLists.txt

@@ -28,14 +28,14 @@ if(NOT EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR})
   get_host_tool_path(llvm-ar LLVM_AR llvm-ar_exe llvm-ar_target)
   get_host_tool_path(append-file APPEND_FILE append-file_exe append-file_target)
   get_host_tool_path(clang-offload-bundler CLANG_OFFLOAD_BUNDLER clang-offload-bundler_exe clang-offload-bundler_target)
-  get_host_tool_path(clang-offload-packager CLANG_OFFLOAD_PACKAGER clang-offload-packager_exe clang-offload-packager_target)
+  get_host_tool_path(llvm-offload-binary LLVM_OFFLOAD_BINARY llvm-offload-binary_exe llvm-offload-binary_target)
   get_host_tool_path(file-table-tform FILE_TABLE_TFORM file-table-tform_exe file-table-tform_target)
   get_host_tool_path(llvm-foreach LLVM_FOREACH llvm-foreach_exe llvm-foreach_target)
   get_host_tool_path(llvm-spirv LLVM_SPIRV llvm-spirv_exe llvm-spirv_target)
   get_host_tool_path(sycl-post-link SYCL_POST_LINK sycl-post-link_exe sycl-post-link_target)
   get_host_tool_path(llvm-link LLVM_LINK llvm-link_exe llvm-link_target)
 else()
-  foreach(tool IN ITEMS clang llvm-ar append-file clang-offload-bundler clang-offload-packager file-table-tform llvm-foreach llvm-spirv sycl-post-link llvm-link)
+  foreach(tool IN ITEMS clang llvm-ar append-file clang-offload-bundler llvm-offload-binary file-table-tform llvm-foreach llvm-spirv sycl-post-link llvm-link)
     find_program(LLVM_CUSTOM_TOOL_${tool} ${tool}
       PATHS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
     set(${tool}_exe ${LLVM_CUSTOM_TOOL_${tool}})

libdevice/cmake/modules/SYCLLibdevice.cmake

@@ -340,7 +340,7 @@ endfunction()
 # For cross builds, we also need native versions of the tools.
 set(sycl-compiler_deps
   sycl-compiler ${clang_target} ${append-file_target}
-  ${clang-offload-bundler_target} ${clang-offload-packager_target}
+  ${clang-offload-bundler_target} ${llvm-offload-binary_target}
   ${file-table-tform_target} ${llvm-foreach_target} ${llvm-spirv_target}
   ${sycl-post-link_target})
 set(crt_obj_deps wrapper.h device.h spirv_vars.h ${sycl-compiler_deps})

sycl/CMakeLists.txt

@@ -394,7 +394,7 @@ add_custom_target(sycl-compiler
           clang-offload-bundler
           clang-offload-deps
           clang-offload-extract
-          clang-offload-packager
+          llvm-offload-binary
           clang-linker-wrapper
           file-table-tform
           llc
@@ -477,7 +477,7 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
      clang-offload-bundler
      clang-offload-deps
      clang-offload-extract
-     clang-offload-packager
+     llvm-offload-binary
      clang-linker-wrapper
      file-table-tform
      llc

sycl/doc/design/OffloadDesign.md

@@ -54,11 +54,11 @@ host and target device binaries.
 
 When dealing with multiple device binaries, an additional step is performed to
 package the multiple device binaries before being added to the host object.
-This additional step is performed with the `clang-offload-packager` taking
+This additional step is performed with the `llvm-offload-binary` taking
 image inputs containing information relating to the target triple,
 architecture setting and offloading kind.
 
-The `clang-offload-packager` is run during 'fat object' generation regardless
+The `llvm-offload-binary` is run during 'fat object' generation regardless
 of the number of device binaries being added to the conglomerate fat object.
 The device binaries are contained in what is designated as an ‘Offload Binary’.
 These binaries can reside in a variety of binary formats including Bitcode
@@ -69,9 +69,9 @@ We should have the ability to package SPIR-V based device binaries in the
 offload section of any given binary.  These device binaries will be packaged
 as normal with the packager and placed within the given section.
 
-Example usage of the external `clang-offload-packager` call:
+Example usage of the external `llvm-offload-binary` call:
 
-`clang-offload-packager --image=file=<name>,triple=<triple>,kind=<kind>`
+`llvm-offload-binary --image=file=<name>,triple=<triple>,kind=<kind>`
 
 ## Clang Linker Wrapper
 

sycl/doc/design/SYCLBINDesign.md

@@ -28,7 +28,7 @@ in this section. The intention of defining a new format for these is to give
 the DPC++ implementation an extendable and lightweight wrapper around the
 multiple modules and corresponding metadata captured in the SYCLBIN file.
 The content of the SYCLBIN may be contained as an entry in the offloading binary
-format produced by the clang-offload-packager, as described in
+format produced by the llvm-offload-binary, as described in
 [ClangOffloadPackager.rst](https://github.com/intel/llvm/blob/sycl/clang/docs/ClangOffloadPackager.rst).
 
 The format of these files consist of a [file header](#file-header), containing
@@ -221,7 +221,7 @@ The clang driver needs to accept the following new flags:
 If this option is set, the output of the invocation is a SYCLBIN file with the
 .syclbin file extension. This skips the host-compilation invocation of the
 typical `-fsycl` pipeline, instead passing the output of the
-clang-offload-packager invocation to clang-linker-wrapper together with the new
+llvm-offload-binary invocation to clang-linker-wrapper together with the new
 `--syclbin` flag.
 
 Setting this option will override `-fsycl`. Passing`-fsycl-device-only` with