commit 8de73a626d8696093e254dd3e59b3af05d115726
author Cindy Liu <hcindyl@google.com> Sun Jan 22 15:40:25 2023 -0800
committer Cindy Liu <hcindyl@google.com> Sun Jan 22 15:40:25 2023 -0800
tree eed3a6958b6cfd43614ed4c7e7622c8c8a8d0d24
parent 18b820fc8658ef9e5d641cdcb9fd7b1f0203e156

sw:vec_iree: Fix ukernel library dependencies

Match upstream change https://github.com/iree-org/iree/pull/11920 to fix
b/266347926

Fix: 266347926
Change-Id: I62a7dbf004799f439df317432b42663d280f1ea9

vmvx_ukernel/CMakeLists.txt

diff --git a/vmvx_ukernel/CMakeLists.txt b/vmvx_ukernel/CMakeLists.txt
index 537e9e7..eff2b5b 100644
--- a/vmvx_ukernel/CMakeLists.txt
+++ b/vmvx_ukernel/CMakeLists.txt
@@ -12,8 +12,7 @@
     "pack_arch.c"
     "query_tile_sizes_arch.c"
   DEPS
-    iree::builtins::ukernel::common
-    iree::builtins::ukernel::generic
+    iree::builtins::ukernel::headers
   PUBLIC
 )
 
@@ -21,20 +20,20 @@
   NAME
     ukernel
   HDRS
-    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/elementwise.h"
-    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/mmt4d.h"
-    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/pack.h"
-    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/query_tile_sizes.h"
-    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/unpack.h"
+    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/api.h"
+    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/mmt4d_generic.h"
+    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/pack_generic.h"
   SRCS
+    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/elementwise_generic.c"
+    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/elementwise_impl.c.inc"
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/mmt4d.c"
+    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/mmt4d_generic.c"
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/pack.c"
+    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/pack_generic.c"
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/query_tile_sizes.c"
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/unpack.c"
   DEPS
     ::arch
-    iree::builtins::ukernel::common
-    iree::builtins::ukernel::elementwise
   PUBLIC
 )
 

vmvx_ukernel/mmt4d_arch.c

diff --git a/vmvx_ukernel/mmt4d_arch.c b/vmvx_ukernel/mmt4d_arch.c
index d7274ba..9c8aecf 100644
--- a/vmvx_ukernel/mmt4d_arch.c
+++ b/vmvx_ukernel/mmt4d_arch.c
@@ -16,10 +16,8 @@
 
 #include "iree/builtins/ukernel/arch/mmt4d_arch.h"
 
-#include "iree/builtins/ukernel/mmt4d_generic.h"
-
 iree_uk_mmt4d_tile_func_t iree_uk_mmt4d_select_tile_func_arch(
     const iree_uk_mmt4d_params_t* params) {
   // TODO(lundong): to be replaced with Kelvin
-  return iree_uk_mmt4d_select_tile_func_generic(params);
+  return 0;
 }

vmvx_ukernel/pack_arch.c

diff --git a/vmvx_ukernel/pack_arch.c b/vmvx_ukernel/pack_arch.c
index b962938..beb234e 100644
--- a/vmvx_ukernel/pack_arch.c
+++ b/vmvx_ukernel/pack_arch.c
@@ -16,10 +16,8 @@
 
 #include "iree/builtins/ukernel/arch/pack_arch.h"
 
-#include "iree/builtins/ukernel/pack_generic.h"
-
 iree_uk_pack_tile_func_t iree_uk_pack_select_tile_func_arch(
     const iree_uk_pack_params_t* params) {
   // TODO(lundong): to be replaced with Kelvin
-  return iree_uk_pack_select_tile_func_generic(params);
+  return 0;
 }