Skip to content

Remove --repeats option #660

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
solidpixel merged 3 commits into from
Jul 31, 2026
Merged

Remove --repeats option #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ce8fe0
Remove --repeats option
solidpixel Jul 31, 2026
821c5e9
Remove cut-and-paste remnant
solidpixel Jul 31, 2026
5716c5d
Fix typo in argument names
solidpixel Jul 31, 2026
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
17 changes: 17 additions & 0 deletions Docs/ChangeLog-5x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,23 @@ release of the 5.x series.
All performance data on this page is measured on an Intel Core i5-9600K
clocked at 4.2 GHz, running `astcenc` using AVX2 and 6 threads.

<!-- ---------------------------------------------------------------------- -->
## 5.7.0

**Status:** In development.

The 5.7.0 release is a minor maintenance release.

* **Command line tool updates:**
* **Bug fix:** Avoid pixel count overflow when loading input PNG file.
* **Bug fix:** Error if payload is undersized for stated image dimensions
when loading compressed input KTX file.
* **Improvement:** Top-level `-help` text as been rewritten to improve
clarity and consistency.
* **Change:** Removed `-repeats` benchmarking option, because we prefer to
repeat by invoking the command line multiple times. This gives performance
results closer to what a real user sees.

<!-- ---------------------------------------------------------------------- -->
## 5.6.0

Expand Down
3 changes: 0 additions & 3 deletions Source/astcenccli_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ struct cli_config_options
/** @brief The number of threads to use for processing. */
unsigned int thread_count;

/** @brief The number of repeats to execute for benchmarking. */
unsigned int repeat_count;

/** @brief The number of image slices to load for a 3D image. */
unsigned int array_size;

