From 499991e5308346c6512f168dabbd2e54ab4597a6 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Fri, 6 Jun 2025 01:00:36 +0000 Subject: [PATCH] Rename build profile release-max-perf to release-native. Signed-off-by: Jason Volk --- .github/workflows/main.yml | 28 ++++++++++++++-------------- .github/workflows/test.yml | 6 +++--- Cargo.toml | 18 ++++++------------ docker/bake.hcl | 6 +++--- 4 files changed, 26 insertions(+), 32 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f30b2e6..d7f8195c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,8 +88,8 @@ jobs: # excludes: > # [ # {"cargo_profile": "release-debuginfo", "rust_toolchain": "nightly"}, - # {"cargo_profile": "release-max-perf", "rust_toolchain": "stable"}, - # {"cargo_profile": "release-max-perf", "feat_set": "none"} + # {"cargo_profile": "release-native", "rust_toolchain": "stable"}, + # {"cargo_profile": "release-native", "feat_set": "none"} # ] lint: @@ -111,9 +111,9 @@ jobs: excludes: > [ {"cargo_profile": "release-debuginfo"}, - {"cargo_profile": "release-max-perf", "rust_toolchain": "stable"}, - {"cargo_profile": "release-max-perf", "feat_set": "none"}, - {"cargo_profile": "release-max-perf", "feat_set": "default"}, + {"cargo_profile": "release-native", "rust_toolchain": "stable"}, + {"cargo_profile": "release-native", "feat_set": "none"}, + {"cargo_profile": "release-native", "feat_set": "default"}, {"cargo_profile": "test", "rust_toolchain": "stable", "feat_set": "none"}, {"cargo_profile": "release", "rust_toolchain": "nightly", "feat_set": "none"}, {"cargo_profile": "release", "rust_toolchain": "nightly", "feat_set": "default"} @@ -139,9 +139,9 @@ jobs: excludes: > [ {"cargo_profile": "test", "rust_toolchain": "stable", "feat_set": "none"}, - {"cargo_profile": "release-max-perf", "rust_toolchain": "stable"}, - {"cargo_profile": "release-max-perf", "feat_set": "default"}, - {"cargo_profile": "release-max-perf", "feat_set": "none"}, + {"cargo_profile": "release-native", "rust_toolchain": "stable"}, + {"cargo_profile": "release-native", "feat_set": "default"}, + {"cargo_profile": "release-native", "feat_set": "none"}, {"cargo_profile": "release-debuginfo"} ] @@ -168,11 +168,11 @@ jobs: {"cargo_profile": "release-debuginfo", "feat_set": "default"}, {"cargo_profile": "release-debuginfo", "rust_toolchain": "nightly"}, {"cargo_profile": "release-debuginfo", "bake_target": "oci"}, - {"cargo_profile": "release-max-perf", "feat_set": "default"}, - {"cargo_profile": "release-max-perf", "rust_toolchain": "stable"}, - {"cargo_profile": "release-max-perf", "feat_set": "default"}, - {"cargo_profile": "release-max-perf", "bake_target": "docker"}, - {"cargo_profile": "release-max-perf", "bake_target": "oci"}, + {"cargo_profile": "release-native", "feat_set": "default"}, + {"cargo_profile": "release-native", "rust_toolchain": "stable"}, + {"cargo_profile": "release-native", "feat_set": "default"}, + {"cargo_profile": "release-native", "bake_target": "docker"}, + {"cargo_profile": "release-native", "bake_target": "oci"}, {"cargo_profile": "release", "rust_toolchain": "nightly"} ] @@ -199,7 +199,7 @@ jobs: {"cargo_profile": "test"}, {"rust_toolchain": "nightly", "cargo_profile": "release"}, {"cargo_profile": "release-debuginfo"}, - {"cargo_profile": "release-max-perf"} + {"cargo_profile": "release-native"} ] secrets: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a9a9b5fd..80339038 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -86,9 +86,9 @@ jobs: {"cargo_profile": "release", "rust_toolchain": "nightly"}, {"cargo_profile": "release", "rust_toolchain": "stable", "feat_set": "none"}, {"cargo_profile": "release-debuginfo"}, - {"cargo_profile": "release-max-perf", "rust_toolchain": "stable"}, - {"cargo_profile": "release-max-perf", "feat_set": "none"}, - {"cargo_profile": "release-max-perf", "feat_set": "default"} + {"cargo_profile": "release-native", "rust_toolchain": "stable"}, + {"cargo_profile": "release-native", "feat_set": "none"}, + {"cargo_profile": "release-native", "feat_set": "default"} ] complement: diff --git a/Cargo.toml b/Cargo.toml index cab9e916..a3d5e4fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -663,15 +663,9 @@ inherits = "release" debug = "full" strip = "none" -[profile.release-high-perf] -inherits = "release" -lto = "fat" -codegen-units = 1 -panic = "abort" - # do not use without profile-rustflags enabled. uncomment ALL the sections for -# profile.release-max-perf -[profile.release-max-perf] +# profile.release-native +[profile.release-native] inherits = "release" strip = "symbols" lto = "fat" @@ -688,8 +682,8 @@ lto = "fat" # '-Ztime-llvm-passes', #] -[profile.release-max-perf.build-override] -inherits = "release-max-perf" +[profile.release-native.build-override] +inherits = "release-native" opt-level = 0 codegen-units = 32 #rustflags = [ @@ -698,8 +692,8 @@ codegen-units = 32 # '-Clink-arg=-Wl,--no-gc-sections', #] -[profile.release-max-perf.package.tuwunel_macros] -inherits = "release-max-perf.build-override" +[profile.release-native.package.tuwunel_macros] +inherits = "release-native.build-override" #rustflags = [ # '-Crelocation-model=pic', # '-Ctarget-feature=-crt-static', diff --git a/docker/bake.hcl b/docker/bake.hcl index 1d3d9cc3..9a764a02 100644 --- a/docker/bake.hcl +++ b/docker/bake.hcl @@ -552,9 +552,9 @@ target "docker" { contexts = { input = ( rust_toolchain == "stable" - || cargo_profile == "release-max-perf" || cargo_profile == "release" - || cargo_profile == "release-debuginfo"? + || cargo_profile == "release-debuginfo" + || cargo_profile == "release-native"? elem("target:static", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]): elem("target:install", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]) ) @@ -1127,7 +1127,7 @@ target "deps-base" { CARGO_PROFILE_RELEASE_DEBUGINFO_LTO = "off" CARGO_BUILD_RUSTFLAGS = ( - cargo_profile == "release-max-perf"? + cargo_profile == "release-native"? join(" ", [ join(" ", nightly_rustflags), contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")?