From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>,
igt-dev@lists.freedesktop.org
Cc: chris.p.wilson@linux.intel.com
Subject: Re: [igt-dev] [PATCH i-g-t 07/17] benchmarks/gem_wsim: cleanups
Date: Fri, 29 Sep 2023 09:09:10 +0100 [thread overview]
Message-ID: <b3605f40-9761-0e0d-d838-410b9d8c2344@linux.intel.com> (raw)
In-Reply-To: <20230928174535.2074462-8-marcin.bernatowicz@linux.intel.com>
On 28/09/2023 18:45, Marcin Bernatowicz wrote:
> Cleaning checkpatch.pl reported warnings/errors.
> Removed unused fence_signal field from struct w_step.
>
> v2:
> - restored unnecessarily changed malloc (Tvrtko)
>
> Signed-off-by: Marcin Bernatowicz <marcin.bernatowicz@linux.intel.com>
> ---
> benchmarks/gem_wsim.c | 54 ++++++++++++++++++++++++++-----------------
> 1 file changed, 33 insertions(+), 21 deletions(-)
>
> diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
> index 3c25d801c..f91e126f1 100644
> --- a/benchmarks/gem_wsim.c
> +++ b/benchmarks/gem_wsim.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: MIT
> /*
> * Copyright © 2017 Intel Corporation
> *
> @@ -76,8 +77,7 @@ struct duration {
> bool unbound;
> };
>
> -enum w_type
> -{
> +enum w_type {
> BATCH,
> SYNC,
> DELAY,
> @@ -102,8 +102,7 @@ struct dep_entry {
> int working_set; /* -1 = step dependecy, >= 0 working set id */
> };
>
> -struct deps
> -{
> +struct deps {
> int nr;
> bool submit_fence;
> struct dep_entry *list;
> @@ -137,8 +136,7 @@ struct working_set {
>
> struct workload;
>
> -struct w_step
> -{
> +struct w_step {
> struct workload *wrk;
>
> /* Workload step metadata */
> @@ -155,7 +153,6 @@ struct w_step
> int period;
> int target;
> int throttle;
> - int fence_signal;
> int priority;
> struct {
> unsigned int engine_map_count;
> @@ -194,8 +191,7 @@ struct ctx {
> uint64_t sseu;
> };
>
> -struct workload
> -{
> +struct workload {
> unsigned int id;
>
> unsigned int nr_steps;
> @@ -807,6 +803,7 @@ static int add_buffers(struct working_set *set, char *str)
>
> for (i = 0; i < add; i++) {
> struct work_buffer_size *sz = &sizes[set->nr + i];
> +
> sz->min = min_sz;
> sz->max = max_sz;
> sz->size = 0;
> @@ -899,13 +896,16 @@ parse_duration(unsigned int nr_steps, struct duration *dur, double scale_dur, ch
> }
>
> #define int_field(_STEP_, _FIELD_, _COND_, _ERR_) \
> - if ((field = strtok_r(fstart, ".", &fctx))) { \
> - tmp = atoi(field); \
> - check_arg(_COND_, _ERR_, nr_steps); \
> - step.type = _STEP_; \
> - step._FIELD_ = tmp; \
> - goto add_step; \
> - } \
> + do { \
> + field = strtok_r(fstart, ".", &fctx); \
> + if (field) { \
> + tmp = atoi(field); \
> + check_arg(_COND_, _ERR_, nr_steps); \
> + step.type = _STEP_; \
> + step._FIELD_ = tmp; \
> + goto add_step; \
> + } \
> + } while (0)
>
> static struct workload *
> parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> @@ -930,7 +930,8 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> valid = 0;
> memset(&step, 0, sizeof(step));
>
> - if ((field = strtok_r(fstart, ".", &fctx))) {
> + field = strtok_r(fstart, ".", &fctx);
> + if (field) {
> fstart = NULL;
>
> if (!strcmp(field, "d")) {
> @@ -941,6 +942,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> "Invalid period at step %u!\n");
> } else if (!strcmp(field, "P")) {
> unsigned int nr = 0;
> +
> while ((field = strtok_r(fstart, ".", &fctx))) {
> tmp = atoi(field);
> check_arg(nr == 0 && tmp <= 0,
> @@ -966,6 +968,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> "Invalid sync target at step %u!\n");
> } else if (!strcmp(field, "S")) {
> unsigned int nr = 0;
> +
> while ((field = strtok_r(fstart, ".", &fctx))) {
> tmp = atoi(field);
> check_arg(tmp <= 0 && nr == 0,
> @@ -1002,6 +1005,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> goto add_step;
> } else if (!strcmp(field, "M")) {
> unsigned int nr = 0;
> +
> while ((field = strtok_r(fstart, ".", &fctx))) {
> tmp = atoi(field);
> check_arg(nr == 0 && tmp <= 0,
> @@ -1032,6 +1036,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> "Invalid terminate target at step %u!\n");
> } else if (!strcmp(field, "X")) {
> unsigned int nr = 0;
> +
> while ((field = strtok_r(fstart, ".", &fctx))) {
> tmp = atoi(field);
> check_arg(nr == 0 && tmp <= 0,
> @@ -1056,6 +1061,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> goto add_step;
> } else if (!strcmp(field, "B")) {
> unsigned int nr = 0;
> +
> while ((field = strtok_r(fstart, ".", &fctx))) {
> tmp = atoi(field);
> check_arg(nr == 0 && tmp <= 0,
> @@ -1075,6 +1081,7 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> goto add_step;
> } else if (!strcmp(field, "b")) {
> unsigned int nr = 0;
> +
> while ((field = strtok_r(fstart, ".", &fctx))) {
> check_arg(nr > 2,
> "Invalid bond format at step %u!\n",
> @@ -1146,7 +1153,8 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> valid++;
> }
>
> - if ((field = strtok_r(fstart, ".", &fctx))) {
> + field = strtok_r(fstart, ".", &fctx);
> + if (field) {
> fstart = NULL;
>
> i = str_to_engine(field);
> @@ -1158,7 +1166,8 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> step.engine = i;
> }
>
> - if ((field = strtok_r(fstart, ".", &fctx))) {
> + field = strtok_r(fstart, ".", &fctx);
> + if (field) {
> fstart = NULL;
>
> if (parse_duration(nr_steps, &step.duration, scale_dur, field))
> @@ -1167,7 +1176,8 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> valid++;
> }
>
> - if ((field = strtok_r(fstart, ".", &fctx))) {
> + field = strtok_r(fstart, ".", &fctx);
> + if (field) {
> fstart = NULL;
>
> tmp = parse_dependencies(nr_steps, &step, field);
> @@ -1177,7 +1187,8 @@ parse_workload(struct w_arg *arg, unsigned int flags, double scale_dur,
> valid++;
> }
>
> - if ((field = strtok_r(fstart, ".", &fctx))) {
> + field = strtok_r(fstart, ".", &fctx);
> + if (field) {
> fstart = NULL;
>
> check_arg(strlen(field) != 1 ||
> @@ -2716,6 +2727,7 @@ int main(int argc, char **argv)
>
> if (append_workload_arg) {
> struct w_arg arg = { NULL, append_workload_arg, 0 };
> +
> app_w = parse_workload(&arg, flags, scale_dur, scale_time,
> NULL);
> if (!app_w) {
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
next prev parent reply other threads:[~2023-09-29 8:25 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-28 17:45 [igt-dev] [PATCH i-g-t 00/17] [RFC] benchmarks/gem_wsim: added basic xe support Marcin Bernatowicz
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 01/17] lib/igt_device_scan: Xe get integrated/discrete card functions Marcin Bernatowicz
2023-10-05 12:17 ` Kamil Konieczny
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 02/17] benchmarks/gem_wsim: reposition the unbound duration boolean Marcin Bernatowicz
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 03/17] benchmarks/gem_wsim: fix scaling of period steps Marcin Bernatowicz
2023-09-29 8:01 ` Tvrtko Ursulin
2023-09-29 9:31 ` Bernatowicz, Marcin
2023-09-29 10:52 ` Tvrtko Ursulin
2023-09-29 11:30 ` Bernatowicz, Marcin
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 04/17] benchmarks/gem_wsim: fix duration range check Marcin Bernatowicz
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 05/17] benchmarks/gem_wsim: extract duration parsing code to new function Marcin Bernatowicz
2023-09-29 8:08 ` Tvrtko Ursulin
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 06/17] benchmarks/gem_wsim: fix conflicting SSEU #define and enum Marcin Bernatowicz
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 07/17] benchmarks/gem_wsim: cleanups Marcin Bernatowicz
2023-09-29 8:09 ` Tvrtko Ursulin [this message]
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 08/17] benchmarks/gem_wsim: reposition repeat_start variable Marcin Bernatowicz
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 09/17] benchmarks/gem_wsim: use lib code to query engines Marcin Bernatowicz
2023-09-29 8:11 ` Tvrtko Ursulin
2023-09-29 10:35 ` Bernatowicz, Marcin
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 10/17] benchmarks/gem_wsim: allow comments in workload description files Marcin Bernatowicz
2023-09-29 8:28 ` Tvrtko Ursulin
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 11/17] benchmarks/gem_wsim: introduce w_step_sync function Marcin Bernatowicz
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 12/17] benchmarks/gem_wsim: extract allocate and prepare contexts code to new functions Marcin Bernatowicz
2023-09-29 9:26 ` Tvrtko Ursulin
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 13/17] benchmarks/gem_wsim: extract prepare working sets code to new function Marcin Bernatowicz
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 14/17] benchmarks/gem_wsim: group i915 fields Marcin Bernatowicz
2023-09-29 9:33 ` Tvrtko Ursulin
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 15/17] benchmarks/gem_wsim: introduce bb_size in w_step Marcin Bernatowicz
2023-09-29 9:35 ` Tvrtko Ursulin
2023-09-29 10:08 ` Bernatowicz, Marcin
2023-09-29 10:49 ` Tvrtko Ursulin
2023-10-05 10:52 ` Bernatowicz, Marcin
2023-10-05 12:30 ` Tvrtko Ursulin
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 16/17] benchmarks/gem_wsim: for_each_dep macro Marcin Bernatowicz
2023-09-29 9:37 ` Tvrtko Ursulin
2023-09-28 17:45 ` [igt-dev] [PATCH i-g-t 17/17] benchmarks/gem_wsim: added basic xe support Marcin Bernatowicz
2023-09-29 10:45 ` Tvrtko Ursulin
2023-09-29 15:53 ` Bernatowicz, Marcin
2023-09-28 18:59 ` [igt-dev] ✓ CI.xeBAT: success for benchmarks/gem_wsim: added basic xe support (rev5) Patchwork
2023-09-28 19:10 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b3605f40-9761-0e0d-d838-410b9d8c2344@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=chris.p.wilson@linux.intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=marcin.bernatowicz@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox