Merge branch 'main' into coarse_ops

jedel1043 · Nov 2, 2023 · 0c538d2 · 0c538d2
2 parents 861dbd2 + 8975047
commit 0c538d2
Show file tree

Hide file tree

Showing 31 changed files with 3,084 additions and 155 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -3,25 +3,6 @@
 # (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
 [alias]
-
 quick = "make quick"
 tidy = "make tidy"
-
-# Run Clippy on all code paths
-# Keep args in sync with `clippy` job in .github/workflows/build-test.yml
 clippy-all = "clippy --all-features --all-targets -- -D warnings"
-
-# Build configuration for small binary size
-panic-abort-build = "build -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort"
-
-wasm-build-release = "panic-abort-build --target wasm32-unknown-unknown --profile=release-opt-size"
-
-[target.wasm32-unknown-unknown]
-rustflags = [
- # 100 KiB, working around a bug in older rustc
- # https://github.com/unicode-org/icu4x/issues/2753
- # keep in sync with wasm's and tinywasm's build.sh
- "-C", "link-args=-z stack-size=100000",
- "-C", "panic=abort",
- "-C", "opt-level=s"
-]
diff --git a/Cargo.toml b/Cargo.toml
@@ -239,21 +239,21 @@ diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "3
 diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "354307d4a519a3f42a9dc744ea0d64d766431d1d" }
 diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "354307d4a519a3f42a9dc744ea0d64d766431d1d" }
 
-# LTO is needed for WASM and other size-optimized builds,
-# and it improve the performance of benchmarks
-[profile.release]
-lto = true
-
+# Size optimized builds
 [profile.release-opt-size]
 inherits = "release"
+lto = true
 opt-level = "s"
+panic = "abort"
+codegen-units = 1
 
 # Enable debug information specifically for memory profiling.
 # https://docs.rs/dhat/0.2.1/dhat/#configuration
 #
 # 2021-01-08: This would be nicer as a named profile, e.g. [profile.memory]
 # https://github.com/rust-lang/cargo/issues/6988
 [profile.bench]
+lto = true
 debug = true
 debug-assertions = false
 

diff --git a/ffi/capi/c/examples/fixeddecimal_tiny/Makefile b/ffi/capi/c/examples/fixeddecimal_tiny/Makefile
@@ -20,53 +20,53 @@ LLD := lld-15
 baked_data/macros.rs:
  cargo run -p icu_datagen -- --locales en bn --keys all --fallback preresolved --format mod --out baked_data --overwrite
 
-../../../../../target/debug/libicu_capi_staticlib.a: FORCE
- cargo build -p icu_capi_staticlib --no-default-features --features compiled_data,default_components
+crate/target/debug/libcrate.a: FORCE
+ cd crate && cargo build --features std
 
-icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a: FORCE baked_data/macros.rs
+crate/target/x86_64-unknown-linux-gnu/debug/libcrate.a: FORCE baked_data/macros.rs
  rustup toolchain install ${ICU4X_NIGHTLY_TOOLCHAIN}
  rustup component add rust-src --toolchain ${ICU4X_NIGHTLY_TOOLCHAIN}
- cd icu_capi_staticlib_tiny && \
- RUSTFLAGS="-Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort" ICU4X_DATA_DIR=$(shell pwd)/baked_data cargo +${ICU4X_NIGHTLY_TOOLCHAIN} panic-abort-build --target x86_64-unknown-linux-gnu
+ cd crate && \
+ RUSTFLAGS="-Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort" ICU4X_DATA_DIR=$(shell pwd)/baked_data cargo +${ICU4X_NIGHTLY_TOOLCHAIN} build -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --target x86_64-unknown-linux-gnu
 
-icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a: FORCE baked_data/macros.rs
+crate/target/x86_64-unknown-linux-gnu/release/libcrate.a: FORCE baked_data/macros.rs
  rustup toolchain install ${ICU4X_NIGHTLY_TOOLCHAIN}
  rustup component add rust-src --toolchain ${ICU4X_NIGHTLY_TOOLCHAIN}
- cd icu_capi_staticlib_tiny && \
- RUSTFLAGS="-Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort" ICU4X_DATA_DIR=$(shell pwd)/baked_data cargo +${ICU4X_NIGHTLY_TOOLCHAIN} panic-abort-build --target x86_64-unknown-linux-gnu --profile=release-opt-size
+ cd crate && \
+ RUSTFLAGS="-Clto -Cembed-bitcode -Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort -Copt-level=s" ICU4X_DATA_DIR=$(shell pwd)/baked_data cargo +${ICU4X_NIGHTLY_TOOLCHAIN} build -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --target x86_64-unknown-linux-gnu --release
 
 # Naive target: no optimizations, full std
