Skip to content
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.

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

Use alloca to address memory layout effects #744

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 2 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ tokio = { version = "1.0", default-features = false, features = [
"rt",
], optional = true }
async-std = { version = "1.9", optional = true }
alloca = "0.3.4"

[dependencies.plotters]
version = "^0.3.1"
Expand All @@ -61,14 +62,7 @@ futures = { version = "0.3", default_features = false, features = ["executor"
maintenance = { status = "passively-maintained" }

[features]
stable = [
"csv_output",
"html_reports",
"async_futures",
"async_smol",
"async_tokio",
"async_std",
]
stable = ["csv_output", "html_reports", "async_futures", "async_smol", "async_tokio", "async_std"]
default = ["rayon", "plotters", "cargo_bench_support"]

# Enable use of the nightly-only test::black_box function to discourage compiler optimizations.
Expand Down
30 changes: 24 additions & 6 deletions src/routine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,31 @@ where
elapsed_time: Duration::from_millis(0),
};

iters
.iter()
.map(|iters| {
let mut results = Vec::with_capacity(iters.len());
results.resize(iters.len(), 0.0);
for (i, iters) in iters.iter().enumerate() {
let stack_alloc = i % 4096; // default page size
#[cfg(any(target_family = "unix", target_family = "windows"))]
{
alloca::with_alloca(
stack_alloc, /* how much bytes we want to allocate */
|_memory: &mut [core::mem::MaybeUninit<u8>] /* dynamically stack allocated slice itself */| {
Comment on lines +252 to +253
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe stack_alloc should be inlined here, to prevent getting a warning on platforms not selected by the cfg attribute. Using a name such as _shifting_stack_space or similar instead of _memory would be self-documenting.

b.iters = *iters;
(*f)(&mut b, black_box(parameter));
b.assert_iterated();
results[i] = m.to_f64(&b.value);
},
);
}
#[cfg(not(any(target_family = "unix", target_family = "windows")))]
{
b.iters = *iters;
(*f)(&mut b, black_box(parameter));
b.assert_iterated();
m.to_f64(&b.value)
})
.collect()
results[i] = m.to_f64(&b.value);
}
}
results
}

fn warm_up(&mut self, m: &M, how_long: Duration, parameter: &T) -> (u64, u64) {
Expand All @@ -277,6 +293,8 @@ where
}

b.iters = b.iters.wrapping_mul(2);
b.iters = b.iters.min(64); // To make sure we offset the test at least with 0-64 bytes
// wit alloca
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: typo ("wit" -> "with"). Also, the comment is typically placed above the line, not on the side.

}
}
}