Remove leftovers. Remove unnecessary function. Improve the comment.

Author: maksimsab

clang/test/Driver/linker-wrapper-image.c

@@ -283,8 +283,6 @@
 // SYCL-NEXT: @.offloading.entry_name = internal unnamed_addr constant [5 x i8] c"stub\00", section ".llvm.rodata.offloading", align 1
 // SYCL-NEXT: @.offloading.entry.stub = weak constant %struct.__tgt_offload_entry { i64 0, i16 1, i16 8, i32 0, ptr null, ptr @.offloading.entry_name, i64 0, i64 0, ptr null }, section "llvm_offload_entries", align 8
 // SYCL-NEXT: @.sycl_offloading.entries_arr = internal constant [1 x %struct.__tgt_offload_entry] [%struct.__tgt_offload_entry { i64 0, i16 1, i16 8, i32 0, ptr null, ptr @.offloading.entry_name, i64 0, i64 0, ptr null }]
-// SYCL-NEXT: @.sycl_offloading.0.info = internal local_unnamed_addr constant [2 x i64] [i64 ptrtoint (ptr @.sycl_offloading.0.data to i64), i64 0], section ".tgtimg", align 16
-// SYCL-NEXT: @llvm.used = appending global [1 x ptr] [ptr @.sycl_offloading.0.info], section "llvm.metadata"
 // SYCL-NEXT: @.sycl_offloading.device_images = internal unnamed_addr constant [1 x %__sycl.tgt_device_image] [%__sycl.tgt_device_image { i16 3, i8 8, i8 0, ptr @.sycl_offloading.target.0, ptr @.sycl_offloading.opts.compile.0, ptr @.sycl_offloading.opts.link.0, ptr @.sycl_offloading.0.data, ptr @.sycl_offloading.0.data, ptr @.sycl_offloading.entries_arr, ptr getelementptr ([1 x %struct.__tgt_offload_entry], ptr @.sycl_offloading.entries_arr, i64 0, i64 1), ptr null, ptr null }]
 // SYCL-NEXT: @.sycl_offloading.descriptor = internal constant %__sycl.tgt_bin_desc { i16 1, i16 1, ptr @.sycl_offloading.device_images, ptr null, ptr null }
 

llvm/include/llvm/Frontend/Offloading/OffloadWrapper.h

@@ -66,7 +66,8 @@ struct SYCLJITOptions {
 
 /// Wraps OffloadBinaries in the given \p Buffers into the module \p M
 /// as global symbols and registers the images with the SYCL Runtime.
-/// \param Options Data that needs to be encoded for the later use in a runtime.
+/// \param Options Compiler and linker options to be encoded for the later
+///  use by a runtime for JIT compilation.
 LLVM_ABI llvm::Error
 wrapSYCLBinaries(llvm::Module &M, llvm::ArrayRef<char> Buffer,
                  SYCLJITOptions Options = SYCLJITOptions());

llvm/lib/Frontend/Offloading/OffloadWrapper.cpp

@@ -36,8 +36,6 @@ using namespace llvm;
 using namespace llvm::object;
 using namespace llvm::offloading;
 
-using OffloadingImage = OffloadBinary::OffloadingImage;
-
 namespace {
 /// Magic number that begins the section containing the CUDA fatbinary.
 constexpr unsigned CudaFatMagic = 0x466243b1;
@@ -834,29 +832,6 @@ struct SYCLWrapper {
     return std::make_pair(EntriesB, EntriesE);
   }
 
-  /// Emits a global array that contains \p Address and \P Size. Also add
-  /// it into llvm.used to force it to be emitted in the object file.
-  void emitRegistrationFunctions(Constant *Address, size_t Size,
-                                 const Twine &ImageID,
-                                 StringRef OffloadKindTag) {
-    Type *IntPtrTy = M.getDataLayout().getIntPtrType(C);
-    auto *ImgInfoArr =
-        ConstantArray::get(ArrayType::get(IntPtrTy, 2),
-                           {ConstantExpr::getPointerCast(Address, IntPtrTy),
-                            ConstantInt::get(IntPtrTy, Size)});
-    auto *ImgInfoVar = new GlobalVariable(
-        M, ImgInfoArr->getType(), true, GlobalVariable::InternalLinkage,
-        ImgInfoArr, Twine(OffloadKindTag) + ImageID + ".info");
-    ImgInfoVar->setAlignment(
-        MaybeAlign(M.getDataLayout().getTypeStoreSize(IntPtrTy) * 2u));
-    ImgInfoVar->setUnnamedAddr(GlobalValue::UnnamedAddr::Local);
-    ImgInfoVar->setSection(".tgtimg");
-
-    // Add image info to the used list to force it to be emitted to the
-    // object.
-    appendToUsed(M, ImgInfoVar);
-  }
-
   Constant *wrapImage(const OffloadBinary &OB, const Twine &ImageID,
                       StringRef OffloadKindTag) {
     // Note: Intel DPC++ compiler had 2 versions of this structure
@@ -897,9 +872,6 @@ struct SYCLWrapper {
         Binary.second, ImageEntriesPtrs.first, ImageEntriesPtrs.second,
         PropertiesConstants.first, PropertiesConstants.second);
 
-    emitRegistrationFunctions(Binary.first, RawImage.size(), ImageID,
-                              OffloadKindTag);
-
     return WrappedBinary;
   }