commit 42be722879e63184a8989d7a0a717cb69c653e5d
author bjacob <benoitjacob@google.com> Tue May 30 16:42:09 2023 -0400
committer GitHub <noreply@github.com> Tue May 30 13:42:09 2023 -0700
tree c59ce93686177160294887ccb1660fb413ce4851
parent c9c2e8372e59cd3a482c2d6842d1d6a0cbe711f2

fix the `cpu_ukernel` standalone plugin: was missing `weak.c` (#13850)

I forgot to update this in #13715. This would result in linker errors
when using this outside of x86_64 and arm64. Sorry! @lundong .

(The need for this standalone plugin is likely to diminish as #13804 is
getting completed. Even if it stays around, it could be reimplemented as
a thin shell around the bitcode.).

experimental/cpu_ukernel/CMakeLists.txt

diff --git a/experimental/cpu_ukernel/CMakeLists.txt b/experimental/cpu_ukernel/CMakeLists.txt
index 48cc286..1cf7775 100644
--- a/experimental/cpu_ukernel/CMakeLists.txt
+++ b/experimental/cpu_ukernel/CMakeLists.txt
@@ -57,13 +57,8 @@
     "arm_64"
   SRCS
     plugin.c
-    runtime/src/iree/builtins/ukernel/mmt4d.c
-    runtime/src/iree/builtins/ukernel/mmt4d_tile.c
-    runtime/src/iree/builtins/ukernel/unpack_tile.c
-    runtime/src/iree/builtins/ukernel/pack.c
-    runtime/src/iree/builtins/ukernel/query_tile_sizes.c
-    runtime/src/iree/builtins/ukernel/unpack.c
-    runtime/src/iree/builtins/ukernel/pack_tile.c
+    # ukernel/arch/ file come before ukernel/ (non-arch) files because they
+    # contains symbols that should override weak symbols in ukernel/weak.c.
     "x86_64:runtime/src/iree/builtins/ukernel/arch/x86_64/query_tile_sizes_x86_64.c"
     "x86_64:runtime/src/iree/builtins/ukernel/arch/x86_64/unpack_x86_64.c"
     "x86_64:runtime/src/iree/builtins/ukernel/arch/x86_64/pack_x86_64.c"
@@ -81,4 +76,12 @@
     "arm_64:runtime/src/iree/builtins/ukernel/arch/arm_64/unpack_arm_64.c"
     "arm_64:runtime/src/iree/builtins/ukernel/arch/arm_64/mmt4d_arm_64_dotprod.c:IREE_UK_ARM_64_DOTPROD_COPTS"
     "arm_64:runtime/src/iree/builtins/ukernel/arch/arm_64/mmt4d_arm_64_i8mm.c:IREE_UK_ARM_64_I8MM_COPTS"
+    runtime/src/iree/builtins/ukernel/mmt4d.c
+    runtime/src/iree/builtins/ukernel/mmt4d_tile.c
+    runtime/src/iree/builtins/ukernel/unpack_tile.c
+    runtime/src/iree/builtins/ukernel/pack.c
+    runtime/src/iree/builtins/ukernel/query_tile_sizes.c
+    runtime/src/iree/builtins/ukernel/unpack.c
+    runtime/src/iree/builtins/ukernel/pack_tile.c
+    runtime/src/iree/builtins/ukernel/weak.c
 )