[PATCH] benchtests: make compare_strings.py accept string as attribute value

[PATCH] benchtests: make compare_strings.py accept string as attribute value

[Su Lifan]

Commit ac759b1fbf28a82d99afde9046f8b72c7cba5dae added attribute
"overlap" to bench-memmove-walk, whose value is a string. This change
makes compare_strings.py fail since benchout_strings.schema.json
requires the values of attributes to be number.

This patch relaxes such constraint.
---
 benchtests/scripts/benchout_strings.schema.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/benchtests/scripts/benchout_strings.schema.json
b/benchtests/scripts/benchout_strings.schema.json
index 7c9a67134b..bfd9b4e6c0 100644
--- a/benchtests/scripts/benchout_strings.schema.json
+++ b/benchtests/scripts/benchout_strings.schema.json
@@ -28,7 +28,12 @@
 		    "items": {"type": "number"}
                    }
 		 },
-		 "additionalProperties": {"type": "number"},
+		 "additionalProperties": {
+		   "oneOf": [
+		     { "type": "number" },
+		     { "type": "string" }
+		   ]
+		 },
 		 "minProperties": 2
 	      }
 	    }
--
2.32.0

Re: [PATCH] benchtests: make compare_strings.py accept string as attribute value

[Siddhesh Poyarekar]

On 25/02/2022 14:28, Su Lifan via Libc-alpha wrote:
> Commit ac759b1fbf28a82d99afde9046f8b72c7cba5dae added attribute
> "overlap" to bench-memmove-walk, whose value is a string. This change
> makes compare_strings.py fail since benchout_strings.schema.json
> requires the values of attributes to be number.
> 
> This patch relaxes such constraint.

LGTM.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>

> ---
>   benchtests/scripts/benchout_strings.schema.json | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/benchtests/scripts/benchout_strings.schema.json
> b/benchtests/scripts/benchout_strings.schema.json
> index 7c9a67134b..bfd9b4e6c0 100644
> --- a/benchtests/scripts/benchout_strings.schema.json
> +++ b/benchtests/scripts/benchout_strings.schema.json
> @@ -28,7 +28,12 @@
>   		    "items": {"type": "number"}
>                      }
>   		 },
> -		 "additionalProperties": {"type": "number"},
> +		 "additionalProperties": {
> +		   "oneOf": [
> +		     { "type": "number" },
> +		     { "type": "string" }
> +		   ]
> +		 },
>   		 "minProperties": 2
>   	      }
>   	    }
> --
> 2.32.0
> 

[committed] benchtests: make compare_strings.py accept string as attribute value

[Siddhesh Poyarekar]

From: Su Lifan <su-lifan@linux.alibaba.com>

Commit ac759b1fbf28a82d99afde9046f8b72c7cba5dae added attribute
"overlap" to bench-memmove-walk, whose value is a string. This change
makes compare_strings.py fail since benchout_strings.schema.json
requires the values of attributes to be number.

This patch relaxes such constraint.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
---

I've fixed up the patch slightly before applying since it had been
mangled by your mail client.  Please make sure you use git-send-email or
another method in future that sends out patches without modification.

Also, this contribution is legally trivial but in future please make
sure that you either confirm your copyright assignment to the FSF or
provide a DCO.  The contribution checklist has more details about all of
this:

https://sourceware.org/glibc/wiki/Contribution%20checklist

Thank you for contributing!

 benchtests/scripts/benchout_strings.schema.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/benchtests/scripts/benchout_strings.schema.json b/benchtests/scripts/benchout_strings.schema.json
index 7c9a67134b..bfd9b4e6c0 100644
--- a/benchtests/scripts/benchout_strings.schema.json
+++ b/benchtests/scripts/benchout_strings.schema.json
@@ -28,7 +28,12 @@
 		    "items": {"type": "number"}
                    }
 		 },
-		 "additionalProperties": {"type": "number"},
+		 "additionalProperties": {
+		   "oneOf": [
+		     { "type": "number" },
+		     { "type": "string" }
+		   ]
+		 },
 		 "minProperties": 2
 	      }
 	    }
-- 
2.35.1