tqcq/llama.cpp
0
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-06-27 12:05:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

llama-bench : add --no-warmup flag (#14224) (#14270)

Browse Source 
Add no_warmup parameter to cmd_params struct and command-line parsing to allow users to skip warmup runs before benchmarking.

- Add no_warmup boolean field to cmd_params struct

- Add --no-warmup command-line argument parsing

- Add help text documentation for the new flag

- Wrap existing warmup logic in conditional check

- Maintain full backward compatibility (warmup enabled by default)

Addresses #14224
This commit is contained in:
bashayer hijji
2025-06-19 13:24:12 +03:00
committed by GitHub
parent 5fc7856815
commit fffcce535e
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tools/llama-bench/llama-bench.cpp
View File

@ -267,6 +267,7 @@ struct cmd_params {
int delay; int delay;
bool verbose; bool verbose;
bool progress; bool progress;
bool no_warmup;
output_formats output_format; output_formats output_format;
output_formats output_format_stderr; output_formats output_format_stderr;
}; };
@ -303,6 +304,7 @@ static const cmd_params cmd_params_defaults = {
/* delay */ 0, /* delay */ 0,
/* verbose */ false, /* verbose */ false,
/* progress */ false, /* progress */ false,
/* no_warmup */ false,
/* output_format */ MARKDOWN, /* output_format */ MARKDOWN,
/* output_format_stderr */ NONE, /* output_format_stderr */ NONE,
}; };
@ -325,6 +327,7 @@ static void print_usage(int /* argc */, char ** argv) {
output_format_str(cmd_params_defaults.output_format_stderr)); output_format_str(cmd_params_defaults.output_format_stderr));
printf(" -v, --verbose verbose output\n"); printf(" -v, --verbose verbose output\n");
printf(" --progress print test progress indicators\n"); printf(" --progress print test progress indicators\n");
printf(" --no-warmup skip warmup runs before benchmarking\n");
printf("\n"); printf("\n");
printf("test parameters:\n"); printf("test parameters:\n");
printf(" -m, --model <filename> (default: %s)\n", join(cmd_params_defaults.model, ",").c_str()); printf(" -m, --model <filename> (default: %s)\n", join(cmd_params_defaults.model, ",").c_str());
@ -425,6 +428,7 @@ static cmd_params parse_cmd_params(int argc, char ** argv) {
params.prio = cmd_params_defaults.prio; params.prio = cmd_params_defaults.prio;
params.delay = cmd_params_defaults.delay; params.delay = cmd_params_defaults.delay;
params.progress = cmd_params_defaults.progress; params.progress = cmd_params_defaults.progress;
params.no_warmup = cmd_params_defaults.no_warmup;
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
arg = argv[i]; arg = argv[i];
@ -798,6 +802,8 @@ static cmd_params parse_cmd_params(int argc, char ** argv) {
params.verbose = true; params.verbose = true;
} else if (arg == "--progress") { } else if (arg == "--progress") {
params.progress = true; params.progress = true;
} else if (arg == "--no-warmup") {
params.no_warmup = true;
} else { } else {
invalid_param = true; invalid_param = true;
break; break;
@ -1925,25 +1931,27 @@ int main(int argc, char ** argv) {
llama_attach_threadpool(ctx, threadpool, NULL); llama_attach_threadpool(ctx, threadpool, NULL);
// warmup run // warmup run
if (t.n_prompt > 0) { if (!params.no_warmup) {
if (params.progress) { if (t.n_prompt > 0) {
fprintf(stderr, "llama-bench: benchmark %d/%zu: warmup prompt run\n", params_idx, params_count); if (params.progress) {
fprintf(stderr, "llama-bench: benchmark %d/%zu: warmup prompt run\n", params_idx, params_count);
}
//test_prompt(ctx, std::min(t.n_batch, std::min(t.n_prompt, 32)), 0, t.n_batch, t.n_threads);
bool res = test_prompt(ctx, t.n_prompt, t.n_batch, t.n_threads);
if (!res) {
fprintf(stderr, "%s: error: failed to run prompt warmup\n", __func__);
exit(1);
}
} }
//test_prompt(ctx, std::min(t.n_batch, std::min(t.n_prompt, 32)), 0, t.n_batch, t.n_threads); if (t.n_gen > 0) {
bool res = test_prompt(ctx, t.n_prompt, t.n_batch, t.n_threads); if (params.progress) {
if (!res) { fprintf(stderr, "llama-bench: benchmark %d/%zu: warmup generation run\n", params_idx, params_count);
fprintf(stderr, "%s: error: failed to run prompt warmup\n", __func__); }
exit(1); bool res = test_gen(ctx, 1, t.n_threads);
} if (!res) {
} fprintf(stderr, "%s: error: failed to run gen warmup\n", __func__);
if (t.n_gen > 0) { exit(1);
if (params.progress) { }
fprintf(stderr, "llama-bench: benchmark %d/%zu: warmup generation run\n", params_idx, params_count);
}
bool res = test_gen(ctx, 1, t.n_threads);
if (!res) {
fprintf(stderr, "%s: error: failed to run gen warmup\n", __func__);
exit(1);
} }
} }