[Intel-gfx] [PATCH i-g-t] benchmarks/gem_wsim: Tidy manual sizeof VLA calculations

Chris Wilson chris at chris-wilson.co.uk
Mon May 27 09:46:11 UTC 2019


We can use offsetof for the same effect, much tidier with no dummy
locals.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
---
 benchmarks/gem_wsim.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
index db19925b1..a76fdbfe2 100644
--- a/benchmarks/gem_wsim.c
+++ b/benchmarks/gem_wsim.c
@@ -1443,23 +1443,20 @@ set_ctx_sseu(struct ctx *ctx, uint64_t slice_mask)
 
 static size_t sizeof_load_balance(int count)
 {
-	struct i915_context_engines_load_balance *ptr;
-
-	return sizeof(*ptr) + count * sizeof(ptr->engines[0]);
+	return offsetof(struct i915_context_engines_load_balance,
+			engines[count]);
 }
 
 static size_t sizeof_param_engines(int count)
 {
-	struct i915_context_param_engines *ptr;
-
-	return sizeof(*ptr) + count * sizeof(ptr->engines[0]);
+	return offsetof(struct i915_context_param_engines,
+			engines[count]);
 }
 
 static size_t sizeof_engines_bond(int count)
 {
-	struct i915_context_engines_bond *ptr;
-
-	return sizeof(*ptr) + count * sizeof(ptr->engines[0]);
+	return offsetof(struct i915_context_engines_bond,
+			engines[count]);
 }
 
 #define alloca0(sz) ({ size_t sz__ = (sz); memset(alloca(sz__), 0, sz__); })
-- 
2.20.1



More information about the Intel-gfx mailing list