Skip to content

Account for optimization levels other than numbers #743

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
merged 2 commits into from
Jan 7, 2025
Merged

Account for optimization levels other than numbers #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad26150
Update the `libm` submodule
tgross35 Jan 7, 2025
4e3cc6d
Account for optimization levels other than numbers
tgross35 Jan 7, 2025
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
2 changes: 1 addition & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ fn configure_libm(target: &Target) {
}

println!("cargo:rustc-check-cfg=cfg(optimizations_enabled)");
if target.opt_level >= 2 {
if !matches!(target.opt_level.as_str(), "0" | "1") {
Copy link

Choose a reason for hiding this comment

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

is "z" optimizations_enabled?

Copy link
Contributor Author

@tgross35 tgross35 Jan 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

For this purpose it is fine, the config is only used in libm's test-related code. I only included it here for consistency if we wind up doing something similar in compiler-builtins/testcrate.

println!("cargo:rustc-cfg=optimizations_enabled");
}

Expand Down
4 changes: 2 additions & 2 deletions configure.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::env;
#[allow(dead_code)]
pub struct Target {
pub triple: String,
pub opt_level: u8,
pub opt_level: String,
pub cargo_features: Vec<String>,
pub os: String,
pub arch: String,
Expand All @@ -32,7 +32,7 @@ impl Target {
Self {
triple: env::var("TARGET").unwrap(),
os: env::var("CARGO_CFG_TARGET_OS").unwrap(),
opt_level: env::var("OPT_LEVEL").unwrap().parse().unwrap(),
opt_level: env::var("OPT_LEVEL").unwrap(),
cargo_features,
arch: env::var("CARGO_CFG_TARGET_ARCH").unwrap(),
vendor: env::var("CARGO_CFG_TARGET_VENDOR").unwrap(),
Expand Down
2 changes: 1 addition & 1 deletion libm
Open in desktop
Submodule libm updated 7 files
+3 −3 configure.rs
+1 −1 crates/libm-test/src/gen/domain_logspace.rs
+171 −66 crates/libm-test/src/gen/extensive.rs
+1 −1 crates/libm-test/src/lib.rs
+78 −11 crates/libm-test/src/num.rs
+2 −1 crates/libm-test/src/precision.rs
+1 −2 crates/libm-test/tests/z_extensive/run.rs
Loading