-optim0.elf: ../../../../../target/debug/libicu_capi_staticlib.a $(ALL_HEADERS) test.c
- $(GCC) test.c ../../../../../target/debug/libicu_capi_staticlib.a -ldl -lpthread -lm -g -o optim0.elf
+optim0.elf: crate/target/debug/libcrate.a $(ALL_HEADERS) test.c
+ $(GCC) test.c crate/target/debug/libcrate.a -ldl -lpthread -lm -g -o optim0.elf
 
 # optim.elf: gcc with maximum link-time code stripping (gc-sections and strip-all)
-optim1.elf: ../../../../../target/debug/libicu_capi_staticlib.a $(ALL_HEADERS) test.c
- $(GCC) -fdata-sections -ffunction-sections test.c ../../../../../target/debug/libicu_capi_staticlib.a -ldl -lpthread -lm -g -o optim1.elf -Wl,--gc-sections -Wl,--strip-all
+optim1.elf: crate/target/debug/libcrate.a $(ALL_HEADERS) test.c
+ $(GCC) -fdata-sections -ffunction-sections test.c crate/target/debug/libcrate.a -ldl -lpthread -lm -g -o optim1.elf -Wl,--gc-sections -Wl,--strip-all
 
 # optim2.elf: clang single-step with gc-sections
-optim2.elf: icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a $(ALL_HEADERS) test.c
- $(CLANG) -flto -fdata-sections -ffunction-sections test.c icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a -g -o optim2.elf -Wl,--gc-sections
+optim2.elf: crate/target/x86_64-unknown-linux-gnu/debug/libcrate.a $(ALL_HEADERS) test.c
+ $(CLANG) -flto -fdata-sections -ffunction-sections test.c crate/target/x86_64-unknown-linux-gnu/debug/libcrate.a -g -o optim2.elf -Wl,--gc-sections
 
 optim3.o: $(ALL_HEADERS) test.c
  $(CLANG) -c -flto=thin -fdata-sections -ffunction-sections --target=x86_64-unknown-linux-gnu test.c -g -o optim3.o
 
 # optim3.elf: clang two-step with lld, debug mode
-optim3.elf: optim3.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a
- $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim3.elf optim3.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a -Wl,--gc-sections
+optim3.elf: optim3.o crate/target/x86_64-unknown-linux-gnu/debug/libcrate.a
+ $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim3.elf optim3.o crate/target/x86_64-unknown-linux-gnu/debug/libcrate.a -Wl,--gc-sections
 
 optim4.o: $(ALL_HEADERS) test.c
  $(CLANG) -c -flto=thin -fdata-sections -ffunction-sections --target=x86_64-unknown-linux-gnu test.c -g -o optim4.o
 
 # optim4.elf: clang two-step with lld, release mode with debug symbols
-optim4.elf: optim4.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a
- $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim4.elf optim4.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a -Wl,--gc-sections
+optim4.elf: optim4.o crate/target/x86_64-unknown-linux-gnu/release/libcrate.a
+ $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim4.elf optim4.o crate/target/x86_64-unknown-linux-gnu/release/libcrate.a -Wl,--gc-sections
 
 optim5.o: $(ALL_HEADERS) test.c
  $(CLANG) -c -flto=thin -fdata-sections -ffunction-sections --target=x86_64-unknown-linux-gnu test.c -o optim5.o
 
 # optim5.elf: clang two-step with lld, release mode stripped of debug symbols
-optim5.elf: optim5.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a
- $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim5.elf optim5.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a -Wl,--gc-sections -Wl,--strip-all
+optim5.elf: optim5.o crate/target/x86_64-unknown-linux-gnu/release/libcrate.a
+ $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim5.elf optim5.o crate/target/x86_64-unknown-linux-gnu/release/libcrate.a -Wl,--gc-sections -Wl,--strip-all
 
 build: optim0.elf optim1.elf optim2.elf optim3.elf optim4.elf optim5.elf
  ls -l optim*.elf
@@ -81,4 +81,3 @@ test: build
 
 clean:
  git clean -xf *
- rm -f ../../../../../target/debug/libicu_capi_staticlib.a
diff --git a/...l_tiny/icu_capi_staticlib_tiny/Cargo.lock → ...amples/fixeddecimal_tiny/crate/Cargo.lock b/...l_tiny/icu_capi_staticlib_tiny/Cargo.lock → ...amples/fixeddecimal_tiny/crate/Cargo.lock
diff --git a/...l_tiny/icu_capi_staticlib_tiny/Cargo.toml → ...amples/fixeddecimal_tiny/crate/Cargo.toml b/...l_tiny/icu_capi_staticlib_tiny/Cargo.toml → ...amples/fixeddecimal_tiny/crate/Cargo.toml
@@ -3,7 +3,7 @@
 # (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
 [package]
