improve lit test, apply code-style feedback

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

clang/test/Tooling/Inputs/clang-linker-wrapper-spirv-elf.o

@@ -3,7 +3,8 @@
 // REQUIRES: spirv-tools
 // RUN: mkdir -p %t_tmp
 // RUN: cd %t_tmp
-// RUN: not clang-linker-wrapper -o a.out %S/Inputs/clang-linker-wrapper-spirv-elf.o --save-temps --linker-path=ld
+// RUN: %clangxx -fopenmp -fopenmp-targets=spirv64-intel -nogpulib -c -o %t_clang-linker-wrapper-spirv-elf.o %s
+// RUN: not clang-linker-wrapper -o a.out %t_clang-linker-wrapper-spirv-elf.o --save-temps --linker-path=ld
 // RUN: clang-offload-packager --image=triple=spirv64-intel,kind=openmp,file=%t.elf  %t_tmp/a.out.openmp.image.wrapper.o
 // RUN: llvm-readelf -t %t.elf | FileCheck -check-prefix=CHECK-SECTION %s
 // RUN: llvm-readelf -n %t.elf | FileCheck -check-prefix=CHECK-NOTES %s
@@ -12,3 +13,6 @@
 // CHECK-SECTION: __openmp_offload_spirv_0
 
 // CHECK-NOTES-COUNT-3: INTELONEOMPOFFLOAD
+int main(int argc, char** argv) {
+  return 0;
+}

clang/test/Tooling/clang-linker-wrapper-spirv-elf.cpp

@@ -611,9 +611,7 @@ Error containerizeRawImage(std::unique_ptr<MemoryBuffer> &Img, OffloadKind Kind,
   if (Kind != OFK_OpenMP || !Triple.isSPIRV() ||
       Triple.getVendor() != llvm::Triple::Intel)
     return Error::success();
-  if (Error E = offloading::intel::containerizeOpenMPSPIRVImage(Img))
-    return E;
-  return Error::success();
+  return offloading::intel::containerizeOpenMPSPIRVImage(Img);
 }
 
 Expected<StringRef> writeOffloadFile(const OffloadFile &File) {

clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp

@@ -153,6 +153,7 @@ Error getAMDGPUMetaDataFromImage(MemoryBufferRef MemBuffer,
                                  StringMap<AMDGPUKernelMetaData> &KernelInfoMap,
                                  uint16_t &ELFABIVersion);
 } // namespace amdgpu
+
 namespace intel {
 /// Containerizes an offloading binary into the ELF binary format expected by
 /// the Intel runtime offload plugin.

llvm/include/llvm/Frontend/Offloading/Utility.h

@@ -415,46 +415,46 @@ Error offloading::intel::containerizeOpenMPSPIRVImage(
   std::string YamlFile;
   llvm::raw_string_ostream YamlFileStream(YamlFile);
 
-  // Write YAML template file.
-  {
-    // We use 64-bit little-endian ELF currently.
-    ELFYAML::FileHeader Header{};
-    Header.Class = ELF::ELFCLASS64;
-    Header.Data = ELF::ELFDATA2LSB;
-    Header.Type = ELF::ET_DYN;
-    // Use an existing Intel machine type as there is not one specifically for
-    // Intel GPUs.
-    Header.Machine = ELF::EM_IA_64;
-
-    // Create a section with notes.
-    ELFYAML::NoteSection Section{};
-    Section.Type = ELF::SHT_NOTE;
-    Section.AddressAlign = 0;
-    Section.Name = ".note.inteloneompoffload";
-    Section.Notes.emplace(std::move(Notes));
-
-    ELFYAML::Object Object{};
-    Object.Header = Header;
-    Object.Chunks.push_back(
-        std::make_unique<ELFYAML::NoteSection>(std::move(Section)));
-
-    // Create the section that will hold the image
-    ELFYAML::RawContentSection ImageSection{};
-    ImageSection.Type = ELF::SHT_PROGBITS;
-    ImageSection.AddressAlign = 0;
-    std::string Name = "__openmp_offload_spirv_0";
-    ImageSection.Name = Name;
-    ImageSection.Content =
-        llvm::yaml::BinaryRef(arrayRefFromStringRef(Img->getBuffer()));
-    Object.Chunks.push_back(
-        std::make_unique<ELFYAML::RawContentSection>(std::move(ImageSection)));
-    Error Err = Error::success();
-    llvm::yaml::yaml2elf(
-        Object, YamlFileStream,
-        [&Err](const Twine &Msg) { Err = createStringError(Msg); }, UINT64_MAX);
-    if (Err)
-      return Err;
-  }
+  // Write the YAML template file.
+
+  // We use 64-bit little-endian ELF currently.
+  ELFYAML::FileHeader Header{};
+  Header.Class = ELF::ELFCLASS64;
+  Header.Data = ELF::ELFDATA2LSB;
+  Header.Type = ELF::ET_DYN;
+  // Use an existing Intel machine type as there is not one specifically for
+  // Intel GPUs.
+  Header.Machine = ELF::EM_IA_64;
+
+  // Create a section with notes.
+  ELFYAML::NoteSection Section{};
+  Section.Type = ELF::SHT_NOTE;
+  Section.AddressAlign = 0;
+  Section.Name = ".note.inteloneompoffload";
+  Section.Notes.emplace(std::move(Notes));
+
+  ELFYAML::Object Object{};
+  Object.Header = Header;
+  Object.Chunks.push_back(
+      std::make_unique<ELFYAML::NoteSection>(std::move(Section)));
+
+  // Create the section that will hold the image
+  ELFYAML::RawContentSection ImageSection{};
+  ImageSection.Type = ELF::SHT_PROGBITS;
+  ImageSection.AddressAlign = 0;
+  std::string Name = "__openmp_offload_spirv_0";
+  ImageSection.Name = Name;
+  ImageSection.Content =
+      llvm::yaml::BinaryRef(arrayRefFromStringRef(Img->getBuffer()));
+  Object.Chunks.push_back(
+      std::make_unique<ELFYAML::RawContentSection>(std::move(ImageSection)));
+  Error Err = Error::success();
+  llvm::yaml::yaml2elf(
+      Object, YamlFileStream,
+      [&Err](const Twine &Msg) { Err = createStringError(Msg); }, UINT64_MAX);
+  if (Err)
+    return Err;
+
   Img = MemoryBuffer::getMemBufferCopy(YamlFile);
   return Error::success();
 }