[SYCL] Support partially linked fat objects in the bundler.

[kbobrovs]

Signed-off-by: Konstantin Bobrovsky konstantin.s.bobrovsky@intel.com

[keryell]

Good feature!

[keryell]

Perhaps an interface such as

for (auto const &Sec : Obj->sections()) {

or similar would be even clearer.

[kbobrovs]

I actually need section_iterator here, not SectionRef. So section_begin()/end() instead of sections()

[keryell]

= "" seems redundant.

[kbobrovs]

OK

[keryell]

Missing end of line.

[kbobrovs]

OK

[kbobrovs]

Hi, I'm pretty new to github, and it looks like I inadvertently discarded the previous pull request for this feature along with your comments. I will implement the changes you suggest.

…

--  Konst

Понедельник, 8 апреля 2019, 16:32 -07:00 от Ronan Keryell ***@***.***>: @keryell commented on this pull request. Good feature! ---------------------------------------------------------------------- In clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp : > ~ObjectFileHandler() final {} - void ReadHeader(MemoryBuffer &Input) final {} + // Iterate through sections and create a map from triple to relevant bundle + // information. + void ReadHeader(MemoryBuffer &Input) final { + for (section_iterator Sec = Obj->section_begin(); Sec != Obj->section_end(); Perhaps an interface such as for (auto const &Sec : Obj->sections()) { or similar would be even clearer. ---------------------------------------------------------------------- In clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp : > StringRef Content; - CurrentSection->getContents(Content); + CurBundle->second->BundleSection->getContents(Content); + const char *ObjData = Content.data(); + // Determine the number of "device objects" (or individual bundles + // concatenated by partial linkage) in the bundle: + const auto &SizeVec = CurBundle->second->ObjectSizes; + auto NumObjects = SizeVec.size(); + bool FileListMode = FilesType == "oo"; + + if (NumObjects > 1 && !FileListMode) + report_fatal_error( + "'o' file type is requested, but the fat object contains multiple " + "device objects; use 'oo' instead"); + std::string FileList = ""; = "" seems redundant. ---------------------------------------------------------------------- In test/Driver/clang-offload-bundler1.cpp : > + if (F.is_open()) { + while (getline(F, Line)) { + OutFiles.push_back(Line); + } + F.close(); + } + else { + cout << "Unable to open file " << ListFile; + return 1; + } + + for (const auto &File : OutFiles) { + cat(File); + } + return 0; +} Missing end of line. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub , or mute the thread .