From patchwork Fri Aug 14 12:56:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7014801 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AE5F69F373 for ; Fri, 14 Aug 2015 12:57:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3FB5207DB for ; Fri, 14 Aug 2015 12:56:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A71CF207D2 for ; Fri, 14 Aug 2015 12:56:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 26BD88A1C2; Fri, 14 Aug 2015 05:56:58 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F8A98A1C2 for ; Fri, 14 Aug 2015 05:56:56 -0700 (PDT) Received: by wicja10 with SMTP id ja10so19753566wic.1 for ; Fri, 14 Aug 2015 05:56:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=rz8uoEMDMUgiuFDz/e6P8ksLE1cj8CPJkHkQ1C9T4U0=; b=L4uiInBhs3vBxSUbmEhPXgKQPwgfOSmqyrJTblc6zwbeR2sBtr2sts230Eb4TqHCnB kfixc1y3ynVSkaKsCe67cVS9AsynosL1EPnxKPbTMCEfNkrUmJGtz8JUNpdt0CnMl3a+ MjWVcBP9M0BDkanQsLOXsEvkv1qupjEcBeuz8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=rz8uoEMDMUgiuFDz/e6P8ksLE1cj8CPJkHkQ1C9T4U0=; b=XJLYFSUj/KU6wmUiRX7yGTtEdIDQuiWoQhItZFNh66wR7FKHvThpRXpdof7S5s/QOO GFNB/PaFB8sWOahxPmchTDE4wJHEFg63CEFKmCwzF6vmkxD0CdM6g3KC4FTBgJbbBGYr SP6seitliEb7M/diEuCJb8VAJbqvvChCvDa6M7LVcG7ynrI05TLpmKqY9Heimdl5sMgk dZMyL8/IWLyXGgHB0dj1eRd2R7zLVrl/fEsL635vVN0Ql4PIqepC//KA4BMsM4zoGOB7 RLnh+8ZPbIXwz10VpPQ2FsZ7T0iROml1h8U9ZuCuZigf0IZm/zQiFlPveQJ2tSf+VkiE Pe5Q== X-Gm-Message-State: ALoCoQl5vCsEiVZVAuMaXVs24WBOydp9ESxoskyv0P7twzHq+Tp/WsFH6F2uarzlMjikV5pgpFG5 X-Received: by 10.180.87.230 with SMTP id bb6mr6249131wib.36.1439557015039; Fri, 14 Aug 2015 05:56:55 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:22cf:30ff:fe4c:37d6]) by smtp.gmail.com with ESMTPSA id b13sm2976963wic.15.2015.08.14.05.56.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Aug 2015 05:56:54 -0700 (PDT) Date: Fri, 14 Aug 2015 14:56:52 +0200 From: Daniel Vetter To: Jesse Barnes Message-ID: <20150814125652.GP17734@phenom.ffwll.local> References: <1439497901-14310-1-git-send-email-jbarnes@virtuousgeek.org> <1439497901-14310-16-git-send-email-jbarnes@virtuousgeek.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1439497901-14310-16-git-send-email-jbarnes@virtuousgeek.org> X-Operating-System: Linux phenom 4.2.0-rc1+ User-Agent: Mutt/1.5.23 (2014-03-12) Cc: intel-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH 16/18] tests/kms_flip: add basic tests for flip, flip vs dpms, and flip modeset 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Aug 13, 2015 at 01:31:39PM -0700, Jesse Barnes wrote: > Simple variants that don't do multiple output or interruptible testing. > > Signed-off-by: Jesse Barnes > --- > tests/kms_flip.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/tests/kms_flip.c b/tests/kms_flip.c > index a595d9f..a0e4112 100644 > --- a/tests/kms_flip.c > +++ b/tests/kms_flip.c > @@ -80,6 +80,7 @@ > #define TEST_TS_CONT (1 << 27) > #define TEST_BO_TOOBIG (1 << 28) > #define TEST_HANG_ONCE (1 << 29) > +#define TEST_BASIC (1 << 30) > > #define EVENT_FLIP (1 << 0) > #define EVENT_VBLANK (1 << 1) > @@ -1649,7 +1650,7 @@ int main(int argc, char **argv) > "blt-wf_vblank-vs-modeset" }, > { 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS, > "rcs-wf_vblank-vs-modeset" }, > - > + { 30, TEST_FLIP | TEST_BASIC, "basic-plain-flip" }, I think for better coverage we should pick the timestamp checking ones here. Also we need one to cover vblank since kms_vblank can't be used. And we can do that all in one testcases to save testing time! > { 30, TEST_FLIP , "plain-flip" }, > { 30, TEST_FLIP | TEST_EBUSY , "busy-flip" }, > { 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" }, > @@ -1657,12 +1658,14 @@ int main(int argc, char **argv) > { 30, TEST_FLIP | TEST_CHECK_TS | TEST_FB_RECREATE, > "plain-flip-fb-recreate" }, > { 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" }, > + { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "basic-flip-vs-dpms" }, > { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL, "flip-vs-dpms" }, > { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_BCS, "blt-flip-vs-dpms" }, > { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_RCS, "render-flip-vs-dpms" }, > { 30, TEST_FLIP | TEST_PAN, "flip-vs-panning" }, > { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_BCS, "blt-flip-vs-panning" }, > { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_RCS, "render-flip-vs-panning" }, > + { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "basic-flip-vs-modeset" }, > { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL, "flip-vs-modeset" }, > { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_BCS, "blt-flip-vs-modeset" }, > { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_RCS, "render-flip-vs-modeset" }, > @@ -1721,6 +1724,9 @@ int main(int argc, char **argv) > igt_subtest(tests[i].name) > run_test(tests[i].duration, tests[i].flags); > > + if (tests[i].flags & TEST_BASIC) > + continue; This means you remove the tests you marked as BASIC from the 2x and interruptible sets. What about instead adding the basic prefix at runtime, i.e. for all my requests: Totally untested ;-) Cheers, Daniel diff --git a/tests/kms_flip.c b/tests/kms_flip.c index a595d9f1d69f..aaf03b07df87 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -80,6 +80,7 @@ #define TEST_TS_CONT (1 << 27) #define TEST_BO_TOOBIG (1 << 28) #define TEST_HANG_ONCE (1 << 29) +#define TEST_BASIC (1 << 31) #define EVENT_FLIP (1 << 0) #define EVENT_VBLANK (1 << 1) @@ -1650,20 +1651,20 @@ int main(int argc, char **argv) { 60, TEST_VBLANK | TEST_MODESET | TEST_WITH_DUMMY_RCS, "rcs-wf_vblank-vs-modeset" }, - { 30, TEST_FLIP , "plain-flip" }, + { 30, TEST_FLIP, "plain-flip" }, { 30, TEST_FLIP | TEST_EBUSY , "busy-flip" }, { 30, TEST_FLIP | TEST_FENCE_STRESS , "flip-vs-fences" }, { 30, TEST_FLIP | TEST_CHECK_TS, "plain-flip-ts-check" }, { 30, TEST_FLIP | TEST_CHECK_TS | TEST_FB_RECREATE, "plain-flip-fb-recreate" }, { 30, TEST_FLIP | TEST_RMFB | TEST_MODESET , "flip-vs-rmfb" }, - { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL, "flip-vs-dpms" }, + { 60, TEST_FLIP | TEST_DPMS | TEST_EINVAL | TEST_BASIC, "flip-vs-dpms" }, { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_BCS, "blt-flip-vs-dpms" }, { 60, TEST_FLIP | TEST_DPMS | TEST_WITH_DUMMY_RCS, "render-flip-vs-dpms" }, { 30, TEST_FLIP | TEST_PAN, "flip-vs-panning" }, { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_BCS, "blt-flip-vs-panning" }, { 60, TEST_FLIP | TEST_PAN | TEST_WITH_DUMMY_RCS, "render-flip-vs-panning" }, - { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL, "flip-vs-modeset" }, + { 60, TEST_FLIP | TEST_MODESET | TEST_EINVAL | TEST_BASIC, "flip-vs-modeset" }, { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_BCS, "blt-flip-vs-modeset" }, { 60, TEST_FLIP | TEST_MODESET | TEST_WITH_DUMMY_RCS, "render-flip-vs-modeset" }, { 30, TEST_FLIP | TEST_VBLANK_EXPIRED_SEQ, @@ -1671,7 +1672,7 @@ int main(int argc, char **argv) { 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_ABSOLUTE | TEST_CHECK_TS, "flip-vs-absolute-wf_vblank" }, - { 30, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS, + { 30, TEST_FLIP | TEST_VBLANK | TEST_CHECK_TS | TEST_BASIC, "flip-vs-wf_vblank" }, { 30, TEST_FLIP | TEST_VBLANK | TEST_VBLANK_BLOCK | TEST_CHECK_TS, "flip-vs-blocking-wf-vblank" }, @@ -1718,7 +1719,9 @@ int main(int argc, char **argv) test_nonblocking_read(drm_fd); for (i = 0; i < sizeof(tests) / sizeof (tests[0]); i++) { - igt_subtest(tests[i].name) + igt_subtest_f("%s%s", + tests[i].flags & TEST_BASIC ? "basic-" : "", + tests[i].name) run_test(tests[i].duration, tests[i].flags); if (tests[i].flags & TEST_NO_2X_OUTPUT)