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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2409FC433F5 for ; Tue, 2 Nov 2021 23:23:07 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id DEF5A60EB9 for ; Tue, 2 Nov 2021 23:23:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DEF5A60EB9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 344B36E8D9; Tue, 2 Nov 2021 23:23:06 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id E732B6E839; Tue, 2 Nov 2021 23:23:04 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10156"; a="231238641" X-IronPort-AV: E=Sophos;i="5.87,203,1631602800"; d="scan'208";a="231238641" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2021 16:23:04 -0700 X-IronPort-AV: E=Sophos;i="5.87,203,1631602800"; d="scan'208";a="467914082" Received: from jons-linux-dev-box.fm.intel.com (HELO jons-linux-dev-box) ([10.1.27.20]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2021 16:23:04 -0700 Date: Tue, 2 Nov 2021 16:18:31 -0700 From: Matthew Brost To: John Harrison Message-ID: <20211102231831.GA16278@jons-linux-dev-box> References: <20211021234044.3071069-1-John.C.Harrison@Intel.com> <20211021234044.3071069-3-John.C.Harrison@Intel.com> <20211029173905.GA35332@jons-linux-dev-box> <98fe41ea-75fc-463c-23fd-25156a975b53@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <98fe41ea-75fc-463c-23fd-25156a975b53@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [igt-dev] [PATCH i-g-t 2/8] tests/i915/gem_exec_capture: Cope with larger page sizes X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: IGT-Dev@Lists.FreeDesktop.Org, Intel-GFX@Lists.FreeDesktop.Org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Oct 29, 2021 at 05:32:40PM -0700, John Harrison wrote: > On 10/29/2021 10:39, Matthew Brost wrote: > > On Thu, Oct 21, 2021 at 04:40:38PM -0700, John.C.Harrison@Intel.com wrote: > > > From: John Harrison > > > > > > At some point, larger than 4KB page sizes were added to the i915 > > > driver. This included adding an informational line to the buffer > > > entries in error capture logs. However, the error capture test was not > > > updated to skip this string, thus it would silently abort processing. > > > > > > Signed-off-by: John Harrison > > > --- > > > tests/i915/gem_exec_capture.c | 6 ++++++ > > > 1 file changed, 6 insertions(+) > > > > > > diff --git a/tests/i915/gem_exec_capture.c b/tests/i915/gem_exec_capture.c > > > index 53649cdb2..47ca64dd6 100644 > > > --- a/tests/i915/gem_exec_capture.c > > > +++ b/tests/i915/gem_exec_capture.c > > > @@ -484,6 +484,12 @@ static void many(int fd, int dir, uint64_t size, unsigned int flags) > > > addr |= strtoul(str + 1, &str, 16); > > > igt_assert(*str++ == '\n'); > > > + /* gtt_page_sizes = 0x00010000 */ > > > + if (strncmp(str, "gtt_page_sizes = 0x", 19) == 0) { > > > + str += 19 + 8; > > > + igt_assert(*str++ == '\n'); > > > + } > > Can you explain this logic to me, for the life of me I can't figure out > > what this doing. That probably warrent's a more detailed comment too. > It's no different to the rest of the processing that this code was already > doing. > > if( start_of_current_line == "gtt_page_sizes = 0x") { >     current_line += strlen(above_string) + strlen(8-digit hex string); >     assert( next_character_of_current_line == end_of_line); > } > > I.e. skip over any line that just contains the page size message. > Ok, got it. Not sure I missed that. The magic numbers 19 and 8 where confusing me but I understand this now. With that: Reviewed-by: Matthew Brost > John. > > > > > Matt > > > > > + > > > if (!(*str == ':' || *str == '~')) > > > continue; > > > -- > > > 2.25.1 > > > >