[clang] f93c271 - [Object] Change OffloadBinary::write to return SmallString<0>
Fangrui Song via cfe-commits
cfe-commits at lists.llvm.org
Fri Sep 1 09:19:32 PDT 2023
Author: Fangrui Song
Date: 2023-09-01T09:19:25-07:00
New Revision: f93c271d4cc11b865b87da1402e1cb33449fe4bf
URL: https://github.com/llvm/llvm-project/commit/f93c271d4cc11b865b87da1402e1cb33449fe4bf
DIFF: https://github.com/llvm/llvm-project/commit/f93c271d4cc11b865b87da1402e1cb33449fe4bf.diff
LOG: [Object] Change OffloadBinary::write to return SmallString<0>
SmallString<0> is more flexible and avoids an unneeded copy in
ObjectYAML/OffloadEmitter.cpp.
Reviewed By: jhuber6
Differential Revision: https://reviews.llvm.org/D159335
Added:
Modified:
clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
clang/tools/clang-offload-packager/ClangOffloadPackager.cpp
llvm/include/llvm/Object/OffloadBinary.h
llvm/lib/Object/OffloadBinary.cpp
llvm/lib/ObjectYAML/OffloadEmitter.cpp
llvm/unittests/Object/OffloadingTest.cpp
Removed:
################################################################################
diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
index dcf23d538c7e331..432a34730f923c2 100644
--- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
+++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
@@ -184,7 +184,8 @@ Expected<OffloadFile> getInputBitcodeLibrary(StringRef Input) {
Image.StringData["arch"] = Arch;
Image.Image = std::move(*ImageOrError);
- std::unique_ptr<MemoryBuffer> Binary = OffloadBinary::write(Image);
+ std::unique_ptr<MemoryBuffer> Binary =
+ MemoryBuffer::getMemBufferCopy(OffloadBinary::write(Image));
auto NewBinaryOrErr = OffloadBinary::create(*Binary);
if (!NewBinaryOrErr)
return NewBinaryOrErr.takeError();
@@ -909,7 +910,8 @@ Expected<SmallVector<std::unique_ptr<MemoryBuffer>>>
bundleOpenMP(ArrayRef<OffloadingImage> Images) {
SmallVector<std::unique_ptr<MemoryBuffer>> Buffers;
for (const OffloadingImage &Image : Images)
- Buffers.emplace_back(OffloadBinary::write(Image));
+ Buffers.emplace_back(
+ MemoryBuffer::getMemBufferCopy(OffloadBinary::write(Image)));
return std::move(Buffers);
}
diff --git a/clang/tools/clang-offload-packager/ClangOffloadPackager.cpp b/clang/tools/clang-offload-packager/ClangOffloadPackager.cpp
index 7100727015e7b7f..08de3f3a3771c12 100644
--- a/clang/tools/clang-offload-packager/ClangOffloadPackager.cpp
+++ b/clang/tools/clang-offload-packager/ClangOffloadPackager.cpp
@@ -126,11 +126,11 @@ static Error bundleImages() {
ImageBinary.StringData[Key] = Value;
}
}
- std::unique_ptr<MemoryBuffer> Buffer = OffloadBinary::write(ImageBinary);
- if (Buffer->getBufferSize() % OffloadBinary::getAlignment() != 0)
+ llvm::SmallString<0> Buffer = OffloadBinary::write(ImageBinary);
+ if (Buffer.size() % OffloadBinary::getAlignment() != 0)
return createStringError(inconvertibleErrorCode(),
"Offload binary has invalid size alignment");
- OS << Buffer->getBuffer();
+ OS << Buffer;
}
if (Error E = writeFile(OutputFile,
diff --git a/llvm/include/llvm/Object/OffloadBinary.h b/llvm/include/llvm/Object/OffloadBinary.h
index 320a8e1f6d8ff90..dda1e7f1eafbbae 100644
--- a/llvm/include/llvm/Object/OffloadBinary.h
+++ b/llvm/include/llvm/Object/OffloadBinary.h
@@ -18,6 +18,7 @@
#define LLVM_OBJECT_OFFLOADBINARY_H
#include "llvm/ADT/MapVector.h"
+#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Object/Binary.h"
#include "llvm/Support/Error.h"
@@ -78,7 +79,7 @@ class OffloadBinary : public Binary {
static Expected<std::unique_ptr<OffloadBinary>> create(MemoryBufferRef);
/// Serialize the contents of \p File to a binary buffer to be read later.
- static std::unique_ptr<MemoryBuffer> write(const OffloadingImage &);
+ static SmallString<0> write(const OffloadingImage &);
static uint64_t getAlignment() { return 8; }
diff --git a/llvm/lib/Object/OffloadBinary.cpp b/llvm/lib/Object/OffloadBinary.cpp
index 342327daf7e4dea..1de784c44da10e8 100644
--- a/llvm/lib/Object/OffloadBinary.cpp
+++ b/llvm/lib/Object/OffloadBinary.cpp
@@ -204,8 +204,7 @@ OffloadBinary::create(MemoryBufferRef Buf) {
new OffloadBinary(Buf, TheHeader, TheEntry));
}
-std::unique_ptr<MemoryBuffer>
-OffloadBinary::write(const OffloadingImage &OffloadingData) {
+SmallString<0> OffloadBinary::write(const OffloadingImage &OffloadingData) {
// Create a null-terminated string table with all the used strings.
StringTableBuilder StrTab(StringTableBuilder::ELF);
for (auto &KeyAndValue : OffloadingData.StringData) {
@@ -243,7 +242,7 @@ OffloadBinary::write(const OffloadingImage &OffloadingData) {
TheEntry.ImageOffset = BinaryDataSize;
TheEntry.ImageSize = OffloadingData.Image->getBufferSize();
- SmallVector<char> Data;
+ SmallString<0> Data;
Data.reserve(TheHeader.Size);
raw_svector_ostream OS(Data);
OS << StringRef(reinterpret_cast<char *>(&TheHeader), sizeof(Header));
@@ -264,7 +263,7 @@ OffloadBinary::write(const OffloadingImage &OffloadingData) {
OS.write_zeros(TheHeader.Size - OS.tell());
assert(TheHeader.Size == OS.tell() && "Size mismatch");
- return MemoryBuffer::getMemBufferCopy(OS.str());
+ return Data;
}
Error object::extractOffloadBinaries(MemoryBufferRef Buffer,
diff --git a/llvm/lib/ObjectYAML/OffloadEmitter.cpp b/llvm/lib/ObjectYAML/OffloadEmitter.cpp
index dfb572531660d4d..8692ad8a5865595 100644
--- a/llvm/lib/ObjectYAML/OffloadEmitter.cpp
+++ b/llvm/lib/ObjectYAML/OffloadEmitter.cpp
@@ -38,14 +38,10 @@ bool yaml2offload(Binary &Doc, raw_ostream &Out, ErrorHandler EH) {
Member.Content->writeAsBinary(OS);
Image.Image = MemoryBuffer::getMemBufferCopy(OS.str());
- std::unique_ptr<MemoryBuffer> Binary = object::OffloadBinary::write(Image);
-
// Copy the data to a new buffer so we can modify the bytes directly.
- SmallVector<char> NewBuffer;
- std::copy(Binary->getBufferStart(), Binary->getBufferEnd(),
- std::back_inserter(NewBuffer));
+ auto Buffer = object::OffloadBinary::write(Image);
auto *TheHeader =
- reinterpret_cast<object::OffloadBinary::Header *>(&NewBuffer[0]);
+ reinterpret_cast<object::OffloadBinary::Header *>(&Buffer[0]);
if (Doc.Version)
TheHeader->Version = *Doc.Version;
if (Doc.Size)
@@ -55,7 +51,7 @@ bool yaml2offload(Binary &Doc, raw_ostream &Out, ErrorHandler EH) {
if (Doc.EntrySize)
TheHeader->EntrySize = *Doc.EntrySize;
- Out.write(NewBuffer.begin(), NewBuffer.size());
+ Out.write(Buffer.begin(), Buffer.size());
}
return true;
diff --git a/llvm/unittests/Object/OffloadingTest.cpp b/llvm/unittests/Object/OffloadingTest.cpp
index 77d8b14a4ffd2ce..18c9efaceed06f1 100644
--- a/llvm/unittests/Object/OffloadingTest.cpp
+++ b/llvm/unittests/Object/OffloadingTest.cpp
@@ -43,8 +43,8 @@ TEST(OffloadingTest, checkOffloadingBinary) {
Data.StringData = StringData;
Data.Image = std::move(ImageData);
- auto BinaryBuffer = OffloadBinary::write(Data);
-
+ auto BinaryBuffer =
+ MemoryBuffer::getMemBufferCopy(OffloadBinary::write(Data));
auto BinaryOrErr = OffloadBinary::create(*BinaryBuffer);
if (!BinaryOrErr)
FAIL();
More information about the cfe-commits
mailing list