feat: enable asm-keccak on more platforms (#10101)

This commit is contained in:
DaniPopes
2024-08-05 23:07:56 +02:00
committed by GitHub
parent 33f612a41a
commit eda161af2c
2 changed files with 24 additions and 25 deletions

38
Cargo.lock generated
View File

@ -2522,9 +2522,9 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
[[package]] [[package]]
name = "dunce" name = "dunce"
version = "1.0.4" version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]] [[package]]
name = "dyn-clone" name = "dyn-clone"
@ -4387,9 +4387,9 @@ dependencies = [
[[package]] [[package]]
name = "keccak-asm" name = "keccak-asm"
version = "0.1.1" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47a3633291834c4fbebf8673acbc1b04ec9d151418ff9b8e26dcd79129928758" checksum = "422fbc7ff2f2f5bdffeb07718e5a5324dca72b0c9293d50df4026652385e3314"
dependencies = [ dependencies = [
"digest 0.10.7", "digest 0.10.7",
"sha3-asm", "sha3-asm",
@ -5866,16 +5866,17 @@ dependencies = [
[[package]] [[package]]
name = "quinn" name = "quinn"
version = "0.11.2" version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
dependencies = [ dependencies = [
"bytes", "bytes",
"pin-project-lite", "pin-project-lite",
"quinn-proto", "quinn-proto",
"quinn-udp", "quinn-udp",
"rustc-hash 1.1.0", "rustc-hash 2.0.0",
"rustls", "rustls",
"socket2 0.5.7",
"thiserror", "thiserror",
"tokio", "tokio",
"tracing", "tracing",
@ -5883,14 +5884,14 @@ dependencies = [
[[package]] [[package]]
name = "quinn-proto" name = "quinn-proto"
version = "0.11.3" version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
dependencies = [ dependencies = [
"bytes", "bytes",
"rand 0.8.5", "rand 0.8.5",
"ring", "ring",
"rustc-hash 1.1.0", "rustc-hash 2.0.0",
"rustls", "rustls",
"slab", "slab",
"thiserror", "thiserror",
@ -5907,6 +5908,7 @@ dependencies = [
"libc", "libc",
"once_cell", "once_cell",
"socket2 0.5.7", "socket2 0.5.7",
"tracing",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -9007,9 +9009,9 @@ dependencies = [
[[package]] [[package]]
name = "rgb" name = "rgb"
version = "0.8.45" version = "0.8.47"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" checksum = "e12bc8d2f72df26a5d3178022df33720fbede0d31d82c7291662eff89836994d"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
] ]
@ -9308,9 +9310,9 @@ dependencies = [
[[package]] [[package]]
name = "scc" name = "scc"
version = "2.1.7" version = "2.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a870e34715d5d59c8536040d4d4e7a41af44d527dc50237036ba4090db7996fc" checksum = "8d777f59627453628a9a5be1ee8d948745b94b1dfc2d0c3099cbd9e08ab89e7c"
dependencies = [ dependencies = [
"sdd", "sdd",
] ]
@ -9633,9 +9635,9 @@ dependencies = [
[[package]] [[package]]
name = "sha3-asm" name = "sha3-asm"
version = "0.1.1" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9b57fd861253bff08bb1919e995f90ba8f4889de2726091c8876f3a4e823b40" checksum = "57d79b758b7cb2085612b11a235055e485605a5103faccdd633f35bd7aee69dd"
dependencies = [ dependencies = [
"cc", "cc",
"cfg-if", "cfg-if",
@ -10535,9 +10537,9 @@ dependencies = [
[[package]] [[package]]
name = "tracing-logfmt" name = "tracing-logfmt"
version = "0.3.4" version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22b8e455f6caa5212a102ec530bf86b8dc5a4c536299bffd84b238fed9119be7" checksum = "6b1f47d22deb79c3f59fcf2a1f00f60cbdc05462bf17d1cd356c1fefa3f444bd"
dependencies = [ dependencies = [
"time", "time",
"tracing", "tracing",

View File

@ -13,7 +13,7 @@ BUILD_PATH = "target"
# List of features to use when building. Can be overridden via the environment. # List of features to use when building. Can be overridden via the environment.
# No jemalloc on Windows # No jemalloc on Windows
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
FEATURES ?= FEATURES ?= asm-keccak
else else
FEATURES ?= jemalloc asm-keccak FEATURES ?= jemalloc asm-keccak
endif endif
@ -82,15 +82,12 @@ op-build-native-%:
# #
# The resulting binaries will be created in the `target/` directory. # The resulting binaries will be created in the `target/` directory.
# For aarch64, disable asm-keccak optimizations and set the page size for # For aarch64, set the page size for jemalloc.
# jemalloc. When cross compiling, we must compile jemalloc with a large page # When cross compiling, we must compile jemalloc with a large page size,
# size, otherwise it will use the current system's page size which may not work # otherwise it will use the current system's page size which may not work
# on other systems. JEMALLOC_SYS_WITH_LG_PAGE=16 tells jemalloc to use 64-KiB # on other systems. JEMALLOC_SYS_WITH_LG_PAGE=16 tells jemalloc to use 64-KiB
# pages. See: https://github.com/paradigmxyz/reth/issues/6742 # pages. See: https://github.com/paradigmxyz/reth/issues/6742
build-aarch64-unknown-linux-gnu: FEATURES := $(filter-out asm-keccak,$(FEATURES))
build-aarch64-unknown-linux-gnu: export JEMALLOC_SYS_WITH_LG_PAGE=16 build-aarch64-unknown-linux-gnu: export JEMALLOC_SYS_WITH_LG_PAGE=16
op-build-aarch64-unknown-linux-gnu: FEATURES := $(filter-out asm-keccak,$(FEATURES))
op-build-aarch64-unknown-linux-gnu: export JEMALLOC_SYS_WITH_LG_PAGE=16 op-build-aarch64-unknown-linux-gnu: export JEMALLOC_SYS_WITH_LG_PAGE=16
# No jemalloc on Windows # No jemalloc on Windows