xnnpack.patch 4.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122
  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..5d3e685f4 100644
  18. --- a/WORKSPACE
  19. +++ b/WORKSPACE
  20. @@ -92,8 +92,25 @@ http_archive(
  21. ],
  22. )
  23. +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
  24. +http_archive(
  25. + name = "emsdk",
  26. + # Use emsdk-3.0.0 since the larger version may:
  27. + # - compress the wasm file into a tar file but not directly generate wasm file
  28. + # - generate incomplete implementation of libc API, e.g. throw exception in getentropy
  29. + strip_prefix = "emsdk-3.0.0/bazel",
  30. + url = "https://github.com/emscripten-core/emsdk/archive/refs/tags/3.0.0.tar.gz",
  31. + sha256 = "a41dccfd15be9e85f923efaa0ac21943cbab77ec8d39e52f25eca1ec61a9ac9e"
  32. +)
  33. +
  34. +load("@emsdk//:deps.bzl", emsdk_deps = "deps")
  35. +emsdk_deps()
  36. +
  37. +load("@emsdk//:emscripten_deps.bzl", emsdk_emscripten_deps = "emscripten_deps")
  38. +emsdk_emscripten_deps()
  39. +
  40. # Android NDK location and version is auto-detected from $ANDROID_NDK_HOME environment variable
  41. -android_ndk_repository(name = "androidndk")
  42. +#android_ndk_repository(name = "androidndk")
  43. # Android SDK location and API is auto-detected from $ANDROID_HOME environment variable
  44. -android_sdk_repository(name = "androidsdk")
  45. +#android_sdk_repository(name = "androidsdk")
  46. diff --git a/build_defs.bzl b/build_defs.bzl
  47. index b8217a18d..da232966e 100644
  48. --- a/build_defs.bzl
  49. +++ b/build_defs.bzl
  50. @@ -380,7 +380,7 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
  51. explicitly specified.
  52. """
  53. native.cc_binary(
  54. - name = name,
  55. + name = name + ".wasm",
  56. srcs = srcs,
  57. copts = xnnpack_std_cxxopts() + [
  58. "-Iinclude",
  59. diff --git a/emscripten.bzl b/emscripten.bzl
  60. index f1557a7b1..7f964a094 100644
  61. --- a/emscripten.bzl
  62. +++ b/emscripten.bzl
  63. @@ -25,12 +25,19 @@ def xnnpack_emscripten_benchmark_linkopts():
  64. """Emscripten-specific linkopts for benchmarks."""
  65. return [
  66. "-s ASSERTIONS=1",
  67. - "-s ENVIRONMENT=node,shell,web",
  68. - "-s ERROR_ON_UNDEFINED_SYMBOLS=1",
  69. - "-s EXIT_RUNTIME=1",
  70. + "-s ERROR_ON_UNDEFINED_SYMBOLS=0",
  71. "-s ALLOW_MEMORY_GROWTH=1",
  72. "-s TOTAL_MEMORY=536870912", # 512M
  73. - "--pre-js $(location :preamble.js.lds)",
  74. + "-s USE_PTHREADS=0",
  75. + "-s STANDALONE_WASM=1",
  76. + "-Wno-unused",
  77. + "-Wno-unused-variable",
  78. + "-Wno-unused-command-line-argument",
  79. + "-Wl,--export=__heap_base",
  80. + "-Wl,--export=__data_end",
  81. + "-Wl,--export=malloc",
  82. + "-Wl,--export=free",
  83. + "--oformat=wasm",
  84. ]
  85. def xnnpack_emscripten_deps():
  86. diff --git a/src/log.c b/src/log.c
  87. index 5715f2f85..4b3e4261b 100644
  88. --- a/src/log.c
  89. +++ b/src/log.c
  90. @@ -55,7 +55,7 @@
  91. #endif
  92. #if XNN_LOG_TO_STDIO
  93. -static void xnn_vlog(int output_handle, const char* prefix, size_t prefix_length, const char* format, va_list args) {
  94. +void xnn_vlog(int output_handle, const char* prefix, size_t prefix_length, const char* format, va_list args) {
  95. char stack_buffer[XNN_LOG_STACK_BUFFER_SIZE];
  96. char* heap_buffer = NULL;
  97. char* out_buffer = &stack_buffer[0];
  98. diff --git a/third_party/cpuinfo.BUILD b/third_party/cpuinfo.BUILD
  99. index 1997f4e3a..5e03c43af 100644
  100. --- a/third_party/cpuinfo.BUILD
  101. +++ b/third_party/cpuinfo.BUILD
  102. @@ -150,7 +150,7 @@ cc_library(
  103. "src/arm/midr.h",
  104. ],
  105. deps = [
  106. - "@clog",
  107. + "//deps/clog"
  108. ],
  109. )
  110. @@ -352,5 +352,5 @@ config_setting(
  111. config_setting(
  112. name = "emscripten",
  113. - values = {"crosstool_top": "//toolchain:emscripten"},
  114. + values = {"crosstool_top": "@emsdk//emscripten_toolchain:everything"},
  115. )