-name = "icu_capi_staticlib_tiny"
+name = "crate"
 publish = false
 version = "0.0.0"
 edition = "2021"
@@ -15,11 +15,7 @@ crate-type = ["staticlib"]
 icu_capi = { path = "../../../..", default-features = false, features = ["compiled_data", "icu_decimal"] }
 dlmalloc = { version = "0.2", features = ["global"] }
 
-[profile.release]
-lto = true
+[features]
+std = []
 
-[profile.release-opt-size]
-inherits = "release"
-opt-level = "s"
-
-[workspace]
+[workspace]
diff --git a/...l_tiny/icu_capi_staticlib_tiny/src/lib.rs → ...amples/fixeddecimal_tiny/crate/src/lib.rs b/...l_tiny/icu_capi_staticlib_tiny/src/lib.rs → ...amples/fixeddecimal_tiny/crate/src/lib.rs
@@ -2,14 +2,16 @@
 // called LICENSE at the top level of the ICU4X source tree
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
-#![no_std]
+#![cfg_attr(not(feature = "std"), no_std)]
 
 // Expose icu_capi symbols
 extern crate icu_capi;
 
+#[cfg(not(feature = "std"))]
 #[global_allocator]
 static ALLOCATOR: dlmalloc::GlobalDlmalloc = dlmalloc::GlobalDlmalloc;
 
+#[cfg(not(feature = "std"))]
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
  loop {}

diff --git a/ffi/capi/c/examples/segmenter_tiny/Makefile b/ffi/capi/c/examples/segmenter_tiny/Makefile
@@ -17,53 +17,53 @@ GCC := gcc
 CLANG := clang-15
 LLD := lld-15
 
-../../../../../target/debug/libicu_capi_staticlib.a: FORCE
- cargo build -p icu_capi_staticlib --no-default-features --features compiled_data,default_components
+crate/target/debug/libcrate.a: FORCE
+ cd crate && cargo build --features std
 
-icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a: FORCE
+crate/target/x86_64-unknown-linux-gnu/debug/libcrate.a: FORCE
  rustup toolchain install ${ICU4X_NIGHTLY_TOOLCHAIN}
  rustup component add rust-src --toolchain ${ICU4X_NIGHTLY_TOOLCHAIN}
- cd icu_capi_staticlib_tiny && \
- RUSTFLAGS="-Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort" cargo +${ICU4X_NIGHTLY_TOOLCHAIN} panic-abort-build --target x86_64-unknown-linux-gnu
+ cd crate && \
+ RUSTFLAGS="-Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort" cargo +${ICU4X_NIGHTLY_TOOLCHAIN} build -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --target x86_64-unknown-linux-gnu
 
-icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a: FORCE
+crate/target/x86_64-unknown-linux-gnu/release/libcrate.a: FORCE
  rustup toolchain install ${ICU4X_NIGHTLY_TOOLCHAIN}
  rustup component add rust-src --toolchain ${ICU4X_NIGHTLY_TOOLCHAIN}
- cd icu_capi_staticlib_tiny && \
- RUSTFLAGS="-Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort" cargo +${ICU4X_NIGHTLY_TOOLCHAIN} panic-abort-build --target x86_64-unknown-linux-gnu --profile=release-opt-size
+ cd crate && \
+ RUSTFLAGS="-Clto -Cembed-bitcode -Clinker-plugin-lto -Clinker=$(CLANG) -Ccodegen-units=1 -Clink-arg=-flto -Cpanic=abort -Copt-level=s" cargo +${ICU4X_NIGHTLY_TOOLCHAIN} build -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --target x86_64-unknown-linux-gnu --release
 
 # Naive target: no optimizations, full std
-optim0.elf: ../../../../../target/debug/libicu_capi_staticlib.a $(ALL_HEADERS) test.c
- $(GCC) test.c ../../../../../target/debug/libicu_capi_staticlib.a -ldl -lpthread -lm -g -o optim0.elf
+optim0.elf: crate/target/debug/libcrate.a $(ALL_HEADERS) test.c
+ $(GCC) test.c crate/target/debug/libcrate.a -ldl -lpthread -lm -g -o optim0.elf
 
 # optim.elf: gcc with maximum link-time code stripping (gc-sections and strip-all)
