xnnpack.patch 3.5 KB

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