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 BA025C27C4F for ; Thu, 13 Jun 2024 04:31:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E335D10E0E3; Thu, 13 Jun 2024 04:31:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Cjn//8Oy"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0C7910E0E3 for ; Thu, 13 Jun 2024 04:31:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718253063; x=1749789063; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WbuJb+O5xbQqjG9/HMa1fg+isumNBEqyj4aCdBhoBFo=; b=Cjn//8Oy+rIK8skqWty2bXon52JGIk5tY+F9fZN7JPZCKy4ChBXjJ0AW +LXnDNF5WnYhxwqlMlB/+6unDW9cifyqGYBJYRNVyZ5++s+xpJOZE3URI TCvu0wY2PJMkSaQSHeq6dvVgmL+b8Q0ARWigFwjcVmD3TJ7GNNMVla26f q8JxACuEyOqjeMhdQxxMkLlCK+XR1USsv4ylwnUqjpxXpkNZQqjI5/UrF O5Q8zX/jv59kh2LmFmmQ0XJKLpiP61pUXygGmZKxR76INZkwVZRpOTQX0 Xx+/fRWwKT2bQlOe8SZVD91gTW04IeYRkzhFCAraXnCRsNfEX08wMz7vT A==; X-CSE-ConnectionGUID: 2vB/92qRRrW81kUcxDCUfQ== X-CSE-MsgGUID: 4L+LkWwgTDmCjMrr59MHvw== X-IronPort-AV: E=McAfee;i="6700,10204,11101"; a="25688063" X-IronPort-AV: E=Sophos;i="6.08,234,1712646000"; d="scan'208";a="25688063" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2024 21:31:02 -0700 X-CSE-ConnectionGUID: gi/CafHdRDGaPxjTFtjgIg== X-CSE-MsgGUID: 9mysZzPjQleTk8VsDTXOEg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,234,1712646000"; d="scan'208";a="44397688" Received: from bhanu-nuclab.iind.intel.com ([10.145.169.172]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2024 21:30:59 -0700 From: Bhanuprakash Modem To: igt-dev@lists.freedesktop.org Cc: Bhanuprakash Modem , Rob Clark , Helen Koike , Emma Anholt , Kamil Konieczny Subject: [i-g-t V3 2/3] tests/msm: Generate MSM test bins in new dir Date: Thu, 13 Jun 2024 09:53:11 +0530 Message-ID: <20240613042311.3784310-1-bhanuprakash.modem@intel.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240612070335.3758500-3-bhanuprakash.modem@intel.com> References: <20240612070335.3758500-3-bhanuprakash.modem@intel.com> MIME-Version: 1.0 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" Instead of generating MSM specific test bins at /tests/ generate them in a new dir /tests/msm/ V2: - Update commit message Cc: Rob Clark Cc: Helen Koike Cc: Emma Anholt Cc: Kamil Konieczny Signed-off-by: Bhanuprakash Modem Reviewed-by: Kamil Konieczny Acked-by: Rob Clark --- meson.build | 8 ++++++++ tests/meson.build | 19 ++----------------- tests/msm/meson.build | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 tests/msm/meson.build diff --git a/meson.build b/meson.build index 701a5cc35..6ae3c2684 100644 --- a/meson.build +++ b/meson.build @@ -276,6 +276,7 @@ includedir = get_option('includedir') libdir = get_option('libdir') libexecdir = join_paths(get_option('libexecdir'), 'igt-gpu-tools') amdgpudir = join_paths(libexecdir, 'amdgpu') +msmdir = join_paths(libexecdir, 'msm') panfrostdir = join_paths(libexecdir, 'panfrost') v3ddir = join_paths(libexecdir, 'v3d') vc4dir = join_paths(libexecdir, 'vc4') @@ -316,6 +317,12 @@ if get_option('use_rpath') endforeach amdgpudir_rpathdir = join_paths(amdgpudir_rpathdir, libdir) + msm_rpathdir = '$ORIGIN' + foreach p : msmdir.split('/') + msm_rpathdir = join_paths(msm_rpathdir, '..') + endforeach + msm_rpathdir = join_paths(msm_rpathdir, libdir) + panfrost_rpathdir = '$ORIGIN' foreach p : panfrostdir.split('/') panfrost_rpathdir = join_paths(panfrost_rpathdir, '..') @@ -343,6 +350,7 @@ else bindir_rpathdir = '' libexecdir_rpathdir = '' amdgpudir_rpathdir = '' + msm_rpathdir = '' panfrost_rpathdir = '' v3d_rpathdir = '' vc4_rpathdir = '' diff --git a/tests/meson.build b/tests/meson.build index 16896de99..122fbd07c 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -314,14 +314,6 @@ intel_xe_progs = [ 'xe_sysfs_scheduler', ] -msm_progs = [ - 'msm_mapping', - 'msm_recovery', - 'msm_shrink', - 'msm_submit', - 'msm_submitoverhead', -] - chamelium_progs = [ 'kms_chamelium_audio', 'kms_chamelium_color', @@ -424,15 +416,6 @@ foreach prog : intel_progs endif endforeach -foreach prog : msm_progs - test_executables += executable(prog, join_paths('msm', prog + '.c'), - dependencies : test_deps, - install_dir : libexecdir, - install_rpath : libexecdir_rpathdir, - install : true) - test_list += prog -endforeach - if chamelium.found() foreach prog : chamelium_progs testexe = executable(prog, @@ -457,6 +440,8 @@ endif subdir('amdgpu') +subdir('msm') + subdir('panfrost') subdir('v3d') diff --git a/tests/msm/meson.build b/tests/msm/meson.build new file mode 100644 index 000000000..74169b5b2 --- /dev/null +++ b/tests/msm/meson.build @@ -0,0 +1,16 @@ +msm_progs = [ + 'msm_mapping', + 'msm_recovery', + 'msm_shrink', + 'msm_submit', + 'msm_submitoverhead', +] + +foreach prog : msm_progs + test_executables += executable(prog, prog + '.c', + dependencies : test_deps, + install_dir : msmdir, + install_rpath : msm_rpathdir, + install : true) + test_list += join_paths('msm', prog) +endforeach -- 2.43.2