Skip to content

removed unnecessary datasink checks #9211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2025
Merged

removed unnecessary datasink checks #9211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions devtools/etdump/etdump_flatcc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,10 +351,6 @@ void ETDumpGen::log_intermediate_output_delegate_helper(
(name == nullptr) ^ (delegate_debug_index == -1),
"Only name or delegate_debug_index can be valid. Check DelegateMappingBuilder documentation for more details.");

ET_CHECK_MSG(
data_sink_,
"Must pre-set data sink before logging evalue with set_data_sink() or set_debug_buffer()\n");

check_ready_to_add_events();
int64_t string_id = name != nullptr ? create_string_entry(name) : -1;

Expand Down Expand Up @@ -515,8 +511,6 @@ void ETDumpGen::set_data_sink(DataSinkBase* data_sink) {
}

void ETDumpGen::log_evalue(const EValue& evalue, LoggedEValueType evalue_type) {
ET_CHECK_MSG(data_sink_, "Must set data sink before logging evalue\n");

check_ready_to_add_events();

etdump_DebugEvent_start(builder_);
Expand Down Expand Up @@ -650,7 +644,8 @@ long ETDumpGen::write_tensor_or_raise_error(Tensor tensor) {
return static_cast<size_t>(-1);
}

ET_CHECK_MSG(data_sink_, "Must set data sink before writing data");
ET_CHECK_MSG(
data_sink_, "Must set data sink before writing tensor-like data");
Result<size_t> ret =
data_sink_->write(tensor.const_data_ptr(), tensor.nbytes());
ET_CHECK_MSG(
Expand Down
41 changes: 22 additions & 19 deletions devtools/etdump/tests/etdump_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,27 +178,9 @@ TEST_F(ProfilerETDumpTest, AllocationEvents) {
TEST_F(ProfilerETDumpTest, DebugEvent) {
for (size_t i = 0; i < 2; i++) {
for (size_t j = 0; j < 2; j++) {
TensorFactory<ScalarType::Float> tf;
EValue evalue(tf.ones({3, 2}));

etdump_gen[i]->create_event_block("test_block");

void* ptr = malloc(2048);
Span<uint8_t> buffer((uint8_t*)ptr, 2048);

auto buffer_data_sink = BufferDataSink::create(ptr, 2048);

// using span to record debug data
if (j == 0) {
etdump_gen[i]->set_debug_buffer(buffer);
}
// using data sink to record debug data
else {
etdump_gen[i]->set_data_sink(&buffer_data_sink.get());
}

etdump_gen[i]->log_evalue(evalue);
etdump_gen[i]->log_evalue(evalue, LoggedEValueType::kProgramOutput);

EValue evalue_int((int64_t)5);
etdump_gen[i]->log_evalue(evalue_int);
Expand All @@ -211,6 +193,27 @@ TEST_F(ProfilerETDumpTest, DebugEvent) {

etdump_gen[i]->log_evalue(evalue_bool);

TensorFactory<ScalarType::Float> tf;
EValue evalue_tensor(tf.ones({3, 2}));

// using span to record debug data
Span<uint8_t> buffer((uint8_t*)ptr, 2048);
auto buffer_data_sink = BufferDataSink::create(ptr, 2048);
if (j == 0) {
ET_EXPECT_DEATH(
etdump_gen[i]->log_evalue(evalue_tensor),
"Must set data sink before writing tensor-like data");
etdump_gen[i]->set_debug_buffer(buffer);
}
// using data sink to record debug data
else {
etdump_gen[i]->set_data_sink(&buffer_data_sink.get());
}

etdump_gen[i]->log_evalue(evalue_tensor);
etdump_gen[i]->log_evalue(
evalue_tensor, LoggedEValueType::kProgramOutput);

free(ptr);
}
}
Expand Down Expand Up @@ -487,7 +490,7 @@ TEST_F(ProfilerETDumpTest, LogDelegateIntermediateOutput) {
"test_event_tensor",
static_cast<torch::executor::DebugHandle>(-1),
tf.ones({3, 2})),
"Must pre-set data sink before logging evalue with set_data_sink");
"Must set data sink before writing tensor-like data");
etdump_gen[i]->set_debug_buffer(buffer);
}
// using data sink to record debug data
Expand Down
Loading