From nobody Sat Dec 14 20:18: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=1718198511; cv=none; d=zohomail.com; s=zohoarc; b=T/KigHJH0wVHg56pu4b/+578g9vneyvMnq2vExrXRoHU3M2VRsbqRzcx4USu4Ezcaz1YgWURxaLy4v75eEXJSmweDOhiNYl8qT2bvo6dTsr05wxcriNbWcuD0dMnzUV7sIRX7ldLR89ffDB338RbIcoWS+JGl2L86JGV6YeXJ+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198511; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9OrYmp1+PPajE5yz84/ZfnVk7je9DAqWkH2ebcMnK2s=; b=O50OUt2hzjqDZ1vovwz2Dh41WcDMrv85+nmrVDGjA1D6iW7gzOzxJLdw2a/lKR+bXqSJ2Egz1ci6bX1rgnWQYEQ608y3BILPtm4DTAUKCwNGzpFt8nt+zKLAhHQ67pkGASL2B8ZD5fACNLnFBNNy4btDfZxdCv5BDJwlQBZLgpI= 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 1718198511586860.9066246211754; Wed, 12 Jun 2024 06:21:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNuZ-0008Fr-Ht; Wed, 12 Jun 2024 09:21:11 -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 1sHNuW-0008Ak-Ao for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:08 -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 1sHNuU-0003ra-No for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:08 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-xzBYucCiP-StObfsEJMhIw-1; Wed, 12 Jun 2024 09:21:04 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C8AF81954194; Wed, 12 Jun 2024 13:21:02 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1CA101956087; Wed, 12 Jun 2024 13:20:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198465; 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=9OrYmp1+PPajE5yz84/ZfnVk7je9DAqWkH2ebcMnK2s=; b=Un+14kIOHl3/rW5+Ab2HyyrkWJbpS/yk5YR6DD453jAuH+Lx+h6dat9DqlMMB4T6Mb5WZb sNQ36C+6UKEYya7bVL49S8JZx76Vn8DPO6Zv2BxuhoRSbp/A8d9zRWo3K5yts6Pr2oXCZJ QLoUmRN/9spHWWWeBDmUTAMpduqkmfY= X-MC-Unique: xzBYucCiP-StObfsEJMhIw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Song Gao Subject: [PULL 01/15] tests/avocado: Update LoongArch bios file Date: Wed, 12 Jun 2024 15:20:41 +0200 Message-ID: <20240612132055.326889-2-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198512847100013 Content-Type: text/plain; charset="utf-8" From: Song Gao The VM uses old bios to boot up only 1 cpu, causing the test case to fail. Update the bios to solve this problem. Reported-by: Thomas Huth Signed-off-by: Song Gao Message-ID: <20240604030058.2327145-1-gaosong@loongson.cn> Signed-off-by: Thomas Huth --- tests/avocado/machine_loongarch.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/avocado/machine_loongarch.py b/tests/avocado/machine_loo= ngarch.py index 7d8a3c1fa5..8de308f2d6 100644 --- a/tests/avocado/machine_loongarch.py +++ b/tests/avocado/machine_loongarch.py @@ -27,18 +27,18 @@ def test_loongarch64_devices(self): """ =20 kernel_url =3D ('https://github.com/yangxiaojuan-loongson/qemu-bin= ary/' - 'releases/download/binary-files/vmlinuz.efi') + 'releases/download/2024-05-30/vmlinuz.efi') kernel_hash =3D '951b485b16e3788b6db03a3e1793c067009e31a2' kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) =20 initrd_url =3D ('https://github.com/yangxiaojuan-loongson/qemu-bin= ary/' - 'releases/download/binary-files/ramdisk') + 'releases/download/2024-05-30/ramdisk') initrd_hash =3D 'c67658d9b2a447ce7db2f73ba3d373c9b2b90ab2' initrd_path =3D self.fetch_asset(initrd_url, asset_hash=3Dinitrd_h= ash) =20 bios_url =3D ('https://github.com/yangxiaojuan-loongson/qemu-binar= y/' - 'releases/download/binary-files/QEMU_EFI.fd') - bios_hash =3D ('dfc1bfba4853cd763b9d392d0031827e8addbca8') + 'releases/download/2024-05-30/QEMU_EFI.fd') + bios_hash =3D ('f4d0966b5117d4cd82327c050dd668741046be69') bios_path =3D self.fetch_asset(bios_url, asset_hash=3Dbios_hash) =20 self.vm.set_console() --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198596; cv=none; d=zohomail.com; s=zohoarc; b=K0a2HoFGOgbW6i4fQASx3bsjB/64tCeIhrc5T2mX2/dr2oK0YfPMsdFZzr83CttfuLcaJWYIkxzpcjnbd/szQblQODG0YA1RxmjYdcOxWWVqTJItwGMXilP6VLHJIt56m6GFDW54jI44mI+Go84L7rDKkPVZ1SPgtbvCOd/jKXI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198596; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=udY147KRX/Z9HyZIqBV5gl0sFEtUuPXHi6kthE79/nc=; b=g3tdRRbOCTPuuTYbgfVITM5Z+JhyjQOsT0d+/+N8HNuhesXkRs2DpL25x4SQacpn42b8LiPosfzXw3vZAdec9P9m4FaTpaPAFpJdFXPz5OoBIWP21vfsgQlww7TCrep4shoF9KOHgeqmbYmvUf5fIYOi02hVZgolrYIJWJDr3b8= 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 1718198596711871.1088224734324; Wed, 12 Jun 2024 06:23:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNui-0008QY-6R; Wed, 12 Jun 2024 09:21:20 -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 1sHNua-0008M3-Ae for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:16 -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 1sHNuW-0003s8-KX for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:11 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-489-jAMxsR8OPfmhCAR0d4w1Eg-1; Wed, 12 Jun 2024 09:21:06 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8B1211955BE0; Wed, 12 Jun 2024 13:21:05 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8EB3B1955E91; Wed, 12 Jun 2024 13:21:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198467; 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=udY147KRX/Z9HyZIqBV5gl0sFEtUuPXHi6kthE79/nc=; b=NaT6OJG0/JfgoUqiBzB/Q8Oj3b+8VErbPrdx6PcHtCmbNLdT2L/GhLsw8Gm9tHSO1SknDf pdghmi2Vk54htGhxnMp1dIqxjZPA5vYCNbqLKvHmM8QcXFVIonCOcQKykcXDR8Sdimovox JM/94HiOE286Ku5oiNKgZR7ZP2rTvl0= X-MC-Unique: jAMxsR8OPfmhCAR0d4w1Eg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Ani Sinha , Igor Mammedov , Mario Casquero Subject: [PULL 02/15] qtest/x86/numa-test: do not use the obsolete 'pentium' cpu Date: Wed, 12 Jun 2024 15:20:42 +0200 Message-ID: <20240612132055.326889-3-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198597368100009 Content-Type: text/plain; charset="utf-8" From: Ani Sinha 'pentium' cpu is old and obsolete and should be avoided for running tests if its not strictly needed. Use 'max' cpu instead for generic non-cpu specific numa test. Reviewed-by: Thomas Huth Reviewed-by: Igor Mammedov Tested-by: Mario Casquero Signed-off-by: Ani Sinha Message-ID: <20240610155303.7933-2-anisinha@redhat.com> Signed-off-by: Thomas Huth --- tests/qtest/numa-test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c index 5518f6596b..ede418963c 100644 --- a/tests/qtest/numa-test.c +++ b/tests/qtest/numa-test.c @@ -125,7 +125,8 @@ static void pc_numa_cpu(const void *data) QTestState *qts; g_autofree char *cli =3D NULL; =20 - cli =3D make_cli(data, "-cpu pentium -machine smp.cpus=3D8,smp.sockets= =3D2,smp.cores=3D2,smp.threads=3D2 " + cli =3D make_cli(data, + "-cpu max -machine smp.cpus=3D8,smp.sockets=3D2,smp.cores=3D2,smp.= threads=3D2 " "-numa node,nodeid=3D0,memdev=3Dram -numa node,nodeid=3D1 " "-numa cpu,node-id=3D1,socket-id=3D0 " "-numa cpu,node-id=3D0,socket-id=3D1,core-id=3D0 " --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198590; cv=none; d=zohomail.com; s=zohoarc; b=WxanYCe7m6ikwiOjRj1cNGOS9UD72KHJZTGfdZ3Q+cFH0+pfFXalk/cNlpH2I6GWDS2V3lrcc8HKNaGmhFasB8Pq5zgMLx1rHf60oUoAEc/WQu37alv/gCy+/OnWPI/876au1t2mV4cantitSx57uHG76y4eF683NS/MyMV5V90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198590; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=p0NLTHKG2jo6Yw/A7uIp4KE1CaAQQzdO+TW/NBVSo/U=; b=WAF9yzF7ZFFD5XXQpTcJ1zQ9MTf1VeBcO88gGugeYP1qpoKCWJm3FE63qMC+DRnR9Ux7hPTltg34lHFewiCA5Fte5sFqvZOGLuRpuSGjbYfdh0HuKBJKUXeVz3jXIF7D8H4r/j6PSsaC4bKsosXApIGee1Bj5mFCeTF1e3MTGeQ= 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 1718198590076363.0243113367867; Wed, 12 Jun 2024 06:23:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNui-0008Qa-7z; Wed, 12 Jun 2024 09:21:20 -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 1sHNuc-0008MB-Uh for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:16 -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 1sHNub-0003uT-5Y for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:14 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-557-E8TwyPbCOWSlsTCtcS1piQ-1; Wed, 12 Jun 2024 09:21:09 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 72ED21955BDD; Wed, 12 Jun 2024 13:21:08 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4B47B1956087; Wed, 12 Jun 2024 13:21:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198472; 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=p0NLTHKG2jo6Yw/A7uIp4KE1CaAQQzdO+TW/NBVSo/U=; b=ClZlRve4p1ctwuOGJESAgC4SwKr37z3hw7XVvElvQebU3LKBq9PDJIAon0J6mHzB+StNRB xKbMU7x1537dwGRuNpmCB3ik48aWMkCxF4mF8N6+MEEqfiioEt3kuyJvgI8W0bj4ZigSEt ubRm3Mkc5YYJX19h3nZxopMwkETFeB8= X-MC-Unique: E8TwyPbCOWSlsTCtcS1piQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Ani Sinha , =?UTF-8?q?Reviewed-by=20=3A=20Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 03/15] tests/qtest/libqtest: add qtest_has_cpu_model() api Date: Wed, 12 Jun 2024 15:20:43 +0200 Message-ID: <20240612132055.326889-4-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-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.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198591343100009 From: Ani Sinha Added a new test api qtest_has_cpu_model() in order to check availability of some cpu models in the current QEMU binary. The specific architecture of the QEMU binary is selected using the QTEST_QEMU_BINARY environment variable. This api would be useful to run tests against some older cpu models after checking if QEMU actually supported these models. Signed-off-by: Ani Sinha Reviewed-by: Reviewed-by: Daniel P. Berrang=C3=A9 Message-ID: <20240610155303.7933-3-anisinha@redhat.com> Signed-off-by: Thomas Huth --- tests/qtest/libqtest.h | 8 ++++ tests/qtest/libqtest.c | 83 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index 6e3d3525bf..beb96b18eb 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -949,6 +949,14 @@ bool qtest_has_machine(const char *machine); */ bool qtest_has_machine_with_env(const char *var, const char *machine); =20 +/** + * qtest_has_cpu_model: + * @cpu: The cpu to look for + * + * Returns: true if the cpu is available in the target binary. + */ +bool qtest_has_cpu_model(const char *cpu); + /** * qtest_has_device: * @device: The device to look for diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index d8f80d335e..18e2f7f282 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -37,6 +37,7 @@ #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" +#include "qapi/qmp/qbool.h" =20 #define MAX_IRQ 256 =20 @@ -1471,6 +1472,12 @@ struct MachInfo { char *alias; }; =20 +struct CpuModel { + char *name; + char *alias_of; + bool deprecated; +}; + static void qtest_free_machine_list(struct MachInfo *machines) { if (machines) { @@ -1550,6 +1557,82 @@ static struct MachInfo *qtest_get_machines(const cha= r *var) return machines; } =20 +static struct CpuModel *qtest_get_cpu_models(void) +{ + static struct CpuModel *cpus; + QDict *response, *minfo; + QList *list; + const QListEntry *p; + QObject *qobj; + QString *qstr; + QBool *qbool; + QTestState *qts; + int idx; + + if (cpus) { + return cpus; + } + + silence_spawn_log =3D !g_test_verbose(); + + qts =3D qtest_init_with_env(NULL, "-machine none"); + response =3D qtest_qmp(qts, "{ 'execute': 'query-cpu-definitions' }"); + g_assert(response); + list =3D qdict_get_qlist(response, "return"); + g_assert(list); + + cpus =3D g_new0(struct CpuModel, qlist_size(list) + 1); + + for (p =3D qlist_first(list), idx =3D 0; p; p =3D qlist_next(p), idx++= ) { + minfo =3D qobject_to(QDict, qlist_entry_obj(p)); + g_assert(minfo); + + qobj =3D qdict_get(minfo, "name"); + g_assert(qobj); + qstr =3D qobject_to(QString, qobj); + g_assert(qstr); + cpus[idx].name =3D g_strdup(qstring_get_str(qstr)); + + qobj =3D qdict_get(minfo, "alias_of"); + if (qobj) { /* old machines do not report aliases */ + qstr =3D qobject_to(QString, qobj); + g_assert(qstr); + cpus[idx].alias_of =3D g_strdup(qstring_get_str(qstr)); + } else { + cpus[idx].alias_of =3D NULL; + } + + qobj =3D qdict_get(minfo, "deprecated"); + qbool =3D qobject_to(QBool, qobj); + g_assert(qbool); + cpus[idx].deprecated =3D qbool_get_bool(qbool); + } + + qtest_quit(qts); + qobject_unref(response); + + silence_spawn_log =3D false; + + return cpus; +} + +bool qtest_has_cpu_model(const char *cpu) +{ + struct CpuModel *cpus; + int i; + + cpus =3D qtest_get_cpu_models(); + + for (i =3D 0; cpus[i].name !=3D NULL; i++) { + if (g_str_equal(cpu, cpus[i].name) || + (cpus[i].alias_of && g_str_equal(cpu, cpus[i].alias_of))) { + return true; + } + } + + return false; +} + void qtest_cb_for_every_machine(void (*cb)(const char *machine), bool skip_old_versioned) { --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198508; cv=none; d=zohomail.com; s=zohoarc; b=hiVnbSdBKKlDHqnAB7v2gwxVRUGkD8j0Nw01vIkMoO4XY9MPBjUaZaDWFZlXjUmWFKoaKG475NZ7l6D8qA0sY9xM9QA/Xk4G3b5/sXAlXVd9AI6QtVdMQtifkyw+SY8H99g4wA+p6nH6WcFOv7JwPzdll07tP9ksHIBD70my5LE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198508; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=76NiWBKyQcEFElyQMaFGltfiHdnMty6s8Qu7s1R1agU=; b=Q93Bn/HdzED9HCxepwxU0wyfIfWaMnhBdstMwhzzuDD0i435AeXhOMOv5+PyPJEXEMo89sNJDRjBf5wI/2dLIu7l2HFRUPzdKKd48aSpeZOUDBxeZeN4/yvoatsmXAxaJruN6cVZ+gNF53bvycTIxaIvQX/8OSPXEwzvZJShFHY= 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 1718198508104550.1985578384878; Wed, 12 Jun 2024 06:21:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNuh-0008QV-Lm; Wed, 12 Jun 2024 09:21:19 -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 1sHNuf-0008My-31 for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:17 -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 1sHNuc-0003ui-Sy for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:16 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-632-JPNK3KxlPbOJpOT2enaKMw-1; Wed, 12 Jun 2024 09:21:12 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 658AD1955E7D; Wed, 12 Jun 2024 13:21:11 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EA8221956087; Wed, 12 Jun 2024 13:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198474; 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=76NiWBKyQcEFElyQMaFGltfiHdnMty6s8Qu7s1R1agU=; b=Ez93P1K9ugnMJ8Vm8t5R1+W+ZqtEqgWMpFu3PPZLY1katEmuJNmTejj3c5fTBtZ43hmr83 kZh19StO9H+ycSN912mc/BftvOoGpFIstApoxvJzthn1/AzvGK7QTgtacUbe4cwtenfDg7 vD1aNnc3bBBT1kp8npblsJ0TScIWIMk= X-MC-Unique: JPNK3KxlPbOJpOT2enaKMw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Ani Sinha , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 04/15] tests/qtest/x86: check for availability of older cpu models before running tests Date: Wed, 12 Jun 2024 15:20:44 +0200 Message-ID: <20240612132055.326889-5-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-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.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198508934100003 From: Ani Sinha It is better to check if some older cpu models like 486, athlon, pentium, penryn, phenom, core2duo etc are available before running their correspondi= ng tests. Some downstream distributions may no longer support these older cpu models. Signature of add_feature_test() has been modified to return void as FeatureTestArgs* was not used by the caller. One minor correction. Replaced 'phenom' with '486' in the test 'x86/cpuid/auto-level/phenom/arat' matching the cpu used. Signed-off-by: Ani Sinha Reviewed-by: Daniel P. Berrang=C3=A9 Message-ID: <20240610155303.7933-4-anisinha@redhat.com> Signed-off-by: Thomas Huth --- tests/qtest/test-x86-cpuid-compat.c | 170 ++++++++++++++++++---------- 1 file changed, 108 insertions(+), 62 deletions(-) diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpu= id-compat.c index 6a39454fce..b9e7e5ef7b 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -67,10 +67,29 @@ static void test_cpuid_prop(const void *data) g_free(path); } =20 -static void add_cpuid_test(const char *name, const char *cmdline, +static void add_cpuid_test(const char *name, const char *cpu, + const char *cpufeat, const char *machine, const char *property, int64_t expected_value) { CpuidTestArgs *args =3D g_new0(CpuidTestArgs, 1); + char *cmdline; + char *save; + + if (!qtest_has_cpu_model(cpu)) { + return; + } + cmdline =3D g_strdup_printf("-cpu %s", cpu); + + if (cpufeat) { + save =3D cmdline; + cmdline =3D g_strdup_printf("%s,%s", cmdline, cpufeat); + g_free(save); + } + if (machine) { + save =3D cmdline; + cmdline =3D g_strdup_printf("-machine %s %s", machine, cmdline); + g_free(save); + } args->cmdline =3D cmdline; args->property =3D property; args->expected_value =3D expected_value; @@ -149,12 +168,24 @@ static void test_feature_flag(const void *data) * either "feature-words" or "filtered-features", when running QEMU * using cmdline */ -static FeatureTestArgs *add_feature_test(const char *name, const char *cmd= line, - uint32_t eax, uint32_t ecx, - const char *reg, int bitnr, - bool expected_value) +static void add_feature_test(const char *name, const char *cpu, + const char *cpufeat, uint32_t eax, + uint32_t ecx, const char *reg, + int bitnr, bool expected_value) { FeatureTestArgs *args =3D g_new0(FeatureTestArgs, 1); + char *cmdline; + + if (!qtest_has_cpu_model(cpu)) { + return; + } + + if (cpufeat) { + cmdline =3D g_strdup_printf("-cpu %s,%s", cpu, cpufeat); + } else { + cmdline =3D g_strdup_printf("-cpu %s", cpu); + } + args->cmdline =3D cmdline; args->in_eax =3D eax; args->in_ecx =3D ecx; @@ -162,13 +193,17 @@ static FeatureTestArgs *add_feature_test(const char *= name, const char *cmdline, args->bitnr =3D bitnr; args->expected_value =3D expected_value; qtest_add_data_func(name, args, test_feature_flag); - return args; + return; } =20 static void test_plus_minus_subprocess(void) { char *path; =20 + if (!qtest_has_cpu_model("pentium")) { + return; + } + /* Rules: * 1)"-foo" overrides "+foo" * 2) "[+-]foo" overrides "foo=3D..." @@ -198,6 +233,10 @@ static void test_plus_minus_subprocess(void) =20 static void test_plus_minus(void) { + if (!qtest_has_cpu_model("pentium")) { + return; + } + g_test_trap_subprocess("/x86/cpuid/parsing-plus-minus/subprocess", 0, = 0); g_test_trap_assert_passed(); g_test_trap_assert_stderr("*Ambiguous CPU model string. " @@ -217,99 +256,105 @@ int main(int argc, char **argv) =20 /* Original level values for CPU models: */ add_cpuid_test("x86/cpuid/phenom/level", - "-cpu phenom", "level", 5); + "phenom", NULL, NULL, "level", 5); add_cpuid_test("x86/cpuid/Conroe/level", - "-cpu Conroe", "level", 10); + "Conroe", NULL, NULL, "level", 10); add_cpuid_test("x86/cpuid/SandyBridge/level", - "-cpu SandyBridge", "level", 0xd); + "SandyBridge", NULL, NULL, "level", 0xd); add_cpuid_test("x86/cpuid/486/xlevel", - "-cpu 486", "xlevel", 0); + "486", NULL, NULL, "xlevel", 0); add_cpuid_test("x86/cpuid/core2duo/xlevel", - "-cpu core2duo", "xlevel", 0x80000008); + "core2duo", NULL, NULL, "xlevel", 0x80000008); add_cpuid_test("x86/cpuid/phenom/xlevel", - "-cpu phenom", "xlevel", 0x8000001A); + "phenom", NULL, NULL, "xlevel", 0x8000001A); add_cpuid_test("x86/cpuid/athlon/xlevel", - "-cpu athlon", "xlevel", 0x80000008); + "athlon", NULL, NULL, "xlevel", 0x80000008); =20 /* If level is not large enough, it should increase automatically: */ /* CPUID[6].EAX: */ - add_cpuid_test("x86/cpuid/auto-level/phenom/arat", - "-cpu 486,arat=3Don", "level", 6); + add_cpuid_test("x86/cpuid/auto-level/486/arat", + "486", "arat=3Don", NULL, "level", 6); /* CPUID[EAX=3D7,ECX=3D0].EBX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/fsgsbase", - "-cpu phenom,fsgsbase=3Don", "level", 7); + "phenom", "fsgsbase=3Don", NULL, "level", 7); /* CPUID[EAX=3D7,ECX=3D0].ECX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/avx512vbmi", - "-cpu phenom,avx512vbmi=3Don", "level", 7); + "phenom", "avx512vbmi=3Don", NULL, "level", 7); /* CPUID[EAX=3D0xd,ECX=3D1].EAX: */ add_cpuid_test("x86/cpuid/auto-level/phenom/xsaveopt", - "-cpu phenom,xsaveopt=3Don", "level", 0xd); + "phenom", "xsaveopt=3Don", NULL, "level", 0xd); /* CPUID[8000_0001].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/3dnow", - "-cpu 486,3dnow=3Don", "xlevel", 0x80000001); + "486", "3dnow=3Don", NULL, "xlevel", 0x80000001); /* CPUID[8000_0001].ECX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/sse4a", - "-cpu 486,sse4a=3Don", "xlevel", 0x80000001); + "486", "sse4a=3Don", NULL, "xlevel", 0x80000001); /* CPUID[8000_0007].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/invtsc", - "-cpu 486,invtsc=3Don", "xlevel", 0x80000007); + "486", "invtsc=3Don", NULL, "xlevel", 0x80000007); /* CPUID[8000_000A].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/npt", - "-cpu 486,svm=3Don,npt=3Don", "xlevel", 0x8000000A); + "486", "svm=3Don,npt=3Don", NULL, "xlevel", 0x8000000A); /* CPUID[C000_0001].EDX: */ add_cpuid_test("x86/cpuid/auto-xlevel2/phenom/xstore", - "-cpu phenom,xstore=3Don", "xlevel2", 0xC0000001); + "phenom", "xstore=3Don", NULL, "xlevel2", 0xC0000001); /* SVM needs CPUID[0x8000000A] */ add_cpuid_test("x86/cpuid/auto-xlevel/athlon/svm", - "-cpu athlon,svm=3Don", "xlevel", 0x8000000A); + "athlon", "svm=3Don", NULL, "xlevel", 0x8000000A); =20 =20 /* If level is already large enough, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-level/SandyBridge/multiple", - "-cpu SandyBridge,arat=3Don,fsgsbase=3Don,avx512vbmi=3D= on", - "level", 0xd); + "SandyBridge", "arat=3Don,fsgsbase=3Don,avx512vbmi=3Don= ", + NULL, "level", 0xd); /* If level is explicitly set, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-level/486/fixed/0xF", - "-cpu 486,level=3D0xF,arat=3Don,fsgsbase=3Don,avx512vbm= i=3Don,xsaveopt=3Don", - "level", 0xF); + "486", + "level=3D0xF,arat=3Don,fsgsbase=3Don,avx512vbmi=3Don,xs= aveopt=3Don", + NULL, "level", 0xF); add_cpuid_test("x86/cpuid/auto-level/486/fixed/2", - "-cpu 486,level=3D2,arat=3Don,fsgsbase=3Don,avx512vbmi= =3Don,xsaveopt=3Don", - "level", 2); + "486", + "level=3D2,arat=3Don,fsgsbase=3Don,avx512vbmi=3Don,xsav= eopt=3Don", + NULL, "level", 2); add_cpuid_test("x86/cpuid/auto-level/486/fixed/0", - "-cpu 486,level=3D0,arat=3Don,fsgsbase=3Don,avx512vbmi= =3Don,xsaveopt=3Don", - "level", 0); + "486", + "level=3D0,arat=3Don,fsgsbase=3Don,avx512vbmi=3Don,xsav= eopt=3Don", + NULL, "level", 0); =20 /* if xlevel is already large enough, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-xlevel/phenom/3dnow", - "-cpu phenom,3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don= ,svm=3Don", - "xlevel", 0x8000001A); + "phenom", "3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don,s= vm=3Don", + NULL, "xlevel", 0x8000001A); /* If xlevel is explicitly set, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/80000002", - "-cpu 486,xlevel=3D0x80000002,3dnow=3Don,sse4a=3Don,inv= tsc=3Don,npt=3Don,svm=3Don", - "xlevel", 0x80000002); + "486", + "xlevel=3D0x80000002,3dnow=3Don,sse4a=3Don,invtsc=3Don,= npt=3Don,svm=3Don", + NULL, "xlevel", 0x80000002); add_cpuid_test("x86/cpuid/auto-xlevel/486/fixed/8000001A", - "-cpu 486,xlevel=3D0x8000001A,3dnow=3Don,sse4a=3Don,inv= tsc=3Don,npt=3Don,svm=3Don", - "xlevel", 0x8000001A); + "486", + "xlevel=3D0x8000001A,3dnow=3Don,sse4a=3Don,invtsc=3Don,= npt=3Don,svm=3Don", + NULL, "xlevel", 0x8000001A); add_cpuid_test("x86/cpuid/auto-xlevel/phenom/fixed/0", - "-cpu 486,xlevel=3D0,3dnow=3Don,sse4a=3Don,invtsc=3Don,= npt=3Don,svm=3Don", - "xlevel", 0); + "486", + "xlevel=3D0,3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don,= svm=3Don", + NULL, "xlevel", 0); =20 /* if xlevel2 is already large enough, it shouldn't change: */ add_cpuid_test("x86/cpuid/auto-xlevel2/486/fixed", - "-cpu 486,xlevel2=3D0xC0000002,xstore=3Don", - "xlevel2", 0xC0000002); + "486", "xlevel2=3D0xC0000002,xstore=3Don", + NULL, "xlevel2", 0xC0000002); =20 /* Check compatibility of old machine-types that didn't * auto-increase level/xlevel/xlevel2: */ if (qtest_has_machine("pc-i440fx-2.7")) { add_cpuid_test("x86/cpuid/auto-level/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,arat=3Don,avx512vb= mi=3Don,xsaveopt=3Don", - "level", 1); + "486", "arat=3Don,avx512vbmi=3Don,xsaveopt=3Don", + "pc-i440fx-2.7", "level", 1); add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,3dnow=3Don,sse4a= =3Don,invtsc=3Don,npt=3Don,svm=3Don", - "xlevel", 0); + "486", "3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don,= svm=3Don", + "pc-i440fx-2.7", "xlevel", 0); add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7", - "-machine pc-i440fx-2.7 -cpu 486,xstore=3Don", + "486", "xstore=3Don", "pc-i440fx-2.7", "xlevel2", 0); } /* @@ -319,18 +364,18 @@ int main(int argc, char **argv) */ if (qtest_has_machine("pc-i440fx-2.3")) { add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/off", - "-machine pc-i440fx-2.3 -cpu Penryn", + "Penryn", NULL, "pc-i440fx-2.3", "level", 4); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/on", - "-machine pc-i440fx-2.3 -cpu Penryn,erms=3Don", + "Penryn", "erms=3Don", "pc-i440fx-2.3", "level", 7); } if (qtest_has_machine("pc-i440fx-2.9")) { add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", - "-machine pc-i440fx-2.9 -cpu Conroe", + "Conroe", NULL, "pc-i440fx-2.9", "level", 10); add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on", - "-machine pc-i440fx-2.9 -cpu Conroe,erms=3Don", + "Conroe", "erms=3Don", "pc-i440fx-2.9", "level", 10); } =20 @@ -341,42 +386,43 @@ int main(int argc, char **argv) */ if (qtest_has_machine("pc-i440fx-2.3")) { add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.3", - "-machine pc-i440fx-2.3 -cpu SandyBridge", + "SandyBridge", NULL, "pc-i440fx-2.3", "xlevel", 0x8000000a); } if (qtest_has_machine("pc-i440fx-2.4")) { add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-off", - "-machine pc-i440fx-2.4 -cpu SandyBridge,", + "SandyBridge", NULL, "pc-i440fx-2.4", "xlevel", 0x80000008); add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on", - "-machine pc-i440fx-2.4 -cpu SandyBridge,svm=3Don,n= pt=3Don", + "SandyBridge", "svm=3Don,npt=3Don", "pc-i440fx-2.4", "xlevel", 0x80000008); } =20 /* Test feature parsing */ add_feature_test("x86/cpuid/features/plus", - "-cpu 486,+arat", + "486", "+arat", 6, 0, "EAX", 2, true); add_feature_test("x86/cpuid/features/minus", - "-cpu pentium,-mmx", + "pentium", "-mmx", 1, 0, "EDX", 23, false); add_feature_test("x86/cpuid/features/on", - "-cpu 486,arat=3Don", + "486", "arat=3Don", 6, 0, "EAX", 2, true); add_feature_test("x86/cpuid/features/off", - "-cpu pentium,mmx=3Doff", + "pentium", "mmx=3Doff", 1, 0, "EDX", 23, false); + add_feature_test("x86/cpuid/features/max-plus-invtsc", - "-cpu max,+invtsc", + "max" , "+invtsc", 0x80000007, 0, "EDX", 8, true); add_feature_test("x86/cpuid/features/max-invtsc-on", - "-cpu max,invtsc=3Don", + "max", "invtsc=3Don", 0x80000007, 0, "EDX", 8, true); add_feature_test("x86/cpuid/features/max-minus-mmx", - "-cpu max,-mmx", + "max", "-mmx", 1, 0, "EDX", 23, false); add_feature_test("x86/cpuid/features/max-invtsc-on,mmx=3Doff", - "-cpu max,mmx=3Doff", + "max", "mmx=3Doff", 1, 0, "EDX", 23, false); =20 return g_test_run(); --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198508; cv=none; d=zohomail.com; s=zohoarc; b=SyaZmkT799CTYdtLims89+2LrL0dSj4/P553w67EVLdj0xx+Q7xotdzyVaZROBXgy3sWpbWyx8toj1i4d/oRWe3Z5tI47E4+/eYsDjr0QA1pDj07L8ovZwFIaocbK7TzRSzvWMJYD22kuSPHhuskFLkH2HjR4oUEpeawvC7rEkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198508; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jeuxJPJSriOT6mgC26O99hWcp6rMxbuZTnb/ndt0wI0=; b=BZwLoLtv4ikCV7hR39J5SJP4OAumpl/6DVCchg44lCG08V+px6IZBpGnkQG1DhPpjuuoP87uwrFPpK7r1Kp/gkdCTqpbZ6CgLCfxnYJxzlBEEzoEnOd+v1+kWtsbGvTqn015Aqtu+dzOkWz3bq8005JV4w586m5Mtx+ZQGHl7Xs= 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 1718198508045689.734431890476; Wed, 12 Jun 2024 06:21:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNux-0000O3-Nx; Wed, 12 Jun 2024 09:21:36 -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 1sHNuq-00008r-Ru for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:29 -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 1sHNuj-0003vs-5R for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:24 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-351-yXSl0u5ZMoiZIRK24uusRQ-1; Wed, 12 Jun 2024 09:21:15 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 390C4195607A; Wed, 12 Jun 2024 13:21:14 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 229C31955E91; Wed, 12 Jun 2024 13:21:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198479; 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=jeuxJPJSriOT6mgC26O99hWcp6rMxbuZTnb/ndt0wI0=; b=UYEEJ+kkQDV2/qt4KD0a9dpeA8KStJ/ltzERlGT5TBBc5UmzDXdvikN+IdoYzTTEVuir1T t9kiJu6Pny9n45Ciz6y4NAN5JxoV5pUIK9iE5tg/B3CcJ65bCjzQBXyKQ/fJ4v8yyFkWml iGUKfV+5Nst52G2PLOFXAzDnrZ2Eaao= X-MC-Unique: yXSl0u5ZMoiZIRK24uusRQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: zhenwei pi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 05/15] meson: Remove libibumad dependence Date: Wed, 12 Jun 2024 15:20:45 +0200 Message-ID: <20240612132055.326889-6-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-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.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198508868100001 From: zhenwei pi RDMA based migration has no dependence on libumad. libibverbs and librdmacm are enough. libumad was used by rdmacm-mux which has been already removed. It's remained mistakenly. Fixes: 1dfd42c4264b ("hw/rdma: Remove deprecated pvrdma device and rdmacm-m= ux helper") Cc: Philippe Mathieu-Daud=C3=A9 Signed-off-by: zhenwei pi Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240611105427.61395-2-pizhenwei@bytedance.com> Signed-off-by: Thomas Huth --- meson.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meson.build b/meson.build index ec59effca2..226b97ea26 100644 --- a/meson.build +++ b/meson.build @@ -1885,11 +1885,9 @@ endif =20 rdma =3D not_found if not get_option('rdma').auto() or have_system - libumad =3D cc.find_library('ibumad', required: get_option('rdma')) rdma_libs =3D [cc.find_library('rdmacm', has_headers: ['rdma/rdma_cma.h'= ], required: get_option('rdma')), - cc.find_library('ibverbs', required: get_option('rdma')), - libumad] + cc.find_library('ibverbs', required: get_option('rdma'))] rdma =3D declare_dependency(dependencies: rdma_libs) foreach lib: rdma_libs if not lib.found() --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198521; cv=none; d=zohomail.com; s=zohoarc; b=YeTxFz3FXokItax+HUT/TGRUFTg8tb4d6iK27HFdS3RzWf1D8nBCRsf2AgohtLr76vsryX6DT7BN18fqvD6Oz4i6KnJCKnHd2ZE1yDjbJi4Ln+FwW1j9ukfAy7hRujSHjk54A4chFM4UarkmlrVUIoRHj8DSLAAta555D9O+VxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198521; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZXZx4mBy9A0uTUfCiqa1pLnX0ROixaN0F0vHgz6+z5U=; b=fos0j+bWc8gi3R5r+WkkrT4oQbvVjcZSD1DXhOuaCTAyHYcPa0RIMSq/d9kyvc5wgxElR1ffq8CPXqky1GkXEv5QH90Su2sg+aNe/TjYUJaWOsusCtJHc3gXoQ6MLCZ9EQCzmRyLQQRwRoZ0/agSzAxw8RIadTIpWI7+NWVmxAM= 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 1718198521562512.3926938238674; Wed, 12 Jun 2024 06:22:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNv3-0000TS-T6; Wed, 12 Jun 2024 09:21:43 -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 1sHNur-00009n-U2 for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:29 -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 1sHNul-0003wM-DP for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:25 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-158-D2cjC5yaMiG_arktHFSKXw-1; Wed, 12 Jun 2024 09:21:18 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 50B691956062; Wed, 12 Jun 2024 13:21:17 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6A8CB1955E87; Wed, 12 Jun 2024 13:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198482; 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=ZXZx4mBy9A0uTUfCiqa1pLnX0ROixaN0F0vHgz6+z5U=; b=fLewCAAfG3G1701F8qrDjTPG2TRi7Dd4HJaYUpAKAtveZptqURgVi5wAnT6+CHlH76nbzZ M+f1hVAQwMqLESdQxDTiiXvzk00znArMB/PtrW/Mywg0j93MqTDyv6RzZr8mSDxBMlxxrf KWAHVyOwjAiNlgjZwxK/sbTe64QWqcY= X-MC-Unique: D2cjC5yaMiG_arktHFSKXw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: zhenwei pi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 06/15] test: Remove libibumad dependence Date: Wed, 12 Jun 2024 15:20:46 +0200 Message-ID: <20240612132055.326889-7-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-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.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198523071100001 From: zhenwei pi Remove libibumad dependence from the test environment. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: zhenwei pi Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240611105427.61395-3-pizhenwei@bytedance.com> Signed-off-by: Thomas Huth --- scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml | 1 - scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml | 1 - tests/docker/dockerfiles/debian-amd64-cross.docker | 1 - tests/docker/dockerfiles/debian-arm64-cross.docker | 1 - tests/docker/dockerfiles/debian-armel-cross.docker | 1 - tests/docker/dockerfiles/debian-armhf-cross.docker | 1 - tests/docker/dockerfiles/debian-i686-cross.docker | 1 - tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 - tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 - tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 - tests/docker/dockerfiles/debian-s390x-cross.docker | 1 - tests/docker/dockerfiles/debian.docker | 1 - tests/docker/dockerfiles/ubuntu2204.docker | 1 - tests/lcitool/projects/qemu.yml | 1 - 14 files changed, 14 deletions(-) diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml b/scripts/ci/= setup/ubuntu/ubuntu-2204-aarch64.yaml index 8d7d8725fb..fd5489cd82 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml @@ -49,7 +49,6 @@ packages: - libglusterfs-dev - libgnutls28-dev - libgtk-3-dev - - libibumad-dev - libibverbs-dev - libiscsi-dev - libjemalloc-dev diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml b/scripts/ci/se= tup/ubuntu/ubuntu-2204-s390x.yaml index 16050a5058..afa04502cf 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml @@ -49,7 +49,6 @@ packages: - libglusterfs-dev - libgnutls28-dev - libgtk-3-dev - - libibumad-dev - libibverbs-dev - libiscsi-dev - libjemalloc-dev diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index f8c61d1191..8058695979 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -105,7 +105,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev:amd64 \ libgnutls28-dev:amd64 \ libgtk-3-dev:amd64 \ - libibumad-dev:amd64 \ libibverbs-dev:amd64 \ libiscsi-dev:amd64 \ libjemalloc-dev:amd64 \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index 6510872279..15457d7657 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -105,7 +105,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev:arm64 \ libgnutls28-dev:arm64 \ libgtk-3-dev:arm64 \ - libibumad-dev:arm64 \ libibverbs-dev:arm64 \ libiscsi-dev:arm64 \ libjemalloc-dev:arm64 \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/doc= ker/dockerfiles/debian-armel-cross.docker index f227d42987..c26ffc2e9e 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -108,7 +108,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev:armel \ libgnutls28-dev:armel \ libgtk-3-dev:armel \ - libibumad-dev:armel \ libibverbs-dev:armel \ libiscsi-dev:armel \ libjemalloc-dev:armel \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index 58bdf07223..8f87656d89 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -105,7 +105,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev:armhf \ libgnutls28-dev:armhf \ libgtk-3-dev:armhf \ - libibumad-dev:armhf \ libibverbs-dev:armhf \ libiscsi-dev:armhf \ libjemalloc-dev:armhf \ diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/dock= er/dockerfiles/debian-i686-cross.docker index 9f4102be8f..f1e5b0b877 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -108,7 +108,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev:i386 \ libgnutls28-dev:i386 \ libgtk-3-dev:i386 \ - libibumad-dev:i386 \ libibverbs-dev:i386 \ libiscsi-dev:i386 \ libjemalloc-dev:i386 \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index c861c3bd5b..59c4c68dce 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -107,7 +107,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev:mips64el \ libgnutls28-dev:mips64el \ libgtk-3-dev:mips64el \ - libibumad-dev:mips64el \ libibverbs-dev:mips64el \ libiscsi-dev:mips64el \ libjemalloc-dev:mips64el \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index fe9415395e..880c774f1c 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -107,7 +107,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev:mipsel \ libgnutls28-dev:mipsel \ libgtk-3-dev:mipsel \ - libibumad-dev:mipsel \ libibverbs-dev:mipsel \ libiscsi-dev:mipsel \ libjemalloc-dev:mipsel \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index 35c8ff0864..1d55b9514c 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -105,7 +105,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev:ppc64el \ libgnutls28-dev:ppc64el \ libgtk-3-dev:ppc64el \ - libibumad-dev:ppc64el \ libibverbs-dev:ppc64el \ libiscsi-dev:ppc64el \ libjemalloc-dev:ppc64el \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index bef9dff17a..62ccda6ab1 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -105,7 +105,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev:s390x \ libgnutls28-dev:s390x \ libgtk-3-dev:s390x \ - libibumad-dev:s390x \ libibverbs-dev:s390x \ libiscsi-dev:s390x \ libjemalloc-dev:s390x \ diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfi= les/debian.docker index 63d7aac616..0d1d401eb8 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -55,7 +55,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev \ libgnutls28-dev \ libgtk-3-dev \ - libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dock= erfiles/ubuntu2204.docker index febd25b320..beeb44fc28 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -55,7 +55,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev \ libgnutls28-dev \ libgtk-3-dev \ - libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index 070d7f4706..0c85784259 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -47,7 +47,6 @@ packages: - libfdt - libffi - libgcrypt - - libibumad - libibverbs - libiscsi - libjemalloc --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198575; cv=none; d=zohomail.com; s=zohoarc; b=ZizvWjN5EA0umKvhoM/xY8BVZl5mKrPhCmkWa/Eb47LXP6upQCQX+Q2wYWtTgH2rOgAigfwi1DssSY26VNme+CU7nEr9OOR0QucOnAyrR/mmnP2MMlWkNPCocuxY8iJqbzgixlwoqVy73cVYnTw3nLgU2aimrfV0N3sXVUTaHyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198575; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fL0oeRA4y1D39ogIDciJCzoJ6e3r/gjv0CsBd13xcrY=; b=bd0vNXhJ1Am5Iavlh8hjcQzfzeyvcQyJolcn/eSQiu31GgTa+mCdgbz5vKCNHKq0uxbGp5V+vVQTctPz/iJd9cVSAcNMP4IubP12X+K6s+LOYScKTL7A6Nz31mru84mj+g/4oTOFlERcsoqHQz+U6F9bB7p6910TN3VKJ0fPWzM= 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 1718198575313302.01706889241336; Wed, 12 Jun 2024 06:22:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNvQ-00011D-5V; Wed, 12 Jun 2024 09:22:07 -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 1sHNuv-0000O7-Qs for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:34 -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 1sHNuq-0003wj-7b for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:31 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-81-g7DcJbRPPtOjZJNWJ6SOIQ-1; Wed, 12 Jun 2024 09:21:20 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AFCB819560B3; Wed, 12 Jun 2024 13:21:19 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B579B1955E87; Wed, 12 Jun 2024 13:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198484; 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=fL0oeRA4y1D39ogIDciJCzoJ6e3r/gjv0CsBd13xcrY=; b=Kd6DWsihCBEZUW8VI0lXQkQegwtWWp+q1OZfBEQMEC5HLumnfSIbX7GJb6dJ5n5pgE5goC nKBa5a8FFB89taQPVB8lDKLUKhkPq9+RrHixYd4uzS9k/yrhwn2Lx5bdbXrYYOy9GKfhvJ AL4fd8cnV7LgnXWNU3HrqmmeqmGlxB8= X-MC-Unique: g7DcJbRPPtOjZJNWJ6SOIQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Zhao Liu , Yongwei Ma Subject: [PULL 07/15] tests/unit/test-smp-parse: Fix comments of drawers and books case Date: Wed, 12 Jun 2024 15:20:47 +0200 Message-ID: <20240612132055.326889-8-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198577255100009 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Fix the comments to match the actual configurations. Signed-off-by: Zhao Liu Reviewed-by: Thomas Huth Tested-by: Yongwei Ma Message-ID: <20240529061925.350323-2-zhao1.liu@intel.com> Signed-off-by: Thomas Huth --- tests/unit/test-smp-parse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 9fdba24fce..fa8e7d83a7 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -474,8 +474,8 @@ static const struct SMPTestData data_with_drawers_inval= id[] =3D { static const struct SMPTestData data_with_drawers_books_invalid[] =3D { { /* - * config: -smp 200,drawers=3D2,books=3D2,sockets=3D2,cores=3D4,\ - * threads=3D2,maxcpus=3D200 + * config: -smp 200,drawers=3D3,books=3D5,sockets=3D2,cores=3D4,\ + * threads=3D2,maxcpus=3D200 */ .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 200, T, 3, T, 5, T, 2, T, 4, T, 2, T, 200), @@ -485,8 +485,8 @@ static const struct SMPTestData data_with_drawers_books= _invalid[] =3D { "cores (4) * threads (2) !=3D maxcpus (200)", }, { /* - * config: -smp 242,drawers=3D2,books=3D2,sockets=3D2,cores=3D4,\ - * threads=3D2,maxcpus=3D240 + * config: -smp 242,drawers=3D3,books=3D5,sockets=3D2,cores=3D4,\ + * threads=3D2,maxcpus=3D240 */ .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 242, T, 3, T, 5, T, 2, T, 4, T, 2, T, 240), --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198587; cv=none; d=zohomail.com; s=zohoarc; b=LEZ34iqV3P/OYZuiVsh30DGRhIo+M3uy8INkRAiNzwB+63p7lQcSSG3F+2t5dY2R27M606l0IzoNdrQ1REhv2sxPYhuBjazyoY+NC+dRQGl6pzD+ylAtbPwzJd2/B1mzUImeiOYuvukVRFjEb2ciguO4mPncpPjFxC28PMNXYzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198587; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oZVPlEGbCCOC79f4sHz2CsYrZpGooR8EfTW2vWGLuGA=; b=J6aSl59WILg0G3PaTSLasOfdcs5VRHVQmkGrGt2eFIOe+rLWvOJmc46IPE9l5JIcF2z/51g/kd5JKykv6FxVCm+6FDxpBdakJsMlF3T9ilCiC2uuPa5JQmUjUMtOvFLsU//F/dQU1CKrlOduExBVsK5HXx1mKKFIRurU+C9/Vgc= 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 1718198587572134.7000925339255; Wed, 12 Jun 2024 06:23:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNvZ-0001N2-Mn; Wed, 12 Jun 2024 09:22: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 1sHNuw-0000OD-8f for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:34 -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 1sHNuq-0003ww-JZ for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:31 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-307-VzVuyYP_OqiYdpe5wWLHQw-1; Wed, 12 Jun 2024 09:21:23 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2F05B1954194; Wed, 12 Jun 2024 13:21:22 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 47FDF1954AC0; Wed, 12 Jun 2024 13:21:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198486; 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=oZVPlEGbCCOC79f4sHz2CsYrZpGooR8EfTW2vWGLuGA=; b=XqKZWdFmK4DqbLZSAujPcUwfGA5l4q3SATtkomTqwHM75QNBuOUqNo8JQr3RvitS/L6RKe 1NFAb3SkqDHAZy6mF5NhC+hUDcIDOL0Wbc/Z5nrT7wuCAw5ZYW4cl3L18zEf12+z2KD4w2 GSgYipdwmOm6Aef16on3OpA1owJohoc= X-MC-Unique: VzVuyYP_OqiYdpe5wWLHQw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Zhao Liu , Yongwei Ma Subject: [PULL 08/15] tests/unit/test-smp-parse: Fix comment of parameters=1 case Date: Wed, 12 Jun 2024 15:20:48 +0200 Message-ID: <20240612132055.326889-9-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198589382100005 Content-Type: text/plain; charset="utf-8" From: Zhao Liu SMP_CONFIG_WITH_FULL_TOPO hasn't support module level, so the parameter should indicate the "clusters". Additionally, reorder the parameters of -smp to match the topology hierarchy order. Signed-off-by: Zhao Liu Reviewed-by: Thomas Huth Tested-by: Yongwei Ma Message-ID: <20240529061925.350323-3-zhao1.liu@intel.com> Signed-off-by: Thomas Huth --- tests/unit/test-smp-parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index fa8e7d83a7..c9cbc89c21 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -333,7 +333,9 @@ static const struct SMPTestData data_generic_valid[] = =3D { }, { /* * Unsupported parameters are always allowed to be set to '1' - * config: -smp 8,books=3D1,drawers=3D1,sockets=3D2,modules=3D1,di= es=3D1,cores=3D2,threads=3D2,maxcpus=3D8 + * config: + * -smp 8,drawers=3D1,books=3D1,sockets=3D2,dies=3D1,clusters=3D= 1,cores=3D2,\ + * threads=3D2,maxcpus=3D8 * expect: cpus=3D8,sockets=3D2,cores=3D2,threads=3D2,maxcpus=3D8 = */ .config =3D SMP_CONFIG_WITH_FULL_TOPO(8, 1, 1, 2, 1, 1, 2, 2, 8), .expect_prefer_sockets =3D CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198572; cv=none; d=zohomail.com; s=zohoarc; b=hxjK+dARyjWI32QF46f1BEYlv5k0mAsn2eE5MLGzGnRoVaXJxl+GB27MN0ZBWYy3ddmcCNp/BWhXzl2EnluaHf+wIhJwvQ2IaRH1OxBWS8zYiSt3lBYcSXmrkOgqOgG1RjScppF/Op4SKsr+6M1oRa30U+1EMAQfIvqxzN1FKXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198572; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dOt6/vHV+92jo7OA0/inuOqUXayabXwf6bIcdaIVBuE=; b=mezEd+QuW3T3zF4m5xf7IeGJ4P5CL/2JeoVm6ySH0U4jFNpnx8YVYXRN9Q8Xt4uWGAv0qxjIRntd4HYojHXv+N/8UceNBmtjC8YMA+P2kX0VPhhrVDCE/sYLTRwSwdmNFLjEXsmQM4I2+7ayS58yuVkKpcSCr56tB2Iy8W2lLZA= 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 1718198572506195.47260852789395; Wed, 12 Jun 2024 06:22:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNv7-0000bp-SG; Wed, 12 Jun 2024 09:21:46 -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 1sHNuw-0000OC-8e for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:34 -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 1sHNur-0003x3-LL for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:31 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-12-PFEw8ceUNuCVQC5_mUJQLg-1; Wed, 12 Jun 2024 09:21:26 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7D95D1956094; Wed, 12 Jun 2024 13:21:25 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 936861956087; Wed, 12 Jun 2024 13:21:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198488; 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=dOt6/vHV+92jo7OA0/inuOqUXayabXwf6bIcdaIVBuE=; b=MyS3kel72xveROgAOoCsR12IgqouFTIA00A+FNkToDkhMkLnQkL3SZAstKFeihXxsVQ0N1 FXVmwavHPr6m9/zlgqhN1JU6l19lHfqf55X7JYp+4GgzXdrJxIhOJHTvcsbpZG5vlYlAHx 2MyncAMHs4IgSH9OhRdhVcgHtL53YMg= X-MC-Unique: PFEw8ceUNuCVQC5_mUJQLg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Zhao Liu , Yongwei Ma Subject: [PULL 09/15] tests/unit/test-smp-parse: Fix an invalid topology case Date: Wed, 12 Jun 2024 15:20:49 +0200 Message-ID: <20240612132055.326889-10-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198573289100001 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Adjust the "cpus" parameter to match the comment configuration. Signed-off-by: Zhao Liu Reviewed-by: Thomas Huth Tested-by: Yongwei Ma Message-ID: <20240529061925.350323-4-zhao1.liu@intel.com> Signed-off-by: Thomas Huth --- tests/unit/test-smp-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index c9cbc89c21..5d99e0d923 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -528,7 +528,7 @@ static const struct SMPTestData data_full_topo_invalid[= ] =3D { * config: -smp 1,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ * clusters=3D2,cores=3D7,threads=3D3,maxcpus=3D5040 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(3361, 3, 5, 2, 4, 2, 7, 3, 5= 040), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 3, 5, 2, 4, 2, 7, 3, 5040= ), .expect_error =3D "Invalid SMP CPUs 5040. The max CPUs supported " "by machine '" SMP_MACHINE_NAME "' is 4096", }, --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198574; cv=none; d=zohomail.com; s=zohoarc; b=bZFr3oETkcThxyO0hbO6O2yyTOAfetTLW1NM+0jMizQv+wQdPVh8zy9pYMfqsyYczCF8cABSUeWXcu0rxsq5z+wf6/7X8su1MCM9XIs8v8VE0ivAfkEDPFNqs4V4K6LH9wxpYjDQj4Su6Jh8/H911AbdrlCVJRenVZ8vAKQCIX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198574; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=W2ti5MdYPaT8sRVI8LbSwShzQk9KoHPKLbkpjkZs45g=; b=WBQhaeSZmh34Fum5YoYkQRlt0FVyoThOatrgZmK1mKvHzay64VY30naDQ4+dgOI2sb3DDemxOATuq4+UY2KDEWMDn1+73BKYPFdqG5Avp5orlPSNA7P2nD2uMN8D2hAcSKv4P9b3j5CJaNz+IurcVNsvSKNP7yVEQVWhWbMZr7Y= 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 171819857437862.63325625645689; Wed, 12 Jun 2024 06:22:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNvG-0000vG-Gc; Wed, 12 Jun 2024 09:21:56 -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 1sHNux-0000Ou-QB for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:36 -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 1sHNuu-0003xc-4w for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:34 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-528-pgY8wELfON2cUdHWwdQftw-1; Wed, 12 Jun 2024 09:21:28 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9F16A1955E7D; Wed, 12 Jun 2024 13:21:27 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id ED2B91956087; Wed, 12 Jun 2024 13:21:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198490; 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=W2ti5MdYPaT8sRVI8LbSwShzQk9KoHPKLbkpjkZs45g=; b=GNVETZCJICESylYYABdVadvUnZkgr8IPCu01C6bxt80cXNVUbOvf9426ymuH5+Qm5nkrB+ go29Sb09lJjIe+RGqCEHoE6b+utRKeWVO7nD+DsnUPIwzKL2myjGYGp+rQsP8I3WxpfDIY hEs3WoI7/EwkcYJpEWIMVJt9qP/H7tw= X-MC-Unique: pgY8wELfON2cUdHWwdQftw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Zhao Liu , Yongwei Ma Subject: [PULL 10/15] tests/unit/test-smp-parse: Use default parameters=0 when not set in -smp Date: Wed, 12 Jun 2024 15:20:50 +0200 Message-ID: <20240612132055.326889-11-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198575451100005 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Since -smp allows parameters=3D1 whether the level is supported by machine, to avoid the test scenarios where the parameter defaults to 1 cause some errors to be masked, explicitly set undesired parameters to 0. Signed-off-by: Zhao Liu Reviewed-by: Thomas Huth Tested-by: Yongwei Ma Message-ID: <20240529061925.350323-5-zhao1.liu@intel.com> Signed-off-by: Thomas Huth --- tests/unit/test-smp-parse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 5d99e0d923..e3a0a9d12d 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -436,7 +436,7 @@ static const struct SMPTestData data_with_clusters_inva= lid[] =3D { static const struct SMPTestData data_with_books_invalid[] =3D { { /* config: -smp 16,books=3D2,sockets=3D2,cores=3D4,threads=3D2,max= cpus=3D16 */ - .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, F, 1, T, 2, T, + .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, F, 0, T, 2, T, 2, T, 4, T, 2, T, 16), .expect_error =3D "Invalid CPU topology: " "product of the hierarchy must match maxcpus: " @@ -444,7 +444,7 @@ static const struct SMPTestData data_with_books_invalid= [] =3D { "!=3D maxcpus (16)", }, { /* config: -smp 34,books=3D2,sockets=3D2,cores=3D4,threads=3D2,max= cpus=3D32 */ - .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, F, 1, T, 2, T, + .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, F, 0, T, 2, T, 2, T, 4, T, 2, T, 32), .expect_error =3D "Invalid CPU topology: " "maxcpus must be equal to or greater than smp: " @@ -456,7 +456,7 @@ static const struct SMPTestData data_with_books_invalid= [] =3D { static const struct SMPTestData data_with_drawers_invalid[] =3D { { /* config: -smp 16,drawers=3D2,sockets=3D2,cores=3D4,threads=3D2,m= axcpus=3D16 */ - .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, T, 2, F, 1, T, + .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, T, 2, F, 0, T, 2, T, 4, T, 2, T, 16), .expect_error =3D "Invalid CPU topology: " "product of the hierarchy must match maxcpus: " @@ -464,7 +464,7 @@ static const struct SMPTestData data_with_drawers_inval= id[] =3D { "!=3D maxcpus (16)", }, { /* config: -smp 34,drawers=3D2,sockets=3D2,cores=3D4,threads=3D2,m= axcpus=3D32 */ - .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, T, 2, F, 1, T, + .config =3D SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, T, 2, F, 0, T, 2, T, 4, T, 2, T, 32), .expect_error =3D "Invalid CPU topology: " "maxcpus must be equal to or greater than smp: " --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198561; cv=none; d=zohomail.com; s=zohoarc; b=YfjYugEFUsFq86gRf+LzgmPI/eR0ald1e65NyDb3QXFpY8rGYuR6XPzcI4837OEVgSpahpZdo+3UH/AdA1RMvWBAQK1M/2esbSr2YAEs6Tsyd9+cW1i/QrQHkt4JXVXBKPbiTwrA/nC0QP8gT3Lsl5OkgK29jY4LLqrGChtnR+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198561; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UrBycxmXKZRJrolXCFLanmpcSgTCZTkm0Z2V99WJj/s=; b=KS1z9Sr3+3X0tzavv4Dmx4N6nnyWMFsB4abo6+RQK999biNbk+AHWN25X6G2+86MBMSa+E84OJvC5l2OuYJBH1m+ZGs+LxVoh7Yhc5ENlnHj9ioHKD31Juv0Y3/ylgAzK+8uWptmFWj0InFEXiNcdAYlehVD0QWTokrlJOQOQ2M= 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 1718198561301887.0712046580716; Wed, 12 Jun 2024 06:22:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNvc-0001kx-Op; Wed, 12 Jun 2024 09:22:17 -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 1sHNv3-0000XT-1L for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:42 -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 1sHNuy-0003yT-Jn for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:38 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-479-6FCLyDMsNJmfylXjVtynBA-1; Wed, 12 Jun 2024 09:21:32 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C68951955E89; Wed, 12 Jun 2024 13:21:29 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EDA741956087; Wed, 12 Jun 2024 13:21:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198495; 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=UrBycxmXKZRJrolXCFLanmpcSgTCZTkm0Z2V99WJj/s=; b=EvxsG7k5hxax972W5opcqp9BkmuR/kqIrxchvIsNqsj7oHHnzMtuP0qDt/HEWZR7MCcj5l 94XL9CCmjR4Zl2+o0oUB0MBDZYUVGN5Zc9++C/8zo4ih3ZNdSc77V1yOITky8iipNfJn1R 9m2WlzVAOSGWyY67NxEmKPwOuCwkRYw= X-MC-Unique: 6FCLyDMsNJmfylXjVtynBA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Zhao Liu , Yongwei Ma Subject: [PULL 11/15] tests/unit/test-smp-parse: Make test cases aware of module level Date: Wed, 12 Jun 2024 15:20:51 +0200 Message-ID: <20240612132055.326889-12-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198563288100001 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Currently, -smp supports module level. It is necessary to consider the effects of module in the test cases to ensure that the calculations are correct. This is also the preparation to add module test cases. Signed-off-by: Zhao Liu Reviewed-by: Thomas Huth Tested-by: Yongwei Ma Message-ID: <20240529061925.350323-6-zhao1.liu@intel.com> Signed-off-by: Thomas Huth --- tests/unit/test-smp-parse.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index e3a0a9d12d..2214e47ba9 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -629,6 +629,7 @@ static char *smp_config_to_string(const SMPConfiguratio= n *config) " .has_sockets =3D %5s, sockets =3D %" PRId64 ",\n" " .has_dies =3D %5s, dies =3D %" PRId64 ",\n" " .has_clusters =3D %5s, clusters =3D %" PRId64 ",\n" + " .has_modules =3D %5s, modules =3D %" PRId64 ",\n" " .has_cores =3D %5s, cores =3D %" PRId64 ",\n" " .has_threads =3D %5s, threads =3D %" PRId64 ",\n" " .has_maxcpus =3D %5s, maxcpus =3D %" PRId64 ",\n" @@ -639,6 +640,7 @@ static char *smp_config_to_string(const SMPConfiguratio= n *config) config->has_sockets ? "true" : "false", config->sockets, config->has_dies ? "true" : "false", config->dies, config->has_clusters ? "true" : "false", config->clusters, + config->has_modules ? "true" : "false", config->modules, config->has_cores ? "true" : "false", config->cores, config->has_threads ? "true" : "false", config->threads, config->has_maxcpus ? "true" : "false", config->maxcpus); @@ -679,6 +681,7 @@ static char *cpu_topology_to_string(const CpuTopology *= topo, " .sockets =3D %u,\n" " .dies =3D %u,\n" " .clusters =3D %u,\n" + " .modules =3D %u,\n" " .cores =3D %u,\n" " .threads =3D %u,\n" " .max_cpus =3D %u,\n" @@ -688,8 +691,8 @@ static char *cpu_topology_to_string(const CpuTopology *= topo, "}", topo->cpus, topo->drawers, topo->books, topo->sockets, topo->dies, topo->clusters, - topo->cores, topo->threads, topo->max_cpus, - threads_per_socket, cores_per_socket, + topo->modules, topo->cores, topo->threads, + topo->max_cpus, threads_per_socket, cores_per_socket, has_clusters ? "true" : "false"); } =20 @@ -732,6 +735,7 @@ static void check_parse(MachineState *ms, const SMPConf= iguration *config, (ms->smp.sockets =3D=3D expect_topo->sockets) && (ms->smp.dies =3D=3D expect_topo->dies) && (ms->smp.clusters =3D=3D expect_topo->clusters) && + (ms->smp.modules =3D=3D expect_topo->modules) && (ms->smp.cores =3D=3D expect_topo->cores) && (ms->smp.threads =3D=3D expect_topo->threads) && (ms->smp.max_cpus =3D=3D expect_topo->max_cpus) && @@ -812,6 +816,11 @@ static void smp_parse_test(MachineState *ms, SMPTestDa= ta *data, bool is_valid) /* The parsed results of the unsupported parameters should be 1 */ static void unsupported_params_init(const MachineClass *mc, SMPTestData *d= ata) { + if (!mc->smp_props.modules_supported) { + data->expect_prefer_sockets.modules =3D 1; + data->expect_prefer_cores.modules =3D 1; + } + if (!mc->smp_props.dies_supported) { data->expect_prefer_sockets.dies =3D 1; data->expect_prefer_cores.dies =3D 1; --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198593; cv=none; d=zohomail.com; s=zohoarc; b=bo0N00YWqkhTysE9Riu1PX6VpjlYCC7k4yAq10kx5bg3TOUb541GrnI13YUreUr3DXm51cJme81ixMC0z2x4wpMT2l3Ta9xPnCrBlLmC15dmZBmswCIbNYx9pbOtaBSBLaYhS7UNBLYwDcrJiGrLnjAKvs6+0SyMR793+pmgJd4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198593; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ysjaZul4ZbC1SjhznPFtrygYxu0FiigwTdLPvfz0yuU=; b=Lmv2DBXzocx5yvY3Wqgb9dDvX4dDk9lbr1t7cwpQqD6N/4JxxGbeIG3JdWLySAM6EnX4BAt/wt3zYpU1216dvIo7ofalGDlWAgc4RDW365G73jZaHxHxl0ZZ3AkF1AEaISbaMM+e6fYrRXZpYc3yw8i9Wv1DgnTemmaEsB1aaWE= 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 1718198593320127.69122908867541; Wed, 12 Jun 2024 06:23:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNvK-0000vu-UA; Wed, 12 Jun 2024 09:21:59 -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 1sHNv5-0000b7-JJ for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:44 -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 1sHNv0-0003zK-7h for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:41 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-uhxMkd_3PX-dtGuPmRoXVg-1; Wed, 12 Jun 2024 09:21:32 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DE2BB1954213; Wed, 12 Jun 2024 13:21:31 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 451421956087; Wed, 12 Jun 2024 13:21:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198497; 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=ysjaZul4ZbC1SjhznPFtrygYxu0FiigwTdLPvfz0yuU=; b=SmYR7yZjCQZ0Z2lRmBoiCJf279u20lDAsb/qbh+bSdGtMlQI1TMweghPjMTz/pQJSN0fbk 7PDqJIfSL2i/wsNirdAMmijaw/kZVx09tK28vydkcooyYDU07wBVCeszrZlVzF5aaLAmoE FTBvKRWkGfhDw4EhkOYdcyL3QVoh5x4= X-MC-Unique: uhxMkd_3PX-dtGuPmRoXVg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Zhao Liu , Yongwei Ma Subject: [PULL 12/15] tests/unit/test-smp-parse: Test "modules" parameter in -smp Date: Wed, 12 Jun 2024 15:20:52 +0200 Message-ID: <20240612132055.326889-13-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198595392100002 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Cover the module cases in test-smp-parse. Signed-off-by: Zhao Liu Tested-by: Yongwei Ma Message-ID: <20240529061925.350323-7-zhao1.liu@intel.com> Signed-off-by: Thomas Huth --- tests/unit/test-smp-parse.c | 112 +++++++++++++++++++++++++++++++++--- 1 file changed, 103 insertions(+), 9 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 2214e47ba9..01832e5eda 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -48,17 +48,19 @@ } =20 /* - * Currently a 4-level topology hierarchy is supported on PC machines - * -sockets/dies/cores/threads + * Currently a 5-level topology hierarchy is supported on PC machines + * -sockets/dies/modules/cores/threads */ -#define SMP_CONFIG_WITH_DIES(ha, a, hb, b, hc, c, hd, d, he, e, hf, f) \ +#define SMP_CONFIG_WITH_MODS_DIES(ha, a, hb, b, hc, c, hd, d, \ + he, e, hf, f, hg, g) \ { \ .has_cpus =3D ha, .cpus =3D a, \ .has_sockets =3D hb, .sockets =3D b, \ .has_dies =3D hc, .dies =3D c, \ - .has_cores =3D hd, .cores =3D d, \ - .has_threads =3D he, .threads =3D e, \ - .has_maxcpus =3D hf, .maxcpus =3D f, \ + .has_modules =3D hd, .modules =3D d, \ + .has_cores =3D he, .cores =3D e, \ + .has_threads =3D hf, .threads =3D f, \ + .has_maxcpus =3D hg, .maxcpus =3D g, \ } =20 /* @@ -345,8 +347,14 @@ static const struct SMPTestData data_generic_valid[] = =3D { =20 static const struct SMPTestData data_generic_invalid[] =3D { { + /* config: -smp 2,modules=3D2 */ + .config =3D SMP_CONFIG_WITH_MODS_DIES(T, 2, F, 0, F, 0, T, 2, + F, 0, F, 0, F, 0), + .expect_error =3D "modules > 1 not supported by this machine's CPU= topology", + }, { /* config: -smp 2,dies=3D2 */ - .config =3D SMP_CONFIG_WITH_DIES(T, 2, F, 0, T, 2, F, 0, F, 0, F, = 0), + .config =3D SMP_CONFIG_WITH_MODS_DIES(T, 2, F, 0, T, 2, F, 0, + F, 0, F, 0, F, 0), .expect_error =3D "dies > 1 not supported by this machine's CPU to= pology", }, { /* config: -smp 2,clusters=3D2 */ @@ -397,17 +405,39 @@ static const struct SMPTestData data_generic_invalid[= ] =3D { }, }; =20 +static const struct SMPTestData data_with_modules_invalid[] =3D { + { + /* config: -smp 16,sockets=3D2,modules=3D2,cores=3D4,threads=3D2,m= axcpus=3D16 */ + .config =3D SMP_CONFIG_WITH_MODS_DIES(T, 16, T, 2, F, 0, T, 2, + T, 4, T, 2, T, 16), + .expect_error =3D "Invalid CPU topology: " + "product of the hierarchy must match maxcpus: " + "sockets (2) * modules (2) * cores (4) * threads (= 2) " + "!=3D maxcpus (16)", + }, { + /* config: -smp 34,sockets=3D2,modules=3D2,cores=3D4,threads=3D2,m= axcpus=3D32 */ + .config =3D SMP_CONFIG_WITH_MODS_DIES(T, 34, T, 2, F, 0, T, 2, + T, 4, T, 2, T, 32), + .expect_error =3D "Invalid CPU topology: " + "maxcpus must be equal to or greater than smp: " + "sockets (2) * modules (2) * cores (4) * threads (= 2) " + "=3D=3D maxcpus (32) < smp_cpus (34)", + }, +}; + static const struct SMPTestData data_with_dies_invalid[] =3D { { /* config: -smp 16,sockets=3D2,dies=3D2,cores=3D4,threads=3D2,maxc= pus=3D16 */ - .config =3D SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, T, 4, T, 2, T,= 16), + .config =3D SMP_CONFIG_WITH_MODS_DIES(T, 16, T, 2, T, 2, F, 0, + T, 4, T, 2, T, 16), .expect_error =3D "Invalid CPU topology: " "product of the hierarchy must match maxcpus: " "sockets (2) * dies (2) * cores (4) * threads (2) " "!=3D maxcpus (16)", }, { /* config: -smp 34,sockets=3D2,dies=3D2,cores=3D4,threads=3D2,maxc= pus=3D32 */ - .config =3D SMP_CONFIG_WITH_DIES(T, 34, T, 2, T, 2, T, 4, T, 2, T,= 32), + .config =3D SMP_CONFIG_WITH_MODS_DIES(T, 34, T, 2, T, 2, F, 0, + T, 4, T, 2, T, 32), .expect_error =3D "Invalid CPU topology: " "maxcpus must be equal to or greater than smp: " "sockets (2) * dies (2) * cores (4) * threads (2) " @@ -861,6 +891,13 @@ static void machine_generic_invalid_class_init(ObjectC= lass *oc, void *data) mc->max_cpus =3D MAX_CPUS - 1; } =20 +static void machine_with_modules_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->smp_props.modules_supported =3D true; +} + static void machine_with_dies_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -945,6 +982,56 @@ static void test_generic_invalid(const void *opaque) object_unref(obj); } =20 +static void test_with_modules(const void *opaque) +{ + const char *machine_type =3D opaque; + Object *obj =3D object_new(machine_type); + MachineState *ms =3D MACHINE(obj); + MachineClass *mc =3D MACHINE_GET_CLASS(obj); + SMPTestData data =3D {}; + unsigned int num_modules =3D 2; + int i; + + for (i =3D 0; i < ARRAY_SIZE(data_generic_valid); i++) { + data =3D data_generic_valid[i]; + unsupported_params_init(mc, &data); + + /* when modules parameter is omitted, it will be set as 1 */ + data.expect_prefer_sockets.modules =3D 1; + data.expect_prefer_cores.modules =3D 1; + + smp_parse_test(ms, &data, true); + + /* when modules parameter is specified */ + data.config.has_modules =3D true; + data.config.modules =3D num_modules; + if (data.config.has_cpus) { + data.config.cpus *=3D num_modules; + } + if (data.config.has_maxcpus) { + data.config.maxcpus *=3D num_modules; + } + + data.expect_prefer_sockets.modules =3D num_modules; + data.expect_prefer_sockets.cpus *=3D num_modules; + data.expect_prefer_sockets.max_cpus *=3D num_modules; + data.expect_prefer_cores.modules =3D num_modules; + data.expect_prefer_cores.cpus *=3D num_modules; + data.expect_prefer_cores.max_cpus *=3D num_modules; + + smp_parse_test(ms, &data, true); + } + + for (i =3D 0; i < ARRAY_SIZE(data_with_modules_invalid); i++) { + data =3D data_with_modules_invalid[i]; + unsupported_params_init(mc, &data); + + smp_parse_test(ms, &data, false); + } + + object_unref(obj); +} + static void test_with_dies(const void *opaque) { const char *machine_type =3D opaque; @@ -1303,6 +1390,10 @@ static const TypeInfo smp_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("smp-generic-invalid"), .parent =3D TYPE_MACHINE, .class_init =3D machine_generic_invalid_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("smp-with-modules"), + .parent =3D TYPE_MACHINE, + .class_init =3D machine_with_modules_class_init, }, { .name =3D MACHINE_TYPE_NAME("smp-with-dies"), .parent =3D TYPE_MACHINE, @@ -1344,6 +1435,9 @@ int main(int argc, char *argv[]) g_test_add_data_func("/test-smp-parse/generic/invalid", MACHINE_TYPE_NAME("smp-generic-invalid"), test_generic_invalid); + g_test_add_data_func("/test-smp-parse/with_modules", + MACHINE_TYPE_NAME("smp-with-modules"), + test_with_modules); g_test_add_data_func("/test-smp-parse/with_dies", MACHINE_TYPE_NAME("smp-with-dies"), test_with_dies); --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198595; cv=none; d=zohomail.com; s=zohoarc; b=JpYf1zGffGZ2EMEVU4yv8d9jTZX7gsB/IYYGISvULyV9Z7WSqFspuN0V8kC8qsE4sceWFjSpZUxa2rbxnv6Yr18ZUSfPj4kbOmvLMEfGPMFsQHD8UlJbaTvvXaaAeU9VD4WAjx1zD7qd6TXFxAusDau3AYpz51FyybU0z14+QPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198595; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4cUKmPgrHxOvdyn6AxHRIzYDAEU26KLGZwsf7oV2h70=; b=nOxzjE7mBysn6avBv2d87SJOxCZXDLAA9IsBRq9PjSW8zDi7ENsdKc5qnDCqMOXseWA2BJFRrH9NmxFFbe+k4eLvhVOAavs8paLPCNbzUVwOALDRrxuvinyIo6EJexzUCs03LJBrSWJ4ZA96D3FTZSgThl6miy/qrgHb165fbiM= 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 171819859509411.083373001238783; Wed, 12 Jun 2024 06:23:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNvZ-0001GP-4O; Wed, 12 Jun 2024 09:22: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 1sHNvA-0000mn-Ts for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:50 -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 1sHNv5-00040b-DW for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:45 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-588-GZ47Zw3HO6W4-gDRsVpZlQ-1; Wed, 12 Jun 2024 09:21:37 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 12149195DE0C; Wed, 12 Jun 2024 13:21:36 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 501441956087; Wed, 12 Jun 2024 13:21:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198502; 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=4cUKmPgrHxOvdyn6AxHRIzYDAEU26KLGZwsf7oV2h70=; b=HSTiwQ+q5GXx0l8e9aXg7j6/RtL8QG/Yi2ExzgLC0Qx4aGEdZpnxhlL9GVbOmk6XeOFsMs MVRPHEln8ghMs39nA0zHtrug2Mi9mr1nqNTKCaHoZc/94ItCt1F84eK3hifFeBMFxDbqhq Y8jfUIXAVFqQzXWkTGgHZm+5bsn5v+M= X-MC-Unique: GZ47Zw3HO6W4-gDRsVpZlQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Zhao Liu , Yongwei Ma Subject: [PULL 13/15] tests/unit/test-smp-parse: Test "modules" and "dies" combination case Date: Wed, 12 Jun 2024 15:20:53 +0200 Message-ID: <20240612132055.326889-14-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198595390100001 Content-Type: text/plain; charset="utf-8" From: Zhao Liu Since i386 PC machine supports both "modules" and "dies" in -smp, add the "modules" and "dies" combination test case to match the actual topology usage scenario. Signed-off-by: Zhao Liu Tested-by: Yongwei Ma Message-ID: <20240529061925.350323-8-zhao1.liu@intel.com> Signed-off-by: Thomas Huth --- tests/unit/test-smp-parse.c | 103 ++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 01832e5eda..2ca8530e93 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -445,6 +445,33 @@ static const struct SMPTestData data_with_dies_invalid= [] =3D { }, }; =20 +static const struct SMPTestData data_with_modules_dies_invalid[] =3D { + { + /* + * config: -smp 200,sockets=3D3,dies=3D5,modules=3D2,cores=3D4,\ + * threads=3D2,maxcpus=3D200 + */ + .config =3D SMP_CONFIG_WITH_MODS_DIES(T, 200, T, 3, T, 5, T, + 2, T, 4, T, 2, T, 200), + .expect_error =3D "Invalid CPU topology: " + "product of the hierarchy must match maxcpus: " + "sockets (3) * dies (5) * modules (2) * " + "cores (4) * threads (2) !=3D maxcpus (200)", + }, { + /* + * config: -smp 242,sockets=3D3,dies=3D5,modules=3D2,cores=3D4,\ + * threads=3D2,maxcpus=3D240 + */ + .config =3D SMP_CONFIG_WITH_MODS_DIES(T, 242, T, 3, T, 5, T, + 2, T, 4, T, 2, T, 240), + .expect_error =3D "Invalid CPU topology: " + "maxcpus must be equal to or greater than smp: " + "sockets (3) * dies (5) * modules (2) * " + "cores (4) * threads (2) " + "=3D=3D maxcpus (240) < smp_cpus (242)", + }, +}; + static const struct SMPTestData data_with_clusters_invalid[] =3D { { /* config: -smp 16,sockets=3D2,clusters=3D2,cores=3D4,threads=3D2,= maxcpus=3D16 */ @@ -905,6 +932,14 @@ static void machine_with_dies_class_init(ObjectClass *= oc, void *data) mc->smp_props.dies_supported =3D true; } =20 +static void machine_with_modules_dies_class_init(ObjectClass *oc, void *da= ta) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->smp_props.modules_supported =3D true; + mc->smp_props.dies_supported =3D true; +} + static void machine_with_clusters_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1082,6 +1117,67 @@ static void test_with_dies(const void *opaque) object_unref(obj); } =20 +static void test_with_modules_dies(const void *opaque) +{ + const char *machine_type =3D opaque; + Object *obj =3D object_new(machine_type); + MachineState *ms =3D MACHINE(obj); + MachineClass *mc =3D MACHINE_GET_CLASS(obj); + SMPTestData data =3D {}; + unsigned int num_modules =3D 5, num_dies =3D 3; + int i; + + for (i =3D 0; i < ARRAY_SIZE(data_generic_valid); i++) { + data =3D data_generic_valid[i]; + unsupported_params_init(mc, &data); + + /* + * when modules and dies parameters are omitted, they will + * be both set as 1. + */ + data.expect_prefer_sockets.modules =3D 1; + data.expect_prefer_sockets.dies =3D 1; + data.expect_prefer_cores.modules =3D 1; + data.expect_prefer_cores.dies =3D 1; + + smp_parse_test(ms, &data, true); + + /* when modules and dies parameters are both specified */ + data.config.has_modules =3D true; + data.config.modules =3D num_modules; + data.config.has_dies =3D true; + data.config.dies =3D num_dies; + + if (data.config.has_cpus) { + data.config.cpus *=3D num_modules * num_dies; + } + if (data.config.has_maxcpus) { + data.config.maxcpus *=3D num_modules * num_dies; + } + + data.expect_prefer_sockets.modules =3D num_modules; + data.expect_prefer_sockets.dies =3D num_dies; + data.expect_prefer_sockets.cpus *=3D num_modules * num_dies; + data.expect_prefer_sockets.max_cpus *=3D num_modules * num_dies; + + data.expect_prefer_cores.modules =3D num_modules; + data.expect_prefer_cores.dies =3D num_dies; + data.expect_prefer_cores.cpus *=3D num_modules * num_dies; + data.expect_prefer_cores.max_cpus *=3D num_modules * num_dies; + + smp_parse_test(ms, &data, true); + } + + for (i =3D 0; i < ARRAY_SIZE(data_with_modules_dies_invalid); i++) { + data =3D data_with_modules_dies_invalid[i]; + unsupported_params_init(mc, &data); + + smp_parse_test(ms, &data, false); + } + + object_unref(obj); +} + static void test_with_clusters(const void *opaque) { const char *machine_type =3D opaque; @@ -1398,6 +1494,10 @@ static const TypeInfo smp_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("smp-with-dies"), .parent =3D TYPE_MACHINE, .class_init =3D machine_with_dies_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("smp-with-modules-dies"), + .parent =3D TYPE_MACHINE, + .class_init =3D machine_with_modules_dies_class_init, }, { .name =3D MACHINE_TYPE_NAME("smp-with-clusters"), .parent =3D TYPE_MACHINE, @@ -1441,6 +1541,9 @@ int main(int argc, char *argv[]) g_test_add_data_func("/test-smp-parse/with_dies", MACHINE_TYPE_NAME("smp-with-dies"), test_with_dies); + g_test_add_data_func("/test-smp-parse/with_modules_dies", + MACHINE_TYPE_NAME("smp-with-modules-dies"), + test_with_modules_dies); g_test_add_data_func("/test-smp-parse/with_clusters", MACHINE_TYPE_NAME("smp-with-clusters"), test_with_clusters); --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198582; cv=none; d=zohomail.com; s=zohoarc; b=BnItQevBbEZm3FGKnmksqLgJXwv4X/cAVUjveEkXmU12ZWmimU++nhD5M0Q3hzpZjLzWSsX75+3YFZ9/QP63XoIXhAsgQVBTg3f/ClBk+QEIX4E2PD6Wv7ttforMLPCJ42R1d0DEzf4/so1d56DHTcEc1IPpQUbXpk9vVFpdmvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198582; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fOfjBdntAepIxFZzZ7peqwPdszRHHDJUcIIq7tm5rMg=; b=Flz6FXHpRMHnNqMNQ/acmPoQ+bnGyYbXiuTOcX+HER3h/SyKVcnhbDpTwAipI0CYEZE45N5dBiwi3quAAdVScu+hLvO58GcqHXkq51zqL102NsNkJsftCOhpkll5Hrc6nQy84LOsz6z00pBR64KF47PBdm8vWe54SqPJLGiuXY4= 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 1718198582479658.6463848123391; Wed, 12 Jun 2024 06:23:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNvm-00020p-0Y; Wed, 12 Jun 2024 09:22:27 -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 1sHNvH-00010X-FF for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:56 -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 1sHNv9-00041A-T9 for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:52 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-497-I9YzEPqgNhuNvN_X8U9f0g-1; Wed, 12 Jun 2024 09:21:42 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4E8331955D64; Wed, 12 Jun 2024 13:21:38 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 704C8196BE8C; Wed, 12 Jun 2024 13:21:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198506; 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=fOfjBdntAepIxFZzZ7peqwPdszRHHDJUcIIq7tm5rMg=; b=L25CN6wzsRaA9J4o4dBnN/mCREIx0dB4pTjNIElnmOE6WkP0qHV/gxPMlOQ0jl6Qo+BBFN yBk7NMe3QIIWAKGbCn0r92ho85K2rszUxDerAG0QXrRnh9mKd91p7G99uZHRJeyrMwA0hB 3lHnhQx2wKG23JLksJFiMbm6nv+W4gA= X-MC-Unique: I9YzEPqgNhuNvN_X8U9f0g-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Zhao Liu , Yongwei Ma Subject: [PULL 14/15] tests/unit/test-smp-parse: Test the full 8-levels topology hierarchy Date: Wed, 12 Jun 2024 15:20:54 +0200 Message-ID: <20240612132055.326889-15-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198583386100001 Content-Type: text/plain; charset="utf-8" From: Zhao Liu With module level, QEMU now support 8-levels topology hierarchy. Cover "modules" in SMP_CONFIG_WITH_FULL_TOPO related cases. Signed-off-by: Zhao Liu Tested-by: Yongwei Ma Message-ID: <20240529061925.350323-9-zhao1.liu@intel.com> Signed-off-by: Thomas Huth --- tests/unit/test-smp-parse.c | 129 ++++++++++++++++++++++++------------ 1 file changed, 85 insertions(+), 44 deletions(-) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 2ca8530e93..f9bccb56ab 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -94,11 +94,11 @@ } =20 /* - * Currently QEMU supports up to a 7-level topology hierarchy, which is the + * Currently QEMU supports up to a 8-level topology hierarchy, which is the * QEMU's unified abstract representation of CPU topology. - * -drawers/books/sockets/dies/clusters/cores/threads + * -drawers/books/sockets/dies/clusters/modules/cores/threads */ -#define SMP_CONFIG_WITH_FULL_TOPO(a, b, c, d, e, f, g, h, i) \ +#define SMP_CONFIG_WITH_FULL_TOPO(a, b, c, d, e, f, g, h, i, j) \ { \ .has_cpus =3D true, .cpus =3D a, \ .has_drawers =3D true, .drawers =3D b, \ @@ -106,9 +106,10 @@ .has_sockets =3D true, .sockets =3D d, \ .has_dies =3D true, .dies =3D e, \ .has_clusters =3D true, .clusters =3D f, \ - .has_cores =3D true, .cores =3D g, \ - .has_threads =3D true, .threads =3D h, \ - .has_maxcpus =3D true, .maxcpus =3D i, \ + .has_modules =3D true, .modules =3D g, \ + .has_cores =3D true, .cores =3D h, \ + .has_threads =3D true, .threads =3D i, \ + .has_maxcpus =3D true, .maxcpus =3D j, \ } =20 /** @@ -336,10 +337,10 @@ static const struct SMPTestData data_generic_valid[] = =3D { /* * Unsupported parameters are always allowed to be set to '1' * config: - * -smp 8,drawers=3D1,books=3D1,sockets=3D2,dies=3D1,clusters=3D= 1,cores=3D2,\ - * threads=3D2,maxcpus=3D8 + * -smp 8,drawers=3D1,books=3D1,sockets=3D2,dies=3D1,clusters=3D= 1,modules=3D1,\ + * cores=3D2,threads=3D2,maxcpus=3D8 * expect: cpus=3D8,sockets=3D2,cores=3D2,threads=3D2,maxcpus=3D8 = */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(8, 1, 1, 2, 1, 1, 2, 2, 8), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(8, 1, 1, 2, 1, 1, 1, 2, 2, 8= ), .expect_prefer_sockets =3D CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), .expect_prefer_cores =3D CPU_TOPOLOGY_GENERIC(8, 2, 2, 2, 8), }, @@ -561,32 +562,37 @@ static const struct SMPTestData data_full_topo_invali= d[] =3D { { /* * config: -smp 200,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ - * clusters=3D2,cores=3D7,threads=3D2,maxcpus=3D200 + * clusters=3D2,modules=3D3,cores=3D7,threads=3D2,\ + * maxcpus=3D200 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(200, 3, 5, 2, 4, 2, 7, 2, 20= 0), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(200, 3, 5, 2, 4, 2, 3, 7, 2,= 200), .expect_error =3D "Invalid CPU topology: " "product of the hierarchy must match maxcpus: " "drawers (3) * books (5) * sockets (2) * dies (4) = * " - "clusters (2) * cores (7) * threads (2) " + "clusters (2) * modules (3) * cores (7) * threads = (2) " "!=3D maxcpus (200)", }, { /* - * config: -smp 3361,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ - * clusters=3D2,cores=3D7,threads=3D2,maxcpus=3D3360 + * config: -smp 2881,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ + * clusters=3D2,modules=3D3,cores=3D2,threads=3D2, + * maxcpus=3D2880 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(3361, 3, 5, 2, 4, 2, 7, 2, 3= 360), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(2881, 3, 5, 2, 4, + 2, 3, 2, 2, 2880), .expect_error =3D "Invalid CPU topology: " "maxcpus must be equal to or greater than smp: " - "drawers (3) * books (5) * sockets (2) * dies (4) = * " - "clusters (2) * cores (7) * threads (2) " - "=3D=3D maxcpus (3360) < smp_cpus (3361)", + "drawers (3) * books (5) * sockets (2) * " + "dies (4) * clusters (2) * modules (3) * " + "cores (2) * threads (2) =3D=3D maxcpus (2880) " + "< smp_cpus (2881)", }, { /* * config: -smp 1,drawers=3D3,books=3D5,sockets=3D2,dies=3D4,\ - * clusters=3D2,cores=3D7,threads=3D3,maxcpus=3D5040 + * clusters=3D2,modules=3D3,cores=3D3,threads=3D3,\ + * maxcpus=3D6480 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 3, 5, 2, 4, 2, 7, 3, 5040= ), - .expect_error =3D "Invalid SMP CPUs 5040. The max CPUs supported " + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 3, 5, 2, 4, 2, 3, 3, 3, 6= 480), + .expect_error =3D "Invalid SMP CPUs 6480. The max CPUs supported " "by machine '" SMP_MACHINE_NAME "' is 4096", }, }; @@ -596,81 +602,100 @@ static const struct SMPTestData data_zero_topo_inval= id[] =3D { /* * Test "cpus=3D0". * config: -smp 0,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(0, 1, 1, 1, 1, 1, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(0, 1, 1, 1, 1, 1, 1, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "drawers=3D0". * config: -smp 1,drawers=3D0,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 0, 1, 1, 1, 1, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 0, 1, 1, 1, 1, 1, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "books=3D0". * config: -smp 1,drawers=3D1,books=3D0,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 0, 1, 1, 1, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 0, 1, 1, 1, 1, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "sockets=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D0,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1, + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 0, 1, 1, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 0, 1, 1, 1, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "dies=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D0,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 0, 1, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 0, 1, 1, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "clusters=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D0,cores=3D1,threads=3D1,maxcpus=3D1 + * clusters=3D0,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D1 + */ + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 0, 1, 1, 1, 1= ), + .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " + "be greater than zero", + }, { + /* + * Test "modules=3D0". + * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ + * clusters=3D1,modules=3D0,cores=3D1,threads=3D1,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 0, 1, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 0, 1, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "cores=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D0,threads=3D1,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D0,threads=3D1, + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 0, 1, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 0, 1, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "threads=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D0,maxcpus=3D1 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D0,\ + * maxcpus=3D1 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 0, 1), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 1, 0, 1= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, { /* * Test "maxcpus=3D0". * config: -smp 1,drawers=3D1,books=3D1,sockets=3D1,dies=3D1,\ - * clusters=3D1,cores=3D1,threads=3D1,maxcpus=3D0 + * clusters=3D1,modules=3D1,cores=3D1,threads=3D1,\ + * maxcpus=3D0 */ - .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 1, 0), + .config =3D SMP_CONFIG_WITH_FULL_TOPO(1, 1, 1, 1, 1, 1, 1, 1, 1, 0= ), .expect_error =3D "Invalid CPU topology: CPU topology parameters m= ust " "be greater than zero", }, @@ -977,6 +1002,7 @@ static void machine_full_topo_class_init(ObjectClass *= oc, void *data) mc->smp_props.books_supported =3D true; mc->smp_props.dies_supported =3D true; mc->smp_props.clusters_supported =3D true; + mc->smp_props.modules_supported =3D true; } =20 static void test_generic_valid(const void *opaque) @@ -1396,30 +1422,41 @@ static void test_full_topo(const void *opaque) MachineState *ms =3D MACHINE(obj); MachineClass *mc =3D MACHINE_GET_CLASS(obj); SMPTestData data =3D {}; - unsigned int drawers =3D 5, books =3D 3, dies =3D 2, clusters =3D 7, m= ultiplier; + unsigned int drawers, books, dies, clusters, modules, multiplier; int i; =20 - multiplier =3D drawers * books * dies * clusters; + drawers =3D 5; + books =3D 3; + dies =3D 2; + clusters =3D 3; + modules =3D 2; + + multiplier =3D drawers * books * dies * clusters * modules; for (i =3D 0; i < ARRAY_SIZE(data_generic_valid); i++) { data =3D data_generic_valid[i]; unsupported_params_init(mc, &data); =20 /* - * when drawers, books, dies and clusters parameters are omitted, - * they will be set as 1. + * when drawers, books, dies, clusters and modules parameters are + * omitted, they will be set as 1. */ data.expect_prefer_sockets.drawers =3D 1; data.expect_prefer_sockets.books =3D 1; data.expect_prefer_sockets.dies =3D 1; data.expect_prefer_sockets.clusters =3D 1; + data.expect_prefer_sockets.modules =3D 1; data.expect_prefer_cores.drawers =3D 1; data.expect_prefer_cores.books =3D 1; data.expect_prefer_cores.dies =3D 1; data.expect_prefer_cores.clusters =3D 1; + data.expect_prefer_cores.modules =3D 1; =20 smp_parse_test(ms, &data, true); =20 - /* when drawers, books, dies and clusters parameters are specified= . */ + /* + * when drawers, books, dies, clusters and modules parameters + * are specified. + */ data.config.has_drawers =3D true; data.config.drawers =3D drawers; data.config.has_books =3D true; @@ -1428,6 +1465,8 @@ static void test_full_topo(const void *opaque) data.config.dies =3D dies; data.config.has_clusters =3D true; data.config.clusters =3D clusters; + data.config.has_modules =3D true; + data.config.modules =3D modules; =20 if (data.config.has_cpus) { data.config.cpus *=3D multiplier; @@ -1440,6 +1479,7 @@ static void test_full_topo(const void *opaque) data.expect_prefer_sockets.books =3D books; data.expect_prefer_sockets.dies =3D dies; data.expect_prefer_sockets.clusters =3D clusters; + data.expect_prefer_sockets.modules =3D modules; data.expect_prefer_sockets.cpus *=3D multiplier; data.expect_prefer_sockets.max_cpus *=3D multiplier; =20 @@ -1447,6 +1487,7 @@ static void test_full_topo(const void *opaque) data.expect_prefer_cores.books =3D books; data.expect_prefer_cores.dies =3D dies; data.expect_prefer_cores.clusters =3D clusters; + data.expect_prefer_cores.modules =3D modules; data.expect_prefer_cores.cpus *=3D multiplier; data.expect_prefer_cores.max_cpus *=3D multiplier; =20 --=20 2.45.2 From nobody Sat Dec 14 20:18: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=1718198546; cv=none; d=zohomail.com; s=zohoarc; b=eO8YgMC8PzVMs8+MnjVjgieq19MyJzRQHGhzKSjJ01Cz+8a7LBPU5dNx/k+/nN7HITmpbLxUvRVAb2iWPRAdctV7Z5Rm1hu+M+G0uTrhXEk3WlhdMMsxM0ZzSfidcBFmFkGRhjr62J6+MsUrSgDkUpxW7EopmpnD+RIyOjLxdR8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718198546; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dPkqPM09irKk4/tJSzzBfn9xWhd8lM+mKkGF85AX1tg=; b=i1/MJYjbbvxui64IXWT5Kx2sAXnGohGX0RcCgjRQ0aA7TfZ/YX1cNkcXSPPTU1Lva+bUsubIovrWWo7zpIZnOhEJBfQsFmjpNuT53k3mWlYCQzQpH443wXzmry+z17lMEgEEReCkJPjkiUgEEsIUNTUiJhpeoiBByyNemaXjiSA= 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 1718198546365186.72969899242105; Wed, 12 Jun 2024 06:22:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHNvc-0001gJ-A6; Wed, 12 Jun 2024 09:22: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 1sHNvG-0000zx-2y for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:55 -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 1sHNv9-000415-Gk for qemu-devel@nongnu.org; Wed, 12 Jun 2024 09:21:51 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-552-mlJ7JGJxNXK2VVCCmLN76Q-1; Wed, 12 Jun 2024 09:21:41 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 58719195420E; Wed, 12 Jun 2024 13:21:40 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B802A1955E91; Wed, 12 Jun 2024 13:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718198505; 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=dPkqPM09irKk4/tJSzzBfn9xWhd8lM+mKkGF85AX1tg=; b=edj3MVY0clRlhaQbjA3hsx3OxPrhCvXYf3coxWdXhjuVveD6LWWb7/o9eQUKoK+mNnqIP8 WQ01+xf/T97m9Pi4VTuO/5wsMACmUFjWwYjGSQXxl7IjklDLRsitX/+NSYtXaTjNkdqZ2M 4oor160gHmDJXjbjrGxDQfTaKmYeoGE= X-MC-Unique: mlJ7JGJxNXK2VVCCmLN76Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: Ilya Leoshkevich Subject: [PULL 15/15] tests/tcg/s390x: Allow specifying extra QEMU options on the command line Date: Wed, 12 Jun 2024 15:20:55 +0200 Message-ID: <20240612132055.326889-16-thuth@redhat.com> In-Reply-To: <20240612132055.326889-1-thuth@redhat.com> References: <20240612132055.326889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.143, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: 1718198547028100001 Content-Type: text/plain; charset="utf-8" From: Ilya Leoshkevich The use case for this is `make check-tcg EXTFLAGS=3D"-accel kvm"`, which allows validating the system TCG testcases on real hardware. EXTFLAGS name is borrowed from tests/tcg/xtensa/Makefile.softmmu-target. While at it, use +=3D instead of =3D in order to be consistent with the other architectures. Signed-off-by: Ilya Leoshkevich Reviewed-by: Thomas Huth Message-ID: <20240522184116.35975-1-iii@linux.ibm.com> Signed-off-by: Thomas Huth --- tests/tcg/s390x/Makefile.softmmu-target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/Make= file.softmmu-target index 80159cccf5..4c8e15e625 100644 --- a/tests/tcg/s390x/Makefile.softmmu-target +++ b/tests/tcg/s390x/Makefile.softmmu-target @@ -1,6 +1,6 @@ S390X_SRC=3D$(SRC_PATH)/tests/tcg/s390x VPATH+=3D$(S390X_SRC) -QEMU_OPTS=3D-action panic=3Dexit-failure -nographic -kernel +QEMU_OPTS+=3D-action panic=3Dexit-failure -nographic $(EXTFLAGS) -kernel LINK_SCRIPT=3D$(S390X_SRC)/softmmu.ld CFLAGS+=3D-ggdb -O0 LDFLAGS=3D-nostdlib -static --=20 2.45.2