From patchwork Fri Mar 22 20:03:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 10866487 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 445EE1575 for ; Fri, 22 Mar 2019 20:10:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2ADAA2A93C for ; Fri, 22 Mar 2019 20:10:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B5BE2A99F; Fri, 22 Mar 2019 20:10:11 +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=-2.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,FROM_LOCAL_NOVOWEL,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8B95F2A93C for ; Fri, 22 Mar 2019 20:10:10 +0000 (UTC) Received: from localhost ([127.0.0.1]:34102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7QUT-0005gY-3r for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Mar 2019 16:10:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7QT7-0004Gb-NQ for qemu-devel@nongnu.org; Fri, 22 Mar 2019 16:08:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7QOG-0006mQ-AR for qemu-devel@nongnu.org; Fri, 22 Mar 2019 16:03:45 -0400 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]:37340) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h7QNm-0005ku-UB for qemu-devel@nongnu.org; Fri, 22 Mar 2019 16:03:41 -0400 Received: by mail-lj1-x230.google.com with SMTP id v13so3077055ljk.4 for ; Fri, 22 Mar 2019 13:03:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/DHS++b9Tqf2ShcmSmVyoUdyye9IaDgY1xHQ8izW4D0=; b=XuMrvTgK9qu88hdZrsBH/ccGAPXJvgluf3/OG5V4ThJoNkKGD5A81EnTy1h8Rm0jLt yBPVFUKrPsoudqOLycm5u5Wncwkv4AKRUD0k1/g7hxOBJcWZWywMJ+/wj6PzKaSndqAN meh2a1Xkn8QZpRjvaSxZ6/Zglsie7KELd1MpkSsiD6FqCH8wLjr9PW9lsoU8QPMjxxRE WlltC0EpLBXs0wnHlBVSF+xBx2/OOSCB+1GmzpURnKsCANRjlL4qJpGrXCuj3gjWfjbD unaMOKot+48WYjzPoP+MrmCGnvAIB5whH4N4dU9fC1fGOIln8k5M8Ic2PiCkgff/iq6O o+6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/DHS++b9Tqf2ShcmSmVyoUdyye9IaDgY1xHQ8izW4D0=; b=naj+NvEQh/j0SJlgyDLTfhBvDdk/J+Dx0a/u2mvkVfS22Sv67XsyGind0oR5wArqon 9MB+kZn4OZz4VZvEdCcNM5Cc8B52YzS1uaN6GbpLNt4v5qPFfI2vL1BnLB1iO/6KV/wx VFCNitQ04L+XVZw7mQ2oM5AMPae9GdPSL2GykYcMUfzv1Q1ov2gTXxiF9CzspUXYluz+ TLu7bODlON1fTSRXG//MeVOTbL5WuF47/hHNJeqcLL9pS2BR9S5qsU9OOnNbM30u+/RG lyE9eFV6E354P81QNVk8lMsfIwTgXs+2A+wD1jpQ+YjH0AzVILIl94cqXysDyXqXo9Tg CU5w== X-Gm-Message-State: APjAAAX/U6KAz//RXyJMVcAtzCRg4qBJZfqa8UpCXF75JozHRZ8mJ5N5 K8k+m0J685D6K6xIAxPBvJjlL4sgDWs= X-Google-Smtp-Source: APXvYqz5vJwWhNjoM23hACCmHMnuV10qG2ZDw617P2SLJ+WEKz0b9RuWgnfCiO1V87icyRRI+inJlQ== X-Received: by 2002:a2e:9e57:: with SMTP id g23mr6339493ljk.124.1553284993346; Fri, 22 Mar 2019 13:03:13 -0700 (PDT) Received: from octofox.cadence.com (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id b26sm1873704lfa.47.2019.03.22.13.03.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 13:03:12 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Fri, 22 Mar 2019 13:03:00 -0700 Message-Id: <20190322200300.14325-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::230 Subject: [Qemu-devel] [PATCH] tests/tcg/xtensa: clean up test set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Drop test_fail: we know that exit simcall works. Now that it's not run automatically there's no point in keeping it. Drop test_pipeline: we're not modeling pipeline, we don't control ccount and there's no plan to do so. Enable test_boolean: it won't break on cores without boolean option, it will do testing on cores with boolean option. Signed-off-by: Max Filippov --- tests/tcg/xtensa/Makefile.softmmu-target | 2 +- tests/tcg/xtensa/test_fail.S | 9 -- tests/tcg/xtensa/test_pipeline.S | 157 ------------------------------- 3 files changed, 1 insertion(+), 167 deletions(-) delete mode 100644 tests/tcg/xtensa/test_fail.S delete mode 100644 tests/tcg/xtensa/test_pipeline.S diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target index 86bb47db775b..8212d96b81de 100644 --- a/tests/tcg/xtensa/Makefile.softmmu-target +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -8,7 +8,7 @@ XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa XTENSA_ALL = $(filter-out $(XTENSA_SRC)/linker.ld.S,$(wildcard $(XTENSA_SRC)/*.S)) XTENSA_TESTS = $(patsubst $(XTENSA_SRC)/%.S, %, $(XTENSA_ALL)) # Filter out common blobs and broken tests -XTENSA_BROKEN_TESTS = crt vectors test_boolean test_pipeline test_fail +XTENSA_BROKEN_TESTS = crt vectors XTENSA_USABLE_TESTS = $(filter-out $(XTENSA_BROKEN_TESTS), $(XTENSA_TESTS)) # add to the list of tests diff --git a/tests/tcg/xtensa/test_fail.S b/tests/tcg/xtensa/test_fail.S deleted file mode 100644 index 1c26d5079038..000000000000 --- a/tests/tcg/xtensa/test_fail.S +++ /dev/null @@ -1,9 +0,0 @@ -#include "macros.inc" - -test_suite fail - -test fail - test_fail -test_end - -test_suite_end diff --git a/tests/tcg/xtensa/test_pipeline.S b/tests/tcg/xtensa/test_pipeline.S deleted file mode 100644 index f418c11974aa..000000000000 --- a/tests/tcg/xtensa/test_pipeline.S +++ /dev/null @@ -1,157 +0,0 @@ -#include "macros.inc" - -.purgem test -.macro test name - movi a2, 1f - movi a3, 99f -0: - ipf a2, 0 - ipf a2, 4 - ipf a2, 8 - ipf a2, 12 - addi a2, a2, 16 - blt a2, a3, 0b - j 1f - .align 4 -1: -.endm - -test_suite pipeline - -test register_no_stall - rsr a3, ccount - add a5, a6, a6 - add a6, a5, a5 - rsr a4, ccount - sub a3, a4, a3 - assert eqi, a3, 3 -test_end - -test register_stall - l32i a5, a1, 0 /* data cache preload */ - nop - rsr a3, ccount - l32i a5, a1, 0 - add a6, a5, a5 /* M-to-E interlock */ - rsr a4, ccount - sub a3, a4, a3 - assert eqi, a3, 4 -test_end - -test j0_stall - rsr a3, ccount - j 1f /* E + 2-cycle penalty */ -1: - rsr a4, ccount /* E */ - sub a3, a4, a3 - assert eqi, a3, 4 -test_end - -test j1_stall - rsr a3, ccount - j 1f - nop -1: - rsr a4, ccount - sub a3, a4, a3 - assert eqi, a3, 4 -test_end - -test j5_stall - rsr a3, ccount - j 1f - nop - nop - nop - nop - nop -1: - rsr a4, ccount - sub a3, a4, a3 - assert eqi, a3, 4 -test_end - -test b_no_stall - movi a5, 1 - rsr a3, ccount - beqi a5, 2, 1f - rsr a4, ccount - sub a3, a4, a3 - assert eqi, a3, 2 -1: -test_end - -test b1_stall - movi a5, 1 - rsr a3, ccount - beqi a5, 1, 1f - nop -1: - rsr a4, ccount - sub a3, a4, a3 - assert eqi, a3, 4 -test_end - -test b5_stall - movi a5, 1 - rsr a3, ccount - beqi a5, 1, 1f - nop - nop - nop - nop - nop -1: - rsr a4, ccount - sub a3, a4, a3 - assert eqi, a3, 4 -test_end - -/* PS *SYNC */ - -test ps_dsync - rsr a5, ps - isync - rsr a3, ccount - wsr a5, ps - dsync - rsr a4, ccount - sub a3, a4, a3 - assert eqi, a3, 5 -test_end - -test ps_esync - rsr a5, ps - isync - rsr a3, ccount - wsr a5, ps - esync - rsr a4, ccount - sub a3, a4, a3 - assert eqi, a3, 5 -test_end - -test ps_rsync - rsr a5, ps - isync - rsr a3, ccount - wsr a5, ps - rsync - rsr a4, ccount - sub a3, a4, a3 - assert eqi, a3, 5 -test_end - -test ps_isync - rsr a5, ps - isync - rsr a3, ccount - wsr a5, ps - isync - rsr a4, ccount - sub a3, a4, a3 - movi a4, 9 - assert eq, a3, a4 -test_end - -test_suite_end