From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id E118310E6CC for ; Fri, 29 Sep 2023 08:31:31 +0000 (UTC) Message-ID: Date: Fri, 29 Sep 2023 09:28:09 +0100 MIME-Version: 1.0 Content-Language: en-US To: Marcin Bernatowicz , igt-dev@lists.freedesktop.org References: <20230928174535.2074462-1-marcin.bernatowicz@linux.intel.com> <20230928174535.2074462-11-marcin.bernatowicz@linux.intel.com> From: Tvrtko Ursulin In-Reply-To: <20230928174535.2074462-11-marcin.bernatowicz@linux.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [igt-dev] [PATCH i-g-t 10/17] benchmarks/gem_wsim: allow comments in workload description files List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chris.p.wilson@linux.intel.com Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On 28/09/2023 18:45, Marcin Bernatowicz wrote: > Lines starting with '#' are skipped. > If command line step separator (',') is encountered after '#' > it is replaced with ';' to not break parsing. > > v2: > - SKIP step type is not needed (Tvrtko) > v3: > - correct README comment (Tvrtko) > - removed hunk for trailing comments after BATCH step, > as some other steps do not support it either (Tvrtko) > > Signed-off-by: Marcin Bernatowicz > --- > benchmarks/gem_wsim.c | 16 ++++++++++++++++ > benchmarks/wsim/README | 2 ++ > 2 files changed, 18 insertions(+) > > diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c > index 8cd68058d..87c68316d 100644 > --- a/benchmarks/gem_wsim.c > +++ b/benchmarks/gem_wsim.c > @@ -43,6 +43,7 @@ > #include > #include > #include > +#include > > #include "drm.h" > #include "drmtest.h" > @@ -813,6 +814,14 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur, > if (field) { > fstart = NULL; > > + /* line starting with # is a comment */ > + if (field[0] == '#') { > + if (verbose > 3) > + printf("skipped line: %s\n", _token); > + free(token); > + continue; > + } > + > if (!strcmp(field, "d")) { > int_field(DELAY, delay, tmp <= 0, > "Invalid delay at step %u!\n"); > @@ -2421,6 +2430,13 @@ static char *load_workload_descriptor(char *filename) > close(infd); > > for (i = 0; i < len; i++) { > + /* '#' starts comment till end of line */ > + if (buf[i] == '#') > + /* replace ',' in comments to not break parsing */ > + while (++i < len && buf[i] != '\n') > + if (buf[i] == ',') > + buf[i] = ';'; > + > if (buf[i] == '\n') > buf[i] = ','; Is it a out of bounds access here if ++i < len was hit above? Would happen if file ends with a hash, I think. Maybe: if (buf[i] == '#') { in_comment = true; } else if (buf[i] == '\n') buf[i] = ','; in_comment = false; } else if (in_comment && buf[i] == ',') buf[i] = ';'; } But please triple check. :) Regards, Tvrtko > } > diff --git a/benchmarks/wsim/README b/benchmarks/wsim/README > index 8c71f2fe6..d4f3dd8ae 100644 > --- a/benchmarks/wsim/README > +++ b/benchmarks/wsim/README > @@ -1,6 +1,8 @@ > Workload descriptor format > ========================== > > +Lines starting with '#' are treated as comments and will not create a work step. > + > ctx.engine.duration_us.dependency.wait,... > ..[-]|*.[/][...].<0|1>,... > B.