From patchwork Fri Aug 2 07:23:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11072735 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 218BD112C for ; Fri, 2 Aug 2019 07:23:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08C7828780 for ; Fri, 2 Aug 2019 07:23:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F01A5287C9; Fri, 2 Aug 2019 07:23:39 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 933FC28780 for ; Fri, 2 Aug 2019 07:23:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389526AbfHBHXi (ORCPT ); Fri, 2 Aug 2019 03:23:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60016 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728404AbfHBHXi (ORCPT ); Fri, 2 Aug 2019 03:23:38 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E38C6F0CFF; Fri, 2 Aug 2019 07:23:37 +0000 (UTC) Received: from thuth.com (dhcp-200-228.str.redhat.com [10.33.200.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADAA960605; Fri, 2 Aug 2019 07:23:36 +0000 (UTC) From: Thomas Huth To: kvm@vger.kernel.org, Paolo Bonzini Cc: =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= , David Hildenbrand , Janosch Frank , Christian Borntraeger Subject: [kvm-unit-tests PULL 1/2] kvm-unit-tests: s390: add cpu model checks Date: Fri, 2 Aug 2019 09:23:28 +0200 Message-Id: <20190802072329.8276-2-thuth@redhat.com> In-Reply-To: <20190802072329.8276-1-thuth@redhat.com> References: <20190802072329.8276-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 02 Aug 2019 07:23:37 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Christian Borntraeger This adds a check for documented stfle dependencies. Signed-off-by: Christian Borntraeger Reviewed-by: Thomas Huth Reviewed-by: Janosch Frank [thuth: Added missing report_prefix_pop() at the end] Signed-off-by: Thomas Huth --- s390x/Makefile | 1 + s390x/cpumodel.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ s390x/unittests.cfg | 3 +++ 3 files changed, 64 insertions(+) create mode 100644 s390x/cpumodel.c diff --git a/s390x/Makefile b/s390x/Makefile index 1f21ddb..574a9a2 100644 --- a/s390x/Makefile +++ b/s390x/Makefile @@ -11,6 +11,7 @@ tests += $(TEST_DIR)/cmm.elf tests += $(TEST_DIR)/vector.elf tests += $(TEST_DIR)/gs.elf tests += $(TEST_DIR)/iep.elf +tests += $(TEST_DIR)/cpumodel.elf tests_binary = $(patsubst %.elf,%.bin,$(tests)) all: directories test_cases test_cases_binary diff --git a/s390x/cpumodel.c b/s390x/cpumodel.c new file mode 100644 index 0000000..3811ee1 --- /dev/null +++ b/s390x/cpumodel.c @@ -0,0 +1,60 @@ +/* + * Test the known dependencies for facilities + * + * Copyright 2019 IBM Corp. + * + * Authors: + * Christian Borntraeger + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU Library General Public License version 2. + */ + +#include + +static int dep[][2] = { + /* from SA22-7832-11 4-98 facility indications */ + { 4, 3 }, + { 5, 3 }, + { 5, 4 }, + { 19, 18 }, + { 37, 42 }, + { 43, 42 }, + { 73, 49 }, + { 134, 129 }, + { 135, 129 }, + { 139, 25 }, + { 139, 28 }, + { 146, 76 }, + /* indirectly documented in description */ + { 78, 8 }, /* EDAT */ + /* new dependencies from gen15 */ + { 61, 45 }, + { 148, 129 }, + { 148, 135 }, + { 152, 129 }, + { 152, 134 }, + { 155, 76 }, + { 155, 77 }, +}; + +int main(void) +{ + int i; + + report_prefix_push("cpumodel"); + + report_prefix_push("dependency"); + for (i = 0; i < ARRAY_SIZE(dep); i++) { + if (test_facility(dep[i][0])) { + report("%d implies %d", test_facility(dep[i][1]), + dep[i][0], dep[i][1]); + } else { + report_skip("facility %d not present", dep[i][0]); + } + } + report_prefix_pop(); + + report_prefix_pop(); + return report_summary(); +} diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg index 546b1f2..db58bad 100644 --- a/s390x/unittests.cfg +++ b/s390x/unittests.cfg @@ -61,3 +61,6 @@ file = gs.elf [iep] file = iep.elf + +[cpumodel] +file = cpumodel.elf From patchwork Fri Aug 2 07:23:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11072737 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 37FE813A4 for ; Fri, 2 Aug 2019 07:23:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E42B28780 for ; Fri, 2 Aug 2019 07:23:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 122FB287C9; Fri, 2 Aug 2019 07:23:41 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6C5428780 for ; Fri, 2 Aug 2019 07:23:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389534AbfHBHXk (ORCPT ); Fri, 2 Aug 2019 03:23:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51950 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389520AbfHBHXj (ORCPT ); Fri, 2 Aug 2019 03:23:39 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6454D30EA185; Fri, 2 Aug 2019 07:23:39 +0000 (UTC) Received: from thuth.com (dhcp-200-228.str.redhat.com [10.33.200.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30D0460925; Fri, 2 Aug 2019 07:23:38 +0000 (UTC) From: Thomas Huth To: kvm@vger.kernel.org, Paolo Bonzini Cc: =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= , David Hildenbrand , Janosch Frank , Christian Borntraeger Subject: [kvm-unit-tests PULL 2/2] Force GCC version to 8.2 for compiling the ARM tests Date: Fri, 2 Aug 2019 09:23:29 +0200 Message-Id: <20190802072329.8276-3-thuth@redhat.com> In-Reply-To: <20190802072329.8276-1-thuth@redhat.com> References: <20190802072329.8276-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 02 Aug 2019 07:23:39 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The kvm-unit-tests are currently completely failing with GCC 9.1. So let's use GCC 8.2 again for compiling the ARM tests to fix the CI pipelines on gitlab. Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9dc16a..fbf3328 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ build-aarch64: build-arm: script: - - dnf install -y qemu-system-arm gcc-arm-linux-gnu + - dnf install -y qemu-system-arm gcc-arm-linux-gnu-8.2.1-1.fc30.2 - ./configure --arch=arm --cross-prefix=arm-linux-gnu- - make -j2 - ACCEL=tcg ./run_tests.sh