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 CC0E3C282DE for ; Tue, 11 Mar 2025 00:33:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0564A10E4F1; Tue, 11 Mar 2025 00:33:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VF3bC0cE"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 29E2A10E4F1 for ; Tue, 11 Mar 2025 00:33:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741653226; x=1773189226; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=QQ7DYX75phFEokoIoYF0uTzfBZrTvhKAvHAT9Ar7U0Y=; b=VF3bC0cEZde79P7wgdlmKWjAj6qVo7Rw+bjQYgBfyxIuiZIh/lMOpU+t MxbxTO3rsvFFMketGK1ZPzOsUbLQSmszAiy8iw1ch/oK716adG3hnHj9O O3OUEHy5cxhJJCNzJ5Xx/b1jUoapSjGJ4eqLxHhaUYg/MGGeCtWw7oE4T TM5bN9CSLL1wVYtWKGRDEhquwZ4w3Yw6LnPLMobU+88KULKTE9qIHCReT 1CPkZbyeppaUgjUfbSokVtIkWrRAEfkDXsk47ZKYlWEGsRdp2MiL7eIXF F/MNmsjVXe1DRr11oFaCkKmc5EcQJs/ci8hmOwxLRk/irlCSGI+QspwRl Q==; X-CSE-ConnectionGUID: S6h1jw5OTuWn/dc0Oe/g1Q== X-CSE-MsgGUID: DPXy28ngQ6WdzY+NVzU4tw== X-IronPort-AV: E=McAfee;i="6700,10204,11369"; a="42584993" X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="42584993" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 17:33:45 -0700 X-CSE-ConnectionGUID: I0GQw6l8SbyvduF3f4PGqg== X-CSE-MsgGUID: APxlyJGISYWVDHUk0ttFnA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,237,1736841600"; d="scan'208";a="125201529" Received: from aagwai-mobl2.amr.corp.intel.com (HELO adixit-MOBL3.intel.com) ([10.124.141.85]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2025 17:33:45 -0700 Date: Mon, 10 Mar 2025 17:33:43 -0700 Message-ID: <871pv44d94.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Oak Zeng Cc: Subject: Re: [i-g-t v6 3/4] tests/intel/xe_vm: Exclude invalid_flags tests from LNL and BMG In-Reply-To: <20250224174010.594192-4-oak.zeng@intel.com> References: <20250224174010.594192-1-oak.zeng@intel.com> <20250224174010.594192-4-oak.zeng@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.4 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII 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 Mon, 24 Feb 2025 09:40:09 -0800, Oak Zeng wrote: > > Due to a fix of out of bound prefetch issue, we now allow scratch > page coexist with fault mode on LNL and BMG, thus exclude those > tests on such HW. Instead of making all these changes in this patch, isn't it cleaner to include the platform check for DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE in invalid_flag() itself? Also is it just LNL and BMG, or other future platforms too? In that case instead of using IS_LUNARLAKE() kind of macros, use intel_graphics_ver() checks, so we don't need to keep adding a new patch/check for each platform. > > Signed-off-by: Oak Zeng > --- > tests/intel/xe_vm.c | 47 ++++++++++++++++++++++++++++++--------------- > 1 file changed, 32 insertions(+), 15 deletions(-) > > diff --git a/tests/intel/xe_vm.c b/tests/intel/xe_vm.c > index 0730dd3d3..834e0afd7 100644 > --- a/tests/intel/xe_vm.c > +++ b/tests/intel/xe_vm.c > @@ -2349,6 +2349,7 @@ igt_main > struct drm_xe_engine_class_instance *hwe, *hwe_non_copy = NULL; > uint64_t bind_size; > int fd; > + uint16_t dev_id; > const struct section { > const char *name; > int bo_n_pages; > @@ -2441,23 +2442,28 @@ igt_main > { NULL }, > }; > > - const struct vm_create_section { > - const char *name; > - __u32 flags; > - } xe_vm_create_invalid_flags[] = { > - { "xe_vm_create_fault", DRM_XE_VM_CREATE_FLAG_FAULT_MODE }, > - { "xe_vm_create_scratch_fault", > - DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE | > - DRM_XE_VM_CREATE_FLAG_FAULT_MODE }, > - { "xe_vm_create_scratch_fault_lr", > - ~(DRM_XE_VM_CREATE_FLAG_LR_MODE | > - DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE | > - DRM_XE_VM_CREATE_FLAG_FAULT_MODE) }, > - { } > - }; > + const struct vm_create_section { > + const char *name; > + __u32 flags; > + } xe_vm_create_invalid_flags1[] = { > + { "xe_vm_create_fault", DRM_XE_VM_CREATE_FLAG_FAULT_MODE }, > + { } > + }; > + > + const struct vm_create_section xe_vm_create_invalid_flags2[] = { > + { "xe_vm_create_scratch_fault", > + DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE | > + DRM_XE_VM_CREATE_FLAG_FAULT_MODE }, > + { "xe_vm_create_scratch_fault_lr", > + ~(DRM_XE_VM_CREATE_FLAG_LR_MODE | > + DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE | > + DRM_XE_VM_CREATE_FLAG_FAULT_MODE) }, > + { } > + }; > > igt_fixture { > fd = drm_open_driver(DRIVER_XE); > + dev_id = intel_get_drm_devid(fd); > > xe_for_each_engine(fd, hwe) > if (hwe->engine_class != DRM_XE_ENGINE_CLASS_COPY) { > @@ -2715,11 +2721,22 @@ igt_main > } > } > > - for (const struct vm_create_section *s = xe_vm_create_invalid_flags; s->name; s++) { > + for (const struct vm_create_section *s = xe_vm_create_invalid_flags1; > + s->name; s++) { > igt_subtest_f("invalid-flag-%s", s->name) > invalid_flag(fd, s->flags); > } > > + for (const struct vm_create_section *s = xe_vm_create_invalid_flags2; > + s->name; s++) { > + igt_subtest_f("invalid-flag-%s", s->name) { > + igt_skip_on_f(IS_LUNARLAKE(dev_id) || > + IS_BATTLEMAGE(dev_id), > + "Skip test on this platform\n"); > + invalid_flag(fd, s->flags); > + } > + } > + > igt_subtest("invalid-extensions") > invalid_extensions(fd); > > -- > 2.26.3 >