From patchwork Tue Jul 18 08:13:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jiang, Haochen" X-Patchwork-Id: 121854 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1584653vqt; Tue, 18 Jul 2023 01:16:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlEp0OoQJw+BSCxnMSHN4kcN3vlwnM+Fe+vIYiVTj5pAQ6TpTmdfMAfG+7eiZOGJrR/9UQzZ X-Received: by 2002:a05:6402:6d6:b0:51e:1b80:2f46 with SMTP id n22-20020a05640206d600b0051e1b802f46mr12713783edy.15.1689668198491; Tue, 18 Jul 2023 01:16:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689668198; cv=none; d=google.com; s=arc-20160816; b=dXx6t37pZIKo2uh/saa+U4rZepS2jh8YI2XUA8rM/pRRraiBQcpciZqjGv3YrulSOA pCK8Uj+ef3wNzIorkxDuF4ablxPQ8yNet+Flvmk/6lPNeZskv7cErtjMdmTqAda9YGQe C+3cn9/Qna3+RFKZdTU+kjk9WXN1gtZFLQcwbVieO9cPO93o3vxD55t0F8ihbefHlfx5 khRCd/FDUReLiRZxh9QwVbJEmk2cMQGjTjEmvtWJbkVDaGy4yqwYlEGZjZcjbBygf2gw XQmEyRbpEFlFVmTpO+VIE/HAr9X2Il7QvPEPgORZEdmg9WwXMrg6GwJXVDdCs1ArGBE1 8zWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=RlcMiKpnbjRkVfYL/XOBEIOvCb0ZzORlQOkOBTfkm9M=; fh=knCXwbjHZxawBVBGmmOOYvU5JMU/4iHnaRtYZ7GGK2A=; b=0WmX+ok0I3sXi8+eAuocrPspE/lNGL2iD4oaHKkRbfXn5s1x5QKpMljbKe6xcqjk4a 4L+WshQG9g1yC+TTahKNZd9CCeKNPu2BF44SXFvA4RLUPc1SHpVsN8zdNUtZN803S7Um vpbZPNWuBPiar4k6qPTGJEcbxvA786v9aQeWacCOAtQAcSPoXp/JWDDmFX1BNudcm6qz NOV/zQUmJyi9seV1XGB7Om1G6C9ooBu15Bi2XAJVf7/ktsJLPVPOzn1SyLf6vOXhI0Cc DWtYpqUpBevg2XEDxkzu/7XOb6uP3bxSuvwEuyxODLcqjiMAu1M+r6BKPRhoEskFsx4O wfDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=hIJq2udp; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id b9-20020aa7dc09000000b0051debfa935asi837292edu.141.2023.07.18.01.16.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 01:16:38 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=hIJq2udp; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ED9903857353 for ; Tue, 18 Jul 2023 08:16:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED9903857353 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689668194; bh=RlcMiKpnbjRkVfYL/XOBEIOvCb0ZzORlQOkOBTfkm9M=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=hIJq2udplj7D03OGn5mHunhha83CVIjNkfDvPDeXQhPhs16+L5vU/hA6r1EM2l7D3 IJIhj77XmktdKQPkGqUl+4lirETpMzY6BNkm8oq3X5qhl3Tg5hEKPggpbxNQrSzudZ tmYg6JYEMIm+1L3XKnWr+XlAf1hwbmISfxzbvV1U= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by sourceware.org (Postfix) with ESMTPS id E41F83858401 for ; Tue, 18 Jul 2023 08:16:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E41F83858401 X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="365018336" X-IronPort-AV: E=Sophos;i="6.01,213,1684825200"; d="scan'208";a="365018336" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 01:16:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="673828809" X-IronPort-AV: E=Sophos;i="6.01,213,1684825200"; d="scan'208";a="673828809" Received: from shvmail03.sh.intel.com ([10.239.245.20]) by orsmga003.jf.intel.com with ESMTP; 18 Jul 2023 01:15:59 -0700 Received: from shliclel4217.sh.intel.com (shliclel4217.sh.intel.com [10.239.240.127]) by shvmail03.sh.intel.com (Postfix) with ESMTP id CCD561005608; Tue, 18 Jul 2023 16:15:58 +0800 (CST) To: binutils@sourceware.org, jbeulich@suse.com Cc: hjl.tools@gmail.com Subject: [PATCH v2] Support Intel SM4 Date: Tue, 18 Jul 2023 16:13:58 +0800 Message-Id: <20230718081358.1394673-1-haochen.jiang@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Haochen Jiang via Binutils From: "Jiang, Haochen" Reply-To: Haochen Jiang Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771286320019424994 X-GMAIL-MSGID: 1771745520986776620 Hi all, The v2 SM4 patch has the following changes: 1. Changed the imply from AVX to AVX2. 2. Moved entries near SHA/SHA512/SM3. 3. Avoided the redo in i386-dis.c since the SM3 change. Thx, Haochen gas/ChangeLog: * NEWS: Support Intel SM4. * config/tc-i386.c: Add sm4. * doc/c-i386.texi: Document .sm4. * testsuite/gas/i386/i386.exp: Run SM4 tests. * testsuite/gas/i386/x86-64.exp: Ditto. * testsuite/gas/i386/sm4-intel.d: Add SM4 tests. * testsuite/gas/i386/sm4.d: Ditto. * testsuite/gas/i386/sm4.s: Ditto. * testsuite/gas/i386/x86-64-sm4-intel.d: Ditto. * testsuite/gas/i386/x86-64-sm4.d: Ditto. * testsuite/gas/i386/x86-64-sm4.s: Ditto. opcodes/ChangeLog: * i386-dis.c (prefix_table): Add SM4 instructions. * i386-gen.c (isa_dependencies): Add SM4. (cpu_flags): Ditto. * i386-init.h: Regenerated. * i386-mnem.h: Ditto. * i386-opc.h (CpuSM4): New. (i386_cpu_flags): Add cpusm4. * i386-opc.tbl: Add SM4 instructions. * i386-tbl.h: Regenerated. --- gas/NEWS | 2 + gas/config/tc-i386.c | 1 + gas/doc/c-i386.texi | 3 +- gas/testsuite/gas/i386/i386.exp | 2 + gas/testsuite/gas/i386/sm4-intel.d | 50 + gas/testsuite/gas/i386/sm4.d | 50 + gas/testsuite/gas/i386/sm4.s | 47 + gas/testsuite/gas/i386/x86-64-sm4-intel.d | 50 + gas/testsuite/gas/i386/x86-64-sm4.d | 50 + gas/testsuite/gas/i386/x86-64-sm4.s | 47 + gas/testsuite/gas/i386/x86-64.exp | 2 + opcodes/i386-dis.c | 3 +- opcodes/i386-gen.c | 3 + opcodes/i386-init.h | 790 +- opcodes/i386-mnem.h | 3854 ++++----- opcodes/i386-opc.h | 3 + opcodes/i386-opc.tbl | 7 + opcodes/i386-tbl.h | 8916 +++++++++++---------- 18 files changed, 7128 insertions(+), 6752 deletions(-) create mode 100644 gas/testsuite/gas/i386/sm4-intel.d create mode 100644 gas/testsuite/gas/i386/sm4.d create mode 100644 gas/testsuite/gas/i386/sm4.s create mode 100644 gas/testsuite/gas/i386/x86-64-sm4-intel.d create mode 100644 gas/testsuite/gas/i386/x86-64-sm4.d create mode 100644 gas/testsuite/gas/i386/x86-64-sm4.s diff --git a/gas/NEWS b/gas/NEWS index 42bda657f21..26e75bde391 100644 --- a/gas/NEWS +++ b/gas/NEWS @@ -1,5 +1,7 @@ -*- text -*- +* Add support for Intel SM4 instructions. + * Add support for Intel SM3 instructions. * Add support for Intel SHA512 instructions. diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 7424fa41c44..686dd4c70f4 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -1154,6 +1154,7 @@ static const arch_entry cpu_arch[] = SUBARCH (avx_vnni_int16, AVX_VNNI_INT16, ANY_AVX_VNNI_INT16, false), SUBARCH (sha512, SHA512, ANY_SHA512, false), SUBARCH (sm3, SM3, ANY_SM3, false), + SUBARCH (sm4, SM4, ANY_SM4, false), }; #undef SUBARCH diff --git a/gas/doc/c-i386.texi b/gas/doc/c-i386.texi index 6ef1da21370..54b0d7d738c 100644 --- a/gas/doc/c-i386.texi +++ b/gas/doc/c-i386.texi @@ -210,6 +210,7 @@ accept various extension mnemonics. For example, @code{avx_vnni_int16}, @code{sha512}, @code{sm3}, +@code{sm4}, @code{amx_int8}, @code{amx_bf16}, @code{amx_fp16}, @@ -1639,7 +1640,7 @@ supported on the CPU specified. The choices for @var{cpu_type} are: @item @samp{.prefetchi} @tab @samp{.avx_ifma} @tab @samp{.avx_vnni_int8} @item @samp{.cmpccxadd} @tab @samp{.wrmsrns} @tab @samp{.msrlist} @item @samp{.avx_ne_convert} @tab @samp{.rao_int} @tab @samp{.fred} @tab @samp{.lkgs} -@item @samp{.avx_vnni_int16} @tab @samp{.sha512} @tab @samp{.sm3} +@item @samp{.avx_vnni_int16} @tab @samp{.sha512} @tab @samp{.sm3} @tab @samp{.sm4} @item @samp{.wbnoinvd} @tab @samp{.pconfig} @tab @samp{.waitpkg} @tab @samp{.cldemote} @item @samp{.shstk} @tab @samp{.gfni} @tab @samp{.vaes} @tab @samp{.vpclmulqdq} @item @samp{.movdiri} @tab @samp{.movdir64b} @tab @samp{.enqcmd} @tab @samp{.tsxldtrk} diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp index 2fcd3be1f98..e862d413c7e 100644 --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -503,6 +503,8 @@ if [gas_32_check] then { run_list_test "sha512-inval" run_dump_test "sm3" run_dump_test "sm3-intel" + run_dump_test "sm4" + run_dump_test "sm4-intel" run_list_test "sg" run_dump_test "clzero" run_dump_test "invlpgb" diff --git a/gas/testsuite/gas/i386/sm4-intel.d b/gas/testsuite/gas/i386/sm4-intel.d new file mode 100644 index 00000000000..03ccdb4a67b --- /dev/null +++ b/gas/testsuite/gas/i386/sm4-intel.d @@ -0,0 +1,50 @@ +#as: +#objdump: -dw -Mintel +#name: i386 SM4 insns (Intel disassembly) +#source: sm4.s + +.*: +file format .* + +Disassembly of section \.text: + +0+ <_start>: +\s*[a-f0-9]+:\s*c4 e2 56 da f4\s+vsm4key4 ymm6,ymm5,ymm4 +\s*[a-f0-9]+:\s*c4 e2 52 da f4\s+vsm4key4 xmm6,xmm5,xmm4 +\s*[a-f0-9]+:\s*c4 e2 56 da b4 f4 00 00 00 10\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[esp\+esi\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 e2 56 da 31\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[ecx\] +\s*[a-f0-9]+:\s*c4 e2 56 da b1 e0 0f 00 00\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[ecx\+0xfe0\] +\s*[a-f0-9]+:\s*c4 e2 56 da b2 00 f0 ff ff\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[edx-0x1000\] +\s*[a-f0-9]+:\s*c4 e2 52 da b4 f4 00 00 00 10\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[esp\+esi\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 e2 52 da 31\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[ecx\] +\s*[a-f0-9]+:\s*c4 e2 52 da b1 f0 07 00 00\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[ecx\+0x7f0\] +\s*[a-f0-9]+:\s*c4 e2 52 da b2 00 f8 ff ff\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[edx-0x800\] +\s*[a-f0-9]+:\s*c4 e2 57 da f4\s+vsm4rnds4 ymm6,ymm5,ymm4 +\s*[a-f0-9]+:\s*c4 e2 53 da f4\s+vsm4rnds4 xmm6,xmm5,xmm4 +\s*[a-f0-9]+:\s*c4 e2 57 da b4 f4 00 00 00 10\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[esp\+esi\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 e2 57 da 31\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[ecx\] +\s*[a-f0-9]+:\s*c4 e2 57 da b1 e0 0f 00 00\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[ecx\+0xfe0\] +\s*[a-f0-9]+:\s*c4 e2 57 da b2 00 f0 ff ff\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[edx-0x1000\] +\s*[a-f0-9]+:\s*c4 e2 53 da b4 f4 00 00 00 10\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[esp\+esi\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 e2 53 da 31\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[ecx\] +\s*[a-f0-9]+:\s*c4 e2 53 da b1 f0 07 00 00\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[ecx\+0x7f0\] +\s*[a-f0-9]+:\s*c4 e2 53 da b2 00 f8 ff ff\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[edx-0x800\] +\s*[a-f0-9]+:\s*c4 e2 56 da f4\s+vsm4key4 ymm6,ymm5,ymm4 +\s*[a-f0-9]+:\s*c4 e2 52 da f4\s+vsm4key4 xmm6,xmm5,xmm4 +\s*[a-f0-9]+:\s*c4 e2 56 da b4 f4 00 00 00 10\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[esp\+esi\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 e2 56 da 31\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[ecx\] +\s*[a-f0-9]+:\s*c4 e2 56 da b1 e0 0f 00 00\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[ecx\+0xfe0\] +\s*[a-f0-9]+:\s*c4 e2 56 da b2 00 f0 ff ff\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[edx-0x1000\] +\s*[a-f0-9]+:\s*c4 e2 52 da b4 f4 00 00 00 10\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[esp\+esi\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 e2 52 da 31\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[ecx\] +\s*[a-f0-9]+:\s*c4 e2 52 da b1 f0 07 00 00\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[ecx\+0x7f0\] +\s*[a-f0-9]+:\s*c4 e2 52 da b2 00 f8 ff ff\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[edx-0x800\] +\s*[a-f0-9]+:\s*c4 e2 57 da f4\s+vsm4rnds4 ymm6,ymm5,ymm4 +\s*[a-f0-9]+:\s*c4 e2 53 da f4\s+vsm4rnds4 xmm6,xmm5,xmm4 +\s*[a-f0-9]+:\s*c4 e2 57 da b4 f4 00 00 00 10\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[esp\+esi\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 e2 57 da 31\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[ecx\] +\s*[a-f0-9]+:\s*c4 e2 57 da b1 e0 0f 00 00\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[ecx\+0xfe0\] +\s*[a-f0-9]+:\s*c4 e2 57 da b2 00 f0 ff ff\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[edx-0x1000\] +\s*[a-f0-9]+:\s*c4 e2 53 da b4 f4 00 00 00 10\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[esp\+esi\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 e2 53 da 31\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[ecx\] +\s*[a-f0-9]+:\s*c4 e2 53 da b1 f0 07 00 00\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[ecx\+0x7f0\] +\s*[a-f0-9]+:\s*c4 e2 53 da b2 00 f8 ff ff\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[edx-0x800\] diff --git a/gas/testsuite/gas/i386/sm4.d b/gas/testsuite/gas/i386/sm4.d new file mode 100644 index 00000000000..48dcda66271 --- /dev/null +++ b/gas/testsuite/gas/i386/sm4.d @@ -0,0 +1,50 @@ +#as: +#objdump: -dw +#name: i386 SM4 insns +#source: sm4.s + +.*: +file format .* + +Disassembly of section \.text: + +0+ <_start>: +\s*[a-f0-9]+:\s*c4 e2 56 da f4\s+vsm4key4 %ymm4,%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 52 da f4\s+vsm4key4 %xmm4,%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 56 da b4 f4 00 00 00 10\s+vsm4key4 0x10000000\(%esp,%esi,8\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 56 da 31\s+vsm4key4 \(%ecx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 56 da b1 e0 0f 00 00\s+vsm4key4 0xfe0\(%ecx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 56 da b2 00 f0 ff ff\s+vsm4key4 -0x1000\(%edx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 52 da b4 f4 00 00 00 10\s+vsm4key4 0x10000000\(%esp,%esi,8\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 52 da 31\s+vsm4key4 \(%ecx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 52 da b1 f0 07 00 00\s+vsm4key4 0x7f0\(%ecx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 52 da b2 00 f8 ff ff\s+vsm4key4 -0x800\(%edx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 57 da f4\s+vsm4rnds4 %ymm4,%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 53 da f4\s+vsm4rnds4 %xmm4,%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 57 da b4 f4 00 00 00 10\s+vsm4rnds4 0x10000000\(%esp,%esi,8\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 57 da 31\s+vsm4rnds4 \(%ecx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 57 da b1 e0 0f 00 00\s+vsm4rnds4 0xfe0\(%ecx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 57 da b2 00 f0 ff ff\s+vsm4rnds4 -0x1000\(%edx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 53 da b4 f4 00 00 00 10\s+vsm4rnds4 0x10000000\(%esp,%esi,8\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 53 da 31\s+vsm4rnds4 \(%ecx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 53 da b1 f0 07 00 00\s+vsm4rnds4 0x7f0\(%ecx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 53 da b2 00 f8 ff ff\s+vsm4rnds4 -0x800\(%edx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 56 da f4\s+vsm4key4 %ymm4,%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 52 da f4\s+vsm4key4 %xmm4,%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 56 da b4 f4 00 00 00 10\s+vsm4key4 0x10000000\(%esp,%esi,8\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 56 da 31\s+vsm4key4 \(%ecx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 56 da b1 e0 0f 00 00\s+vsm4key4 0xfe0\(%ecx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 56 da b2 00 f0 ff ff\s+vsm4key4 -0x1000\(%edx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 52 da b4 f4 00 00 00 10\s+vsm4key4 0x10000000\(%esp,%esi,8\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 52 da 31\s+vsm4key4 \(%ecx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 52 da b1 f0 07 00 00\s+vsm4key4 0x7f0\(%ecx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 52 da b2 00 f8 ff ff\s+vsm4key4 -0x800\(%edx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 57 da f4\s+vsm4rnds4 %ymm4,%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 53 da f4\s+vsm4rnds4 %xmm4,%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 57 da b4 f4 00 00 00 10\s+vsm4rnds4 0x10000000\(%esp,%esi,8\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 57 da 31\s+vsm4rnds4 \(%ecx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 57 da b1 e0 0f 00 00\s+vsm4rnds4 0xfe0\(%ecx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 57 da b2 00 f0 ff ff\s+vsm4rnds4 -0x1000\(%edx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 53 da b4 f4 00 00 00 10\s+vsm4rnds4 0x10000000\(%esp,%esi,8\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 53 da 31\s+vsm4rnds4 \(%ecx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 53 da b1 f0 07 00 00\s+vsm4rnds4 0x7f0\(%ecx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 53 da b2 00 f8 ff ff\s+vsm4rnds4 -0x800\(%edx\),%xmm5,%xmm6 diff --git a/gas/testsuite/gas/i386/sm4.s b/gas/testsuite/gas/i386/sm4.s new file mode 100644 index 00000000000..0eb7b2fcb7b --- /dev/null +++ b/gas/testsuite/gas/i386/sm4.s @@ -0,0 +1,47 @@ +# Check 32bit SM4 instructions + + .allow_index_reg + .text +_start: + vsm4key4 %ymm4, %ymm5, %ymm6 + vsm4key4 %xmm4, %xmm5, %xmm6 + vsm4key4 0x10000000(%esp, %esi, 8), %ymm5, %ymm6 + vsm4key4 (%ecx), %ymm5, %ymm6 + vsm4key4 4064(%ecx), %ymm5, %ymm6 + vsm4key4 -4096(%edx), %ymm5, %ymm6 + vsm4key4 0x10000000(%esp, %esi, 8), %xmm5, %xmm6 + vsm4key4 (%ecx), %xmm5, %xmm6 + vsm4key4 2032(%ecx), %xmm5, %xmm6 + vsm4key4 -2048(%edx), %xmm5, %xmm6 + vsm4rnds4 %ymm4, %ymm5, %ymm6 + vsm4rnds4 %xmm4, %xmm5, %xmm6 + vsm4rnds4 0x10000000(%esp, %esi, 8), %ymm5, %ymm6 + vsm4rnds4 (%ecx), %ymm5, %ymm6 + vsm4rnds4 4064(%ecx), %ymm5, %ymm6 + vsm4rnds4 -4096(%edx), %ymm5, %ymm6 + vsm4rnds4 0x10000000(%esp, %esi, 8), %xmm5, %xmm6 + vsm4rnds4 (%ecx), %xmm5, %xmm6 + vsm4rnds4 2032(%ecx), %xmm5, %xmm6 + vsm4rnds4 -2048(%edx), %xmm5, %xmm6 + +.intel_syntax noprefix + vsm4key4 ymm6, ymm5, ymm4 + vsm4key4 xmm6, xmm5, xmm4 + vsm4key4 ymm6, ymm5, YMMWORD PTR [esp+esi*8+0x10000000] + vsm4key4 ymm6, ymm5, YMMWORD PTR [ecx] + vsm4key4 ymm6, ymm5, YMMWORD PTR [ecx+4064] + vsm4key4 ymm6, ymm5, YMMWORD PTR [edx-4096] + vsm4key4 xmm6, xmm5, XMMWORD PTR [esp+esi*8+0x10000000] + vsm4key4 xmm6, xmm5, XMMWORD PTR [ecx] + vsm4key4 xmm6, xmm5, XMMWORD PTR [ecx+2032] + vsm4key4 xmm6, xmm5, XMMWORD PTR [edx-2048] + vsm4rnds4 ymm6, ymm5, ymm4 + vsm4rnds4 xmm6, xmm5, xmm4 + vsm4rnds4 ymm6, ymm5, YMMWORD PTR [esp+esi*8+0x10000000] + vsm4rnds4 ymm6, ymm5, YMMWORD PTR [ecx] + vsm4rnds4 ymm6, ymm5, YMMWORD PTR [ecx+4064] + vsm4rnds4 ymm6, ymm5, YMMWORD PTR [edx-4096] + vsm4rnds4 xmm6, xmm5, XMMWORD PTR [esp+esi*8+0x10000000] + vsm4rnds4 xmm6, xmm5, XMMWORD PTR [ecx] + vsm4rnds4 xmm6, xmm5, XMMWORD PTR [ecx+2032] + vsm4rnds4 xmm6, xmm5, XMMWORD PTR [edx-2048] diff --git a/gas/testsuite/gas/i386/x86-64-sm4-intel.d b/gas/testsuite/gas/i386/x86-64-sm4-intel.d new file mode 100644 index 00000000000..9bfa59592ae --- /dev/null +++ b/gas/testsuite/gas/i386/x86-64-sm4-intel.d @@ -0,0 +1,50 @@ +#as: +#objdump: -dw -Mintel +#name: x86_64 SM4 insns (Intel disassembly) +#source: x86-64-sm4.s + +.*: +file format .* + +Disassembly of section \.text: + +0+ <_start>: +\s*[a-f0-9]+:\s*c4 e2 56 da f4\s+vsm4key4 ymm6,ymm5,ymm4 +\s*[a-f0-9]+:\s*c4 e2 52 da f4\s+vsm4key4 xmm6,xmm5,xmm4 +\s*[a-f0-9]+:\s*c4 a2 56 da b4 f5 00 00 00 10\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[rbp\+r14\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 c2 56 da 31\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[r9\] +\s*[a-f0-9]+:\s*c4 e2 56 da b1 e0 0f 00 00\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[rcx\+0xfe0\] +\s*[a-f0-9]+:\s*c4 e2 56 da b2 00 f0 ff ff\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[rdx-0x1000\] +\s*[a-f0-9]+:\s*c4 a2 52 da b4 f5 00 00 00 10\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[rbp\+r14\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 c2 52 da 31\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[r9\] +\s*[a-f0-9]+:\s*c4 e2 52 da b1 f0 07 00 00\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[rcx\+0x7f0\] +\s*[a-f0-9]+:\s*c4 e2 52 da b2 00 f8 ff ff\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[rdx-0x800\] +\s*[a-f0-9]+:\s*c4 e2 57 da f4\s+vsm4rnds4 ymm6,ymm5,ymm4 +\s*[a-f0-9]+:\s*c4 e2 53 da f4\s+vsm4rnds4 xmm6,xmm5,xmm4 +\s*[a-f0-9]+:\s*c4 a2 57 da b4 f5 00 00 00 10\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[rbp\+r14\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 c2 57 da 31\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[r9\] +\s*[a-f0-9]+:\s*c4 e2 57 da b1 e0 0f 00 00\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[rcx\+0xfe0\] +\s*[a-f0-9]+:\s*c4 e2 57 da b2 00 f0 ff ff\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[rdx-0x1000\] +\s*[a-f0-9]+:\s*c4 a2 53 da b4 f5 00 00 00 10\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[rbp\+r14\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 c2 53 da 31\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[r9\] +\s*[a-f0-9]+:\s*c4 e2 53 da b1 f0 07 00 00\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[rcx\+0x7f0\] +\s*[a-f0-9]+:\s*c4 e2 53 da b2 00 f8 ff ff\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[rdx-0x800\] +\s*[a-f0-9]+:\s*c4 e2 56 da f4\s+vsm4key4 ymm6,ymm5,ymm4 +\s*[a-f0-9]+:\s*c4 e2 52 da f4\s+vsm4key4 xmm6,xmm5,xmm4 +\s*[a-f0-9]+:\s*c4 a2 56 da b4 f5 00 00 00 10\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[rbp\+r14\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 c2 56 da 31\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[r9\] +\s*[a-f0-9]+:\s*c4 e2 56 da b1 e0 0f 00 00\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[rcx\+0xfe0\] +\s*[a-f0-9]+:\s*c4 e2 56 da b2 00 f0 ff ff\s+vsm4key4 ymm6,ymm5,YMMWORD PTR \[rdx-0x1000\] +\s*[a-f0-9]+:\s*c4 a2 52 da b4 f5 00 00 00 10\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[rbp\+r14\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 c2 52 da 31\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[r9\] +\s*[a-f0-9]+:\s*c4 e2 52 da b1 f0 07 00 00\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[rcx\+0x7f0\] +\s*[a-f0-9]+:\s*c4 e2 52 da b2 00 f8 ff ff\s+vsm4key4 xmm6,xmm5,XMMWORD PTR \[rdx-0x800\] +\s*[a-f0-9]+:\s*c4 e2 57 da f4\s+vsm4rnds4 ymm6,ymm5,ymm4 +\s*[a-f0-9]+:\s*c4 e2 53 da f4\s+vsm4rnds4 xmm6,xmm5,xmm4 +\s*[a-f0-9]+:\s*c4 a2 57 da b4 f5 00 00 00 10\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[rbp\+r14\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 c2 57 da 31\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[r9\] +\s*[a-f0-9]+:\s*c4 e2 57 da b1 e0 0f 00 00\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[rcx\+0xfe0\] +\s*[a-f0-9]+:\s*c4 e2 57 da b2 00 f0 ff ff\s+vsm4rnds4 ymm6,ymm5,YMMWORD PTR \[rdx-0x1000\] +\s*[a-f0-9]+:\s*c4 a2 53 da b4 f5 00 00 00 10\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[rbp\+r14\*8\+0x10000000\] +\s*[a-f0-9]+:\s*c4 c2 53 da 31\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[r9\] +\s*[a-f0-9]+:\s*c4 e2 53 da b1 f0 07 00 00\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[rcx\+0x7f0\] +\s*[a-f0-9]+:\s*c4 e2 53 da b2 00 f8 ff ff\s+vsm4rnds4 xmm6,xmm5,XMMWORD PTR \[rdx-0x800\] diff --git a/gas/testsuite/gas/i386/x86-64-sm4.d b/gas/testsuite/gas/i386/x86-64-sm4.d new file mode 100644 index 00000000000..2c1f6737d9a --- /dev/null +++ b/gas/testsuite/gas/i386/x86-64-sm4.d @@ -0,0 +1,50 @@ +#as: +#objdump: -dw +#name: x86_64 SM4 insns +#source: x86-64-sm4.s + +.*: +file format .* + +Disassembly of section \.text: + +0+ <_start>: +\s*[a-f0-9]+:\s*c4 e2 56 da f4\s+vsm4key4 %ymm4,%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 52 da f4\s+vsm4key4 %xmm4,%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 a2 56 da b4 f5 00 00 00 10\s+vsm4key4 0x10000000\(%rbp,%r14,8\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 c2 56 da 31\s+vsm4key4 \(%r9\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 56 da b1 e0 0f 00 00\s+vsm4key4 0xfe0\(%rcx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 56 da b2 00 f0 ff ff\s+vsm4key4 -0x1000\(%rdx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 a2 52 da b4 f5 00 00 00 10\s+vsm4key4 0x10000000\(%rbp,%r14,8\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 c2 52 da 31\s+vsm4key4 \(%r9\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 52 da b1 f0 07 00 00\s+vsm4key4 0x7f0\(%rcx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 52 da b2 00 f8 ff ff\s+vsm4key4 -0x800\(%rdx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 57 da f4\s+vsm4rnds4 %ymm4,%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 53 da f4\s+vsm4rnds4 %xmm4,%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 a2 57 da b4 f5 00 00 00 10\s+vsm4rnds4 0x10000000\(%rbp,%r14,8\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 c2 57 da 31\s+vsm4rnds4 \(%r9\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 57 da b1 e0 0f 00 00\s+vsm4rnds4 0xfe0\(%rcx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 57 da b2 00 f0 ff ff\s+vsm4rnds4 -0x1000\(%rdx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 a2 53 da b4 f5 00 00 00 10\s+vsm4rnds4 0x10000000\(%rbp,%r14,8\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 c2 53 da 31\s+vsm4rnds4 \(%r9\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 53 da b1 f0 07 00 00\s+vsm4rnds4 0x7f0\(%rcx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 53 da b2 00 f8 ff ff\s+vsm4rnds4 -0x800\(%rdx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 56 da f4\s+vsm4key4 %ymm4,%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 52 da f4\s+vsm4key4 %xmm4,%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 a2 56 da b4 f5 00 00 00 10\s+vsm4key4 0x10000000\(%rbp,%r14,8\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 c2 56 da 31\s+vsm4key4 \(%r9\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 56 da b1 e0 0f 00 00\s+vsm4key4 0xfe0\(%rcx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 56 da b2 00 f0 ff ff\s+vsm4key4 -0x1000\(%rdx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 a2 52 da b4 f5 00 00 00 10\s+vsm4key4 0x10000000\(%rbp,%r14,8\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 c2 52 da 31\s+vsm4key4 \(%r9\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 52 da b1 f0 07 00 00\s+vsm4key4 0x7f0\(%rcx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 52 da b2 00 f8 ff ff\s+vsm4key4 -0x800\(%rdx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 57 da f4\s+vsm4rnds4 %ymm4,%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 53 da f4\s+vsm4rnds4 %xmm4,%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 a2 57 da b4 f5 00 00 00 10\s+vsm4rnds4 0x10000000\(%rbp,%r14,8\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 c2 57 da 31\s+vsm4rnds4 \(%r9\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 57 da b1 e0 0f 00 00\s+vsm4rnds4 0xfe0\(%rcx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 e2 57 da b2 00 f0 ff ff\s+vsm4rnds4 -0x1000\(%rdx\),%ymm5,%ymm6 +\s*[a-f0-9]+:\s*c4 a2 53 da b4 f5 00 00 00 10\s+vsm4rnds4 0x10000000\(%rbp,%r14,8\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 c2 53 da 31\s+vsm4rnds4 \(%r9\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 53 da b1 f0 07 00 00\s+vsm4rnds4 0x7f0\(%rcx\),%xmm5,%xmm6 +\s*[a-f0-9]+:\s*c4 e2 53 da b2 00 f8 ff ff\s+vsm4rnds4 -0x800\(%rdx\),%xmm5,%xmm6 diff --git a/gas/testsuite/gas/i386/x86-64-sm4.s b/gas/testsuite/gas/i386/x86-64-sm4.s new file mode 100644 index 00000000000..cc680cb1a89 --- /dev/null +++ b/gas/testsuite/gas/i386/x86-64-sm4.s @@ -0,0 +1,47 @@ +# Check 64bit SM4 instructions + + .allow_index_reg + .text +_start: + vsm4key4 %ymm4, %ymm5, %ymm6 + vsm4key4 %xmm4, %xmm5, %xmm6 + vsm4key4 0x10000000(%rbp, %r14, 8), %ymm5, %ymm6 + vsm4key4 (%r9), %ymm5, %ymm6 + vsm4key4 4064(%rcx), %ymm5, %ymm6 + vsm4key4 -4096(%rdx), %ymm5, %ymm6 + vsm4key4 0x10000000(%rbp, %r14, 8), %xmm5, %xmm6 + vsm4key4 (%r9), %xmm5, %xmm6 + vsm4key4 2032(%rcx), %xmm5, %xmm6 + vsm4key4 -2048(%rdx), %xmm5, %xmm6 + vsm4rnds4 %ymm4, %ymm5, %ymm6 + vsm4rnds4 %xmm4, %xmm5, %xmm6 + vsm4rnds4 0x10000000(%rbp, %r14, 8), %ymm5, %ymm6 + vsm4rnds4 (%r9), %ymm5, %ymm6 + vsm4rnds4 4064(%rcx), %ymm5, %ymm6 + vsm4rnds4 -4096(%rdx), %ymm5, %ymm6 + vsm4rnds4 0x10000000(%rbp, %r14, 8), %xmm5, %xmm6 + vsm4rnds4 (%r9), %xmm5, %xmm6 + vsm4rnds4 2032(%rcx), %xmm5, %xmm6 + vsm4rnds4 -2048(%rdx), %xmm5, %xmm6 + +.intel_syntax noprefix + vsm4key4 ymm6, ymm5, ymm4 + vsm4key4 xmm6, xmm5, xmm4 + vsm4key4 ymm6, ymm5, YMMWORD PTR [rbp+r14*8+0x10000000] + vsm4key4 ymm6, ymm5, YMMWORD PTR [r9] + vsm4key4 ymm6, ymm5, YMMWORD PTR [rcx+4064] + vsm4key4 ymm6, ymm5, YMMWORD PTR [rdx-4096] + vsm4key4 xmm6, xmm5, XMMWORD PTR [rbp+r14*8+0x10000000] + vsm4key4 xmm6, xmm5, XMMWORD PTR [r9] + vsm4key4 xmm6, xmm5, XMMWORD PTR [rcx+2032] + vsm4key4 xmm6, xmm5, XMMWORD PTR [rdx-2048] + vsm4rnds4 ymm6, ymm5, ymm4 + vsm4rnds4 xmm6, xmm5, xmm4 + vsm4rnds4 ymm6, ymm5, YMMWORD PTR [rbp+r14*8+0x10000000] + vsm4rnds4 ymm6, ymm5, YMMWORD PTR [r9] + vsm4rnds4 ymm6, ymm5, YMMWORD PTR [rcx+4064] + vsm4rnds4 ymm6, ymm5, YMMWORD PTR [rdx-4096] + vsm4rnds4 xmm6, xmm5, XMMWORD PTR [rbp+r14*8+0x10000000] + vsm4rnds4 xmm6, xmm5, XMMWORD PTR [r9] + vsm4rnds4 xmm6, xmm5, XMMWORD PTR [rcx+2032] + vsm4rnds4 xmm6, xmm5, XMMWORD PTR [rdx-2048] diff --git a/gas/testsuite/gas/i386/x86-64.exp b/gas/testsuite/gas/i386/x86-64.exp index d31bb40b32b..386d3dfd456 100644 --- a/gas/testsuite/gas/i386/x86-64.exp +++ b/gas/testsuite/gas/i386/x86-64.exp @@ -445,6 +445,8 @@ run_dump_test "x86-64-sha512-intel" run_list_test "x86-64-sha512-inval" run_dump_test "x86-64-sm3" run_dump_test "x86-64-sm3-intel" +run_dump_test "x86-64-sm4" +run_dump_test "x86-64-sm4-intel" run_dump_test "x86-64-clzero" run_dump_test "x86-64-mwaitx-bdver4" run_list_test "x86-64-mwaitx-reg" diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c index 006e38a16a9..6a5b3b7571a 100644 --- a/opcodes/i386-dis.c +++ b/opcodes/i386-dis.c @@ -3972,8 +3972,9 @@ static const struct dis386 prefix_table[][4] = { /* PREFIX_VEX_0F38DA_W_0 */ { { VEX_LEN_TABLE (VEX_LEN_0F38DA_W_0_P_0) }, - { Bad_Opcode }, + { "vsm4key4", { XM, Vex, EXx }, 0 }, { VEX_LEN_TABLE (VEX_LEN_0F38DA_W_0_P_2) }, + { "vsm4rnds4", { XM, Vex, EXx }, 0 }, }, /* PREFIX_VEX_0F38F5_L_0 */ diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c index 11af743ffe7..a0614f92cda 100644 --- a/opcodes/i386-gen.c +++ b/opcodes/i386-gen.c @@ -218,6 +218,8 @@ static const dependency isa_dependencies[] = "AVX2" }, { "SM3", "AVX" }, + { "SM4", + "AVX2" }, { "XSAVES", "XSAVEC" }, { "XSAVEC", @@ -344,6 +346,7 @@ static bitfield cpu_flags[] = BITFIELD (SHA), BITFIELD (SHA512), BITFIELD (SM3), + BITFIELD (SM4), BITFIELD (ClflushOpt), BITFIELD (XSAVES), BITFIELD (XSAVEC), diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h index 256ed532211..68cbfaa95e5 100644 --- a/opcodes/i386-opc.h +++ b/opcodes/i386-opc.h @@ -179,6 +179,8 @@ enum CpuSHA512, /* SM3 instructions required. */ CpuSM3, + /* SM4 instructions required. */ + CpuSM4, /* CLFLUSHOPT instruction required */ CpuClflushOpt, /* XSAVES/XRSTORS instruction required */ @@ -409,6 +411,7 @@ typedef union i386_cpu_flags unsigned int cpusha:1; unsigned int cpusha512:1; unsigned int cpusm3:1; + unsigned int cpusm4:1; unsigned int cpuclflushopt:1; unsigned int cpuxsaves:1; unsigned int cpuxsavec:1; diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl index 653b1cbc587..fdb436e38df 100644 --- a/opcodes/i386-opc.tbl +++ b/opcodes/i386-opc.tbl @@ -2058,6 +2058,13 @@ vsm3msg2, 0x66da, SM3, Modrm|Space0F38|Vex128|VexVVVV|VexW0|NoSuf, { RegXMM|Unsp // SM3 instructions end. +// SM4 instructions. + +vsm4key4, 0xf3da, SM4, Modrm|Space0F38|Vex|VexVVVV|VexW0|CheckOperandSize|NoSuf, { RegXMM|RegYMM|Unspecified|BaseIndex, RegXMM|RegYMM, RegXMM|RegYMM } +vsm4rnds4, 0xf2da, SM4, Modrm|Space0F38|Vex|VexVVVV|VexW0|CheckOperandSize|NoSuf, { RegXMM|RegYMM|Unspecified|BaseIndex, RegXMM|RegYMM, RegXMM|RegYMM } + +// SM4 instructions end. + // VPCLMULQDQ instructions vpclmulqdq, 0x6644, VPCLMULQDQ, Modrm|Vex256|Space0F3A|VexWIG|VexVVVV|NoSuf, { Imm8|Imm8S, Unspecified|BaseIndex|RegYMM, RegYMM, RegYMM }