From 0f863a788d83369ddd49902a7b29c36bb41e3be1 Mon Sep 17 00:00:00 2001 From: gasoonjia Date: Thu, 27 Feb 2025 16:16:44 -0800 Subject: [PATCH] [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] --- devtools/CMakeLists.txt | 4 +- devtools/etdump/data_sinks/TARGETS | 5 ++ .../{ => data_sinks}/buffer_data_sink.cpp | 2 +- .../{ => data_sinks}/buffer_data_sink.h | 2 +- .../etdump/{ => data_sinks}/data_sink_base.h | 0 devtools/etdump/data_sinks/targets.bzl | 49 +++++++++++++++++++ devtools/etdump/data_sinks/tests/TARGETS | 5 ++ .../tests/buffer_data_sink_test.cpp | 2 +- devtools/etdump/data_sinks/tests/targets.bzl | 20 ++++++++ devtools/etdump/etdump_flatcc.cpp | 2 +- devtools/etdump/etdump_flatcc.h | 2 +- devtools/etdump/targets.bzl | 40 ++------------- devtools/etdump/tests/etdump_test.cpp | 2 +- devtools/etdump/tests/targets.bzl | 11 ----- 14 files changed, 90 insertions(+), 56 deletions(-) create mode 100644 devtools/etdump/data_sinks/TARGETS rename devtools/etdump/{ => data_sinks}/buffer_data_sink.cpp (96%) rename devtools/etdump/{ => data_sinks}/buffer_data_sink.h (98%) rename devtools/etdump/{ => data_sinks}/data_sink_base.h (100%) create mode 100644 devtools/etdump/data_sinks/targets.bzl create mode 100644 devtools/etdump/data_sinks/tests/TARGETS rename devtools/etdump/{ => data_sinks}/tests/buffer_data_sink_test.cpp (98%) create mode 100644 devtools/etdump/data_sinks/tests/targets.bzl diff --git a/devtools/CMakeLists.txt b/devtools/CMakeLists.txt index aaee4d1d0b6..77b536d70b5 100644 --- a/devtools/CMakeLists.txt +++ b/devtools/CMakeLists.txt @@ -176,8 +176,8 @@ add_custom_command( add_library( etdump ${CMAKE_CURRENT_SOURCE_DIR}/etdump/etdump_flatcc.cpp ${CMAKE_CURRENT_SOURCE_DIR}/etdump/emitter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/etdump/buffer_data_sink.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/etdump/buffer_data_sink.h + ${CMAKE_CURRENT_SOURCE_DIR}/etdump/data_sinks/buffer_data_sink.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/etdump/data_sinks/buffer_data_sink.h ) target_link_libraries( diff --git a/devtools/etdump/data_sinks/TARGETS b/devtools/etdump/data_sinks/TARGETS new file mode 100644 index 00000000000..0a42614a385 --- /dev/null +++ b/devtools/etdump/data_sinks/TARGETS @@ -0,0 +1,5 @@ +load(":targets.bzl", "define_common_targets") + +oncall("executorch") + +define_common_targets() diff --git a/devtools/etdump/buffer_data_sink.cpp b/devtools/etdump/data_sinks/buffer_data_sink.cpp similarity index 96% rename from devtools/etdump/buffer_data_sink.cpp rename to devtools/etdump/data_sinks/buffer_data_sink.cpp index 8a366339783..5678aefb181 100644 --- a/devtools/etdump/buffer_data_sink.cpp +++ b/devtools/etdump/data_sinks/buffer_data_sink.cpp @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. */ -#include +#include #include using ::executorch::runtime::Error; diff --git a/devtools/etdump/buffer_data_sink.h b/devtools/etdump/data_sinks/buffer_data_sink.h similarity index 98% rename from devtools/etdump/buffer_data_sink.h rename to devtools/etdump/data_sinks/buffer_data_sink.h index c5bbcf6e435..685e62b2103 100644 --- a/devtools/etdump/buffer_data_sink.h +++ b/devtools/etdump/data_sinks/buffer_data_sink.h @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/devtools/etdump/data_sink_base.h b/devtools/etdump/data_sinks/data_sink_base.h similarity index 100% rename from devtools/etdump/data_sink_base.h rename to devtools/etdump/data_sinks/data_sink_base.h diff --git a/devtools/etdump/data_sinks/targets.bzl b/devtools/etdump/data_sinks/targets.bzl new file mode 100644 index 00000000000..f7e68d57e50 --- /dev/null +++ b/devtools/etdump/data_sinks/targets.bzl @@ -0,0 +1,49 @@ +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") + + +def define_data_sink_target(data_sink_name, aten_suffix): + runtime.cxx_library( + name = data_sink_name + aten_suffix, + exported_headers = [ + data_sink_name + ".h", + ], + srcs = [ + data_sink_name + ".cpp", + ], + deps = [ + "//executorch/devtools/etdump:utils", + ], + exported_deps = [ + "//executorch/runtime/core/exec_aten:lib" + aten_suffix, + ":data_sink_base" + aten_suffix, + ], + visibility = [ + "//executorch/...", + "@EXECUTORCH_CLIENTS", + ], + ) + +def define_common_targets(): + """Defines targets that should be shared between fbcode and xplat. + + The directory containing this targets.bzl file should also contain both + TARGETS and BUCK files that call this function. + """ + for aten_mode in (True, False): + aten_suffix = "_aten" if aten_mode else "" + + runtime.cxx_library( + name = "data_sink_base" + aten_suffix, + exported_headers = [ + "data_sink_base.h", + ], + exported_deps = [ + "//executorch/runtime/core/exec_aten/util:scalar_type_util" + aten_suffix, + ], + visibility = [ + "//executorch/...", + "@EXECUTORCH_CLIENTS", + ], + ) + + define_data_sink_target("buffer_data_sink", aten_suffix) diff --git a/devtools/etdump/data_sinks/tests/TARGETS b/devtools/etdump/data_sinks/tests/TARGETS new file mode 100644 index 00000000000..0a42614a385 --- /dev/null +++ b/devtools/etdump/data_sinks/tests/TARGETS @@ -0,0 +1,5 @@ +load(":targets.bzl", "define_common_targets") + +oncall("executorch") + +define_common_targets() diff --git a/devtools/etdump/tests/buffer_data_sink_test.cpp b/devtools/etdump/data_sinks/tests/buffer_data_sink_test.cpp similarity index 98% rename from devtools/etdump/tests/buffer_data_sink_test.cpp rename to devtools/etdump/data_sinks/tests/buffer_data_sink_test.cpp index 0dc4ae997fd..c4178c29a4b 100644 --- a/devtools/etdump/tests/buffer_data_sink_test.cpp +++ b/devtools/etdump/data_sinks/tests/buffer_data_sink_test.cpp @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. */ -#include +#include #include #include #include diff --git a/devtools/etdump/data_sinks/tests/targets.bzl b/devtools/etdump/data_sinks/tests/targets.bzl new file mode 100644 index 00000000000..499898355aa --- /dev/null +++ b/devtools/etdump/data_sinks/tests/targets.bzl @@ -0,0 +1,20 @@ +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") + +def define_common_targets(): + """Defines targets that should be shared between fbcode and xplat. + + The directory containing this targets.bzl file should also contain both + TARGETS and BUCK files that call this function. + """ + + + runtime.cxx_test( + name = "buffer_data_sink_test", + srcs = [ + "buffer_data_sink_test.cpp", + ], + deps = [ + "//executorch/devtools/etdump/data_sinks:buffer_data_sink", + "//executorch/runtime/core/exec_aten/testing_util:tensor_util", + ], + ) diff --git a/devtools/etdump/etdump_flatcc.cpp b/devtools/etdump/etdump_flatcc.cpp index 92c977f778b..a5242c8ed4b 100644 --- a/devtools/etdump/etdump_flatcc.cpp +++ b/devtools/etdump/etdump_flatcc.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include #include diff --git a/devtools/etdump/etdump_flatcc.h b/devtools/etdump/etdump_flatcc.h index a0457a91de8..999fe2170cf 100644 --- a/devtools/etdump/etdump_flatcc.h +++ b/devtools/etdump/etdump_flatcc.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/devtools/etdump/targets.bzl b/devtools/etdump/targets.bzl index afa012ed948..dda68e1b6ac 100644 --- a/devtools/etdump/targets.bzl +++ b/devtools/etdump/targets.bzl @@ -94,47 +94,13 @@ def define_common_targets(): "utils.h", ], visibility = [ - + "//executorch/devtools/etdump/...", ], ) for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" - runtime.cxx_library( - name = "data_sink_base" + aten_suffix, - exported_headers = [ - "data_sink_base.h", - ], - exported_deps = [ - "//executorch/runtime/core/exec_aten/util:scalar_type_util" + aten_suffix, - ], - visibility = [ - "//executorch/...", - "@EXECUTORCH_CLIENTS", - ], - ) - - runtime.cxx_library( - name = "buffer_data_sink" + aten_suffix, - exported_headers = [ - "buffer_data_sink.h", - ], - srcs = [ - "buffer_data_sink.cpp", - ], - deps = [ - ":utils", - ], - exported_deps = [ - "//executorch/runtime/core/exec_aten:lib" + aten_suffix, - ":data_sink_base" + aten_suffix, - ], - visibility = [ - "//executorch/...", - "@EXECUTORCH_CLIENTS", - ], - ) runtime.cxx_library( name = "etdump_flatcc" + aten_suffix, srcs = [ @@ -153,8 +119,8 @@ def define_common_targets(): exported_deps = [ ":etdump_schema_flatcc", ":utils", - ":data_sink_base" + aten_suffix, - ":buffer_data_sink" + aten_suffix, + "//executorch/devtools/etdump/data_sinks:data_sink_base" + aten_suffix, + "//executorch/devtools/etdump/data_sinks:buffer_data_sink" + aten_suffix, "//executorch/runtime/core:event_tracer" + aten_suffix, "//executorch/runtime/core/exec_aten/util:scalar_type_util" + aten_suffix, ], diff --git a/devtools/etdump/tests/etdump_test.cpp b/devtools/etdump/tests/etdump_test.cpp index 50456bade42..cd9acdf5e65 100644 --- a/devtools/etdump/tests/etdump_test.cpp +++ b/devtools/etdump/tests/etdump_test.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/devtools/etdump/tests/targets.bzl b/devtools/etdump/tests/targets.bzl index c91267ff467..5299b7c1cb7 100644 --- a/devtools/etdump/tests/targets.bzl +++ b/devtools/etdump/tests/targets.bzl @@ -19,14 +19,3 @@ def define_common_targets(): "//executorch/runtime/core/exec_aten/testing_util:tensor_util", ], ) - - runtime.cxx_test( - name = "buffer_data_sink_test", - srcs = [ - "buffer_data_sink_test.cpp", - ], - deps = [ - "//executorch/devtools/etdump:buffer_data_sink", - "//executorch/runtime/core/exec_aten/testing_util:tensor_util", - ], - )