From patchwork Wed May 22 13:51:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10955881 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3D63713AD for ; Wed, 22 May 2019 13:51:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E93E28BC0 for ; Wed, 22 May 2019 13:51:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 232F028A85; Wed, 22 May 2019 13:51:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,HK_RANDOM_FROM, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C7C19285EB for ; Wed, 22 May 2019 13:51:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5059789B01; Wed, 22 May 2019 13:51:27 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 17D7989AC3; Wed, 22 May 2019 13:51:19 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 May 2019 06:51:19 -0700 X-ExtLoop1: 1 Received: from dmironox-mobl5.ccr.corp.intel.com (HELO localhost.localdomain) ([10.252.20.122]) by fmsmga008.fm.intel.com with ESMTP; 22 May 2019 06:51:18 -0700 From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Wed, 22 May 2019 14:51:03 +0100 Message-Id: <20190522135104.26930-14-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522135104.26930-1-tvrtko.ursulin@linux.intel.com> References: <20190522135104.26930-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [CI i-g-t 13/14] test/i915: gem_wait: use the gem_engine_topology library X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Andi Shyti Replace the legacy for_each_engine* defines with the ones implemented in the gem_engine_topology library. Signed-off-by: Andi Shyti Cc: Chris Wilson Reviewed-by: Tvrtko Ursulin --- tests/i915/gem_wait.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/i915/gem_wait.c b/tests/i915/gem_wait.c index ee2ecfa0d056..b5e32219d77b 100644 --- a/tests/i915/gem_wait.c +++ b/tests/i915/gem_wait.c @@ -134,7 +134,7 @@ static void basic(int fd, unsigned engine, unsigned flags) igt_main { - const struct intel_execution_engine *e; + const struct intel_execution_engine2 *e; int fd = -1; igt_skip_on_simulation(); @@ -177,27 +177,27 @@ igt_main basic(fd, ALL_ENGINES, WRITE); } - for (e = intel_execution_engines; e->name; e++) { + __for_each_physical_engine(fd, e) { igt_subtest_group { igt_subtest_f("busy-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, BUSY); + basic(fd, e->flags, BUSY); } igt_subtest_f("wait-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, 0); + basic(fd, e->flags, 0); } igt_subtest_f("await-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, AWAIT); + basic(fd, e->flags, AWAIT); } igt_subtest_f("write-busy-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, BUSY | WRITE); + basic(fd, e->flags, BUSY | WRITE); } igt_subtest_f("write-wait-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, WRITE); + basic(fd, e->flags, WRITE); } } } @@ -234,22 +234,22 @@ igt_main basic(fd, ALL_ENGINES, WRITE | HANG); } - for (e = intel_execution_engines; e->name; e++) { + __for_each_physical_engine(fd, e) { igt_subtest_f("hang-busy-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, HANG | BUSY); + basic(fd, e->flags, HANG | BUSY); } igt_subtest_f("hang-wait-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, HANG); + basic(fd, e->flags, HANG); } igt_subtest_f("hang-busy-write-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, HANG | WRITE | BUSY); + basic(fd, e->flags, HANG | WRITE | BUSY); } igt_subtest_f("hang-wait-write-%s", e->name) { gem_quiescent_gpu(fd); - basic(fd, e->exec_id | e->flags, HANG | WRITE); + basic(fd, e->flags, HANG | WRITE); } }