move qnnpack utils under xnnpack

backends/qnnpack/QNNPackBackend.cpp

@@ -8,7 +8,7 @@
 
 #include <executorch/backends/qnnpack/executor/QNNExecutor.h>
 #include <executorch/backends/qnnpack/qnnpack_schema_generated.h>
-#include <executorch/backends/qnnpack/utils/utils.h>
+#include <executorch/backends/xnnpack/runtime/utils/utils.h>
 #include <executorch/backends/xnnpack/threadpool/threadpool.h>
 #include <executorch/runtime/backend/backend_registry.h>
 #include <executorch/runtime/core/error.h>

backends/qnnpack/targets.bzl

@@ -42,25 +42,6 @@ def define_common_targets():
         ],
     )
 
-    for aten_mode in (True, False):
-        aten_suffix = "_aten" if aten_mode else ""
-        runtime.cxx_library(
-            name = "qnnpack_utils" + aten_suffix,
-            srcs = [
-                "utils/utils.cpp",
-            ],
-            exported_headers = ["utils/utils.h"],
-            deps = [
-                "//executorch/runtime/core/exec_aten:lib" + aten_suffix,
-                "//executorch/runtime/backend:backend_registry",
-            ],
-            visibility = [
-                "//executorch/backends/qnnpack/test/...",
-                "//executorch/backends/xnnpack/...",
-                "@EXECUTORCH_CLIENTS",
-            ],
-        )
-
     runtime.cxx_library(
         name = "qnnpack_backend",
         srcs = [
@@ -84,14 +65,14 @@ def define_common_targets():
             "//executorch/runtime/core/exec_aten/util:tensor_util",
             "//executorch/runtime/backend:backend_registry",
             "//executorch/backends/xnnpack/threadpool:threadpool",
+            "//executorch/backends/xnnpack:dynamic_quant_utils",
             "//executorch/util:memory_utils",
             "//{prefix}caffe2/aten/src/ATen/native/quantized/cpu/qnnpack:pytorch_qnnpack".format(
                 prefix = (
                     "xplat/" if is_xplat() else ""
                 ),
             ),
             ":qnnpack_schema",
-            ":qnnpack_utils",
         ],
         platforms = [
             ANDROID,

backends/xnnpack/runtime/XNNExecutor.cpp

@@ -6,8 +6,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/backends/qnnpack/utils/utils.h>
 #include <executorch/backends/xnnpack/runtime/XNNExecutor.h>
+#include <executorch/backends/xnnpack/runtime/utils/utils.h>
 
 namespace torch {
 namespace executor {

backends/qnnpack/utils/utils.cpp → backends/xnnpack/runtime/utils/utils.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/backends/qnnpack/utils/utils.h>
+#include <executorch/backends/xnnpack/runtime/utils/utils.h>
 #include <executorch/runtime/platform/assert.h>
 
 namespace torch {

backends/xnnpack/targets.bzl

@@ -2,6 +2,22 @@ load("@fbsource//xplat/executorch/backends/xnnpack/third-party:third_party_libs.
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 
 def define_common_targets():
+    runtime.cxx_library(
+        name = "dynamic_quant_utils",
+        srcs = [
+            "runtime/utils/utils.cpp",
+        ],
+        exported_headers = ["runtime/utils/utils.h"],
+        deps = [
+            "//executorch/runtime/core/exec_aten:lib",
+            "//executorch/runtime/backend:backend_registry",
+        ],
+        visibility = [
+            "//executorch/backends/xnnpack/...",
+            "@EXECUTORCH_CLIENTS",
+        ],
+    )
+
     runtime.genrule(
         name = "gen_xnnpack_schema",
         srcs = [
@@ -52,8 +68,8 @@ def define_common_targets():
         deps = [
             third_party_dep("XNNPACK"),
             ":xnnpack_schema",
+            ":dynamic_quant_utils",  # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor(),
             "//executorch/runtime/backend:backend_registry",
-            "//executorch/backends/qnnpack:qnnpack_utils",  # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor()
             "//executorch/backends/xnnpack/threadpool:threadpool",
             "//executorch/util:memory_utils",
             "//executorch/runtime/core/exec_aten/util:tensor_util",

backends/xnnpack/test/TARGETS

@@ -1,4 +1,7 @@
 load("@fbcode_macros//build_defs:python_unittest.bzl", "python_unittest")
+load(":targets.bzl", "define_common_targets")
+
+define_common_targets()
 
 python_unittest(
     name = "test_xnnpack",

backends/qnnpack/test/test_utils.cpp → backends/xnnpack/test/runtime/test_runtime_utils.cpp

@@ -13,7 +13,7 @@
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
 #include <executorch/runtime/platform/runtime.h>
-#include "executorch/backends/qnnpack/utils/utils.h"
+#include "executorch/backends/xnnpack/runtime/utils/utils.h"
 
 using namespace ::testing;
 

backends/qnnpack/test/targets.bzl → backends/xnnpack/test/targets.bzl

@@ -1,26 +1,19 @@
-load(
-    "@fbsource//tools/build_defs:default_platform_defs.bzl",
-    "ANDROID",
-    "APPLE",
-    "CXX",
-)
 load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
 
 def define_common_targets():
     runtime.cxx_test(
-        name = "qnnpack_utils_test",
-        srcs = ["test_utils.cpp"],
+        name = "dynamic_quant_utils_test",
+        srcs = ["runtime/test_runtime_utils.cpp"],
         fbcode_deps = [
             "//caffe2:ATen-cpu",
         ],
         xplat_deps = [
             "//caffe2:aten_cpu",
         ],
-        platforms = [ANDROID, APPLE, CXX],
         deps = [
             "//executorch/runtime/core/exec_aten/testing_util:tensor_util",
             "//executorch/runtime/core/exec_aten/util:scalar_type_util",
             "//executorch/extension/aten_util:aten_bridge",
-            "//executorch/backends/qnnpack:qnnpack_utils",
+            "//executorch/backends/xnnpack:dynamic_quant_utils",
         ],
     )

backends/xnnpack/threadpool/targets.bzl

@@ -27,8 +27,8 @@ def define_common_targets():
         exported_headers = _THREADPOOL_HEADERS,
         exported_deps = [
             third_party_dep("pthreadpool"),
+            third_party_dep("cpuinfo"),
         ],
-        external_deps = ["cpuinfo"],
         exported_preprocessor_flags = [
             "-DET_USE_THREADPOOL",
         ],

shim/xplat/executorch/backends/xnnpack/third-party/third_party_libs.bzl

@@ -8,7 +8,7 @@ _THIRD_PARTY_LIBS = {
     "FXdiv": ["//xplat/third-party/FXdiv:FXdiv", "//backends/xnnpack/third-party:FXdiv"],
     "XNNPACK": ["//xplat/third-party/XNNPACK:XNNPACK", "//backends/xnnpack/third-party:XNNPACK"],
     "clog": ["//xplat/third-party/clog:clog", "//backends/xnnpack/third-party:clog"],
-    "cpuinfo": ["//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
+    "cpuinfo": ["fbsource//third-party/cpuinfo:cpuinfo", "//backends/xnnpack/third-party:cpuinfo"],
     "pthreadpool": ["//xplat/third-party/pthreadpool:pthreadpool", "//backends/xnnpack/third-party:pthreadpool"],
     "pthreadpool_header": ["//xplat/third-party/pthreadpool:pthreadpool_header", "//backends/xnnpack/third-party:pthreadpool_header"],
 }