Expand Down
125 changes: 49 additions & 76 deletions Source/astcenccli_toplevel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,22 +1106,6 @@ static int edit_astcenc_config(

cli_config.thread_count = atoi(argv[argidx - 1]);
}
else if (!strcmp(argv[argidx], "-repeats"))
{
argidx += 2;
if (argidx > argc)
{
print_error("ERROR: -repeats switch with no argument\n");
return 1;
}

cli_config.repeat_count = atoi(argv[argidx - 1]);
if (cli_config.repeat_count <= 0)
{
print_error("ERROR: -repeats value must be at least one\n");
return 1;
}
}
else if (!strcmp(argv[argidx], "-yflip"))
{
argidx++;
Expand Down Expand Up @@ -1996,9 +1980,11 @@ int astcenc_main(
}

// Initialize cli_config_options with default values
cli_config_options cli_config { 0, 1, 1, false, false, false, -10, 10,
cli_config_options cli_config {
0, 1, false, false, false, -10, 10,
{ ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A },
{ ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A } };
{ ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A }
};

error = edit_astcenc_config(argc, argv, operation, cli_config, config);
if (error)
Expand Down Expand Up @@ -2160,8 +2146,7 @@ int astcenc_main(
}

// Compress an image
double best_compression_time = 100000.0;
double total_compression_time = 0.0;
double compression_time = 0.0;
if (operation & ASTCENC_STAGE_COMPRESS)
{
print_astcenc_config(cli_config, config);
Expand All @@ -2183,42 +2168,39 @@ int astcenc_main(
// Only launch worker threads for multi-threaded use - it makes basic
// single-threaded profiling and debugging a little less convoluted
double start_compression_time = get_time();
for (unsigned int i = 0; i < cli_config.repeat_count; i++)
{
if (config.progress_callback)
{
printf("Compression\n");
printf("===========\n");
printf("\n");
}

double start_iter_time = get_time();
if (cli_config.thread_count > 1)
{
launch_threads("Compression", cli_config.thread_count, compression_workload_runner, &work);
}
else
{
work.error = astcenc_compress_image(
work.context, work.image, &work.swizzle,
work.data_out, work.data_len, 0);
}
if (config.progress_callback)
{
printf("Compression\n");
printf("===========\n");
printf("\n");
}

astcenc_compress_reset(codec_context.get());
if (cli_config.thread_count > 1)
{
launch_threads("Compression", cli_config.thread_count,
compression_workload_runner, &work);
}
else
{
work.error = astcenc_compress_image(
work.context, work.image, &work.swizzle,
work.data_out, work.data_len, 0);
}

if (config.progress_callback)
{
printf("\n\n");
}
astcenc_compress_reset(codec_context.get());

double iter_time = get_time() - start_iter_time;
best_compression_time = astc::min(iter_time, best_compression_time);
if (config.progress_callback)
{
printf("\n\n");
}
total_compression_time = get_time() - start_compression_time;

compression_time = get_time() - start_compression_time;

if (work.error != ASTCENC_SUCCESS)
{
print_error("ERROR: Codec compress failed: %s\n", astcenc_get_error_string(work.error));
print_error("ERROR: Codec compress failed: %s\n",
astcenc_get_error_string(work.error));
return 1;
}

Expand All @@ -2231,8 +2213,7 @@ int astcenc_main(
}

// Decompress an image
double best_decompression_time = 100000.0;
double total_decompression_time = 0.0;
double decompression_time = 0.0;
if (operation & ASTCENC_STAGE_DECOMPRESS)
{
image_decomp_out = alloc_image(
Expand All @@ -2249,26 +2230,22 @@ int astcenc_main(
// Only launch worker threads for multi-threaded use - it makes basic
// single-threaded profiling and debugging a little less convoluted
double start_decompression_time = get_time();
for (unsigned int i = 0; i < cli_config.repeat_count; i++)

if (cli_config.thread_count > 1)
{
double start_iter_time = get_time();
if (cli_config.thread_count > 1)
{
launch_threads("Decompression", cli_config.thread_count, decompression_workload_runner, &work);
}
else
{
work.error = astcenc_decompress_image(
work.context, work.data, work.data_len,
work.image_out, &work.swizzle, 0);
}
launch_threads("Decompression", cli_config.thread_count,
decompression_workload_runner, &work);
}
else
{
work.error = astcenc_decompress_image(
work.context, work.data, work.data_len,
work.image_out, &work.swizzle, 0);
}

astcenc_decompress_reset(codec_context.get());
astcenc_decompress_reset(codec_context.get());

double iter_time = get_time() - start_iter_time;
best_decompression_time = astc::min(iter_time, best_decompression_time);
}
total_decompression_time = get_time() - start_decompression_time;
decompression_time = get_time() - start_decompression_time;

if (work.error != ASTCENC_SUCCESS)
{
Expand Down Expand Up @@ -2351,28 +2328,24 @@ int astcenc_main(
if ((operation & ASTCENC_STAGE_COMPARE) || (!cli_config.silentmode))
{
double end_time = get_time();

double repeats = static_cast<double>(cli_config.repeat_count);
double avg_compression_time = total_compression_time / repeats;
double avg_decompression_time = total_decompression_time / repeats;
double total_time = (end_time - start_time) - ((repeats - 1.0) * avg_compression_time) - ((repeats - 1.0) * avg_decompression_time);
double total_time = end_time - start_time;

printf("Performance metrics\n");
printf("===================\n\n");
printf(" Total time: %8.4f s\n", total_time);

if (operation & ASTCENC_STAGE_COMPRESS)
{
double compression_rate = image_size / (best_compression_time * 1000000.0);
double compression_rate = image_size / (compression_time * 1000000.0);

printf(" Coding time: %8.4f s\n", best_compression_time);
printf(" Coding time: %8.4f s\n", compression_time);
printf(" Coding rate: %8.4f MT/s\n", compression_rate);
}

if (operation & ASTCENC_STAGE_DECOMPRESS)
{
double decompression_rate = image_size / (best_decompression_time * 1000000.0);
printf(" Decoding time: %8.4f s\n", best_decompression_time);
double decompression_rate = image_size / (decompression_time * 1000000.0);
printf(" Decoding time: %8.4f s\n", decompression_time);
printf(" Decoding rate: %8.4f MT/s\n", decompression_rate);
}
}
Expand Down
Loading