From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6785010E137 for ; Mon, 11 Sep 2023 06:04:02 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Date: Mon, 11 Sep 2023 08:03:38 +0200 Message-Id: <20230911060345.324372-3-zbigniew.kempczynski@intel.com> In-Reply-To: <20230911060345.324372-1-zbigniew.kempczynski@intel.com> References: <20230911060345.324372-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t v3 2/9] lib/intel_compute: Add compatibility flags for running compute List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Allow selectively turn on/off compute tests on both i915 and xe drivers. Signed-off-by: Zbigniew Kempczyński Cc: Christoph Manszewski Cc: Francois Dugast Cc: Mauro Carvalho Chehab Acked-by: Mauro Carvalho Chehab --- lib/intel_compute.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/intel_compute.c b/lib/intel_compute.c index c0f5b1c937..9766dc127b 100644 --- a/lib/intel_compute.c +++ b/lib/intel_compute.c @@ -445,17 +445,27 @@ static void tgl_compute_exec(int fd, const unsigned char *kernel, } /* - * Generic code + * Compatibility flags. + * + * There will be some time period in which both drivers (i915 and xe) + * will support compute runtime tests. Lets define compat flags to allow + * the code to be shared between two drivers allowing disabling this in + * the future. */ +#define COMPAT_FLAG(f) (1 << (f)) +#define COMPAT_I915 COMPAT_FLAG(INTEL_DRIVER_I915) +#define COMPAT_XE COMPAT_FLAG(INTEL_DRIVER_XE) static const struct { unsigned int ip_ver; void (*compute_exec)(int fd, const unsigned char *kernel, unsigned int size); + uint32_t compat; } intel_compute_batches[] = { { .ip_ver = IP_VER(12, 0), .compute_exec = tgl_compute_exec, + .compat = COMPAT_I915 | COMPAT_XE, }, }; @@ -464,6 +474,7 @@ bool run_intel_compute_kernel(int fd) unsigned int ip_ver = intel_graphics_ver(intel_get_drm_devid(fd)); unsigned int batch; const struct intel_compute_kernels *kernels = intel_compute_square_kernels; + enum intel_driver driver = get_intel_driver(fd); for (batch = 0; batch < ARRAY_SIZE(intel_compute_batches); batch++) { if (ip_ver == intel_compute_batches[batch].ip_ver) @@ -472,6 +483,12 @@ bool run_intel_compute_kernel(int fd) if (batch == ARRAY_SIZE(intel_compute_batches)) return false; + if (!(COMPAT_FLAG(driver) & intel_compute_batches[batch].compat)) { + igt_debug("driver flag: %x\n", COMPAT_FLAG(driver)); + igt_debug("compat flag: %x\n", intel_compute_batches[batch].compat); + return false; + } + while (kernels->kernel) { if (ip_ver == kernels->ip_ver) break; -- 2.34.1