diff --git a/vmvx_ukernel/CMakeLists.txt b/vmvx_ukernel/CMakeLists.txt
index a18e016..537e9e7 100644
--- a/vmvx_ukernel/CMakeLists.txt
+++ b/vmvx_ukernel/CMakeLists.txt
@@ -6,9 +6,11 @@
   HDRS
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/arch/mmt4d_arch.h"
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/arch/pack_arch.h"
+    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/arch/query_tile_sizes_arch.h"
   SRCS
     "mmt4d_arch.c"
     "pack_arch.c"
+    "query_tile_sizes_arch.c"
   DEPS
     iree::builtins::ukernel::common
     iree::builtins::ukernel::generic
@@ -22,10 +24,12 @@
     "${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"
   SRCS
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/mmt4d.c"
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/pack.c"
+    "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/query_tile_sizes.c"
     "${IREE_RUNTIME_SOURCE_DIR}/builtins/ukernel/unpack.c"
   DEPS
     ::arch
diff --git a/vmvx_ukernel/query_tile_sizes_arch.c b/vmvx_ukernel/query_tile_sizes_arch.c
new file mode 100644
index 0000000..90b3502
--- /dev/null
+++ b/vmvx_ukernel/query_tile_sizes_arch.c
@@ -0,0 +1,15 @@
+// Copyright 2023 Google LLC.
+// Copyright 2022 The IREE Authors
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#include "iree/builtins/ukernel/arch/query_tile_sizes_arch.h"
+
+bool iree_uk_query_matmul_tile_sizes_arch(
+    const iree_uk_query_tile_sizes_2d_params_t* params,
+    iree_uk_matmul_tile_sizes_t* out_matmul_tile_sizes) {
+  // TODO(lundong): to be replaced with Kelvin logic.
+  return false;
+}