vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

llama-bench : add "test" field with test label in all output formats

Browse source
This commit is contained in:
Stanisław Szymczyk 2025-01-13 19:05:24 +01:00
parent 1c69b0eaba
commit ae86ff36eb
1 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

45
examples/llama-bench/llama-bench.cpp
View file

@ -936,6 +936,7 @@ struct test {
int n_prompt; int n_prompt;
int n_gen; int n_gen;
std::string test_time; std::string test_time;
std::string test_label;
std::vector<uint64_t> samples_ns; std::vector<uint64_t> samples_ns;
test(const cmd_params_instance & inst, const llama_model * lmodel, const llama_context * ctx) { test(const cmd_params_instance & inst, const llama_model * lmodel, const llama_context * ctx) {
@ -969,6 +970,26 @@ struct test {
std::strftime(buf, sizeof(buf), "%FT%TZ", gmtime(&t)); std::strftime(buf, sizeof(buf), "%FT%TZ", gmtime(&t));
test_time = buf; test_time = buf;
// prepare test label for printing
switch (test_kind) {
case TEST_KIND_PP:
snprintf(buf, sizeof(buf), "pp%d", n_prompt);
break;
case TEST_KIND_TG:
snprintf(buf, sizeof(buf), "tg%d", n_gen);
break;
case TEST_KIND_PG:
snprintf(buf, sizeof(buf), "pp%d+tg%d", n_prompt, n_gen);
break;
case TEST_KIND_GP:
snprintf(buf, sizeof(buf), "tg%d@pp%d", n_gen, n_prompt);
break;
default:
snprintf(buf, sizeof(buf), "unknown");
break;
}
test_label = buf;
(void) ctx; (void) ctx;
} }
@ -1007,7 +1028,7 @@ struct test {
"cpu_mask", "cpu_strict", "poll", "type_k", "type_v", "n_gpu_layers", "cpu_mask", "cpu_strict", "poll", "type_k", "type_v", "n_gpu_layers",
"split_mode", "main_gpu", "no_kv_offload", "flash_attn", "tensor_split", "use_mmap", "split_mode", "main_gpu", "no_kv_offload", "flash_attn", "tensor_split", "use_mmap",
"embeddings", "n_prompt", "n_gen", "test_time", "avg_ns", "stddev_ns", "embeddings", "n_prompt", "n_gen", "test_time", "avg_ns", "stddev_ns",
"avg_ts", "stddev_ts", "avg_ts", "stddev_ts", "test",
}; };
return fields; return fields;
} }
@ -1078,7 +1099,8 @@ struct test {
std::to_string(avg_ns()), std::to_string(avg_ns()),
std::to_string(stdev_ns()), std::to_string(stdev_ns()),
std::to_string(avg_ts()), std::to_string(avg_ts()),
std::to_string(stdev_ts()) }; std::to_string(stdev_ts()),
test_label };
return values; return values;
} }
@ -1390,24 +1412,7 @@ struct markdown_printer : public printer {
} else if (field == "backend") { } else if (field == "backend") {
value = test::get_backend(); value = test::get_backend();
} else if (field == "test") { } else if (field == "test") {
switch (t.test_kind) { value = t.test_label;
case TEST_KIND_PP:
snprintf(buf, sizeof(buf), "pp%d", t.n_prompt);
break;
case TEST_KIND_TG:
snprintf(buf, sizeof(buf), "tg%d", t.n_gen);
break;
case TEST_KIND_PG:
snprintf(buf, sizeof(buf), "pp%d+tg%d", t.n_prompt, t.n_gen);
break;
case TEST_KIND_GP:
snprintf(buf, sizeof(buf), "tg%d@pp%d", t.n_gen, t.n_prompt);
break;
default:
assert(false);
exit(1);
}
value = buf;
} else if (field == "t/s") { } else if (field == "t/s") {
snprintf(buf, sizeof(buf), "%.2f ± %.2f", t.avg_ts(), t.stdev_ts()); snprintf(buf, sizeof(buf), "%.2f ± %.2f", t.avg_ts(), t.stdev_ts());
value = buf; value = buf;