happyz
/
gemma.cpp
mirror of https://github.com/google/gemma.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Less verbose threading_test output, improve formatting. 

PiperOrigin-RevId: 726364085
This commit is contained in:
Jan Wassenberg 2025-02-13 00:55:55 -08:00 committed by Copybara-Service
parent f173aa776e
commit 06c70dccd9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util/threading_test.cc
View File

@ -281,12 +281,13 @@ TEST(ThreadingTest, BenchJoin) {
static_cast<hwy::FuncInput>(hwy::Unpredictable1() * pool.NumWorkers()); static_cast<hwy::FuncInput>(hwy::Unpredictable1() * pool.NumWorkers());
hwy::Result results[kInputs]; hwy::Result results[kInputs];
hwy::Params params; hwy::Params params;
params.verbose = false;
params.max_evals = kMaxEvals; params.max_evals = kMaxEvals;
const size_t num_results = const size_t num_results =
Measure(&ForkJoin, reinterpret_cast<const uint8_t*>(&pool), inputs, Measure(&ForkJoin, reinterpret_cast<const uint8_t*>(&pool), inputs,
kInputs, results, params); kInputs, results, params);
for (size_t i = 0; i < num_results; ++i) { for (size_t i = 0; i < num_results; ++i) {
printf("%s: %5d: %6.2f us; MAD=%4.2f%%\n", caption, printf("%-20s: %5d: %6.2f us; MAD=%4.2f%%\n", caption,
static_cast<int>(results[i].input), static_cast<int>(results[i].input),
results[i].ticks / hwy::platform::InvariantTicksPerSecond() * 1E6, results[i].ticks / hwy::platform::InvariantTicksPerSecond() * 1E6,
results[i].variability * 100.0); results[i].variability * 100.0);
@ -302,20 +303,20 @@ TEST(ThreadingTest, BenchJoin) {
}; };
NestedPools pools(0); NestedPools pools(0);
measure(pools.AllPackages(), "\nblock packages"); measure(pools.AllPackages(), "block packages");
if (pools.AllClusters(0).NumWorkers() > 1) { if (pools.AllClusters(0).NumWorkers() > 1) {
measure(pools.AllClusters(0), "\nblock clusters"); measure(pools.AllClusters(0), "block clusters");
} }
measure(pools.Cluster(0, 0), "\nblock in_cluster"); measure(pools.Cluster(0, 0), "block in_cluster");
Tristate use_spinning = Tristate::kDefault; Tristate use_spinning = Tristate::kDefault;
pools.MaybeStartSpinning(use_spinning); pools.MaybeStartSpinning(use_spinning);
if (use_spinning == Tristate::kTrue) { if (use_spinning == Tristate::kTrue) {
measure(pools.AllPackages(), "\nspin packages"); measure(pools.AllPackages(), "spin packages");
if (pools.AllClusters(0).NumWorkers() > 1) { if (pools.AllClusters(0).NumWorkers() > 1) {
measure(pools.AllClusters(0), "\nspin clusters"); measure(pools.AllClusters(0), "spin clusters");
} }
measure(pools.Cluster(0, 0), "\nspin in_cluster"); measure(pools.Cluster(0, 0), "spin in_cluster");
} }
} }