xnnpack.patch 4.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141
  1. diff --git a/.bazelrc b/.bazelrc
  2. index 688279da1..376996885 100644
  3. --- a/.bazelrc
  4. +++ b/.bazelrc
  5. @@ -53,4 +53,9 @@ build:ios_fat --watchos_cpus=armv7k
  6. build:macos --apple_platform_type=macos
  7. build:macos_arm64 --config=macos
  8. -build:macos_arm64 --cpu=darwin_arm64
  9. \ No newline at end of file
  10. +build:macos_arm64 --cpu=darwin_arm64
  11. +
  12. +build:wasm --cpu=wasm
  13. +build:wasm --features=wasm_simd
  14. +build:wasm --crosstool_top=@emsdk//emscripten_toolchain:everything
  15. +build:wasm --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
  16. diff --git a/WORKSPACE b/WORKSPACE
  17. index cd8960ffa..787e03ca8 100644
  18. --- a/WORKSPACE
  19. +++ b/WORKSPACE
  20. @@ -29,8 +29,9 @@ http_archive(
  21. # Google Benchmark library, used in micro-benchmarks.
  22. http_archive(
  23. name = "com_google_benchmark",
  24. - strip_prefix = "benchmark-main",
  25. - urls = ["https://github.com/google/benchmark/archive/main.zip"],
  26. + sha256 = "1ba14374fddcd9623f126b1a60945e4deac4cdc4fb25a5f25e7f779e36f2db52",
  27. + strip_prefix = "benchmark-d2a8a4ee41b923876c034afb939c4fc03598e622",
  28. + urls = ["https://github.com/google/benchmark/archive/d2a8a4ee41b923876c034afb939c4fc03598e622.zip"],
  29. )
  30. # FP16 library, used for half-precision conversions
  31. @@ -92,8 +93,25 @@ http_archive(
  32. ],
  33. )
  34. +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
  35. +http_archive(
  36. + name = "emsdk",
  37. + # Use emsdk-3.0.0 since the larger version may:
  38. + # - compress the wasm file into a tar file but not directly generate wasm file
  39. + # - generate incomplete implementation of libc API, e.g. throw exception in getentropy
  40. + strip_prefix = "emsdk-3.0.0/bazel",
  41. + url = "https://github.com/emscripten-core/emsdk/archive/refs/tags/3.0.0.tar.gz",
  42. + sha256 = "a41dccfd15be9e85f923efaa0ac21943cbab77ec8d39e52f25eca1ec61a9ac9e"
  43. +)
  44. +
  45. +load("@emsdk//:deps.bzl", emsdk_deps = "deps")
  46. +emsdk_deps()
  47. +
  48. +load("@emsdk//:emscripten_deps.bzl", emsdk_emscripten_deps = "emscripten_deps")
  49. +emsdk_emscripten_deps()
  50. +
  51. # Android NDK location and version is auto-detected from $ANDROID_NDK_HOME environment variable
  52. -android_ndk_repository(name = "androidndk")
  53. +#android_ndk_repository(name = "androidndk")
  54. # Android SDK location and API is auto-detected from $ANDROID_HOME environment variable
  55. -android_sdk_repository(name = "androidsdk")
  56. +#android_sdk_repository(name = "androidsdk")
  57. diff --git a/build_defs.bzl b/build_defs.bzl
  58. index b8217a18d..6f2d1675e 100644
  59. --- a/build_defs.bzl
  60. +++ b/build_defs.bzl
  61. @@ -380,7 +380,7 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
  62. explicitly specified.
  63. """
  64. native.cc_binary(
  65. - name = name,
  66. + name = name + ".wasm",
  67. srcs = srcs,
  68. copts = xnnpack_std_cxxopts() + [
  69. "-Iinclude",
  70. @@ -405,5 +405,5 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
  71. ":emscripten": xnnpack_emscripten_deps(),
  72. "//conditions:default": [],
  73. }),
  74. - tags = tags,
  75. + tags = tags,
  76. )
  77. diff --git a/emscripten.bzl b/emscripten.bzl
  78. index f1557a7b1..7f964a094 100644
  79. --- a/emscripten.bzl
  80. +++ b/emscripten.bzl
  81. @@ -25,12 +25,19 @@ def xnnpack_emscripten_benchmark_linkopts():
  82. """Emscripten-specific linkopts for benchmarks."""
  83. return [
  84. "-s ASSERTIONS=1",
  85. - "-s ENVIRONMENT=node,shell,web",
  86. - "-s ERROR_ON_UNDEFINED_SYMBOLS=1",
  87. - "-s EXIT_RUNTIME=1",
  88. + "-s ERROR_ON_UNDEFINED_SYMBOLS=0",
  89. "-s ALLOW_MEMORY_GROWTH=1",
  90. "-s TOTAL_MEMORY=536870912", # 512M
  91. - "--pre-js $(location :preamble.js.lds)",
  92. + "-s USE_PTHREADS=0",
  93. + "-s STANDALONE_WASM=1",
  94. + "-Wno-unused",
  95. + "-Wno-unused-variable",
  96. + "-Wno-unused-command-line-argument",
  97. + "-Wl,--export=__heap_base",
  98. + "-Wl,--export=__data_end",
  99. + "-Wl,--export=malloc",
  100. + "-Wl,--export=free",
  101. + "--oformat=wasm",
  102. ]
  103. def xnnpack_emscripten_deps():
  104. diff --git a/src/log.c b/src/log.c
  105. index 5715f2f85..4b3e4261b 100644
  106. --- a/src/log.c
  107. +++ b/src/log.c
  108. @@ -55,7 +55,7 @@
  109. #endif
  110. #if XNN_LOG_TO_STDIO
  111. -static void xnn_vlog(int output_handle, const char* prefix, size_t prefix_length, const char* format, va_list args) {
  112. +void xnn_vlog(int output_handle, const char* prefix, size_t prefix_length, const char* format, va_list args) {
  113. char stack_buffer[XNN_LOG_STACK_BUFFER_SIZE];
  114. char* heap_buffer = NULL;
  115. char* out_buffer = &stack_buffer[0];
  116. diff --git a/third_party/cpuinfo.BUILD b/third_party/cpuinfo.BUILD
  117. index 1997f4e3a..5e03c43af 100644
  118. --- a/third_party/cpuinfo.BUILD
  119. +++ b/third_party/cpuinfo.BUILD
  120. @@ -150,7 +150,7 @@ cc_library(
  121. "src/arm/midr.h",
  122. ],
  123. deps = [
  124. - "@clog",
  125. + "//deps/clog"
  126. ],
  127. )
  128. @@ -352,5 +352,5 @@ config_setting(
  129. config_setting(
  130. name = "emscripten",
  131. - values = {"crosstool_top": "//toolchain:emscripten"},
  132. + values = {"crosstool_top": "@emsdk//emscripten_toolchain:everything"},
  133. )