Refactor pthreadpool and XNNPACK to remove FXdiv dependency.

PiperOrigin-RevId: 922670033

Author: fbarchard

BUILD.bazel

@@ -116,9 +116,7 @@ cc_library(
     # These are NOT public headers and should not be included from other targets.
     textual_hdrs = INTERNAL_HDRS,
     visibility = ["//visibility:public"],
-    deps = [
-        "@FXdiv",
-    ] + select({
+    deps = select({
         ":linux_arm": ["@cpuinfo"],
         ":linux_armeabi": ["@cpuinfo"],
         ":linux_armhf": ["@cpuinfo"],

CMakeLists.txt

@@ -71,15 +71,6 @@ IF(PTHREADPOOL_BUILD_TESTS)
 ENDIF()
 
 # ---[ Download deps
-IF(NOT DEFINED FXDIV_SOURCE_DIR)
-  MESSAGE(STATUS "Downloading FXdiv to ${CMAKE_BINARY_DIR}/FXdiv-source (define FXDIV_SOURCE_DIR to avoid it)")
-  CONFIGURE_FILE(cmake/DownloadFXdiv.cmake "${CMAKE_BINARY_DIR}/FXdiv-download/CMakeLists.txt")
-  EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/FXdiv-download")
-  EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build .
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/FXdiv-download")
-  SET(FXDIV_SOURCE_DIR "${CMAKE_BINARY_DIR}/FXdiv-source" CACHE STRING "FXdiv source directory")
-ENDIF()
 
 IF(PTHREADPOOL_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR)
   MESSAGE(STATUS "Downloading Google Test to ${CMAKE_BINARY_DIR}/googletest-source (define GOOGLETEST_SOURCE_DIR to avoid it)")
@@ -164,15 +155,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   TARGET_COMPILE_DEFINITIONS(pthreadpool PRIVATE _GNU_SOURCE=1)
 ENDIF()
 
-# ---[ Configure FXdiv
-IF(NOT TARGET fxdiv)
-  SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
-  SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
-  ADD_SUBDIRECTORY(
-    "${FXDIV_SOURCE_DIR}"
-    "${CMAKE_BINARY_DIR}/FXdiv")
-ENDIF()
-TARGET_LINK_LIBRARIES(pthreadpool PRIVATE fxdiv)
+
 
 INSTALL(TARGETS pthreadpool
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

MODULE.bazel

@@ -51,15 +51,7 @@ http_archive(
 )
 # LINT.ThenChange(cmake/DownloadGoogleBenchmark.cmake,WORKSPACE:benchmark)
 
-# LINT.IfChange
-# FXdiv library, used for repeated integer division by the same factor
-http_archive(
-    name = "FXdiv",
-    sha256 = "ab7dfb08829bee33dca38405d647868fb214ac685e379ec7ef2bebcd234cd44d",
-    strip_prefix = "FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1",
-    urls = ["https://github.com/Maratyszcza/FXdiv/archive/b408327ac2a15ec3e43352421954f5b1967701d1.zip"],
-)
-# LINT.ThenChange(cmake/DownloadFXdiv.cmake)
+
 
 # LINT.IfChange
 # cpuinfo library, used for detecting processor characteristics

WORKSPACE

@@ -22,13 +22,7 @@ http_archive(
 )
 # LINT.ThenChange(cmake/DownloadGoogleBenchmark.cmake,MODULE.bazel:benchmark)
 
-# FXdiv library, used for repeated integer division by the same factor
-http_archive(
-    name = "FXdiv",
-    strip_prefix = "FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8",
-    sha256 = "3d7b0e9c4c658a84376a1086126be02f9b7f753caa95e009d9ac38d11da444db",
-    urls = ["https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34395ec3017c8.zip"],
-)
+
 
 # Android NDK location and version is auto-detected from $ANDROID_NDK_HOME environment variable
 android_ndk_repository(name = "androidndk")

cmake/DownloadFXdiv.cmake

@@ -6,31 +6,31 @@
 
 
 def main(args):
-    options = parser.parse_args(args)
-    build = confu.Build.from_options(options)
-
-    build.export_cpath("include", ["pthreadpool.h"])
-
-    with build.options(source_dir="src", extra_include_dirs="src", deps=build.deps.fxdiv):
-        sources = ["legacy-api.c", "portable-api.c"]
-        if build.target.is_emscripten:
-            sources.append("shim.c")
-        elif build.target.is_macos:
-            sources.append("gcd.c")
-        elif build.target.is_windows:
-            sources.append("windows.c")
-        else:
-            sources.append("pthreads.c")
-        build.static_library("pthreadpool", [build.cc(src) for src in sources])
-
-    with build.options(source_dir="test", deps=[build, build.deps.googletest]):
-        build.unittest("pthreadpool-test", build.cxx("pthreadpool.cc"))
-
-    with build.options(source_dir="bench", deps=[build, build.deps.googlebenchmark]):
-        build.benchmark("latency-bench", build.cxx("latency.cc"))
-        build.benchmark("throughput-bench", build.cxx("throughput.cc"))
-
-    return build
+  options = parser.parse_args(args)
+  build = confu.Build.from_options(options)
+
+  build.export_cpath("include", ["pthreadpool.h"])
+
+  with build.options(source_dir="src", extra_include_dirs="src"):
+    sources = ["legacy-api.c", "portable-api.c"]
+    if build.target.is_emscripten:
+      sources.append("shim.c")
+    elif build.target.is_macos:
+      sources.append("gcd.c")
+    elif build.target.is_windows:
+      sources.append("windows.c")
+    else:
+      sources.append("pthreads.c")
+    build.static_library("pthreadpool", [build.cc(src) for src in sources])
+
+  with build.options(source_dir="test", deps=[build, build.deps.googletest]):
+    build.unittest("pthreadpool-test", build.cxx("pthreadpool.cc"))
+
+  with build.options(source_dir="bench", deps=[build, build.deps.googlebenchmark]):
+    build.benchmark("latency-bench", build.cxx("latency.cc"))
+    build.benchmark("throughput-bench", build.cxx("throughput.cc"))
+
+  return build
 
 
 if __name__ == "__main__":

configure.py

@@ -2,7 +2,6 @@ name: pthreadpool
 title: pthread-based thread pool
 license: Simplified BSD
 deps:
-  - name: fxdiv
-    url:  https://github.com/Maratyszcza/FXdiv.git
+
   - name: googletest
   - name: googlebenchmark

confu.yaml

@@ -9,9 +9,9 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := pthreadpool
 LOCAL_SRC_FILES := src/threadpool-pthreads.c
 LOCAL_CFLAGS := -std=c99 -Wall
-LOCAL_STATIC_LIBRARIES := pthreadpool_interface fxdiv
+LOCAL_STATIC_LIBRARIES := pthreadpool_interface
 include $(BUILD_STATIC_LIBRARY)
 
 $(call import-add-path,$(LOCAL_PATH)/deps)
 
-$(call import-module,fxdiv/jni)
+