Skip to content

Commit ec15487

Browse files
kirklandsignkirklandsign
authored
Revert "Updating cadence ops with new name space, rebasing 6 optimize… (#6482)
Revert "Updating cadence ops with new name space, rebasing 6 optimized ops (#6407)" This reverts commit 979708d. Broke internal tests
1 parent 8140a90 commit ec15487

15 files changed

+12
-2919
lines changed

‎backends/cadence/aot/functions_hifi.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
- op: add.out
2626
kernels:
2727
- arg_meta: null
28-
kernel_name: impl::HiFi::add_out
28+
kernel_name: torch::executor::add_out
2929

3030
- op: bmm.out
3131
kernels:
@@ -45,12 +45,12 @@
4545
- op: div.out
4646
kernels:
4747
- arg_meta: null
48-
kernel_name: cadence::impl::HiFi::div_out
48+
kernel_name: torch::executor::div_out
4949

5050
- op: div.out_mode
5151
kernels:
5252
- arg_meta: null
53-
kernel_name: cadence::impl::HiFi::div_out_mode
53+
kernel_name: torch::executor::div_out_mode
5454

5555
- op: embedding.out
5656
kernels:
@@ -65,7 +65,7 @@
6565
- op: mul.out
6666
kernels:
6767
- arg_meta: null
68-
kernel_name: cadence::impl::HiFi::mul_out
68+
kernel_name: torch::executor::mul_out
6969

7070
- op: permute_copy.out
7171
kernels:
@@ -75,7 +75,7 @@
7575
- op: sigmoid.out
7676
kernels:
7777
- arg_meta: null
78-
kernel_name: cadence::impl::HiFi::sigmoid_out
78+
kernel_name: torch::executor::sigmoid_out
7979

8080
- op: slice_copy.Tensor_out
8181
kernels:
@@ -90,12 +90,7 @@
9090
- op: sub.out
9191
kernels:
9292
- arg_meta: null
93-
kernel_name: cadence::impl::HiFi::sub_out
94-
95-
- op: tanh.out
96-
kernels:
97-
- arg_meta: null
98-
kernel_name: cadence::impl::HiFi::tanh_out
93+
kernel_name: torch::executor::sub_out
9994

10095
- op: view_copy.out
10196
kernels:

‎backends/cadence/cadence.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ set(CMAKE_CXX_COMPILER ${TOOLCHAIN_HOME}/bin/${CROSS_COMPILE_TARGET}-clang++)
4343

4444
set(CMAKE_C_FLAGS_INIT "-stdlib=libc++ -mtext-section-literals -mlongcalls")
4545
set(CMAKE_CXX_FLAGS_INIT "-stdlib=libc++ -mtext-section-literals -mlongcalls")
46-
#workaround for larger compilation time
47-
set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} -fno-strict-aliasing")
48-
4946
set(CMAKE_SYSROOT ${TOOLCHAIN_HOME}/${SYSROOT_TARGET})
5047
set(CMAKE_LINKER ${TOOLCHAIN_HOME}/bin/xt-ld)
5148
add_link_options(-lm -stdlib=libc++ -Wl,--no-as-needed -static)

‎backends/cadence/hifi/kernels/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ add_library(
99
cadence_kernels
1010
kernels.cpp
1111
${EXECUTORCH_ROOT}/backends/cadence/hifi/third-party/nnlib/matmul_asym8uxasym8u_asym8u.cpp
12-
${EXECUTORCH_ROOT}/backends/cadence/hifi/third-party/nnlib/xa_nn_elm_add_f32_broadcast.c
13-
${EXECUTORCH_ROOT}/backends/cadence/hifi/third-party/nnlib/xa_nn_elm_div_f32_broadcast.c
14-
${EXECUTORCH_ROOT}/backends/cadence/hifi/third-party/nnlib/xa_nn_elm_div_mode_f32_broadcast.c
15-
${EXECUTORCH_ROOT}/backends/cadence/hifi/third-party/nnlib/xa_nn_elm_mul_f32_broadcast.c
1612
)
1713
# Let files say "include <executorch/path/to/header.h>".
1814
set(_common_include_directories ${EXECUTORCH_ROOT}/..)

