xnnpack.patch 4.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138
  1. diff --git a/.bazelrc b/.bazelrc
  2. index fcaff1063..e61d53337 100644
  3. --- a/.bazelrc
  4. +++ b/.bazelrc
  5. @@ -1,6 +1,7 @@
  6. # Basic build settings
  7. build --jobs 128
  8. build --cxxopt='-std=gnu++14'
  9. +build --incompatible_enable_cc_toolchain_resolution
  10. # Sets the default Apple platform to macOS.
  11. build --apple_platform_type=macos
  12. @@ -55,3 +56,10 @@ build:macos --apple_platform_type=macos
  13. build:macos_arm64 --config=macos
  14. build:macos_arm64 --cpu=darwin_arm64
  15. +
  16. +# Emscripten configs
  17. +build:wasm --copt="-Wno-unused"
  18. +build:wasm --copt="-Wno-unused-function"
  19. +build:wasm --copt="-Wno-unused-but-set-variable"
  20. +build:wasm --cpu=wasm
  21. +build:wasm --features=wasm_simd
  22. diff --git a/WORKSPACE b/WORKSPACE
  23. index 2e568088b..3961371ca 100644
  24. --- a/WORKSPACE
  25. +++ b/WORKSPACE
  26. @@ -83,7 +83,23 @@ http_archive(
  27. )
  28. # Android NDK location and version is auto-detected from $ANDROID_NDK_HOME environment variable
  29. -android_ndk_repository(name = "androidndk")
  30. +# android_ndk_repository(name = "androidndk")
  31. # Android SDK location and API is auto-detected from $ANDROID_HOME environment variable
  32. -android_sdk_repository(name = "androidsdk")
  33. +# android_sdk_repository(name = "androidsdk")
  34. +
  35. +http_archive(
  36. + name = "emsdk",
  37. + sha256 = "5fa6f5eb45a4d50264610c4c9e1c155535359b63bfaad69b4e5101d16c1e7e32",
  38. + strip_prefix = "emsdk-a896e3d066448b3530dbcaa48869fafefd738f57/bazel",
  39. + url = "https://github.com/emscripten-core/emsdk/archive/a896e3d066448b3530dbcaa48869fafefd738f57.tar.gz",
  40. +)
  41. +
  42. +load("@emsdk//:deps.bzl", emsdk_deps = "deps")
  43. +emsdk_deps()
  44. +
  45. +load("@emsdk//:emscripten_deps.bzl", emsdk_emscripten_deps = "emscripten_deps")
  46. +emsdk_emscripten_deps(emscripten_version = "3.1.44")
  47. +
  48. +load("@emsdk//:toolchains.bzl", "register_emscripten_toolchains")
  49. +register_emscripten_toolchains()
  50. diff --git a/bench/utils.cc b/bench/utils.cc
  51. index 3b32503a7..656845336 100644
  52. --- a/bench/utils.cc
  53. +++ b/bench/utils.cc
  54. @@ -456,3 +456,13 @@ CodeMemoryHelper::~CodeMemoryHelper() {
  55. } // namespace utils
  56. } // namespace benchmark
  57. +
  58. +
  59. +extern "C"
  60. +__attribute__((import_module("env"), import_name("getentropy"))) int import_getentropy(void* buffer, size_t length);
  61. +
  62. +extern "C"
  63. +int getentropy(void* buffer, size_t length)
  64. +{
  65. + return import_getentropy(buffer, length);
  66. +}
  67. diff --git a/build_defs.bzl b/build_defs.bzl
  68. index 01b436eb7..2738fd50a 100644
  69. --- a/build_defs.bzl
  70. +++ b/build_defs.bzl
  71. @@ -1,6 +1,7 @@
  72. """Build definitions and rules for XNNPACK."""
  73. -load(":emscripten.bzl", "xnnpack_emscripten_benchmark_linkopts", "xnnpack_emscripten_deps", "xnnpack_emscripten_minimal_linkopts", "xnnpack_emscripten_test_linkopts")
  74. +load(":emscripten.bzl", "xnnpack_emscripten_benchmark_linkopts", "xnnpack_emscripten_deps", "xnnpack_emscripten_minimal_linkopts", "xnnpack_emscripten_test_linkopts", "xnnpack_emscripten_standalone_benchmark_linkopts")
  75. +load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
  76. def xnnpack_visibility():
  77. """Visibility of :XNNPACK target.
  78. @@ -393,7 +394,8 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
  79. "//conditions:default": ["-Wno-unused-function"],
  80. }) + copts,
  81. linkopts = select({
  82. - ":emscripten": xnnpack_emscripten_benchmark_linkopts(),
  83. + ":emscripten": xnnpack_emscripten_standalone_benchmark_linkopts(),
  84. + ":emscripten_wasmsimd": xnnpack_emscripten_standalone_benchmark_linkopts(),
  85. ":windows_x86_64_mingw": ["-lshlwapi"],
  86. ":windows_x86_64_msys": ["-lshlwapi"],
  87. "//conditions:default": [],
  88. @@ -405,5 +407,16 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
  89. ":emscripten": xnnpack_emscripten_deps(),
  90. "//conditions:default": [],
  91. }),
  92. - tags = tags,
  93. + tags = tags,
  94. + )
  95. +
  96. + wasm_cc_binary(
  97. + name = name + "-wasm",
  98. + cc_target = ":" + name,
  99. + threads = "off",
  100. + simd = True,
  101. + standalone= True,
  102. + outputs = [
  103. + name + ".wasm",
  104. + ]
  105. )
  106. diff --git a/emscripten.bzl b/emscripten.bzl
  107. index f1557a7b1..a3c4f93b9 100644
  108. --- a/emscripten.bzl
  109. +++ b/emscripten.bzl
  110. @@ -33,6 +33,21 @@ def xnnpack_emscripten_benchmark_linkopts():
  111. "--pre-js $(location :preamble.js.lds)",
  112. ]
  113. +def xnnpack_emscripten_standalone_benchmark_linkopts():
  114. + return [
  115. + "-s ASSERTIONS=1",
  116. + "-s ERROR_ON_UNDEFINED_SYMBOLS=0",
  117. + "-s ALLOW_MEMORY_GROWTH=1",
  118. + "-s TOTAL_MEMORY=536870912", # 512M
  119. + "-s USE_PTHREADS=0",
  120. + "-s STANDALONE_WASM=1",
  121. + "-Wl,--export=__heap_base",
  122. + "-Wl,--export=__data_end",
  123. + "-Wl,--export=malloc",
  124. + "-Wl,--export=free",
  125. + ]
  126. +
  127. +
  128. def xnnpack_emscripten_deps():
  129. """Emscripten-specific dependencies for unit tests and benchmarks."""
  130. return [