From 5df3d60e957b534088de48f32432f862f56d2da5 Mon Sep 17 00:00:00 2001 From: Imbris Date: Sun, 13 Feb 2022 22:58:24 -0500 Subject: [PATCH] Some changes to help with profiling and cleaning up aliases in .cargo/config. Removed incremental override since incremental is no longer turned off by default in rustc. Remove -Zuntable-options from several aliases because the --profile option is now stable. Added shader-from-source feature to aliases for voxygen that turn off the default features --- .cargo/config | 23 ++++++++++++----------- Cargo.toml | 5 +++++ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.cargo/config b/.cargo/config index 9aaa76436a..72cb7da529 100644 --- a/.cargo/config +++ b/.cargo/config @@ -4,19 +4,20 @@ rustflags = [ ] [alias] +# tools cmd-doc-gen = "run --features=bin_cmd_doc_gen --bin cmd_doc_gen" csv-export = "run --manifest-path common/Cargo.toml --features=bin_csv --bin csv_export" csv-import = "run --manifest-path common/Cargo.toml --features=bin_csv --bin csv_import" -test-server = "run --bin veloren-server-cli --no-default-features" -tracy-server = "-Zunstable-options run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow" -tracy-world-server = "-Zunstable-options run --bin veloren-server-cli --features tracy,simd --profile no_overflow" -tracy-world-server-releasedebuginfo = "-Zunstable-options run --bin veloren-server-cli --features tracy,simd --profile releasedebuginfo" -test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui" -tracy-voxygen = "-Zunstable-options run --bin veloren-voxygen --no-default-features --features tracy,simd,egui-ui --profile no_overflow" +# server-cli server = "run --bin veloren-server-cli" -dbg-voxygen = "run --bin veloren-voxygen -Zunstable-options --profile debuginfo" +test-server = "run --bin veloren-server-cli --no-default-features simd" +tracy-server = "run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow" +tracy-world-server = "run --bin veloren-server-cli --features tracy,simd --profile no_overflow" +tracy-world-server-debuginfo = "run --bin veloren-server-cli --features tracy,simd --profile no_overflow_debuginfo" +tracy-world-server-releasedebuginfo = "run --bin veloren-server-cli --features tracy,simd --profile releasedebuginfo" +# voxygen +test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui,shaderc-from-source" +tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features tracy,simd,egui-ui,shaderc-from-source --profile no_overflow" +dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo" +# misc swarm = "run --bin swarm --features client/bin_bot,client/tick_network --" - - -[env] -RUSTC_FORCE_INCREMENTAL = "1" diff --git a/Cargo.toml b/Cargo.toml index 9e856032d5..08d0dfadd2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,6 +64,11 @@ opt-level = 3 [profile.no_overflow.package."veloren-voxygen-anim"] opt-level = 3 +# this profile is for profiling with using the no_overflow profile, since release can take signifcant times to build. +[profile.no_overflow_debuginfo] +inherits = 'no_overflow' +debug = 1 + # this profile is used for veloren releases, compile time doesn't matter # we need stacktraces, light debug information, as much checks as possible # I would like to put it in a seperate `official_release` target, but that doesnt share caches with `cargo test` and `cargo bench`