From patchwork Wed Jun 17 16:01:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 11610195 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ECC5314E3 for ; Wed, 17 Jun 2020 16:02:10 +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 D573D2088E for ; Wed, 17 Jun 2020 16:02:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D573D2088E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8596B6E8DB; Wed, 17 Jun 2020 16:02:09 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id A2FEC6E8DB for ; Wed, 17 Jun 2020 16:02:07 +0000 (UTC) IronPort-SDR: 0xsgJDYXVo27qtdBczdW+jNEmqF8p6RTYTTEERwvEStBqkQeHEN1na3tIy5GW2zWa/Dz+xC2QO 1p/e5Txk6qYw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2020 09:01:44 -0700 IronPort-SDR: EX3Dh+3yjIk1dcx1w/C5L3h6dYsXwprqwqBeP8w5pXKDPGY4Z/mP0qhMuT72OtfmEixKcK7Kx1 UVtCqkHDIuNA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,523,1583222400"; d="scan'208";a="421186218" Received: from aabdelhi-mobl.ger.corp.intel.com (HELO localhost.localdomain) ([10.255.197.210]) by orsmga004.jf.intel.com with ESMTP; 17 Jun 2020 09:01:42 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Wed, 17 Jun 2020 17:01:19 +0100 Message-Id: <20200617160120.16555-10-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200617160120.16555-1-tvrtko.ursulin@linux.intel.com> References: <20200617160120.16555-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 09/10] gem_wsim: Implement device selection 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Tvrtko Ursulin New command line options -L and -D can respectively be used to list and select a GPU when more than one is present. Signed-off-by: Tvrtko Ursulin --- benchmarks/gem_wsim.c | 62 +++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c index 96ee923fb699..ca07b670bd42 100644 --- a/benchmarks/gem_wsim.c +++ b/benchmarks/gem_wsim.c @@ -43,6 +43,7 @@ #include #include +#include "igt_device_scan.h" #include "intel_chipset.h" #include "intel_reg.h" #include "drm.h" @@ -2593,7 +2594,9 @@ static void print_help(void) " -S Synchronize the sequence of random batch durations between\n" " clients.\n" " -d Sync between data dependencies in userspace.\n" -" -f Scale factor for batch durations." +" -f Scale factor for batch durations.\n" +" -L List GPUs.\n" +" -D One of the GPUs from -L." ); } @@ -2654,30 +2657,31 @@ int main(int argc, char **argv) char *append_workload_arg = NULL; struct w_arg *w_args = NULL; unsigned int tolerance_pct = 1; + enum igt_devices_print_type printtype = IGT_PRINT_SIMPLE; + bool list_devices_arg = false; int exitcode = EXIT_FAILURE; + struct igt_device_card card; double scale_arg = 1.0f; + char *device_arg = NULL; int prio = 0; double t; - int i, c; + int i, c, ret; char *subopts, *value; int raw_number = 0; long calib_val; int eng; - /* - * Open the device via the low-level API so we can do the GPU quiesce - * manually as close as possible in time to the start of the workload. - * This minimizes the gap in engine utilization tracking when observed - * via external tools like trace.pl. - */ - fd = __drm_open_driver_render(DRIVER_INTEL); - igt_require(fd); - master_prng = time(NULL); while ((c = getopt(argc, argv, - "ThqvsSdc:n:r:w:W:a:t:p:I:f:")) != -1) { + "LThqvsSdc:n:r:w:W:a:t:p:I:f:D:")) != -1) { switch (c) { + case 'L': + list_devices_arg = true; + break; + case 'D': + device_arg = strdup(optarg); + break; case 'W': if (master_workload >= 0) { wsim_err("Only one master workload can be given!\n"); @@ -2798,6 +2802,33 @@ int main(int argc, char **argv) } } + + igt_devices_scan(false); + + if (list_devices_arg) { + igt_devices_print(printtype); + return EXIT_SUCCESS; + } + + if (device_arg) { + ret = igt_device_card_match(device_arg, &card); + if (!ret) { + wsim_err("Requested device %s not found!\n", device_arg); + free(device_arg); + + return EXIT_FAILURE; + } + free(device_arg); + } else { + igt_device_find_first_i915_discrete_card(&card); + } + + if (card.render[0]) + fd = igt_open_render(&card); + else + fd = __drm_open_driver_render(DRIVER_INTEL); + igt_require(fd); + if (!has_nop_calibration) { if (verbose > 1) { printf("Calibrating nop delays with %u%% tolerance...\n", @@ -2908,15 +2939,12 @@ int main(int argc, char **argv) clock_gettime(CLOCK_MONOTONIC, &t_start); for (i = 0; i < clients; i++) { - int ret; - ret = pthread_create(&w[i]->thread, NULL, run_workload, w[i]); igt_assert_eq(ret, 0); } if (master_workload >= 0) { - int ret = pthread_join(w[master_workload]->thread, NULL); - + ret = pthread_join(w[master_workload]->thread, NULL); igt_assert(ret == 0); for (i = 0; i < clients; i++) @@ -2925,7 +2953,7 @@ int main(int argc, char **argv) for (i = 0; i < clients; i++) { if (master_workload != i) { - int ret = pthread_join(w[i]->thread, NULL); + ret = pthread_join(w[i]->thread, NULL); igt_assert(ret == 0); } }