sw/vec_iree: update vmvx_ukernel cmake file Update vmvx_kernel camke file to accommodate upstream API chagne. BUG: 292242168 Change-Id: I48d308ea492077eded96cd2e6b29ec96ba773c75
diff --git a/vmvx_ukernel/CMakeLists.txt b/vmvx_ukernel/CMakeLists.txt index 9148a13..b4f66db 100644 --- a/vmvx_ukernel/CMakeLists.txt +++ b/vmvx_ukernel/CMakeLists.txt
@@ -1,9 +1,11 @@ set(IREE_RUNTIME_SOURCE_DIR "${IREE_SOURCE_DIR}/runtime/src/iree") # use IREE builtin reference ukernel implementation if RVV is off -set(PREFIX_SRC "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel") +set(PREFIX_UKERNEL "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel") +set(PREFIX_VMVX "${IREE_RUNTIME_SOURCE_DIR}/modules/vmvx") if (${BUILD_WITH_RVV}) - set(PREFIX_SRC "${CMAKE_CURRENT_SOURCE_DIR}") + set(PREFIX_UKERNEL "${CMAKE_CURRENT_SOURCE_DIR}") + set(PREFIX_VMVX "${CMAKE_CURRENT_SOURCE_DIR}") endif() iree_cc_library( @@ -12,15 +14,14 @@ HDRS "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/api.h" SRCS - "${PREFIX_SRC}/elementwise.c" - "${PREFIX_SRC}/mmt4d_tile.c" - "${PREFIX_SRC}/query_tile_sizes.c" "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/mmt4d.c" "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/pack.c" "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/pack_tile.c" "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/unpack.c" "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/unpack_tile.c" "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/weak.c" + "${PREFIX_UKERNEL}/mmt4d_tile.c" + "${PREFIX_UKERNEL}/query_tile_sizes.c" DEPS iree::builtins::ukernel::internal_headers PUBLIC @@ -35,6 +36,7 @@ "${IREE_RUNTIME_SOURCE_DIR}/modules/vmvx/exports.inl" SRCS "${IREE_RUNTIME_SOURCE_DIR}/modules/vmvx/module.c" + "${PREFIX_VMVX}/elementwise.c" DEFINES "IREE_HAVE_VMVX_MODULE" DEPS
diff --git a/vmvx_ukernel/elementwise.c b/vmvx_ukernel/elementwise.c index 0e71d22..c568dbb 100644 --- a/vmvx_ukernel/elementwise.c +++ b/vmvx_ukernel/elementwise.c
@@ -14,7 +14,7 @@ * limitations under the License. */ -#include "iree/builtins/ukernel/elementwise.h" +#include "iree/modules/vmvx/elementwise.h" #include <math.h> #include <riscv_vector.h>