-optim1.elf: ../../../../../target/debug/libicu_capi_staticlib.a $(ALL_HEADERS) test.c
- $(GCC) -fdata-sections -ffunction-sections test.c ../../../../../target/debug/libicu_capi_staticlib.a -ldl -lpthread -lm -g -o optim1.elf -Wl,--gc-sections -Wl,--strip-all
+optim1.elf: crate/target/debug/libcrate.a $(ALL_HEADERS) test.c
+ $(GCC) -fdata-sections -ffunction-sections test.c crate/target/debug/libcrate.a -ldl -lpthread -lm -g -o optim1.elf -Wl,--gc-sections -Wl,--strip-all
 
 # optim2.elf: clang single-step with gc-sections
-optim2.elf: icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a $(ALL_HEADERS) test.c
- $(CLANG) -flto -fdata-sections -ffunction-sections test.c icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a -g -o optim2.elf -Wl,--gc-sections
+optim2.elf: crate/target/x86_64-unknown-linux-gnu/debug/libcrate.a $(ALL_HEADERS) test.c
+ $(CLANG) -flto -fdata-sections -ffunction-sections test.c crate/target/x86_64-unknown-linux-gnu/debug/libcrate.a -g -o optim2.elf -Wl,--gc-sections
 
 optim3.o: $(ALL_HEADERS) test.c
  $(CLANG) -c -flto=thin -fdata-sections -ffunction-sections --target=x86_64-unknown-linux-gnu test.c -g -o optim3.o
 
 # optim3.elf: clang two-step with lld, debug mode
-optim3.elf: optim3.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a
- $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim3.elf optim3.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/debug/libicu_capi_staticlib_tiny.a -Wl,--gc-sections
+optim3.elf: optim3.o crate/target/x86_64-unknown-linux-gnu/debug/libcrate.a
+ $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim3.elf optim3.o crate/target/x86_64-unknown-linux-gnu/debug/libcrate.a -Wl,--gc-sections
 
 optim4.o: $(ALL_HEADERS) test.c
  $(CLANG) -c -flto=thin -fdata-sections -ffunction-sections --target=x86_64-unknown-linux-gnu test.c -g -o optim4.o
 
 # optim4.elf: clang two-step with lld, release mode with debug symbols
-optim4.elf: optim4.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a
- $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim4.elf optim4.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a -Wl,--gc-sections
+optim4.elf: optim4.o crate/target/x86_64-unknown-linux-gnu/release/libcrate.a
+ $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim4.elf optim4.o crate/target/x86_64-unknown-linux-gnu/release/libcrate.a -Wl,--gc-sections
 
 optim5.o: $(ALL_HEADERS) test.c
  $(CLANG) -c -flto=thin -fdata-sections -ffunction-sections --target=x86_64-unknown-linux-gnu test.c -o optim5.o
 
 # optim5.elf: clang two-step with lld, release mode stripped of debug symbols
-optim5.elf: optim5.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a
- $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim5.elf optim5.o icu_capi_staticlib_tiny/target/x86_64-unknown-linux-gnu/release-opt-size/libicu_capi_staticlib_tiny.a -Wl,--gc-sections -Wl,--strip-all
+optim5.elf: optim5.o crate/target/x86_64-unknown-linux-gnu/release/libcrate.a
+ $(CLANG) -flto=thin -fuse-ld=$(LLD) -L . -o optim5.elf optim5.o crate/target/x86_64-unknown-linux-gnu/release/libcrate.a -Wl,--gc-sections -Wl,--strip-all
 
 build: optim0.elf optim1.elf optim2.elf optim3.elf optim4.elf optim5.elf
  ls -l optim*.elf
@@ -78,4 +78,3 @@ test: build
 
 clean:
  git clean -xf *
- rm -f ../../../../../target/debug/libicu_capi_staticlib.a
diff --git a/...r_tiny/icu_capi_staticlib_tiny/Cargo.lock → .../examples/segmenter_tiny/crate/Cargo.lock b/...r_tiny/icu_capi_staticlib_tiny/Cargo.lock → .../examples/segmenter_tiny/crate/Cargo.lock
diff --git a/...r_tiny/icu_capi_staticlib_tiny/Cargo.toml → .../examples/segmenter_tiny/crate/Cargo.toml b/...r_tiny/icu_capi_staticlib_tiny/Cargo.toml → .../examples/segmenter_tiny/crate/Cargo.toml
@@ -3,7 +3,7 @@
 # (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
 [package]
-name = "icu_capi_staticlib_tiny"
+name = "crate"
 publish = false
 version = "0.0.0"
 edition = "2021"
@@ -15,11 +15,7 @@ crate-type = ["staticlib"]
 icu_capi = { path = "../../../..", default-features = false, features = ["compiled_data", "icu_segmenter"] }
 dlmalloc = { version = "0.2", features = ["global"] }
 
-[profile.release]
-lto = true
+[features]
+std = []
 
-[profile.release-opt-size]
-inherits = "release"
-opt-level = "s"
-
-[workspace]
+[workspace]