From nobody Sun May 19 09:42:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678716741; cv=none; d=zohomail.com; s=zohoarc; b=KWe16gVCybvyOFvhLswAHNIh5Wtv0SlohY/h9RaiiUVE5bv1CyFB0NFKktCKQrudZy4usBi1jgQOcEIom3V0MQczfiRz/excON3G1h26QeSw+P1wEmitNdyvk7nsERF4h+QrKRDX1oApBoPhA6wSTuBtwV9PJk61ZadltG/bJCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678716741; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o/i0rcKiB/Lm+gIKa6w8fX6K4qK1bqkU/Vy5l2Ma27g=; b=hYGFSyKdxg8UZmAM1aur1rN7T8IvPUaK5t1ryUDauCoJpy9cwFViGCdgem8XBkbM1GMzbuKZmMr3ur+cDQEEWt2jlgWhpA+VVCE5/O3rDEDaTfhgF9/DFTe/o5SfBQXU0JykjbEuuJ8wnpXQTPvs6n/wuJDJLu5Gv86BS55iFdI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678716741589129.4492566229336; Mon, 13 Mar 2023 07:12:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbitN-0005YP-9X; Mon, 13 Mar 2023 10:11:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbitK-0005VD-M8 for qemu-devel@nongnu.org; Mon, 13 Mar 2023 10:11:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbitG-0006bw-7g for qemu-devel@nongnu.org; Mon, 13 Mar 2023 10:11:10 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-467-6KFzix50MH-LMc5AEYTT8w-1; Mon, 13 Mar 2023 10:11:01 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 02EEF857A84; Mon, 13 Mar 2023 14:11:01 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E60A1121315; Mon, 13 Mar 2023 14:10:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678716665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o/i0rcKiB/Lm+gIKa6w8fX6K4qK1bqkU/Vy5l2Ma27g=; b=iL0hW3fiuWJ1VBHmYDIWvCajzblXxXfKTXb65usQA8mKpBzmVZ4rAiQXB4JwVHjqge4TtE It8YgorF0h733Y4FcgPw92BB8pGXDyqjJd9+Z3Q0Mt6YDYvZPHPO8pfZyw8jeNHVAljItN lhtoQTHm4Xk3Z6MZNAbaCDbZ7FFECus= X-MC-Unique: 6KFzix50MH-LMc5AEYTT8w-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 1/5] tests/migration: Tweek auto converge limits check Date: Mon, 13 Mar 2023 15:10:53 +0100 Message-Id: <20230313141057.230810-2-thuth@redhat.com> In-Reply-To: <20230313141057.230810-1-thuth@redhat.com> References: <20230313141057.230810-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678716742281100001 From: "Dr. David Alan Gilbert" Thomas found an autoconverge test failure where the migration completed before the autoconverge had kicked in. To try and avoid this again: a) Reduce the usleep in test_migrate_auto_converge so that it should exit quicker when autoconverge kicks in b) Make the loop exit immediately rather than have the sleep when it does start autoconverge, otherwise the autoconverge might succeed during the sleep. c) Reduce inc_pct so auto converge happens more slowly d) Reduce the max-bandwidth in migrate_ensure_non_converge to make the ensure more ensure. Signed-off-by: Dr. David Alan Gilbert Message-Id: <20230306152612.52291-1-dgilbert@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- tests/qtest/migration-test.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index d4ab3934ed..75d4f1d4a9 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -408,8 +408,8 @@ static void migrate_set_parameter_str(QTestState *who, = const char *parameter, =20 static void migrate_ensure_non_converge(QTestState *who) { - /* Can't converge with 1ms downtime + 30 mbs bandwidth limit */ - migrate_set_parameter_int(who, "max-bandwidth", 30 * 1000 * 1000); + /* Can't converge with 1ms downtime + 3 mbs bandwidth limit */ + migrate_set_parameter_int(who, "max-bandwidth", 3 * 1000 * 1000); migrate_set_parameter_int(who, "downtime-limit", 1); } =20 @@ -1808,7 +1808,7 @@ static void test_migrate_auto_converge(void) * E.g., with 1Gb/s bandwith migration may pass without throttling, * so we need to decrease a bandwidth. */ - const int64_t init_pct =3D 5, inc_pct =3D 50, max_pct =3D 95; + const int64_t init_pct =3D 5, inc_pct =3D 25, max_pct =3D 95; =20 if (test_migrate_start(&from, &to, uri, &args)) { return; @@ -1835,13 +1835,16 @@ static void test_migrate_auto_converge(void) =20 /* Wait for throttling begins */ percentage =3D 0; - while (percentage =3D=3D 0) { + do { percentage =3D read_migrate_property_int(from, "cpu-throttle-perce= ntage"); - usleep(100); + if (percentage !=3D 0) { + break; + } + usleep(20); g_assert_false(got_stop); - } - /* The first percentage of throttling should be equal to init_pct */ - g_assert_cmpint(percentage, =3D=3D, init_pct); + } while (true); + /* The first percentage of throttling should be at least init_pct */ + g_assert_cmpint(percentage, >=3D, init_pct); /* Now, when we tested that throttling works, let it converge */ migrate_ensure_converge(from); =20 --=20 2.31.1 From nobody Sun May 19 09:42:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678716767; cv=none; d=zohomail.com; s=zohoarc; b=lV0sD47BY1jALstDrmQmVcuJvO8Rph8mCohG3/qAPJr9VW2iuyUX2esN/34QKi1MI/BXHTyYQsUvRAIO8efGU9LAbWQdAprhxKblc32TicMZYTi1tlkjXZIYatO6lqsAjtXsR7c8GBO/3eLsubRFzAi5nMRxyf5AIOi8XqUOOTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678716767; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AKoYq+TnT9lsTglOxR3ZZ0c05Xmu/JVSt9SeN3s7wn0=; b=DiM+tmz2ELIbJwDsaYWjosOF2BkqynwXdEyRzD0/fABFdu7PAIddSwglxXADjLM6P8aqWJDavbgb6K0pBF2wvNS97FvZBNZAqeXFUN+O/L5Sm85mr5dga65pzEZmalzm14UpXc2cc8BNnImCIZDr9nFNU70D3r7ZxdWNi6gCEbY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678716767793515.943953858134; Mon, 13 Mar 2023 07:12:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbitN-0005Xh-0Q; Mon, 13 Mar 2023 10:11:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbitK-0005VG-O2 for qemu-devel@nongnu.org; Mon, 13 Mar 2023 10:11:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbitG-0006c5-Oq for qemu-devel@nongnu.org; Mon, 13 Mar 2023 10:11:10 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-261-MikgCgCeMg-4zNxxWN6Tbg-1; Mon, 13 Mar 2023 10:11:02 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 276F63C0F237; Mon, 13 Mar 2023 14:11:02 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43F841121315; Mon, 13 Mar 2023 14:11:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678716666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AKoYq+TnT9lsTglOxR3ZZ0c05Xmu/JVSt9SeN3s7wn0=; b=Gp5GwdVZfaOktRmOjd2KSdm2MyRwExGKBzGYfqSGH3cVDmwjFTKlWji3Z7gqF2StysBlAy h9a0zB+RhDmf6VUxpoFu/V9ePwlP4+lf2n8dslzAk5ntiC7Bw1VYh1hV401nmFgC1+t/Hd kc+aSQN3kc7arXAnOVkQQaxkckA8BS4= X-MC-Unique: MikgCgCeMg-4zNxxWN6Tbg-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt Subject: [PULL 2/5] gitlab-ci: Remove job building EDK2 firmware binaries Date: Mon, 13 Mar 2023 15:10:54 +0100 Message-Id: <20230313141057.230810-3-thuth@redhat.com> In-Reply-To: <20230313141057.230810-1-thuth@redhat.com> References: <20230313141057.230810-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678716768436100001 From: Philippe Mathieu-Daud=C3=A9 When we introduced this Gitlab-CI job in commit 71920809ce ("gitlab-ci.yml: Add jobs to build EDK2 firmware binaries"), the naive plan was to have reproducible binaries by downloading what this job would build, testing it and eventually committing it. With retrospective, nothing happened 3 years later and this job is just bitrotting: Step 1/3 : FROM ubuntu:18.04 18.04: Pulling from library/ubuntu mediaType in manifest should be 'application/vnd.docker.distribution.manifest.v2+json' not 'application/vnd.oci.image.manifest.v1+json' Remove this job to avoid wasting maintenance and CI ressources. Reported-by: Palmer Dabbelt Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20230310133247.39268-1-philmd@linaro.org> Signed-off-by: Thomas Huth --- MAINTAINERS | 2 - .gitlab-ci.d/edk2.yml | 85 ----------------------------------- .gitlab-ci.d/edk2/Dockerfile | 27 ----------- .gitlab-ci.d/qemu-project.yml | 1 - 4 files changed, 115 deletions(-) delete mode 100644 .gitlab-ci.d/edk2.yml delete mode 100644 .gitlab-ci.d/edk2/Dockerfile diff --git a/MAINTAINERS b/MAINTAINERS index 95c957d587..d51ddee0b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3344,8 +3344,6 @@ F: roms/edk2 F: roms/edk2-* F: tests/data/uefi-boot-images/ F: tests/uefi-test-tools/ -F: .gitlab-ci.d/edk2.yml -F: .gitlab-ci.d/edk2/ =20 VT-d Emulation M: Michael S. Tsirkin diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml deleted file mode 100644 index 314e101745..0000000000 --- a/.gitlab-ci.d/edk2.yml +++ /dev/null @@ -1,85 +0,0 @@ -# All jobs needing docker-edk2 must use the same rules it uses. -.edk2_job_rules: - rules: - # Forks don't get pipelines unless QEMU_CI=3D1 or QEMU_CI=3D2 is set - - if: '$QEMU_CI !=3D "1" && $QEMU_CI !=3D "2" && $CI_PROJECT_NAMESPACE= !=3D "qemu-project"' - when: never - - # In forks, if QEMU_CI=3D1 is set, then create manual job - # if any of the files affecting the build are touched - - if: '$QEMU_CI =3D=3D "1" && $CI_PROJECT_NAMESPACE !=3D "qemu-project= "' - changes: - - .gitlab-ci.d/edk2.yml - - .gitlab-ci.d/edk2/Dockerfile - - roms/edk2/* - when: manual - - # In forks, if QEMU_CI=3D1 is set, then create manual job - # if the branch/tag starts with 'edk2' - - if: '$QEMU_CI =3D=3D "1" && $CI_PROJECT_NAMESPACE !=3D "qemu-project= " && $CI_COMMIT_REF_NAME =3D~ /^edk2/' - when: manual - - # In forks, if QEMU_CI=3D1 is set, then create manual job - # if last commit msg contains 'EDK2' (case insensitive) - - if: '$QEMU_CI =3D=3D "1" && $CI_PROJECT_NAMESPACE !=3D "qemu-project= " && $CI_COMMIT_MESSAGE =3D~ /edk2/i' - when: manual - - # Run if any files affecting the build output are touched - - changes: - - .gitlab-ci.d/edk2.yml - - .gitlab-ci.d/edk2/Dockerfile - - roms/edk2/* - when: on_success - - # Run if the branch/tag starts with 'edk2' - - if: '$CI_COMMIT_REF_NAME =3D~ /^edk2/' - when: on_success - - # Run if last commit msg contains 'EDK2' (case insensitive) - - if: '$CI_COMMIT_MESSAGE =3D~ /edk2/i' - when: on_success - -docker-edk2: - extends: .edk2_job_rules - stage: containers - image: docker:19.03.1 - services: - - docker:19.03.1-dind - variables: - GIT_DEPTH: 3 - IMAGE_TAG: $CI_REGISTRY_IMAGE:edk2-cross-build - # We don't use TLS - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" - before_script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGIS= TRY - script: - - docker pull $IMAGE_TAG || true - - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_CO= MMIT_SHA - --tag $IMAGE_TAG .gitlab-ci.d/e= dk2 - - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - - docker push $IMAGE_TAG - -build-edk2: - extends: .edk2_job_rules - stage: build - needs: ['docker-edk2'] - artifacts: - paths: # 'artifacts.zip' will contains the following files: - - pc-bios/edk2*bz2 - - pc-bios/edk2-licenses.txt - - edk2-stdout.log - - edk2-stderr.log - image: $CI_REGISTRY_IMAGE:edk2-cross-build - variables: - GIT_DEPTH: 3 - script: # Clone the required submodules and build EDK2 - - git submodule update --init roms/edk2 - - git -C roms/edk2 submodule update --init -- - ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 - BaseTools/Source/C/BrotliCompress/brotli - CryptoPkg/Library/OpensslLib/openssl - MdeModulePkg/Library/BrotliCustomDecompressLib/brotli - - export JOBS=3D$(($(getconf _NPROCESSORS_ONLN) + 1)) - - echo "=3D=3D=3D Using ${JOBS} simultaneous jobs =3D=3D=3D" - - make -j${JOBS} -C roms efi 2>&1 1>edk2-stdout.log | tee -a edk2-stde= rr.log >&2 diff --git a/.gitlab-ci.d/edk2/Dockerfile b/.gitlab-ci.d/edk2/Dockerfile deleted file mode 100644 index bbe50ff832..0000000000 --- a/.gitlab-ci.d/edk2/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# -# Docker image to cross-compile EDK2 firmware binaries -# -FROM ubuntu:18.04 - -MAINTAINER Philippe Mathieu-Daud=C3=A9 - -# Install packages required to build EDK2 -RUN apt update \ - && \ - \ - DEBIAN_FRONTEND=3Dnoninteractive \ - apt install --assume-yes --no-install-recommends \ - build-essential \ - ca-certificates \ - dos2unix \ - gcc-aarch64-linux-gnu \ - gcc-arm-linux-gnueabi \ - git \ - iasl \ - make \ - nasm \ - python3 \ - uuid-dev \ - && \ - \ - rm -rf /var/lib/apt/lists/* diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml index 691d9bf5dc..a7ed447fe4 100644 --- a/.gitlab-ci.d/qemu-project.yml +++ b/.gitlab-ci.d/qemu-project.yml @@ -4,7 +4,6 @@ include: - local: '/.gitlab-ci.d/base.yml' - local: '/.gitlab-ci.d/stages.yml' - - local: '/.gitlab-ci.d/edk2.yml' - local: '/.gitlab-ci.d/opensbi.yml' - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' --=20 2.31.1 From nobody Sun May 19 09:42:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678716759; cv=none; d=zohomail.com; s=zohoarc; b=iQJDP6XK3heQemvAJ2NS1HDrFSZs911PvD5y4L2qJirw7zODsy99lv3NTCiw+uQnA4uCBIjnm9qXf2mjgYZOSlZsanEk3X1BWV+Z+t+I/vCYQGrLwRfIeGH8AId7kNePPsaFFVhWtoAnB78LJIqYrcjWWdEsKs4Yp163ftoBXuE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678716759; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MYl6zo2YFTzCRQbEr7TLJNfqD/29rvsOVKUOlTuU2Nw=; b=RFvHrVQn5sQTp2tJFHl4PUvIwd6H/YQ0dKVUlRRVQ1NK5ai5jh4Ozt8IOOYzZKSorAE0mq0jUlZr0VEOdyW4GxL6RlHN1DYRACrZ5paZdrcJTBva9D9HNfDqvD6QmN7zmpvJPV53rKiBBu772EWp8xwQUuUZRoyCqKDplOx1vVc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678716759885508.60403807491514; Mon, 13 Mar 2023 07:12:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbitQ-0005dS-55; Mon, 13 Mar 2023 10:11:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbitM-0005Wy-3T for qemu-devel@nongnu.org; Mon, 13 Mar 2023 10:11:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbitI-0006cH-Cp for qemu-devel@nongnu.org; Mon, 13 Mar 2023 10:11:11 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-668-QD9_E6CPM4qFR4GdcXCcGg-1; Mon, 13 Mar 2023 10:11:03 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0A79C1C04187; Mon, 13 Mar 2023 14:11:03 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68A5A1121315; Mon, 13 Mar 2023 14:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678716667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MYl6zo2YFTzCRQbEr7TLJNfqD/29rvsOVKUOlTuU2Nw=; b=JLDFC/63EHAflcV96GczobdKnTpgIAH31nX3Pa56qfNiw5vMar4d1kXacy2jaFHvTUA2HF IUI2oekcvosiNYbhCkIbvpqnr9Y2HGG6L6L8Jx1xH5IzdpVK9TKIKJgpML9EHdaM+H3CXo 6wbLcRH6v5hEjv4GKD+PbX2nejmDNro= X-MC-Unique: QD9_E6CPM4qFR4GdcXCcGg-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 3/5] gitlab-ci.d/buildtest: Rework the target list of build-system-alpine Date: Mon, 13 Mar 2023 15:10:55 +0100 Message-Id: <20230313141057.230810-4-thuth@redhat.com> In-Reply-To: <20230313141057.230810-1-thuth@redhat.com> References: <20230313141057.230810-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678716762373100001 Content-Type: text/plain; charset="utf-8" The target list of the build-system-alpine job is pretty much a copy of the build-system-ubuntu job (apart from "aarch64-softmmu" which has recently been removed from the ubuntu job in commit 6eda5ef5f8f4, but aarch64-softmmu is still also tested in the opensuse jobs, so we don't need to keep it here). Let's stop wasting our CI minutes with such duplications, and focus on testing targets instead that do not have such a great test coverage yet: The "loongarch64-softmmu" target has never been added to our build tests yet since it has been introduced, and the "mips64-softmmu" target is so far only tested in jobs that lack the "avocado" testing stage (only the little endian or 32-bit MIPS variants are tested in jobs with avocado so far). While we're at it, also move the avr-softmmu and mipsel-softmmu targets from the Debian job to the alpine job, since the Debian job (and its following test jobs) has already a long runtime compared to the others jobs. With this movement, the runtimes should be more equally distributed along the parallel running jobs now. Message-Id: <20230309164850.109882-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/buildtest.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 44b8275299..ba6f551752 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -9,8 +9,7 @@ build-system-alpine: - job: amd64-alpine-container variables: IMAGE: alpine - TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu - microblazeel-softmmu mips64el-softmmu + TARGETS: avr-softmmu loongarch64-softmmu mips64-softmmu mipsel-softmmu MAKE_CHECK_ARGS: check-build CONFIGURE_ARGS: --enable-docs --enable-trace-backends=3Dlog,simple,sys= log =20 @@ -72,8 +71,8 @@ build-system-debian: variables: IMAGE: debian-amd64 CONFIGURE_ARGS: --with-coroutine=3Dsigaltstack - TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu - riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu + TARGETS: arm-softmmu i386-softmmu riscv64-softmmu sh4eb-softmmu + sparc-softmmu xtensaeb-softmmu MAKE_CHECK_ARGS: check-build =20 check-system-debian: --=20 2.31.1 From nobody Sun May 19 09:42:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678716769; cv=none; d=zohomail.com; s=zohoarc; b=QyHytiW78zdaKScTLZ1G55kCZ+PzrdRB8RgWDa0c5pKmVmyeaU2G3iQa0P6cVhC/LZID0022wV1i2zXbbzB4GAL2wNYQlY7/fXue0iLjvm7Afc0ye3KqbvK8LuqLu5mfvARgUWR+iZVqXS9d6xXFb9XcQCMalE6/td+pO2CpUzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678716769; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n4KjcrfQFXyRSIUVExEgxfCz3R/sBlg3iPX48okrKhw=; b=K3Qd33r/jbVz0rnx2aAJAsk7iFwUyhlZ27s55UWLsM/sMP/C+8McvW3gcA060UHC2niaQcpVqx9SNsf5wmOlLfvRJr1ieLP47aZTpiWrgr8hnMYk7zlOMLenqbv1rqL2tHpeSgysLl9G/TaZVn9XxoFb+iN63nZILQ8UQQwIga4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678716769114831.038144478346; Mon, 13 Mar 2023 07:12:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbitO-0005aV-18; Mon, 13 Mar 2023 10:11:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbitK-0005VF-N0 for qemu-devel@nongnu.org; Mon, 13 Mar 2023 10:11:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbitH-0006cB-Ic for qemu-devel@nongnu.org; Mon, 13 Mar 2023 10:11:10 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-359-PIWCJSCzPRGb42FDG-Vg6g-1; Mon, 13 Mar 2023 10:11:04 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5AF722A2AD6E; Mon, 13 Mar 2023 14:11:04 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DC341121315; Mon, 13 Mar 2023 14:11:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678716666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n4KjcrfQFXyRSIUVExEgxfCz3R/sBlg3iPX48okrKhw=; b=c6z+zwWtWanjEixpXJrIf5uZXZW2DC346+un3l+BqUCgwfw2NqBXq+zzajI+W1jU6K9PLR IoKstIRAgtO1ocRvs9qyP1SF+lVuB4BfTjaxUTSv/1yP0TiXkQH6CC0FqUsJGDzpXmVPNI mUC7uroxfC2H/dZ1wTBmtTuRGBpHFo8= X-MC-Unique: PIWCJSCzPRGb42FDG-Vg6g-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nina Schoetterl-Glausch , Richard Henderson , David Hildenbrand Subject: [PULL 4/5] target/s390x: Fix emulation of C(G)HRL Date: Mon, 13 Mar 2023 15:10:56 +0100 Message-Id: <20230313141057.230810-5-thuth@redhat.com> In-Reply-To: <20230313141057.230810-1-thuth@redhat.com> References: <20230313141057.230810-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678716770421100005 Content-Type: text/plain; charset="utf-8" From: Nina Schoetterl-Glausch The second operand of COMPARE HALFWORD RELATIVE LONG is a signed halfword, it does not have the same size as the first operand. Fixes: a7e836d5eb ("target-s390: Convert COMPARE, COMPARE LOGICAL") Signed-off-by: Nina Schoetterl-Glausch Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Message-Id: <20230310114157.3024170-2-nsg@linux.ibm.com> Signed-off-by: Thomas Huth --- target/s390x/tcg/insn-data.h.inc | 4 ++-- target/s390x/tcg/translate.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/target/s390x/tcg/insn-data.h.inc b/target/s390x/tcg/insn-data.= h.inc index 9d2d35f084..6fe8ca5143 100644 --- a/target/s390x/tcg/insn-data.h.inc +++ b/target/s390x/tcg/insn-data.h.inc @@ -199,8 +199,8 @@ C(0xe55c, CHSI, SIL, GIE, m1_32s, i2, 0, 0, 0, cmps64) C(0xe558, CGHSI, SIL, GIE, m1_64, i2, 0, 0, 0, cmps64) /* COMPARE HALFWORD RELATIVE LONG */ - C(0xc605, CHRL, RIL_b, GIE, r1_o, mri2_32s, 0, 0, 0, cmps32) - C(0xc604, CGHRL, RIL_b, GIE, r1_o, mri2_64, 0, 0, 0, cmps64) + C(0xc605, CHRL, RIL_b, GIE, r1_o, mri2_16s, 0, 0, 0, cmps32) + C(0xc604, CGHRL, RIL_b, GIE, r1_o, mri2_16s, 0, 0, 0, cmps64) /* COMPARE HIGH */ C(0xb9cd, CHHR, RRE, HW, r1_sr32, r2_sr32, 0, 0, 0, cmps32) C(0xb9dd, CHLR, RRE, HW, r1_sr32, r2_o, 0, 0, 0, cmps32) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 21a57d5eb2..d324c0b6f2 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -5979,6 +5979,13 @@ static void in2_m2_64a(DisasContext *s, DisasOps *o) #define SPEC_in2_m2_64a 0 #endif =20 +static void in2_mri2_16s(DisasContext *s, DisasOps *o) +{ + o->in2 =3D tcg_temp_new_i64(); + tcg_gen_qemu_ld16s(o->in2, gen_ri2(s), get_mem_index(s)); +} +#define SPEC_in2_mri2_16s 0 + static void in2_mri2_16u(DisasContext *s, DisasOps *o) { o->in2 =3D tcg_temp_new_i64(); --=20 2.31.1 From nobody Sun May 19 09:42:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678716731; cv=none; d=zohomail.com; s=zohoarc; b=HsJ/B+lETukk3rejp3wRMTTyzH/LiHkrfG0sH1/TahI2XGuwXZjewpKdX+STZYpzIJ1vaqK+WFYM8aCH9FW228ErWuz4yWCKMUl+TQM8mCHwqXpHeObk2aSVLn3DIpZtEQkzQoOCd2nvS9zUyfr29X5Hc1uV6D99O0B4NFwnCc4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678716731; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xXUWi/D5ENS/HMywWSU2ibnGR6zQfeC988o8MFTww+s=; b=m6qxLf7NXq/WOvPyfKT9sv9rP9EWMyHy6e4ePdRLsnimVdaXK0VOaVc8tOaTioLux0UNrU3DDaVh+d/ULzvOx60O/vZHLlJvZtlR11Mqkkn6gDBGlsLwXSHLpgIOdEV9fO2Ke4HZY+4cXBiAOvYhSI8hHYt0PxGVScRWlEJEFdE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678716731704435.84690071629484; Mon, 13 Mar 2023 07:12:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbitP-0005bJ-H1; Mon, 13 Mar 2023 10:11:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbitM-0005X2-5T for qemu-devel@nongnu.org; Mon, 13 Mar 2023 10:11:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbitK-0006cO-KS for qemu-devel@nongnu.org; Mon, 13 Mar 2023 10:11:11 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-88-0UWyOnf4Mdu9OH-Ov206pw-1; Mon, 13 Mar 2023 10:11:06 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A65AE3828889; Mon, 13 Mar 2023 14:11:05 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F1C21121315; Mon, 13 Mar 2023 14:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678716669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xXUWi/D5ENS/HMywWSU2ibnGR6zQfeC988o8MFTww+s=; b=IT6chbjlCsuL19iFLMbO/FDvrpGPHpWBaZ5W21UGr6jYqVFRsjctE5+Jyoc+MVlIL7qWp6 HEm5zcV3OkaHY10zd02hSga6VA00pYzkxR7r0gqbJeFkjpeVMYP/YtQWHo6/slzr2Fv8po ObbKXQyoeWuW72gpPzn7Eb4CTalHDtk= X-MC-Unique: 0UWyOnf4Mdu9OH-Ov206pw-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Nina Schoetterl-Glausch , Richard Henderson , David Hildenbrand Subject: [PULL 5/5] tests/tcg/s390x: Add C(G)HRL test Date: Mon, 13 Mar 2023 15:10:57 +0100 Message-Id: <20230313141057.230810-6-thuth@redhat.com> In-Reply-To: <20230313141057.230810-1-thuth@redhat.com> References: <20230313141057.230810-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678716732275100001 Content-Type: text/plain; charset="utf-8" From: Nina Schoetterl-Glausch Test COMPARE HALFWORD RELATIVE LONG instructions. Test that the bytes following the second operand do not affect the instruction. Test the sign extension performed on the second operand. Signed-off-by: Nina Schoetterl-Glausch Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Message-Id: <20230310114157.3024170-3-nsg@linux.ibm.com> Signed-off-by: Thomas Huth --- tests/tcg/s390x/chrl.c | 80 +++++++++++++++++++++++++++++++++ tests/tcg/s390x/Makefile.target | 1 + 2 files changed, 81 insertions(+) create mode 100644 tests/tcg/s390x/chrl.c diff --git a/tests/tcg/s390x/chrl.c b/tests/tcg/s390x/chrl.c new file mode 100644 index 0000000000..b1c3a1c561 --- /dev/null +++ b/tests/tcg/s390x/chrl.c @@ -0,0 +1,80 @@ +#include +#include +#include + +static void test_chrl(void) +{ + uint32_t program_mask, cc; + + asm volatile ( + ".pushsection .rodata\n" + "0:\n\t" + ".short 1, 0x8000\n\t" + ".popsection\n\t" + + "chrl %[r], 0b\n\t" + "ipm %[program_mask]\n" + : [program_mask] "=3Dr" (program_mask) + : [r] "r" (1) + ); + + cc =3D program_mask >> 28; + assert(!cc); + + asm volatile ( + ".pushsection .rodata\n" + "0:\n\t" + ".short -1, 0x8000\n\t" + ".popsection\n\t" + + "chrl %[r], 0b\n\t" + "ipm %[program_mask]\n" + : [program_mask] "=3Dr" (program_mask) + : [r] "r" (-1) + ); + + cc =3D program_mask >> 28; + assert(!cc); +} + +static void test_cghrl(void) +{ + uint32_t program_mask, cc; + + asm volatile ( + ".pushsection .rodata\n" + "0:\n\t" + ".short 1, 0x8000, 0, 0\n\t" + ".popsection\n\t" + + "cghrl %[r], 0b\n\t" + "ipm %[program_mask]\n" + : [program_mask] "=3Dr" (program_mask) + : [r] "r" (1L) + ); + + cc =3D program_mask >> 28; + assert(!cc); + + asm volatile ( + ".pushsection .rodata\n" + "0:\n\t" + ".short -1, 0x8000, 0, 0\n\t" + ".popsection\n\t" + + "cghrl %[r], 0b\n\t" + "ipm %[program_mask]\n" + : [program_mask] "=3Dr" (program_mask) + : [r] "r" (-1L) + ); + + cc =3D program_mask >> 28; + assert(!cc); +} + +int main(void) +{ + test_chrl(); + test_cghrl(); + return EXIT_SUCCESS; +} diff --git a/tests/tcg/s390x/Makefile.target b/tests/tcg/s390x/Makefile.tar= get index b7f576f983..cf93b96686 100644 --- a/tests/tcg/s390x/Makefile.target +++ b/tests/tcg/s390x/Makefile.target @@ -28,6 +28,7 @@ TESTS+=3Ddiv TESTS+=3Dclst TESTS+=3Dlong-double TESTS+=3Dcdsg +TESTS+=3Dchrl =20 cdsg: CFLAGS+=3D-pthread cdsg: LDFLAGS+=3D-pthread --=20 2.31.1