|
|
@@ -1,141 +1,138 @@
|
|
|
diff --git a/.bazelrc b/.bazelrc
|
|
|
-index 688279da1..376996885 100644
|
|
|
+index fcaff1063..e61d53337 100644
|
|
|
--- a/.bazelrc
|
|
|
+++ b/.bazelrc
|
|
|
-@@ -53,4 +53,9 @@ build:ios_fat --watchos_cpus=armv7k
|
|
|
- build:macos --apple_platform_type=macos
|
|
|
+@@ -1,6 +1,7 @@
|
|
|
+ # Basic build settings
|
|
|
+ build --jobs 128
|
|
|
+ build --cxxopt='-std=gnu++14'
|
|
|
++build --incompatible_enable_cc_toolchain_resolution
|
|
|
+
|
|
|
+ # Sets the default Apple platform to macOS.
|
|
|
+ build --apple_platform_type=macos
|
|
|
+@@ -55,3 +56,10 @@ build:macos --apple_platform_type=macos
|
|
|
|
|
|
build:macos_arm64 --config=macos
|
|
|
--build:macos_arm64 --cpu=darwin_arm64
|
|
|
-\ No newline at end of file
|
|
|
-+build:macos_arm64 --cpu=darwin_arm64
|
|
|
+ build:macos_arm64 --cpu=darwin_arm64
|
|
|
+
|
|
|
++# Emscripten configs
|
|
|
++build:wasm --copt="-Wno-unused"
|
|
|
++build:wasm --copt="-Wno-unused-function"
|
|
|
++build:wasm --copt="-Wno-unused-but-set-variable"
|
|
|
+build:wasm --cpu=wasm
|
|
|
+build:wasm --features=wasm_simd
|
|
|
-+build:wasm --crosstool_top=@emsdk//emscripten_toolchain:everything
|
|
|
-+build:wasm --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
|
|
|
diff --git a/WORKSPACE b/WORKSPACE
|
|
|
-index cd8960ffa..787e03ca8 100644
|
|
|
+index 2e568088b..3961371ca 100644
|
|
|
--- a/WORKSPACE
|
|
|
+++ b/WORKSPACE
|
|
|
-@@ -29,8 +29,9 @@ http_archive(
|
|
|
- # Google Benchmark library, used in micro-benchmarks.
|
|
|
- http_archive(
|
|
|
- name = "com_google_benchmark",
|
|
|
-- strip_prefix = "benchmark-main",
|
|
|
-- urls = ["https://github.com/google/benchmark/archive/main.zip"],
|
|
|
-+ sha256 = "1ba14374fddcd9623f126b1a60945e4deac4cdc4fb25a5f25e7f779e36f2db52",
|
|
|
-+ strip_prefix = "benchmark-d2a8a4ee41b923876c034afb939c4fc03598e622",
|
|
|
-+ urls = ["https://github.com/google/benchmark/archive/d2a8a4ee41b923876c034afb939c4fc03598e622.zip"],
|
|
|
+@@ -83,7 +83,23 @@ http_archive(
|
|
|
)
|
|
|
|
|
|
- # FP16 library, used for half-precision conversions
|
|
|
-@@ -92,8 +93,25 @@ http_archive(
|
|
|
- ],
|
|
|
- )
|
|
|
+ # Android NDK location and version is auto-detected from $ANDROID_NDK_HOME environment variable
|
|
|
+-android_ndk_repository(name = "androidndk")
|
|
|
++# android_ndk_repository(name = "androidndk")
|
|
|
|
|
|
-+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
|
|
+ # Android SDK location and API is auto-detected from $ANDROID_HOME environment variable
|
|
|
+-android_sdk_repository(name = "androidsdk")
|
|
|
++# android_sdk_repository(name = "androidsdk")
|
|
|
++
|
|
|
+http_archive(
|
|
|
+ name = "emsdk",
|
|
|
-+ # Use emsdk-3.0.0 since the larger version may:
|
|
|
-+ # - compress the wasm file into a tar file but not directly generate wasm file
|
|
|
-+ # - generate incomplete implementation of libc API, e.g. throw exception in getentropy
|
|
|
-+ strip_prefix = "emsdk-3.0.0/bazel",
|
|
|
-+ url = "https://github.com/emscripten-core/emsdk/archive/refs/tags/3.0.0.tar.gz",
|
|
|
-+ sha256 = "a41dccfd15be9e85f923efaa0ac21943cbab77ec8d39e52f25eca1ec61a9ac9e"
|
|
|
++ sha256 = "5fa6f5eb45a4d50264610c4c9e1c155535359b63bfaad69b4e5101d16c1e7e32",
|
|
|
++ strip_prefix = "emsdk-a896e3d066448b3530dbcaa48869fafefd738f57/bazel",
|
|
|
++ url = "https://github.com/emscripten-core/emsdk/archive/a896e3d066448b3530dbcaa48869fafefd738f57.tar.gz",
|
|
|
+)
|
|
|
+
|
|
|
+load("@emsdk//:deps.bzl", emsdk_deps = "deps")
|
|
|
+emsdk_deps()
|
|
|
+
|
|
|
+load("@emsdk//:emscripten_deps.bzl", emsdk_emscripten_deps = "emscripten_deps")
|
|
|
-+emsdk_emscripten_deps()
|
|
|
++emsdk_emscripten_deps(emscripten_version = "3.1.44")
|
|
|
+
|
|
|
- # Android NDK location and version is auto-detected from $ANDROID_NDK_HOME environment variable
|
|
|
--android_ndk_repository(name = "androidndk")
|
|
|
-+#android_ndk_repository(name = "androidndk")
|
|
|
++load("@emsdk//:toolchains.bzl", "register_emscripten_toolchains")
|
|
|
++register_emscripten_toolchains()
|
|
|
+diff --git a/bench/utils.cc b/bench/utils.cc
|
|
|
+index 3b32503a7..656845336 100644
|
|
|
+--- a/bench/utils.cc
|
|
|
++++ b/bench/utils.cc
|
|
|
+@@ -456,3 +456,13 @@ CodeMemoryHelper::~CodeMemoryHelper() {
|
|
|
|
|
|
- # Android SDK location and API is auto-detected from $ANDROID_HOME environment variable
|
|
|
--android_sdk_repository(name = "androidsdk")
|
|
|
-+#android_sdk_repository(name = "androidsdk")
|
|
|
+ } // namespace utils
|
|
|
+ } // namespace benchmark
|
|
|
++
|
|
|
++
|
|
|
++extern "C"
|
|
|
++__attribute__((import_module("env"), import_name("getentropy"))) int import_getentropy(void* buffer, size_t length);
|
|
|
++
|
|
|
++extern "C"
|
|
|
++int getentropy(void* buffer, size_t length)
|
|
|
++{
|
|
|
++ return import_getentropy(buffer, length);
|
|
|
++}
|
|
|
diff --git a/build_defs.bzl b/build_defs.bzl
|
|
|
-index b8217a18d..6f2d1675e 100644
|
|
|
+index 01b436eb7..2738fd50a 100644
|
|
|
--- a/build_defs.bzl
|
|
|
+++ b/build_defs.bzl
|
|
|
-@@ -380,7 +380,7 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
|
|
|
- explicitly specified.
|
|
|
- """
|
|
|
- native.cc_binary(
|
|
|
-- name = name,
|
|
|
-+ name = name + ".wasm",
|
|
|
- srcs = srcs,
|
|
|
- copts = xnnpack_std_cxxopts() + [
|
|
|
- "-Iinclude",
|
|
|
-@@ -405,5 +405,5 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
|
|
|
+@@ -1,6 +1,7 @@
|
|
|
+ """Build definitions and rules for XNNPACK."""
|
|
|
+
|
|
|
+-load(":emscripten.bzl", "xnnpack_emscripten_benchmark_linkopts", "xnnpack_emscripten_deps", "xnnpack_emscripten_minimal_linkopts", "xnnpack_emscripten_test_linkopts")
|
|
|
++load(":emscripten.bzl", "xnnpack_emscripten_benchmark_linkopts", "xnnpack_emscripten_deps", "xnnpack_emscripten_minimal_linkopts", "xnnpack_emscripten_test_linkopts", "xnnpack_emscripten_standalone_benchmark_linkopts")
|
|
|
++load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
|
|
|
+
|
|
|
+ def xnnpack_visibility():
|
|
|
+ """Visibility of :XNNPACK target.
|
|
|
+@@ -393,7 +394,8 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
|
|
|
+ "//conditions:default": ["-Wno-unused-function"],
|
|
|
+ }) + copts,
|
|
|
+ linkopts = select({
|
|
|
+- ":emscripten": xnnpack_emscripten_benchmark_linkopts(),
|
|
|
++ ":emscripten": xnnpack_emscripten_standalone_benchmark_linkopts(),
|
|
|
++ ":emscripten_wasmsimd": xnnpack_emscripten_standalone_benchmark_linkopts(),
|
|
|
+ ":windows_x86_64_mingw": ["-lshlwapi"],
|
|
|
+ ":windows_x86_64_msys": ["-lshlwapi"],
|
|
|
+ "//conditions:default": [],
|
|
|
+@@ -405,5 +407,16 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
|
|
|
":emscripten": xnnpack_emscripten_deps(),
|
|
|
"//conditions:default": [],
|
|
|
}),
|
|
|
- tags = tags,
|
|
|
-+ tags = tags,
|
|
|
++ tags = tags,
|
|
|
++ )
|
|
|
++
|
|
|
++ wasm_cc_binary(
|
|
|
++ name = name + "-wasm",
|
|
|
++ cc_target = ":" + name,
|
|
|
++ threads = "off",
|
|
|
++ simd = True,
|
|
|
++ standalone= True,
|
|
|
++ outputs = [
|
|
|
++ name + ".wasm",
|
|
|
++ ]
|
|
|
)
|
|
|
diff --git a/emscripten.bzl b/emscripten.bzl
|
|
|
-index f1557a7b1..7f964a094 100644
|
|
|
+index f1557a7b1..a3c4f93b9 100644
|
|
|
--- a/emscripten.bzl
|
|
|
+++ b/emscripten.bzl
|
|
|
-@@ -25,12 +25,19 @@ def xnnpack_emscripten_benchmark_linkopts():
|
|
|
- """Emscripten-specific linkopts for benchmarks."""
|
|
|
- return [
|
|
|
- "-s ASSERTIONS=1",
|
|
|
-- "-s ENVIRONMENT=node,shell,web",
|
|
|
-- "-s ERROR_ON_UNDEFINED_SYMBOLS=1",
|
|
|
-- "-s EXIT_RUNTIME=1",
|
|
|
+@@ -33,6 +33,21 @@ def xnnpack_emscripten_benchmark_linkopts():
|
|
|
+ "--pre-js $(location :preamble.js.lds)",
|
|
|
+ ]
|
|
|
+
|
|
|
++def xnnpack_emscripten_standalone_benchmark_linkopts():
|
|
|
++ return [
|
|
|
++ "-s ASSERTIONS=1",
|
|
|
+ "-s ERROR_ON_UNDEFINED_SYMBOLS=0",
|
|
|
- "-s ALLOW_MEMORY_GROWTH=1",
|
|
|
- "-s TOTAL_MEMORY=536870912", # 512M
|
|
|
-- "--pre-js $(location :preamble.js.lds)",
|
|
|
++ "-s ALLOW_MEMORY_GROWTH=1",
|
|
|
++ "-s TOTAL_MEMORY=536870912", # 512M
|
|
|
+ "-s USE_PTHREADS=0",
|
|
|
+ "-s STANDALONE_WASM=1",
|
|
|
-+ "-Wno-unused",
|
|
|
-+ "-Wno-unused-variable",
|
|
|
-+ "-Wno-unused-command-line-argument",
|
|
|
+ "-Wl,--export=__heap_base",
|
|
|
+ "-Wl,--export=__data_end",
|
|
|
+ "-Wl,--export=malloc",
|
|
|
+ "-Wl,--export=free",
|
|
|
-+ "--oformat=wasm",
|
|
|
- ]
|
|
|
-
|
|
|
++ ]
|
|
|
++
|
|
|
++
|
|
|
def xnnpack_emscripten_deps():
|
|
|
-diff --git a/src/log.c b/src/log.c
|
|
|
-index 5715f2f85..4b3e4261b 100644
|
|
|
---- a/src/log.c
|
|
|
-+++ b/src/log.c
|
|
|
-@@ -55,7 +55,7 @@
|
|
|
- #endif
|
|
|
-
|
|
|
- #if XNN_LOG_TO_STDIO
|
|
|
--static void xnn_vlog(int output_handle, const char* prefix, size_t prefix_length, const char* format, va_list args) {
|
|
|
-+void xnn_vlog(int output_handle, const char* prefix, size_t prefix_length, const char* format, va_list args) {
|
|
|
- char stack_buffer[XNN_LOG_STACK_BUFFER_SIZE];
|
|
|
- char* heap_buffer = NULL;
|
|
|
- char* out_buffer = &stack_buffer[0];
|
|
|
-diff --git a/third_party/cpuinfo.BUILD b/third_party/cpuinfo.BUILD
|
|
|
-index 1997f4e3a..5e03c43af 100644
|
|
|
---- a/third_party/cpuinfo.BUILD
|
|
|
-+++ b/third_party/cpuinfo.BUILD
|
|
|
-@@ -150,7 +150,7 @@ cc_library(
|
|
|
- "src/arm/midr.h",
|
|
|
- ],
|
|
|
- deps = [
|
|
|
-- "@clog",
|
|
|
-+ "//deps/clog"
|
|
|
- ],
|
|
|
- )
|
|
|
-
|
|
|
-@@ -352,5 +352,5 @@ config_setting(
|
|
|
-
|
|
|
- config_setting(
|
|
|
- name = "emscripten",
|
|
|
-- values = {"crosstool_top": "//toolchain:emscripten"},
|
|
|
-+ values = {"crosstool_top": "@emsdk//emscripten_toolchain:everything"},
|
|
|
- )
|
|
|
+ """Emscripten-specific dependencies for unit tests and benchmarks."""
|
|
|
+ return [
|
liang.he