‎backends/cadence/hifi/kernels/kernels.h

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -11,49 +11,6 @@
1111
#include <inttypes.h>
1212
#include <stddef.h>
1313
#include <xa_type_def.h>
14-
/* For NNLIB APIs */
15-
#include "xa_nnlib_kernels_api.h"
16-
17-
/* Potential NNLIB function/APIs */
18-
extern "C" WORD32 xa_nn_elm_add_broadcast_4D_f32xf32_f32(
19-
FLOAT32* __restrict__ p_out,
20-
const WORD32* const p_out_shape,
21-
const FLOAT32* __restrict__ p_inp1,
22-
const WORD32* const p_inp1_shape,
23-
const FLOAT32* __restrict__ p_inp2,
24-
const WORD32* const p_inp2_shape);
25-
26-
extern "C" WORD32 xa_nn_elm_div_broadcast_4D_f32xf32_f32(
27-
FLOAT32* __restrict__ p_out,
28-
const WORD32* const p_out_shape,
29-
const FLOAT32* __restrict__ p_inp1,
30-
const WORD32* const p_inp1_shape,
31-
const FLOAT32* __restrict__ p_inp2,
32-
const WORD32* const p_inp2_shape);
33-
34-
extern "C" WORD32 xa_nn_elm_div_mode_f32xf32_f32(
35-
FLOAT32* __restrict__ p_out,
36-
const FLOAT32* __restrict__ p_inp1,
37-
const FLOAT32* __restrict__ p_inp2,
38-
WORD32 num_elm,
39-
WORD32 mode);
40-
41-
extern "C" WORD32 xa_nn_elm_div_mode_broadcast_4D_f32xf32_f32(
42-
FLOAT32* __restrict__ p_out,
43-
const WORD32* const p_out_shape,
44-
const FLOAT32* __restrict__ p_inp1,
45-
const WORD32* const p_inp1_shape,
46-
const FLOAT32* __restrict__ p_inp2,
47-
const WORD32* const p_inp2_shape,
48-
WORD32 mode);
49-
50-
extern "C" WORD32 xa_nn_elm_mul_broadcast_4D_f32xf32_f32(
51-
FLOAT32* __restrict__ p_out,
52-
const WORD32* const p_out_shape,
53-
const FLOAT32* __restrict__ p_inp1,
54-
const WORD32* const p_inp1_shape,
55-
const FLOAT32* __restrict__ p_inp2,
56-
const WORD32* const p_inp2_shape);
5714

5815
namespace cadence {
5916
namespace impl {

‎backends/cadence/hifi/operators/CMakeLists.txt

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ endif()
2020

2121
# ATen compliant ops that are needed to run this model.
2222
set(_aten_ops__srcs
23-
"${EXECUTORCH_ROOT}/backends/cadence/hifi/operators/op_add.cpp"
24-
"${EXECUTORCH_ROOT}/backends/cadence/hifi/operators/op_div.cpp"
25-
"${EXECUTORCH_ROOT}/backends/cadence/hifi/operators/op_mul.cpp"
26-
"${EXECUTORCH_ROOT}/backends/cadence/hifi/operators/op_sigmoid.cpp"
27-
"${EXECUTORCH_ROOT}/backends/cadence/hifi/operators/op_sub.cpp"
28-
"${EXECUTORCH_ROOT}/backends/cadence/hifi/operators/op_tanh.cpp"
2923
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/activation_ops_util.cpp"
3024
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/copy_ops_util.cpp"
3125
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/broadcast_util.cpp"
@@ -35,29 +29,24 @@ set(_aten_ops__srcs
3529
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/reduce_util.cpp"
3630
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/repeat_util.cpp"
3731
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/slice_util.cpp"
32+
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_add.cpp"
3833
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_bmm.cpp"
3934
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_cat.cpp"
4035
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_clone.cpp"
36+
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_div.cpp"
4137
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_embedding.cpp"
4238
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_full.cpp"
39+
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_mul.cpp"
4340
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_permute_copy.cpp"
41+
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_sigmoid.cpp"
4442
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_slice_copy.cpp"
4543
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_softmax.cpp"
4644
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_split_with_sizes_copy.cpp"
45+
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_sub.cpp"
4746
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_to_copy.cpp"
4847
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_view_copy.cpp"
4948
"${EXECUTORCH_ROOT}/kernels/portable/cpu/op_where.cpp"
50-
"${EXECUTORCH_ROOT}/kernels/portable/cpu/pattern/unary_ufunc_realhbbf16_to_floathbf16.cpp"
51-
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/activation_ops_util.cpp"
52-
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/broadcast_util.cpp"
53-
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/copy_ops_util.cpp"
54-
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/dtype_util.cpp"
55-
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/index_util.cpp"
56-
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/kernel_ops_util.cpp"
57-
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/matmul_ops_util.cpp"
58-
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/reduce_util.cpp"
59-
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/repeat_util.cpp"
60-
)
49+
)
6150
add_library(aten_ops_cadence ${_aten_ops__srcs})
6251
target_link_libraries(aten_ops_cadence PUBLIC executorch)
6352
target_link_libraries(aten_ops_cadence PRIVATE cadence_kernels)

‎backends/cadence/hifi/operators/op_add.cpp

Lines changed: 0 additions & 204 deletions
This file was deleted.

0 commit comments

Comments
 (0)