Merge pull request iree-org#3320 from hanhanW:main-to-google

PiperOrigin-RevId: 334853811
Physolia · Oct 1, 2020 · 6409596 · 6409596
2 parents da4b8c3 + 0298b3c
commit 6409596
Show file tree

Hide file tree

Showing 43 changed files with 1,435 additions and 115 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -56,3 +56,6 @@
 [submodule "third_party/spirv_cross"]
 	path = third_party/spirv_cross
 	url = https://github.com/KhronosGroup/SPIRV-Cross.git
+[submodule "third_party/cpuinfo"]
+	path = third_party/cpuinfo
+	url = https://github.com/pytorch/cpuinfo.git
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -21,6 +21,7 @@
 #  "@com_google_absl//absl/"
 #  "@bazel_skylib//"
 #  "@com_google_benchmark//"
+#  "@com_github_pytorch_cpuinfo//"
 #  "@com_github_google_flatbuffers//"
 #  "@com_github_dvidelabs_flatcc//"
 #  "@com_google_googletest//"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -384,6 +384,7 @@ add_subdirectory(build_tools/third_party/flatcc EXCLUDE_FROM_ALL)
 add_subdirectory(build_tools/third_party/renderdoc_api EXCLUDE_FROM_ALL)
 add_subdirectory(build_tools/third_party/ruy EXCLUDE_FROM_ALL)
 
+add_subdirectory(third_party/cpuinfo EXCLUDE_FROM_ALL)
 add_subdirectory(third_party/googletest EXCLUDE_FROM_ALL)
 add_subdirectory(third_party/abseil-cpp EXCLUDE_FROM_ALL)
 add_subdirectory(third_party/flatbuffers EXCLUDE_FROM_ALL)

diff --git a/SUBMODULE_VERSIONS b/SUBMODULE_VERSIONS
@@ -1,5 +1,6 @@
 6ec136281086b71da32b5fb068bd6e46b78a5c79 third_party/abseil-cpp
 daff5fead3fbe22c6fc58310ca3f49caf117f185 third_party/benchmark
+63b254577ed77a8004a9be6ac707f3dccc4e1fd9 third_party/cpuinfo
 4c13807b7d43ff0946b7ffea0ae3aee9e611d778 third_party/dear_imgui
 a5d9d0f7d368054fd1691aedf1db4116efcc233e third_party/flatbuffers
 4fb0ff7069bd88ee85902f4d0bb62794e5f6d021 third_party/flatcc

diff --git a/WORKSPACE b/WORKSPACE
@@ -271,5 +271,12 @@ maybe(
     path = "third_party/renderdoc_api",
 )
 
+maybe(
+    new_local_repository,
+    name = "com_github_pytorch_cpuinfo",
+    build_file = "build_tools/third_party/cpuinfo/BUILD.overlay",
+    path = "third_party/cpuinfo",
+)
+
 # Bootstrap TensorFlow deps last so that ours can take precedence.
 tf_repositories()
diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py b/build_tools/bazel_to_cmake/bazel_to_cmake_targets.py
@@ -70,7 +70,8 @@
     "@com_github_dvidelabs_flatcc//:runtime": ["flatcc::runtime"],
     "@com_google_googletest//:gtest": ["gmock", "gtest"],
     "@renderdoc_api//:renderdoc_app": ["renderdoc_api::renderdoc_app"],
-    "@sdl2//:SDL2": ["SDL2-static"]
+    "@sdl2//:SDL2": ["SDL2-static"],
+    "@com_github_pytorch_cpuinfo//:cpuinfo": ["cpuinfo"],
 }
 
 

diff --git a/build_tools/cmake/iree_copts.cmake b/build_tools/cmake/iree_copts.cmake
@@ -237,6 +237,16 @@ endif()
 set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
 set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "" FORCE)
 
+#-------------------------------------------------------------------------------
+# Third party: cpuinfo
+#-------------------------------------------------------------------------------
+
+set(CPUINFO_BUILD_TOOLS ON CACHE BOOL "" FORCE)
+
+set(CPUINFO_BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE)
+set(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "" FORCE)
+set(CPUINFO_BUILD_MOCK_TESTS OFF CACHE BOOL "" FORCE)
+
 #-------------------------------------------------------------------------------
 # Third party: flatbuffers
 #-------------------------------------------------------------------------------