Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 17 additions & 1 deletion backends/cadence/aot/TARGETS
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,23 @@ executorch_generated_lib(
visibility = ["PUBLIC"],
deps = [
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
"//executorch/backends/cadence/generic/operators:cadence_generic_ops",
# Individual operator targets instead of combined cadence_generic_ops
"//executorch/backends/cadence/generic/operators:op_add",
"//executorch/backends/cadence/generic/operators:op_embedding",
"//executorch/backends/cadence/generic/operators:op_full",
"//executorch/backends/cadence/generic/operators:op_requantize_out",
"//executorch/backends/cadence/generic/operators:op_view_copy",
"//executorch/backends/cadence/generic/operators:im2row_out",
"//executorch/backends/cadence/generic/operators:dequantize_per_tensor",
"//executorch/backends/cadence/generic/operators:quantize_per_tensor",
"//executorch/backends/cadence/generic/operators:quantized_add_out",
"//executorch/backends/cadence/generic/operators:quantized_conv_nchw_out",
"//executorch/backends/cadence/generic/operators:quantized_conv_nhwc_out",
"//executorch/backends/cadence/generic/operators:quantized_fully_connected_out",
"//executorch/backends/cadence/generic/operators:quantized_layer_norm",
"//executorch/backends/cadence/generic/operators:quantized_linear_out",
"//executorch/backends/cadence/generic/operators:quantized_matmul_out",
"//executorch/backends/cadence/generic/operators:quantized_relu_out",
"//executorch/kernels/portable:executorch_all_ops",
"//executorch/kernels/portable:operators",
],
Expand Down
243 changes: 242 additions & 1 deletion backends/cadence/generic/operators/targets.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,252 @@ load("@fbsource//tools/build_defs:platform_defs.bzl", "CXX")
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")

def define_common_targets():
# Individual operator targets with optimized dependencies

# Basic operators (need broadcast_util and scalar_utils)
runtime.cxx_library(
name = "op_add",
srcs = ["op_add.cpp"],
platforms = CXX,
deps = [
"//executorch/kernels/portable/cpu/util:broadcast_util",
"//executorch/runtime/kernel:kernel_includes",
"//executorch/kernels/portable/cpu:scalar_utils",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "op_full",
srcs = ["op_full.cpp"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/kernels/portable/cpu:scalar_utils",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

# Simple operators (only need kernel_includes)
runtime.cxx_library(
name = "op_embedding",
srcs = ["op_embedding.cpp"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "op_view_copy",
srcs = ["op_view_copy.cpp"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

# Operators that need the operators.h header and basic runtime
runtime.cxx_library(
name = "im2row_out",
srcs = ["im2row_out.cpp"],
exported_headers = ["operators.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "op_requantize_out",
srcs = ["op_requantize_out.cpp"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

# Quantized operators that need cadence kernels for quantize/dequantize
runtime.cxx_library(
name = "dequantize_per_tensor",
srcs = ["dequantize_per_tensor.cpp"],
exported_headers = ["quantized_ops.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
],
)

runtime.cxx_library(
name = "quantize_per_tensor",
srcs = ["quantize_per_tensor.cpp"],
exported_headers = ["quantized_ops.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "quantized_add_out",
srcs = ["quantized_add_out.cpp"],
exported_headers = ["operators.h", "quantized_ops.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "quantized_conv_nchw_out",
srcs = ["quantized_conv_nchw_out.cpp"],
exported_headers = ["operators.h", "quantized_ops.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "quantized_conv_nhwc_out",
srcs = ["quantized_conv_nhwc_out.cpp"],
exported_headers = ["operators.h", "quantized_ops.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "quantized_fully_connected_out",
srcs = ["quantized_fully_connected_out.cpp"],
exported_headers = ["operators.h", "quantized_ops.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "quantized_layer_norm",
srcs = ["quantized_layer_norm.cpp"],
exported_headers = ["operators.h", "quantized_ops.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "quantized_linear_out",
srcs = ["quantized_linear_out.cpp"],
exported_headers = ["operators.h", "quantized_ops.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "quantized_matmul_out",
srcs = ["quantized_matmul_out.cpp"],
exported_headers = ["operators.h", "quantized_ops.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

runtime.cxx_library(
name = "quantized_relu_out",
srcs = ["quantized_relu_out.cpp"],
exported_headers = ["operators.h", "quantized_ops.h"],
platforms = CXX,
deps = [
"//executorch/runtime/kernel:kernel_includes",
"//executorch/backends/cadence/generic/kernels:cadence_kernels",
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)

# Combined target for backward compatibility
# NOTE: cadence_aot_lib now uses individual targets directly for better linking
runtime.cxx_library(
name = "cadence_generic_ops",
srcs = glob([
"*.cpp",
]),
exported_headers =glob([
exported_headers = glob([
"*.h",
]),
platforms = CXX,
Expand All @@ -19,5 +259,6 @@ def define_common_targets():
],
visibility = [
"//executorch/backends/cadence/...",
"@EXECUTORCH_CLIENTS",
],
)
Loading