From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org Subject: [PATCH i-g-t 13/21] gem_wsim: Compact int command parsing with a macro Date: Wed, 8 May 2019 13:10:50 +0100 [thread overview] Message-ID: <20190508121058.27038-14-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20190508121058.27038-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Parsing an integer workload descriptor field is a common pattern which we can extract to a helper macro and by doing so further improve the readability of the main parsing loop. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- benchmarks/gem_wsim.c | 80 ++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 55 deletions(-) diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c index 4dbfc3e922a9..c2e13d9939c2 100644 --- a/benchmarks/gem_wsim.c +++ b/benchmarks/gem_wsim.c @@ -370,6 +370,15 @@ static int parse_engine_map(struct w_step *step, const char *_str) return 0; } +#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; \ + } \ + static struct workload * parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w) { @@ -397,25 +406,11 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w) fstart = NULL; if (!strcmp(field, "d")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp <= 0, - "Invalid delay at step %u!\n", - nr_steps); - step.type = DELAY; - step.delay = tmp; - goto add_step; - } + int_field(DELAY, delay, tmp <= 0, + "Invalid delay at step %u!\n"); } else if (!strcmp(field, "p")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp <= 0, - "Invalid period at step %u!\n", - nr_steps); - step.type = PERIOD; - step.period = tmp; - goto add_step; - } + int_field(PERIOD, period, tmp <= 0, + "Invalid period at step %u!\n"); } else if (!strcmp(field, "P")) { unsigned int nr = 0; while ((field = strtok_r(fstart, ".", &fctx))) { @@ -438,46 +433,21 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w) step.type = CTX_PRIORITY; goto add_step; } else if (!strcmp(field, "s")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp >= 0 || - ((int)nr_steps + tmp) < 0, - "Invalid sync target at step %u!\n", - nr_steps); - step.type = SYNC; - step.target = tmp; - goto add_step; - } + int_field(SYNC, target, + tmp >= 0 || ((int)nr_steps + tmp) < 0, + "Invalid sync target at step %u!\n"); } else if (!strcmp(field, "t")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp < 0, - "Invalid throttle at step %u!\n", - nr_steps); - step.type = THROTTLE; - step.throttle = tmp; - goto add_step; - } + int_field(THROTTLE, throttle, + tmp < 0, + "Invalid throttle at step %u!\n"); } else if (!strcmp(field, "q")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp < 0, - "Invalid qd throttle at step %u!\n", - nr_steps); - step.type = QD_THROTTLE; - step.throttle = tmp; - goto add_step; - } + int_field(QD_THROTTLE, throttle, + tmp < 0, + "Invalid qd throttle at step %u!\n"); } else if (!strcmp(field, "a")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp >= 0, - "Invalid sw fence signal at step %u!\n", - nr_steps); - step.type = SW_FENCE_SIGNAL; - step.target = tmp; - goto add_step; - } + int_field(SW_FENCE_SIGNAL, target, + tmp >= 0, + "Invalid sw fence signal at step %u!\n"); } else if (!strcmp(field, "f")) { step.type = SW_FENCE; goto add_step; -- 2.19.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH i-g-t 13/21] gem_wsim: Compact int command parsing with a macro Date: Wed, 8 May 2019 13:10:50 +0100 [thread overview] Message-ID: <20190508121058.27038-14-tvrtko.ursulin@linux.intel.com> (raw) In-Reply-To: <20190508121058.27038-1-tvrtko.ursulin@linux.intel.com> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Parsing an integer workload descriptor field is a common pattern which we can extract to a helper macro and by doing so further improve the readability of the main parsing loop. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- benchmarks/gem_wsim.c | 80 ++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 55 deletions(-) diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c index 4dbfc3e922a9..c2e13d9939c2 100644 --- a/benchmarks/gem_wsim.c +++ b/benchmarks/gem_wsim.c @@ -370,6 +370,15 @@ static int parse_engine_map(struct w_step *step, const char *_str) return 0; } +#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; \ + } \ + static struct workload * parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w) { @@ -397,25 +406,11 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w) fstart = NULL; if (!strcmp(field, "d")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp <= 0, - "Invalid delay at step %u!\n", - nr_steps); - step.type = DELAY; - step.delay = tmp; - goto add_step; - } + int_field(DELAY, delay, tmp <= 0, + "Invalid delay at step %u!\n"); } else if (!strcmp(field, "p")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp <= 0, - "Invalid period at step %u!\n", - nr_steps); - step.type = PERIOD; - step.period = tmp; - goto add_step; - } + int_field(PERIOD, period, tmp <= 0, + "Invalid period at step %u!\n"); } else if (!strcmp(field, "P")) { unsigned int nr = 0; while ((field = strtok_r(fstart, ".", &fctx))) { @@ -438,46 +433,21 @@ parse_workload(struct w_arg *arg, unsigned int flags, struct workload *app_w) step.type = CTX_PRIORITY; goto add_step; } else if (!strcmp(field, "s")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp >= 0 || - ((int)nr_steps + tmp) < 0, - "Invalid sync target at step %u!\n", - nr_steps); - step.type = SYNC; - step.target = tmp; - goto add_step; - } + int_field(SYNC, target, + tmp >= 0 || ((int)nr_steps + tmp) < 0, + "Invalid sync target at step %u!\n"); } else if (!strcmp(field, "t")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp < 0, - "Invalid throttle at step %u!\n", - nr_steps); - step.type = THROTTLE; - step.throttle = tmp; - goto add_step; - } + int_field(THROTTLE, throttle, + tmp < 0, + "Invalid throttle at step %u!\n"); } else if (!strcmp(field, "q")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp < 0, - "Invalid qd throttle at step %u!\n", - nr_steps); - step.type = QD_THROTTLE; - step.throttle = tmp; - goto add_step; - } + int_field(QD_THROTTLE, throttle, + tmp < 0, + "Invalid qd throttle at step %u!\n"); } else if (!strcmp(field, "a")) { - if ((field = strtok_r(fstart, ".", &fctx))) { - tmp = atoi(field); - check_arg(tmp >= 0, - "Invalid sw fence signal at step %u!\n", - nr_steps); - step.type = SW_FENCE_SIGNAL; - step.target = tmp; - goto add_step; - } + int_field(SW_FENCE_SIGNAL, target, + tmp >= 0, + "Invalid sw fence signal at step %u!\n"); } else if (!strcmp(field, "f")) { step.type = SW_FENCE; goto add_step; -- 2.19.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-05-08 12:10 UTC|newest] Thread overview: 126+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-08 12:10 [PATCH i-g-t 00/21] Media scalability tooling Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 01/21] scripts/trace.pl: Fix after intel_engine_notify removal Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-08 12:17 ` Chris Wilson 2019-05-08 12:17 ` Chris Wilson 2019-05-09 9:27 ` Tvrtko Ursulin 2019-05-09 9:27 ` [Intel-gfx] " Tvrtko Ursulin 2019-05-10 12:33 ` Chris Wilson 2019-05-10 12:33 ` Chris Wilson 2019-05-13 12:16 ` Tvrtko Ursulin 2019-05-13 12:16 ` Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 02/21] headers: bump Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 03/21] trace.pl: Virtual engine support Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-10 12:52 ` Chris Wilson 2019-05-10 12:52 ` [igt-dev] " Chris Wilson 2019-05-13 12:30 ` Tvrtko Ursulin 2019-05-13 12:30 ` [igt-dev] " Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 04/21] trace.pl: Virtual engine preemption support Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-10 12:55 ` Chris Wilson 2019-05-10 12:55 ` [igt-dev] [Intel-gfx] " Chris Wilson 2019-05-13 12:38 ` Tvrtko Ursulin 2019-05-13 12:38 ` [igt-dev] [Intel-gfx] " Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 05/21] wsim/media-bench: i915 balancing Tvrtko Ursulin 2019-05-08 12:10 ` [Intel-gfx] " Tvrtko Ursulin 2019-05-10 13:14 ` [igt-dev] " Chris Wilson 2019-05-10 13:14 ` Chris Wilson 2019-05-13 12:41 ` Tvrtko Ursulin 2019-05-13 12:41 ` Tvrtko Ursulin 2019-05-13 12:54 ` Chris Wilson 2019-05-13 12:54 ` Chris Wilson 2019-05-10 13:23 ` Chris Wilson 2019-05-10 13:23 ` [Intel-gfx] " Chris Wilson 2019-05-08 12:10 ` [PATCH i-g-t 06/21] gem_wsim: Use IGT uapi headers Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-10 13:15 ` Chris Wilson 2019-05-10 13:15 ` Chris Wilson 2019-05-08 12:10 ` [PATCH i-g-t 07/21] gem_wsim: Factor out common error handling Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-10 13:15 ` Chris Wilson 2019-05-10 13:15 ` Chris Wilson 2019-05-08 12:10 ` [PATCH i-g-t 08/21] gem_wsim: More wsim_err Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-10 13:16 ` Chris Wilson 2019-05-10 13:16 ` [Intel-gfx] " Chris Wilson 2019-05-08 12:10 ` [PATCH i-g-t 09/21] gem_wsim: Submit fence support Tvrtko Ursulin 2019-05-08 12:10 ` [Intel-gfx] " Tvrtko Ursulin 2019-05-10 13:18 ` [igt-dev] " Chris Wilson 2019-05-10 13:18 ` Chris Wilson 2019-05-08 12:10 ` [PATCH i-g-t 10/21] gem_wsim: Extract str to engine lookup Tvrtko Ursulin 2019-05-08 12:10 ` [Intel-gfx] " Tvrtko Ursulin 2019-05-10 13:20 ` [igt-dev] " Chris Wilson 2019-05-10 13:20 ` Chris Wilson 2019-05-13 13:08 ` Tvrtko Ursulin 2019-05-13 13:08 ` Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 11/21] gem_wsim: Engine map support Tvrtko Ursulin 2019-05-08 12:10 ` [Intel-gfx] " Tvrtko Ursulin 2019-05-10 13:26 ` [igt-dev] " Chris Wilson 2019-05-10 13:26 ` Chris Wilson 2019-05-13 13:18 ` Tvrtko Ursulin 2019-05-13 13:18 ` Tvrtko Ursulin 2019-05-13 13:29 ` Chris Wilson 2019-05-13 13:29 ` Chris Wilson 2019-05-13 13:40 ` Tvrtko Ursulin 2019-05-13 13:40 ` Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 12/21] gem_wsim: Save some lines by changing to implicit NULL checking Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-10 13:28 ` Chris Wilson 2019-05-10 13:28 ` Chris Wilson 2019-05-08 12:10 ` Tvrtko Ursulin [this message] 2019-05-08 12:10 ` [Intel-gfx] [PATCH i-g-t 13/21] gem_wsim: Compact int command parsing with a macro Tvrtko Ursulin 2019-05-10 13:29 ` [igt-dev] " Chris Wilson 2019-05-10 13:29 ` Chris Wilson 2019-05-13 13:24 ` Tvrtko Ursulin 2019-05-13 13:24 ` Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 14/21] gem_wsim: Engine map load balance command Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-10 13:31 ` Chris Wilson 2019-05-10 13:31 ` Chris Wilson 2019-05-15 11:44 ` Tvrtko Ursulin 2019-05-15 11:44 ` Tvrtko Ursulin 2019-05-15 11:48 ` Chris Wilson 2019-05-15 11:48 ` Chris Wilson 2019-05-15 11:55 ` Tvrtko Ursulin 2019-05-15 11:55 ` Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 15/21] gem_wsim: Engine bond command Tvrtko Ursulin 2019-05-08 12:10 ` [Intel-gfx] " Tvrtko Ursulin 2019-05-10 13:36 ` [igt-dev] " Chris Wilson 2019-05-10 13:36 ` Chris Wilson 2019-05-13 13:28 ` Tvrtko Ursulin 2019-05-13 13:28 ` Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 16/21] gem_wsim: Some more example workloads Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-08 12:27 ` Chris Wilson 2019-05-08 12:27 ` Chris Wilson 2019-05-08 13:50 ` Tvrtko Ursulin 2019-05-08 13:50 ` Tvrtko Ursulin 2019-05-08 13:56 ` Chris Wilson 2019-05-08 13:56 ` Chris Wilson 2019-05-08 14:16 ` Tvrtko Ursulin 2019-05-08 14:16 ` Tvrtko Ursulin 2019-05-10 13:37 ` Chris Wilson 2019-05-10 13:37 ` Chris Wilson 2019-05-08 12:10 ` [PATCH i-g-t 17/21] gem_wsim: Infinite batch support Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-10 13:48 ` Chris Wilson 2019-05-10 13:48 ` Chris Wilson 2019-05-13 13:59 ` Tvrtko Ursulin 2019-05-13 13:59 ` Tvrtko Ursulin 2019-05-13 14:11 ` Chris Wilson 2019-05-13 14:11 ` Chris Wilson 2019-05-08 12:10 ` [PATCH i-g-t 18/21] gem_wsim: Command line switch for specifying low slice count workloads Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 19/21] gem_wsim: Per context SSEU control Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-14 21:53 ` Chris Wilson 2019-05-14 21:53 ` Chris Wilson 2019-05-08 12:10 ` [PATCH i-g-t 20/21] gem_wsim: Allow RCS virtual engine with " Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-08 12:10 ` [PATCH i-g-t 21/21] tests/i915_query: Engine discovery tests Tvrtko Ursulin 2019-05-08 12:10 ` [igt-dev] " Tvrtko Ursulin 2019-05-08 12:53 ` [igt-dev] ✓ Fi.CI.BAT: success for Media scalability tooling (rev2) Patchwork 2019-05-08 16:01 ` [igt-dev] ✓ Fi.CI.IGT: " 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=20190508121058.27038-14-tvrtko.ursulin@linux.intel.com \ --to=tvrtko.ursulin@linux.intel.com \ --cc=Intel-gfx@lists.freedesktop.org \ --cc=igt-dev@lists.freedesktop.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.