Skip to content

Add optimized_portable_kernels test #11205

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

Open
wants to merge 4 commits into
base: gh/swolchok/438/head
Choose a base branch
from
Open

Add optimized_portable_kernels test #11205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aedb0fa
split out some commits
swolchok May 28, 2025
f72595a
fix visibility
swolchok May 28, 2025
b721485
Update
swolchok May 28, 2025
a4df2da
rebase, fix lint in #9432
swolchok May 29, 2025
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: 8 additions & 1 deletion kernels/portable/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,15 @@ if(EXECUTORCH_BUILD_PTHREADPOOL AND EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
target_compile_options(optimized_portable_kernels PUBLIC ${_common_compile_options})
target_include_directories(optimized_portable_kernels PRIVATE ${TORCH_INCLUDE_DIRS})
target_compile_definitions(optimized_portable_kernels PRIVATE ET_USE_PYTORCH_HEADERS)
gen_selected_ops(LIB_NAME "optimized_portable_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
generate_bindings_for_kernels(
LIB_NAME "optimized_portable_ops_lib" FUNCTIONS_YAML "${_yaml}"
)
gen_operators_lib(
LIB_NAME "optimized_portable_ops_lib" KERNEL_LIBS optimized_portable_kernels DEPS executorch_core
)
install(
TARGETS optimized_portable_kernels
TARGETS optimized_portable_kernels optimized_portable_ops_lib
DESTINATION lib
)
endif()
Expand Down
32 changes: 30 additions & 2 deletions kernels/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)

include(${EXECUTORCH_ROOT}/tools/cmake/Test.cmake)

set(_kernels portable optimized quantized)
set(_kernels portable optimized_portable optimized quantized)
foreach(kernel ${_kernels})
set(_wrapper_dir
"${CMAKE_CURRENT_BINARY_DIR}/include/${kernel}/executorch/kernels/test"
Expand All @@ -37,13 +37,17 @@ foreach(kernel ${_kernels})
VERBATIM
)

set(_supported_features_kernel ${kernel})
if(${kernel} STREQUAL "optimized_portable")
set(_supported_features_kernel "portable")
endif()
add_custom_command(
OUTPUT "${_wrapper_dir}/supported_features.cpp"
"${_wrapper_dir}/supported_features.h"
COMMAND mkdir -p ${_wrapper_dir}
COMMAND
${PYTHON_EXECUTABLE} kernels/test/gen_supported_features.py
kernels/${kernel}/test/supported_features_def.yaml >
kernels/${_supported_features_kernel}/test/supported_features_def.yaml >
${_wrapper_dir}/supported_features.cpp
COMMAND
${PYTHON_EXECUTABLE} kernels/test/gen_supported_features.py
Expand All @@ -57,6 +61,11 @@ foreach(kernel ${_kernels})
set(_kernel_ops_lib "optimized_native_cpu_ops_lib")
set(_kernel_ops_lib_path
"${CMAKE_CURRENT_BINARY_DIR}/../../configurations/optimized_native_cpu_ops_lib"
)
elseif(${kernel} STREQUAL "optimized_portable")
set(_kernel_ops_lib "${kernel}_ops_lib")
set(_kernel_ops_lib_path
"${CMAKE_CURRENT_BINARY_DIR}/../../kernels/portable/${kernel}_ops_lib"
)
else()
set(_kernel_ops_lib "${kernel}_ops_lib")
Expand Down Expand Up @@ -88,6 +97,9 @@ add_custom_target(
"${CMAKE_CURRENT_BINARY_DIR}/include/optimized/executorch/kernels/test/FunctionHeaderWrapper.h"
"${CMAKE_CURRENT_BINARY_DIR}/include/optimized/executorch/kernels/test/supported_features.h"
"${CMAKE_CURRENT_BINARY_DIR}/include/optimized/executorch/kernels/test/supported_features.cpp"
"${CMAKE_CURRENT_BINARY_DIR}/include/optimized_portable/executorch/kernels/test/FunctionHeaderWrapper.h"
"${CMAKE_CURRENT_BINARY_DIR}/include/optimized_portable/executorch/kernels/test/supported_features.h"
"${CMAKE_CURRENT_BINARY_DIR}/include/optimized_portable/executorch/kernels/test/supported_features.cpp"
"${CMAKE_CURRENT_BINARY_DIR}/include/quantized/executorch/kernels/test/FunctionHeaderWrapper.h"
"${CMAKE_CURRENT_BINARY_DIR}/include/quantized/executorch/kernels/test/supported_features.h"
"${CMAKE_CURRENT_BINARY_DIR}/include/quantized/executorch/kernels/test/supported_features.cpp"
Expand Down Expand Up @@ -297,6 +309,22 @@ set(_optimized_kernels_test_sources
if(TARGET optimized_portable_kernels)
list(APPEND _optimized_kernels_test_sources ${all_test_sources})
list(REMOVE_DUPLICATES _optimized_kernels_test_sources)

# Make sure that we still test optimized versions of portable
# kernels even if they would currently be shadowed by specific
# optimized implementations.
et_cxx_test(
optimized_portable_kernels_test
SOURCES
${all_test_sources}
${CMAKE_CURRENT_BINARY_DIR}/include/optimized_portable/executorch/kernels/test/supported_features.cpp
EXTRA_LIBS
optimized_portable_kernels
)
add_dependencies(optimized_portable_kernels_test generate_wrapper)
target_include_directories(
optimized_portable_kernels_test PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/include/optimized_portable"
)
endif()

et_cxx_test(
Expand Down
Loading