From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0273C3DA5D for ; Thu, 25 Jul 2024 09:52:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D2DD10E11E; Thu, 25 Jul 2024 09:52:20 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="XWoHwuH6"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 242E710E1EE for ; Thu, 25 Jul 2024 09:52:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1721901140; x=1753437140; h=message-id:date:mime-version:subject:to:references:from: in-reply-to:content-transfer-encoding; bh=vmKmKNIlLWFruz4QFD/G0RDcRLRVRasUOCIpR6sl0+E=; b=XWoHwuH6MtHmnX1eDa0uAsPxLqiw3smA/L+7i7NAm27pnYIZzuj7jX2k nWU0jWRYoD/nTzffjxC2tVDeCFGMhZ9HYZdz/PtDwfWdoW7htQvIZYx5Y q5XtgT0mcovp/Ud4b6nv/j0zoSnor8xGZTA2yd6wF5r/MVQKd1sJuTYPU +24ufDgKHVfOobXrphVdmwd8ssmhvDtIH98F2yR5AywAyZJnjR1UAMeLL 53V9bAIIil55ypPaZy1yAW2tMNzxsV8e7MASAk4l+k6Owgr7wuwvizDML at5ciTt58pl+lOjpRndnHSn9DgvLJdCioJtU5RDOd4puoE8krnaT4kowp w==; X-CSE-ConnectionGUID: +vPWzghHStCr/c1C/js5yQ== X-CSE-MsgGUID: J6LU6E8iQ4yomFac2+abOw== X-IronPort-AV: E=McAfee;i="6700,10204,11143"; a="23385033" X-IronPort-AV: E=Sophos;i="6.09,235,1716274800"; d="scan'208";a="23385033" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2024 02:52:19 -0700 X-CSE-ConnectionGUID: 06dwA9wHQam4MUhFcSQpFw== X-CSE-MsgGUID: IcczWckkRZ+EUUDE9WqFOQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,235,1716274800"; d="scan'208";a="52555751" Received: from mbernato-mobl1.ger.corp.intel.com (HELO [10.246.0.122]) ([10.246.0.122]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2024 02:52:16 -0700 Message-ID: <1d9377cd-0608-4bce-a3b7-2f0c0116bfdb@linux.intel.com> Date: Thu, 25 Jul 2024 11:52:14 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 i-g-t 2/2] benchmarks/gem_wsim: Fix mmap for discrete graphics cards To: Michal Wajdeczko , Kamil Konieczny , igt-dev@lists.freedesktop.org, Tvrtko Ursulin , Tvrtko Ursulin , zbigniew.kempczynski@intel.com, lukasz.laguna@intel.com References: <20231214201302.29844-1-marcin.bernatowicz@linux.intel.com> <20231214201302.29844-3-marcin.bernatowicz@linux.intel.com> <20240723103626.tyo27oxjyjnjtyr7@kamilkon-DESK.igk.intel.com> <7a25163e-52f4-4d02-b609-bb7c48d90c71@linux.intel.com> <2b651d12-6a40-43b2-bff1-92dfce927099@intel.com> Content-Language: en-US From: "Bernatowicz, Marcin" In-Reply-To: <2b651d12-6a40-43b2-bff1-92dfce927099@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" On 7/25/2024 11:06 AM, Michal Wajdeczko wrote: > > > On 25.07.2024 09:26, Bernatowicz, Marcin wrote: >> Hi Kamil, >> >> On 7/23/2024 12:36 PM, Kamil Konieczny wrote: >>> Hi Marcin, >>> On 2023-12-14 at 21:13:02 +0100, Marcin Bernatowicz wrote: >>>> It appears that 'gem_mmap__wc' doesn't work for discrete graphics cards >>>> and 'I915_MMAP_OFFSET_FIXED' is needed instead. >>>> Adopt the mapping approach from 'lib/igt_dummyload'. >>>> >>>> Signed-off-by: Marcin Bernatowicz >>>> --- >>>>   benchmarks/gem_wsim.c | 11 ++++++++++- >>>>   1 file changed, 10 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c >>>> index a1db37d4e..eafd9cab8 100644 >>>> --- a/benchmarks/gem_wsim.c >>>> +++ b/benchmarks/gem_wsim.c >>>> @@ -1502,7 +1502,16 @@ static unsigned int create_bb(struct w_step >>>> *w, int self) >>>>       gem_set_domain(fd, w->bb_handle, >>>>                  I915_GEM_DOMAIN_WC, I915_GEM_DOMAIN_WC); >>>>   -    cs = ptr = gem_mmap__wc(fd, w->bb_handle, 0, w->bb_size, >>>> PROT_WRITE); >>>> +    if (__gem_set_caching(fd, w->bb_handle, >>>> +                  I915_CACHING_CACHED) == 0) { >>>> +        cs = ptr = gem_mmap__cpu(fd, w->bb_handle, >>>> +                       0, w->bb_size, >>>> +                       PROT_READ | PROT_WRITE); >>>> +    } else >>> >>> Be consistent, use brace after 'else': >>>     } else { >>> >>>> +        cs = ptr = gem_mmap__device_coherent(fd, >>>> +                               w->bb_handle, >>>> +                               0, w->bb_size, >>>> +                               PROT_READ | PROT_WRITE); >>> >>> so it will look like: >>>     } else { >>>         cs = ptr = gem_mmap__device_coherent(fd, w->bb_handle, 0, >>>                              w->bb_size, >>>                              PROT_READ | PROT_WRITE); >>>     } >> ok >>> >>> Please use checkpatch.pl script from Linux kernel, it could spot >>> such problems, see also CONTRIBUTE.md for some helpful options. >> >> Strange, I did run checkpatch.pl but it didn't shout: >> >> ----------------------------------------------------------------- >> ./0001-benchmarks-gem_wsim-Support-gens-without-relocations.patch >> ----------------------------------------------------------------- >> total: 0 errors, 0 warnings, 230 lines checked >> >> ./0001-benchmarks-gem_wsim-Support-gens-without-relocations.patch has no >> obvious style problems and is ready for submission. >> ----------------------------------------------------------------- >> ./0002-benchmarks-gem_wsim-Fix-mmap-for-discrete-graphics-c.patch >> ----------------------------------------------------------------- >> total: 0 errors, 0 warnings, 17 lines checked >> > > try with --strict option > > CHECK: multiple assignments should be avoided > #12: FILE: benchmarks/gem_wsim.c:1507: > + cs = ptr = gem_mmap__cpu(fd, w->bb_handle, > > CHECK: Unbalanced braces around else statement > #15: FILE: benchmarks/gem_wsim.c:1510: > + } else > > CHECK: multiple assignments should be avoided > #16: FILE: benchmarks/gem_wsim.c:1511: > + cs = ptr = gem_mmap__device_coherent(fd, > > total: 0 errors, 0 warnings, 3 checks, 17 lines checked > Thanks, my bad, I missed the options mentioned in CONTRIBUTE.md > >> >>> >>> With above fixed >>> Reviewed-by: Kamil Konieczny >> >> Thanks >>> >>>>         /* Store initial 64b timestamp: start */ >>>>       *cs++ = MI_LOAD_REGISTER_IMM(1) | MI_CS_MMIO_DST; >>>> -- >>>> 2.31.1 >>>>