From patchwork Tue Oct 3 13:40:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9982865 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0FC966038E for ; Tue, 3 Oct 2017 13:41:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0164B28560 for ; Tue, 3 Oct 2017 13:41:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA59428785; Tue, 3 Oct 2017 13:41:01 +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=-4.2 required=2.0 tests=BAYES_00, 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 7307828560 for ; Tue, 3 Oct 2017 13:41:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B8326E4BF; Tue, 3 Oct 2017 13:41:01 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02F086E4BF for ; Tue, 3 Oct 2017 13:40:58 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 8992357-1500050 for multiple; Tue, 03 Oct 2017 14:40:51 +0100 Received: by haswell.alporthouse.com (sSMTP sendmail emulation); Tue, 03 Oct 2017 14:40:53 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 3 Oct 2017 14:40:44 +0100 Message-Id: <20171003134045.7600-4-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171003134045.7600-1-chris@chris-wilson.co.uk> References: <20171003134045.7600-1-chris@chris-wilson.co.uk> X-Originating-IP: 78.156.65.138 X-Country: code=GB country="United Kingdom" ip=78.156.65.138 Subject: [Intel-gfx] [CI 4/5] igt/gem_workarounds: Reduce manual list to combinatorial loops X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Chris Wilson Reviewed-by: Mika Kuoppala --- tests/gem_workarounds.c | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/tests/gem_workarounds.c b/tests/gem_workarounds.c index 1c514a62..74bb11d2 100644 --- a/tests/gem_workarounds.c +++ b/tests/gem_workarounds.c @@ -215,6 +215,24 @@ static void check_workarounds(int fd, enum operation op, unsigned int flags) igt_main { int device = -1; + const struct { + const char *name; + enum operation op; + } ops[] = { + { "basic-read", SIMPLE_READ }, + { "reset", GPU_RESET }, + { "suspend-resume", SUSPEND_RESUME }, + { } + }, *op; + const struct { + const char *name; + unsigned int flags; + } modes[] = { + { "", 0 }, + { "-context", CONTEXT }, + { "-fd", FDS }, + { } + }, *m; igt_fixture { FILE *file; @@ -254,30 +272,10 @@ igt_main close(fd); } - igt_subtest("basic-read") - check_workarounds(device, SIMPLE_READ, 0); - - igt_subtest("basic-read-context") - check_workarounds(device, SIMPLE_READ, CONTEXT); - - igt_subtest("basic-read-fd") - check_workarounds(device, SIMPLE_READ, FDS); - - igt_subtest("reset") - check_workarounds(device, GPU_RESET, 0); - - igt_subtest("reset-context") - check_workarounds(device, GPU_RESET, CONTEXT); - - igt_subtest("reset-fd") - check_workarounds(device, GPU_RESET, FDS); - - igt_subtest("suspend-resume") - check_workarounds(device, SUSPEND_RESUME, 0); - - igt_subtest("suspend-resume-context") - check_workarounds(device, SUSPEND_RESUME, CONTEXT); - - igt_subtest("suspend-resume-fd") - check_workarounds(device, SUSPEND_RESUME, FDS); + for (op = ops; op->name; op++) { + for (m = modes; m->name; m++) { + igt_subtest_f("%s%s", op->name, m->name) + check_workarounds(device, op->op, m->flags); + } + } }