xnnpack.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100
  1. diff --git a/.bazelrc b/.bazelrc
  2. index ec740f38..29f9d56e 100644
  3. --- a/.bazelrc
  4. +++ b/.bazelrc
  5. @@ -49,4 +49,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 --copt=-msimd128
  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 c58e76b6..30934678 100644
  18. --- a/WORKSPACE
  19. +++ b/WORKSPACE
  20. @@ -21,6 +21,7 @@ http_archive(
  21. name = "com_google_benchmark",
  22. strip_prefix = "benchmark-master",
  23. urls = ["https://github.com/google/benchmark/archive/master.zip"],
  24. + patches = ["@//third_party:benchmark.patch"],
  25. )
  26. # FP16 library, used for half-precision conversions
  27. @@ -84,6 +85,19 @@ http_archive(
  28. ],
  29. )
  30. +http_archive(
  31. + name = "emsdk",
  32. + strip_prefix = "emsdk-2.0.26/bazel",
  33. + url = "https://github.com/emscripten-core/emsdk/archive/refs/tags/2.0.26.tar.gz",
  34. + sha256 = "79e7166aa8eaae6e52cef1363b2d8db795d03684846066bc51f9dcf905dd58ad",
  35. +)
  36. +
  37. +load("@emsdk//:deps.bzl", emsdk_deps = "deps")
  38. +emsdk_deps()
  39. +
  40. +load("@emsdk//:emscripten_deps.bzl", emsdk_emscripten_deps = "emscripten_deps")
  41. +emsdk_emscripten_deps()
  42. +
  43. # Android NDK location and version is auto-detected from $ANDROID_NDK_HOME environment variable
  44. android_ndk_repository(name = "androidndk")
  45. diff --git a/build_defs.bzl b/build_defs.bzl
  46. index 2442bed1..b860dfef 100644
  47. --- a/build_defs.bzl
  48. +++ b/build_defs.bzl
  49. @@ -414,7 +414,7 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
  50. explicitly specified.
  51. """
  52. native.cc_binary(
  53. - name = name,
  54. + name = name + ".wasm",
  55. srcs = srcs,
  56. copts = xnnpack_std_cxxopts() + [
  57. "-Iinclude",
  58. diff --git a/emscripten.bzl b/emscripten.bzl
  59. index 130d5f16..2696ad54 100644
  60. --- a/emscripten.bzl
  61. +++ b/emscripten.bzl
  62. @@ -25,12 +25,19 @@ def xnnpack_emscripten_benchmark_linkopts():
  63. """Emscripten-specific linkopts for benchmarks."""
  64. return [
  65. "-s ASSERTIONS=1",
  66. - "-s ENVIRONMENT=node,shell,web",
  67. - "-s ERROR_ON_UNDEFINED_SYMBOLS=1",
  68. - "-s EXIT_RUNTIME=1",
  69. + "-s ERROR_ON_UNDEFINED_SYMBOLS=0",
  70. "-s ALLOW_MEMORY_GROWTH=1",
  71. "-s TOTAL_MEMORY=445644800", # 425M
  72. - "--pre-js $(location :preamble.js.lds)",
  73. + "-s USE_PTHREADS=0",
  74. + "-s STANDALONE_WASM=1",
  75. + "-Wno-unused",
  76. + "-Wno-unused-variable",
  77. + "-Wno-unused-command-line-argument",
  78. + "-Wl,--export=__heap_base",
  79. + "-Wl,--export=__data_end",
  80. + "-Wl,--export=malloc",
  81. + "-Wl,--export=free",
  82. + "--oformat=wasm",
  83. ]
  84. def xnnpack_emscripten_deps():
  85. diff --git a/third_party/cpuinfo.BUILD b/third_party/cpuinfo.BUILD
  86. index 128d683e..f6c287c4 100644
  87. --- a/third_party/cpuinfo.BUILD
  88. +++ b/third_party/cpuinfo.BUILD
  89. @@ -343,5 +343,5 @@ config_setting(
  90. config_setting(
  91. name = "emscripten",
  92. - values = {"crosstool_top": "//toolchain:emscripten"},
  93. + values = {"crosstool_top": "@emsdk//emscripten_toolchain:everything"},
  94. )