From nobody Mon Feb 9 15:46:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1569220527; cv=none; d=zoho.com; s=zohoarc; b=CT+3zVERdaZZiAxymmxjVSu6rEdI5PgTMapyuCYlehS/Ou2qBwp030yLTPR1MhHjo7xDUKwHubxb/Wa2YVrXSPiN8fGwmPhSmORVrJRfjEhBSjyEIFsNBm9bFRHkWgCmByLnywQu83Snvw4/Nhn1Sz/f2GwZWF9ktRo+WmUxvRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569220527; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=73M1ma4cTUJBjTO7cnROHLIQ7pVFfiyI6twtofjQ2Os=; b=diJQeg3YgBoYqa2i5dhmVtMIwedUyQyXmKDRdzu4djpQgAe52lfgwX6uO1+zHv7ijQ9onm3Okay6nQXgr54BGwsSScYuuF5GxKv2DNLZ4mNx7QQQGGFs1Hdn6vu6/tt9Sgn5h6VePZyo8i35CxWCnfOLpdTk8vvhnvfW5U7Zgvw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569220527469695.4423975558256; Sun, 22 Sep 2019 23:35:27 -0700 (PDT) Received: from localhost ([::1]:52588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCHwT-0002gB-7E for importer@patchew.org; Mon, 23 Sep 2019 02:35:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57403) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCHsA-0000Fd-8R for qemu-devel@nongnu.org; Mon, 23 Sep 2019 02:30:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCHs8-0004oo-5Q for qemu-devel@nongnu.org; Mon, 23 Sep 2019 02:30:57 -0400 Received: from mga05.intel.com ([192.55.52.43]:4527) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCHs7-0004l4-Te for qemu-devel@nongnu.org; Mon, 23 Sep 2019 02:30:56 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Sep 2019 23:30:55 -0700 Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by orsmga008.jf.intel.com with ESMTP; 22 Sep 2019 23:30:53 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,539,1559545200"; d="scan'208";a="182429905" From: Tao Xu To: ehabkost@redhat.com, sgarzare@redhat.com, philmd@redhat.com, pbonzini@redhat.com, rth@twiddle.net Subject: [PATCH v3 2/2] target/i386: drop the duplicated definition of cpuid AVX512_VBMI marco Date: Mon, 23 Sep 2019 14:30:41 +0800 Message-Id: <20190923063041.12420-3-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190923063041.12420-1-tao3.xu@intel.com> References: <20190923063041.12420-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tao Xu , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Drop the duplicated definition of cpuid AVX512_VBMI marco and rename it as CPUID_7_0_ECX_AVX512_VBMI. Signed-off-by: Tao Xu --- target/i386/cpu.c | 4 ++-- target/i386/cpu.h | 3 +-- target/i386/hvf/x86_cpuid.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 9e0bac31e8..f87fe88259 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2412,7 +2412,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX | CPUID_7_0_EBX_SMAP, .features[FEAT_7_0_ECX] =3D - CPUID_7_0_ECX_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU | + CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX= _PKU | CPUID_7_0_ECX_VBMI2 | CPUID_7_0_ECX_GFNI | CPUID_7_0_ECX_VAES | CPUID_7_0_ECX_VPCLMULQDQ | CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG | @@ -2470,7 +2470,7 @@ static X86CPUDefinition builtin_x86_defs[] =3D { CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD | CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT, .features[FEAT_7_0_ECX] =3D - CPUID_7_0_ECX_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU | + CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX= _PKU | CPUID_7_0_ECX_VBMI2 | CPUID_7_0_ECX_GFNI | CPUID_7_0_ECX_VAES | CPUID_7_0_ECX_VPCLMULQDQ | CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG | diff --git a/target/i386/cpu.h b/target/i386/cpu.h index fa4c4cad79..61f6287294 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -695,8 +695,7 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS]; #define CPUID_7_0_EBX_AVX512VL (1U << 31) =20 /* AVX-512 Vector Byte Manipulation Instruction */ -#define CPUID_7_0_ECX_AVX512BMI (1U << 1) -#define CPUID_7_0_ECX_VBMI (1U << 1) +#define CPUID_7_0_ECX_AVX512_VBMI (1U << 1) /* User-Mode Instruction Prevention */ #define CPUID_7_0_ECX_UMIP (1U << 2) /* Protection Keys for User-mode Pages */ diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c index 4d957fe896..16762b6eb4 100644 --- a/target/i386/hvf/x86_cpuid.c +++ b/target/i386/hvf/x86_cpuid.c @@ -89,7 +89,7 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t = idx, ebx &=3D ~CPUID_7_0_EBX_INVPCID; } =20 - ecx &=3D CPUID_7_0_ECX_AVX512BMI | CPUID_7_0_ECX_AVX512_VPOPCN= TDQ; + ecx &=3D CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_AVX512_VPOP= CNTDQ; edx &=3D CPUID_7_0_EDX_AVX512_4VNNIW | CPUID_7_0_EDX_AVX512_4F= MAPS; } else { ebx =3D 0; --=20 2.20.1