From nobody Mon Apr 29 14:25:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1616770594; cv=none; d=zohomail.com; s=zohoarc; b=DPPsIPz0IMWSio4B/fSsQA6fMn/wZDdT5s8VdyMaFPzESrek739+xdnvcZslRRHfyLdKqG5+QEjDqpQ5T3cs5QqtoiCXM5firKJWvVOVhn5781+9W1gaRz3riDxvK5lYNCkjebyxposs6tiyEqHAsxNh+xVikOjbdAb1qFPXyr4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616770594; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=+elhURSMO9DRVkXAcdANcB4idJBcV2nAOuy6HXVMCtc=; b=MR2H2VWx/CvhdO8P5n3RQUMBgCm1kRHgLf232QiJGeSEGI3X94IUMwaHldK3iXhraBU7VBXgnF3LEaZg/ENHYj2aMR69fQsK6vbhKJ+W9JmCUKLMPIpZU+mWXRH06JYeyYKJBtnZJgjdGYpQkAbF4rIFXuyqPzuwCq9kN63Wrm0= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=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 1616770593917459.53716042202825; Fri, 26 Mar 2021 07:56:33 -0700 (PDT) Received: from localhost ([::1]:58524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPnt2-0004Ug-LZ for importer@patchew.org; Fri, 26 Mar 2021 10:56:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPnrJ-0003Xg-Cs for qemu-devel@nongnu.org; Fri, 26 Mar 2021 10:54:45 -0400 Received: from mga07.intel.com ([134.134.136.100]:30556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPnrD-0001Ya-C2 for qemu-devel@nongnu.org; Fri, 26 Mar 2021 10:54:45 -0400 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2021 07:54:36 -0700 Received: from sqa-gate.sh.intel.com (HELO robert-ivt.tsp.org) ([10.239.48.212]) by orsmga007.jf.intel.com with ESMTP; 26 Mar 2021 07:54:34 -0700 IronPort-SDR: 370vQxhpv6KCSVU7Wu2HEknMFbk5hXvMOivQsp3doAuIbFLpjttogyruFeHUZFP8k72aZZmjcT 0wr0BnBjm5Qg== X-IronPort-AV: E=McAfee;i="6000,8403,9935"; a="255154836" X-IronPort-AV: E=Sophos;i="5.81,280,1610438400"; d="scan'208";a="255154836" IronPort-SDR: 0Sj9WvrMU5rd3S6BlcOCfKN4bOXHjlIjlXfRpOoFXJP8A7oZJbt3Cybqzet7Vhg6Zel9irNnYc Vgr4hTIkpXQg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,280,1610438400"; d="scan'208";a="414569243" From: Robert Hoo To: pbonzini@redhat.com, richard.henderson@linaro.org, ehabkost@redhat.com Subject: [PATCH v4] i386/cpu_dump: support AVX512 ZMM regs dump Date: Fri, 26 Mar 2021 22:54:29 +0800 Message-Id: <1616770469-36979-1-git-send-email-robert.hu@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 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: none client-ip=134.134.136.100; envelope-from=robert.hu@linux.intel.com; helo=mga07.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: qemu-devel@nongnu.org, Robert Hoo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since commit fa4518741e (target-i386: Rename struct XMMReg to ZMMReg), CPUX86State.xmm_regs[] has already been extended to 512bit to support AVX512. Also, other qemu level supports for AVX512 registers are there for years. But in x86_cpu_dump_state(), still only dump XMM registers no matter YMM/ZMM is enabled. This patch is to complement this, let it dump XMM/YMM/ZMM accordingly. Signed-off-by: Robert Hoo --- Changelog: v4: stringent AVX512 case and AVX case judgement criteria v3: fix some coding style issue. v2: dump XMM/YMM/ZMM according to XSAVE state-components enablement. target/i386/cpu-dump.c | 62 ++++++++++++++++++++++++++++++++++++++--------= ---- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c index aac21f1..dea4564 100644 --- a/target/i386/cpu-dump.c +++ b/target/i386/cpu-dump.c @@ -478,6 +478,11 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, int fla= gs) qemu_fprintf(f, "EFER=3D%016" PRIx64 "\n", env->efer); if (flags & CPU_DUMP_FPU) { int fptag; + const uint64_t avx512_mask =3D XSTATE_OPMASK_MASK | \ + XSTATE_ZMM_Hi256_MASK | \ + XSTATE_Hi16_ZMM_MASK | \ + XSTATE_YMM_MASK | XSTATE_SSE_MASK, + avx_mask =3D XSTATE_YMM_MASK | XSTATE_SSE_MASK; fptag =3D 0; for(i =3D 0; i < 8; i++) { fptag |=3D ((!env->fptags[i]) << i); @@ -499,21 +504,48 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, int fl= ags) else qemu_fprintf(f, " "); } - if (env->hflags & HF_CS64_MASK) - nb =3D 16; - else - nb =3D 8; - for(i=3D0;ixmm_regs[i].ZMM_L(3), - env->xmm_regs[i].ZMM_L(2), - env->xmm_regs[i].ZMM_L(1), - env->xmm_regs[i].ZMM_L(0)); - if ((i & 1) =3D=3D 1) - qemu_fprintf(f, "\n"); - else - qemu_fprintf(f, " "); + + if ((env->xcr0 & avx512_mask) =3D=3D avx512_mask) { + /* XSAVE enabled AVX512 */ + for (i =3D 0; i < NB_OPMASK_REGS; i++) { + qemu_fprintf(f, "Opmask%02d=3D%016lx%s", i, env->opmask_re= gs[i], + ((i & 3) =3D=3D 3) ? "\n" : " "); + } + + nb =3D (env->hflags & HF_CS64_MASK) ? 32 : 8; + for (i =3D 0; i < nb; i++) { + qemu_fprintf(f, "ZMM%02d=3D%016lx %016lx %016lx %016lx %01= 6lx " + "%016lx %016lx %016lx\n", + i, + env->xmm_regs[i].ZMM_Q(7), + env->xmm_regs[i].ZMM_Q(6), + env->xmm_regs[i].ZMM_Q(5), + env->xmm_regs[i].ZMM_Q(4), + env->xmm_regs[i].ZMM_Q(3), + env->xmm_regs[i].ZMM_Q(2), + env->xmm_regs[i].ZMM_Q(1), + env->xmm_regs[i].ZMM_Q(0)); + } + } else if (env->xcr0 & avx_mask) { + /* XSAVE enabled AVX */ + nb =3D env->hflags & HF_CS64_MASK ? 16 : 8; + for (i =3D 0; i < nb; i++) { + qemu_fprintf(f, "YMM%02d=3D%016lx %016lx %016lx %016lx\n", + i, + env->xmm_regs[i].ZMM_Q(3), + env->xmm_regs[i].ZMM_Q(2), + env->xmm_regs[i].ZMM_Q(1), + env->xmm_regs[i].ZMM_Q(0)); + } + } else { /* SSE and below cases */ + nb =3D env->hflags & HF_CS64_MASK ? 16 : 8; + for (i =3D 0; i < nb; i++) { + qemu_fprintf(f, "XMM%02d=3D%016lx %016lx%s", + i, + env->xmm_regs[i].ZMM_Q(1), + env->xmm_regs[i].ZMM_Q(0), + (i & 1) ? "\n" : " "); + } } } if (flags & CPU_DUMP_CODE) { --=20 1.8.3.1