From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 064B910E50A for ; Tue, 5 Sep 2023 13:33:24 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Date: Tue, 5 Sep 2023 15:33:01 +0200 Message-Id: <20230905133309.365109-2-zbigniew.kempczynski@intel.com> In-Reply-To: <20230905133309.365109-1-zbigniew.kempczynski@intel.com> References: <20230905133309.365109-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 v2 1/9] lib/intel_compute: Migrate xe_compute library to intel_compute List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: During my work on adding xe-compute support to DG2 I hit some issues on Xe driver so instead of limiting workload to Xe only I decided to handle i915 as well. Such attitude might be handy on driver feature status comparison. Patch does preparation step to share the code between i915 and Xe. Signed-off-by: Zbigniew Kempczyński Cc: Christoph Manszewski Cc: Francois Dugast Cc: Mauro Carvalho Chehab --- lib/{xe/xe_compute.c => intel_compute.c} | 18 +++++++++--------- lib/{xe/xe_compute.h => intel_compute.h} | 12 ++++++------ ...ernels.c => intel_compute_square_kernels.c} | 4 ++-- lib/meson.build | 4 ++-- tests/intel/xe_compute.c | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) rename lib/{xe/xe_compute.c => intel_compute.c} (97%) rename lib/{xe/xe_compute.h => intel_compute.h} (74%) rename lib/{xe/xe_compute_square_kernels.c => intel_compute_square_kernels.c} (97%) diff --git a/lib/xe/xe_compute.c b/lib/intel_compute.c similarity index 97% rename from lib/xe/xe_compute.c rename to lib/intel_compute.c index 3e8112a048..647bce0e43 100644 --- a/lib/xe/xe_compute.c +++ b/lib/intel_compute.c @@ -13,7 +13,7 @@ #include "lib/igt_syncobj.h" #include "lib/intel_reg.h" -#include "xe_compute.h" +#include "intel_compute.h" #include "xe/xe_ioctl.h" #include "xe/xe_query.h" @@ -453,24 +453,24 @@ static const struct { unsigned int ip_ver; void (*compute_exec)(int fd, const unsigned char *kernel, unsigned int size); -} xe_compute_batches[] = { +} compute_batches[] = { { .ip_ver = IP_VER(12, 0), .compute_exec = tgl_compute_exec, }, }; -bool run_xe_compute_kernel(int fd) +bool run_compute_kernel(int fd) { unsigned int ip_ver = intel_graphics_ver(intel_get_drm_devid(fd)); unsigned int batch; - const struct xe_compute_kernels *kernels = xe_compute_square_kernels; + const struct compute_kernels *kernels = compute_square_kernels; - for (batch = 0; batch < ARRAY_SIZE(xe_compute_batches); batch++) { - if (ip_ver == xe_compute_batches[batch].ip_ver) + for (batch = 0; batch < ARRAY_SIZE(compute_batches); batch++) { + if (ip_ver == compute_batches[batch].ip_ver) break; } - if (batch == ARRAY_SIZE(xe_compute_batches)) + if (batch == ARRAY_SIZE(compute_batches)) return false; while (kernels->kernel) { @@ -481,8 +481,8 @@ bool run_xe_compute_kernel(int fd) if (!kernels->kernel) return 1; - xe_compute_batches[batch].compute_exec(fd, kernels->kernel, - kernels->size); + compute_batches[batch].compute_exec(fd, kernels->kernel, + kernels->size); return true; } diff --git a/lib/xe/xe_compute.h b/lib/intel_compute.h similarity index 74% rename from lib/xe/xe_compute.h rename to lib/intel_compute.h index b2e7e98278..e271bb5254 100644 --- a/lib/xe/xe_compute.h +++ b/lib/intel_compute.h @@ -6,8 +6,8 @@ * Francois Dugast */ -#ifndef XE_COMPUTE_H -#define XE_COMPUTE_H +#ifndef INTEL_COMPUTE_H +#define INTEL_COMPUTE_H /* * OpenCL Kernels are generated using: @@ -19,14 +19,14 @@ * For each GPU model desired. A list of supported models can be obtained with: ocloc compile --help */ -struct xe_compute_kernels { +struct compute_kernels { int ip_ver; unsigned int size; const unsigned char *kernel; }; -extern const struct xe_compute_kernels xe_compute_square_kernels[]; +extern const struct compute_kernels compute_square_kernels[]; -bool run_xe_compute_kernel(int fd); +bool run_compute_kernel(int fd); -#endif /* XE_COMPUTE_H */ +#endif /* INTEL_COMPUTE_H */ diff --git a/lib/xe/xe_compute_square_kernels.c b/lib/intel_compute_square_kernels.c similarity index 97% rename from lib/xe/xe_compute_square_kernels.c rename to lib/intel_compute_square_kernels.c index f9c07dc778..b30d8a23dd 100644 --- a/lib/xe/xe_compute_square_kernels.c +++ b/lib/intel_compute_square_kernels.c @@ -8,7 +8,7 @@ */ #include "intel_chipset.h" -#include "lib/xe/xe_compute.h" +#include "lib/intel_compute.h" static const unsigned char tgllp_kernel_square_bin[] = { 0x61, 0x00, 0x03, 0x80, 0x20, 0x02, 0x05, 0x03, 0x04, 0x00, 0x10, 0x00, @@ -61,7 +61,7 @@ static const unsigned char tgllp_kernel_square_bin[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -const struct xe_compute_kernels xe_compute_square_kernels[] = { +const struct compute_kernels compute_square_kernels[] = { { .ip_ver = IP_VER(12, 0), .size = sizeof(tgllp_kernel_square_bin), diff --git a/lib/meson.build b/lib/meson.build index 21ea9d5ac4..a45f7d677f 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -58,6 +58,8 @@ lib_sources = [ 'intel_bufops.c', 'intel_chipset.c', 'intel_cmds_info.c', + 'intel_compute.c', + 'intel_compute_square_kernels.c', 'intel_ctx.c', 'intel_device_info.c', 'intel_mmio.c', @@ -103,8 +105,6 @@ lib_sources = [ 'veboxcopy_gen12.c', 'igt_msm.c', 'igt_dsc.c', - 'xe/xe_compute.c', - 'xe/xe_compute_square_kernels.c', 'xe/xe_gt.c', 'xe/xe_ioctl.c', 'xe/xe_query.c', diff --git a/tests/intel/xe_compute.c b/tests/intel/xe_compute.c index 2cf536701a..0c54fbec42 100644 --- a/tests/intel/xe_compute.c +++ b/tests/intel/xe_compute.c @@ -14,8 +14,8 @@ #include #include "igt.h" +#include "intel_compute.h" #include "xe/xe_query.h" -#include "xe/xe_compute.h" /** * SUBTEST: compute-square @@ -29,7 +29,7 @@ static void test_compute_square(int fd) { - igt_require_f(run_xe_compute_kernel(fd), "GPU not supported\n"); + igt_require_f(run_compute_kernel(fd), "GPU not supported\n"); } igt_main -- 2.34.1