Skip to content

Commit eaa6569

Browse files
committed
Update base for Update on "[devtool] make datasink as a sepreate directory"
this diff make data_sink_base and its childrens as a seperate directory for better structure. Differential Revision: [D69732404](https://our.internmc.facebook.com/intern/diff/D69732404/) [ghstack-poisoned]
2 parents 5dc8cdf + 9de9ed4 commit eaa6569

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

devtools/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@ add_custom_command(
176176
add_library(
177177
etdump ${CMAKE_CURRENT_SOURCE_DIR}/etdump/etdump_flatcc.cpp
178178
${CMAKE_CURRENT_SOURCE_DIR}/etdump/emitter.cpp
179+
${CMAKE_CURRENT_SOURCE_DIR}/etdump/buffer_data_sink.cpp
180+
${CMAKE_CURRENT_SOURCE_DIR}/etdump/buffer_data_sink.h
179181
)
180182

181183
target_link_libraries(

devtools/etdump/buffer_data_sink.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Result<size_t> BufferDataSink::write(const void* ptr, size_t length) {
2020
return static_cast<size_t>(-1);
2121
}
2222
uint8_t* offset_ptr =
23-
internal::alignPointer(debug_buffer_.data() + offset_, 64);
23+
internal::align_pointer(debug_buffer_.data() + offset_, 64);
2424

2525
// Zero out the padding between data blobs.
2626
size_t n_zero_pad = offset_ptr - debug_buffer_.data() - offset_;

devtools/etdump/data_sink_base.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace etdump {
1717
/**
1818
* DataSinkBase is an abstract class that users can inherit and implement
1919
* to customize the storage and management of debug data in ETDumpGen. This
20-
* class provides an basic and essential interface for writing datablob to a
20+
* class provides a basic and essential interface for writing datablob to a
2121
* user-defined storage, retrieving storage capacity, and tracking the amount of
2222
* data stored.
2323
*/

devtools/etdump/etdump_flatcc.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ ETDumpGen::ETDumpGen(Span<uint8_t> buffer) {
107107

108108
if (buffer.data() != nullptr) {
109109
builder_ =
110-
(struct flatcc_builder*)internal::alignPointer(buffer.data(), 64);
111-
uintptr_t buffer_with_builder = (uintptr_t)internal::alignPointer(
110+
(struct flatcc_builder*)internal::align_pointer(buffer.data(), 64);
111+
uintptr_t buffer_with_builder = (uintptr_t)internal::align_pointer(
112112
builder_ + sizeof(struct flatcc_builder), 64);
113113
size_t builder_size =
114114
(size_t)(buffer_with_builder - (uintptr_t)buffer.data());
@@ -630,7 +630,7 @@ size_t ETDumpGen::get_debug_buffer_size() const {
630630
}
631631

632632
size_t ETDumpGen::get_data_sink_size() const {
633-
ET_CHECK_MSG(data_sink_, "Must set data sink before checking its size\n");
633+
ET_CHECK_MSG(data_sink_, "Must set data sink before checking its size");
634634
Result<size_t> ret = data_sink_->get_storage_size();
635635
ET_CHECK_MSG(
636636
ret.ok(),
@@ -640,7 +640,7 @@ size_t ETDumpGen::get_data_sink_size() const {
640640
}
641641

642642
long ETDumpGen::write_tensor_or_raise_error(Tensor tensor) {
643-
ET_CHECK_MSG(data_sink_, "Must set data sink before writing data\n");
643+
ET_CHECK_MSG(data_sink_, "Must set data sink before writing data");
644644
Result<size_t> ret =
645645
data_sink_->write(tensor.const_data_ptr(), tensor.nbytes());
646646
ET_CHECK_MSG(

devtools/etdump/utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace executorch {
99
namespace etdump {
1010
namespace internal {
1111

12-
inline uint8_t* alignPointer(void* ptr, size_t alignment) {
12+
inline uint8_t* align_pointer(void* ptr, size_t alignment) {
1313
intptr_t addr = reinterpret_cast<intptr_t>(ptr);
1414
if ((addr & (alignment - 1)) == 0) {
1515
// Already aligned.

runtime/core/error.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ enum class Error : error_code_t {
8585
/// Does not have enough resources to perform the requested operation.
8686
OutOfResources = 0x25,
8787

88-
8988
/*
9089
* Delegate errors.
9190
*/

0 commit comments

Comments
 (0)