fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-19 07:28:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/color-icc-output: gate by average error as well

Browse source 
Maximum error is fragile: radeonsi on Polaris 11 has one error spike
that would force the the tolerances for everything to be much higher
than desired, and it masks changes to usual error levels.

Add a new condition to opaque_pixel_conversion: average two-norm error
statistic. The average is not as susceptible to outliers as maximum is.
We still keep the maximum error tolerance as well, to detect gross
outliers that might not sway the average enough to cause a test failure.

The new average error tolerances have been collected from the worst case
among the following + 0.01:
- GL renderer: Mesa Intel(R) HD Graphics 4600 (HSW GT2)
- GL renderer: AMD Radeon RX 550 Series (radeonsi, polaris11, ACO,
  DRM 3.61, 6.12.35+deb13-amd64)
- GL renderer: llvmpipe (LLVM 19.1.7, 256 bits)

(There is no need to separately print matrix vs. clut, it is already in
the fixture name.)

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2025-07-21 14:22:19 +03:00 • committed by Pekka Paalanen
parent b55a1d5bff
commit a5a2b3abb1
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tests/color-icc-output-test.c
View file

@ -98,6 +98,12 @@ struct setup_args {
int ref_image_index;
const struct lcms_pipeline *pipeline;
/**
* Two-norm color error tolerance in units of 1.0/255, computed in
* output electrical space, of the average error in the whole strip.
*/
float avg_tol;
/**
* Two-norm color error tolerance in units of 1.0/255, computed in
* output electrical space, of the maximum error in the whole strip.
@ -129,6 +135,7 @@ static const struct setup_args my_setup_args[] = {
.meta = { "sRGB->sRGB MAT" },
.ref_image_index = 0,
.pipeline = &pipeline_sRGB,
.avg_tol = 0.0,
.max_tol = 0.0,
.dim_size = 0,
.type = PTYPE_MATRIX_SHAPER,
@ -137,6 +144,7 @@ static const struct setup_args my_setup_args[] = {
.meta = { "sRGB->sRGB MAT VCGT" },
.ref_image_index = 3,
.pipeline = &pipeline_sRGB,
.avg_tol = 0.34,
.max_tol = 0.9,
.dim_size = 0,
.type = PTYPE_MATRIX_SHAPER,
@ -146,6 +154,7 @@ static const struct setup_args my_setup_args[] = {
.meta = { "sRGB->adobeRGB MAT" },
.ref_image_index = 1,
.pipeline = &pipeline_adobeRGB,
.avg_tol = 0.46,
.max_tol = 1.6,
.dim_size = 0,
.type = PTYPE_MATRIX_SHAPER,
@ -154,6 +163,7 @@ static const struct setup_args my_setup_args[] = {
.meta = { "sRGB->adobeRGB MAT VCGT" },
.ref_image_index = 4,
.pipeline = &pipeline_adobeRGB,
.avg_tol = 0.46,
.max_tol = 1.0,
.dim_size = 0,
.type = PTYPE_MATRIX_SHAPER,
@ -163,6 +173,7 @@ static const struct setup_args my_setup_args[] = {
.meta = { "sRGB->BT2020 MAT" },
.ref_image_index = 2,
.pipeline = &pipeline_BT2020,
.avg_tol = 0.47,
.max_tol = 0.9,
.dim_size = 0,
.type = PTYPE_MATRIX_SHAPER,
@ -171,6 +182,7 @@ static const struct setup_args my_setup_args[] = {
.meta = { "sRGB->sRGB CLUT" },
.ref_image_index = 0,
.pipeline = &pipeline_sRGB,
.avg_tol = 1.06,
.max_tol = 1.8,
.dim_size = 17,
.type = PTYPE_CLUT,
@ -180,6 +192,7 @@ static const struct setup_args my_setup_args[] = {
.meta = { "sRGB->sRGB CLUT VCGT" },
.ref_image_index = 3,
.pipeline = &pipeline_sRGB,
.avg_tol = 0.72,
.max_tol = 1.3,
.dim_size = 17,
.type = PTYPE_CLUT,
@ -190,6 +203,7 @@ static const struct setup_args my_setup_args[] = {
.meta = { "sRGB->adobeRGB CLUT" },
.ref_image_index = 1,
.pipeline = &pipeline_adobeRGB,
.avg_tol = 0.51,
.max_tol = 1.8,
.dim_size = 17,
.type = PTYPE_CLUT,
@ -199,6 +213,7 @@ static const struct setup_args my_setup_args[] = {
.meta = { "sRGB->adobeRGB CLUT VCGT" },
.ref_image_index = 4,
.pipeline = &pipeline_adobeRGB,
.avg_tol = 0.52,
.max_tol = 1.1,
.dim_size = 17,
.type = PTYPE_CLUT,
@ -406,6 +421,8 @@ process_pipeline_comparison(const struct buffer *src_buf,
struct color_float pix_src_pipeline;
struct color_float pix_shot;
struct rgb_diff_stat diffstat = { .dump = dump };
float avg_err;
float max_err;
bool ok;
/* no point to compare different images */
@ -432,12 +449,13 @@ process_pipeline_comparison(const struct buffer *src_buf,
}
}
ok = diffstat.two_norm.max <= arg->max_tol / 255.0f;
avg_err = diffstat.two_norm.sum / diffstat.two_norm.count * 255.0f;
max_err = diffstat.two_norm.max * 255.0f;
ok = max_err <= arg->max_tol && avg_err <= arg->avg_tol;
testlog("%s %s %s tolerance %f %s\n", __func__,
ok ? "SUCCESS" : "FAILURE",
arg->meta.name, arg->max_tol,
arg->type == PTYPE_MATRIX_SHAPER ? "matrix-shaper" : "cLUT");
testlog("%s %s %s tolerances avg: %.2f <= %.2f, max: %.2f <= %.2f\n",
__func__, ok ? "SUCCESS" : "FAILURE", arg->meta.name,
avg_err, arg->avg_tol, max_err, arg->max_tol);
rgb_diff_stat_print(&diffstat, __func__, 8);