Skip to content

Optimize sandbox performance #1045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
walkingeyerobot merged 6 commits into from
May 9, 2022
Merged

Optimize sandbox performance #1045

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
58819fd
Optimize sandbox performance
jfirebaugh Apr 30, 2022
a184280
Linux wants clang to link
jfirebaugh May 2, 2022
de46564
all_files not needed?
jfirebaugh May 2, 2022
0eca147
Linux wants llc
jfirebaugh May 2, 2022
186178b
And llvm-ar
jfirebaugh May 2, 2022
b2ac8db
Templated build_file_content
jfirebaugh May 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions bazel/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,34 @@ config_setting(
filegroup(name = "empty")

alias(
name = "binaries",
name = "compiler_files",
actual = select({
":linux": "@emscripten_bin_linux//:all",
":macos": "@emscripten_bin_mac//:all",
":macos_arm64": "@emscripten_bin_mac_arm64//:all",
":windows": "@emscripten_bin_win//:all",
":linux": "@emscripten_bin_linux//:compiler_files",
":macos": "@emscripten_bin_mac//:compiler_files",
":macos_arm64": "@emscripten_bin_mac_arm64//:compiler_files",
":windows": "@emscripten_bin_win//:compiler_files",
"//conditions:default": ":empty",
}),
)

alias(
name = "node_modules",
name = "linker_files",
actual = select({
":linux": "@emscripten_npm_linux//:node_modules",
":macos": "@emscripten_npm_mac//:node_modules",
":macos_arm64": "@emscripten_npm_mac//:node_modules",
":windows": "@emscripten_npm_win//:node_modules",
":linux": "@emscripten_bin_linux//:linker_files",
":macos": "@emscripten_bin_mac//:linker_files",
":macos_arm64": "@emscripten_bin_mac_arm64//:linker_files",
":windows": "@emscripten_bin_win//:linker_files",
"//conditions:default": ":empty",
}),
)

alias(
name = "ar_files",
actual = select({
":linux": "@emscripten_bin_linux//:ar_files",
":macos": "@emscripten_bin_mac//:ar_files",
":macos_arm64": "@emscripten_bin_mac_arm64//:ar_files",
":windows": "@emscripten_bin_win//:ar_files",
"//conditions:default": ":empty",
}),
)
44 changes: 21 additions & 23 deletions bazel/emscripten_toolchain/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,43 @@ package(default_visibility = ["//visibility:public"])
node_files = "@nodejs_host//:node_files" if existing_rule("@nodejs_host//:node_files") else "@nodejs//:node_files"

filegroup(
name = "common-script-includes",
name = "common_files",
srcs = [
"emar.sh",
"emar.bat",
"emcc.sh",
"emcc.bat",
"emscripten_config",
"env.sh",
"env.bat",
"@emsdk//:binaries",
"@emsdk//:node_modules",
node_files,
],
)

filegroup(
name = "compile-emscripten",
srcs = [":common-script-includes"],
name = "compiler_files",
srcs = [
"emcc.sh",
"emcc.bat",
"@emsdk//:compiler_files",
":common_files",
],
)

filegroup(
name = "link-emscripten",
name = "linker_files",
srcs = [
"emcc_link.sh",
"emcc_link.bat",
"link_wrapper.py",
":common-script-includes",
"@emsdk//:binaries",
node_files,
"@emsdk//:linker_files",
":common_files",
],
)

filegroup(
name = "every-file",
name = "ar_files",
srcs = [
":compile-emscripten",
":link-emscripten",
"@emsdk//:binaries",
node_files,
"emar.sh",
"emar.bat",
"@emsdk//:ar_files",
":common_files",
],
)

Expand All @@ -59,7 +57,7 @@ emscripten_cc_toolchain_config_rule(
name = "wasm",
cpu = "wasm",
em_config = "emscripten_config",
emscripten_binaries = "@emsdk//:binaries",
emscripten_binaries = "@emsdk//:compiler_files",
script_extension = select({
"@bazel_tools//src/conditions:host_windows": "bat",
"//conditions:default": "sh",
Expand All @@ -68,12 +66,12 @@ emscripten_cc_toolchain_config_rule(

cc_toolchain(
name = "cc-compiler-wasm",
all_files = ":every-file",
ar_files = ":common-script-includes",
all_files = ":empty",
ar_files = ":ar_files",
as_files = ":empty",
compiler_files = ":compile-emscripten",
compiler_files = ":compiler_files",
dwp_files = ":empty",
linker_files = ":link-emscripten",
linker_files = ":linker_files",
objcopy_files = ":empty",
strip_files = ":empty",
toolchain_config = "wasm",
Expand Down
42 changes: 40 additions & 2 deletions bazel/emscripten_toolchain/emscripten.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,44 @@
package(default_visibility = ['//visibility:public'])

filegroup(
name = "all",
srcs = glob(["**"]),
name = "includes",
srcs = glob([
"emscripten/cache/sysroot/include/c++/v1/**",
"emscripten/cache/sysroot/include/compat/**",
"emscripten/cache/sysroot/include/**",
"lib/clang/15.0.0/include/**",
]),
)

filegroup(
name = "compiler_files",
srcs = [
"emscripten/emcc.py",

@sbc100 sbc100 Apr 30, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where do tools/*.py and stuff like that get included?

"bin/clang",
"bin/clang++",

@zaucy zaucy May 7, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On windows all these executables need to have the .exe extension. A separate BUILD file specifically for windows may be necessary or maybe using build_file_content and template it.

@jfirebaugh jfirebaugh May 7, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this hint! I've taken the templated build_file_content approach.

":includes",
],
)

filegroup(
name = "linker_files",
srcs = [
"emscripten/emcc.py",
"bin/clang",
"bin/llc",
"bin/llvm-ar",
"bin/llvm-nm",
"bin/llvm-objcopy",
"bin/wasm-emscripten-finalize",
"bin/wasm-ld",
"bin/wasm-opt",

@sbc100 sbc100 Apr 30, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the libraries (from the sysroot) that are used during linking? Are they handled separately?

],
)

filegroup(
name = "ar_files",
srcs = [
"emscripten/emar.py",
"bin/llvm-ar",
],
)