From patchwork Fri Feb 16 09:57:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 202036 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp406288dyb; Fri, 16 Feb 2024 01:57:59 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXbLuAL/bjBaukaVL9gEM2dO7ErJQPNSIYAoVHtl6uBPH74A6GOO4fMSOAiswURD3z8OxVzN6tfvm+PSKX3/XljQWYkug== X-Google-Smtp-Source: AGHT+IHeHqeCdeHPuwGL0Fzin/VuLlbCK9TKL2hTS7iTU9p7dSgjHFuyMDgUn4uD437bAjAmbcFG X-Received: by 2002:a05:6102:50a3:b0:46f:2cfa:7c03 with SMTP id bl35-20020a05610250a300b0046f2cfa7c03mr5303952vsb.17.1708077479217; Fri, 16 Feb 2024 01:57:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708077479; cv=pass; d=google.com; s=arc-20160816; b=IBL0c5JwuS7fVu8Vtdg9XRGuZM+9KP30mGo3CrGxVyDJbYlw0Gh2cavckg1j1JjLC6 UBSp9SGWRoOpsfRJlgOvyFkPDhegVP+jCOaRWH9OS3dSM2oMzWF0QXews4GbcHIAMzcN 84Vh89KTgBjo6IYsP+7bC+KukFaY2PP3J9APlvA2t1ZB6ooXQ/MTYp6SYzIjvJkEIQuY 4/16iq1o8U986osu/aDymDYsbaGgDqwCQRMrnhocRcCbui3DJArAMjPyM2SrnjV9oCe8 ifhhbiDaHIKGhgWIuh+jYCnQ1DARJIW4CILCV40rdzdDr/wO7ORZuAeduObL8lbha76z F+XQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :in-reply-to:autocrypt:references:cc:to:from:content-language :subject:user-agent:mime-version:date:message-id:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=wyPIOsaN5sPcj5qLOjJG2QfHnFVK3bgNfE24n2xWvEE=; fh=2DbSPqOhyO7CNtGa024QKgSiHKlKGVt2h+1rlgWLnZI=; b=KhW1HJi2KM/o90oyWVO6R9wtYAtXXrPJUqK3KlzWQeo1PJP730BA0ab7fw+l8ztITc dSJlBspghwNXpDcM037YH2vx35bj95A/UUcXIuaO2N21koxHNnHpox+EBFoYlb25rR7i 79RzM6PkuVr9amwQ1T9xUfjxbpG//KO19gkorG4KGPZIFytTZKlY0iLJ0Bf5cTCRDZ8a nyCjutPILuPD3bmHPp3dlrHCH3xGQCyO1RoJxrpVvguc6H4rqEuT2xhsqyx5h71gCeKV +YAM/PVXob3vWKBDGLSlN2mTzLhc/J7c7ffj1u8zV1B04nhD7ulHcgqiqXWnZ7CvYeVY 8Qeg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b="C/H5NhYh"; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id d6-20020a05622a05c600b0042c7ce7e3f6si3809547qtb.451.2024.02.16.01.57.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 01:57:59 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b="C/H5NhYh"; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DB8EF385829E for ; Fri, 16 Feb 2024 09:57:58 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by sourceware.org (Postfix) with ESMTPS id B45A73858C54 for ; Fri, 16 Feb 2024 09:57:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B45A73858C54 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B45A73858C54 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708077471; cv=none; b=srsl2D4xpqGkBb+jLd5rvl0o6L04JYEFj2PrONL+UHCDYE3zOVHFyKTwCQO6kd0Zh9n1GkGWaDdLsdhtHrJBsCPv3kaOd34stQnzJbzVICZMxDy1tAXQxLVKj3zlF/TV1jPWPMQGq4+8Pxw6VXSys3UduUxhYuUzuNaKBsavUus= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708077471; c=relaxed/simple; bh=wl0YNzX4m7V03zxcznIgJtk5a/s6eris3HQL7zE6cY8=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=jX8Y41MZebUtcMe+ItYSitkBPPI9P/5yNTabxjksKI1HBiYLKmp9HFa4nvI46C28zltAUftBeq1ZK7ZDmu0sL1jksT2okecNnq1t9jeYNs3yCRRXs7JXAsR0LHaN8HseBw2qIq/gv8DmIWgVx63LdnOlmHl0E6Imp8s5LhbxWrI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-41242be3460so3083185e9.1 for ; Fri, 16 Feb 2024 01:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1708077467; x=1708682267; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=wyPIOsaN5sPcj5qLOjJG2QfHnFVK3bgNfE24n2xWvEE=; b=C/H5NhYh3wRY05rBgB8DUTjsde31s0zKpzbWb7bs57CK2OBA8J2nwhAqVKLb1UeOwR 9WJFq1SfEZsDQRrvT6b4tdse8QyH4APibF0NMGvI7CiyLUJksQ7gjRw8Lo/KEb9OFnuW QbbE0d5LLeAHR/HYnyOfqSMN1ASSrp1xwNpss3sqWZsUpPovF+DoqxNZqgr3ecYf8uvq IU7k0KJZ3slu1ffFi8f+8nd27j8G64yFd8lBxnaFdeQoTUc8phqbJAqGAXb1oAgv2s2X bckZm0VtyPHoeruRa0KsRG1Ur/wnhBRrapruXk84IMb8fYftltgCqzPPU2SuipbiivrU DwVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708077467; x=1708682267; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wyPIOsaN5sPcj5qLOjJG2QfHnFVK3bgNfE24n2xWvEE=; b=OS7ttBMDaN4hmRyVM10BR7u2M74oT+5+spLkqFB5whqtuVf3cG5G3GX/NYxADeia3i gkc9N4CmPZVUC2lGwTtDv9x8z7AJnBB6Nj6tYNh5AW5PUqq/Lx61LFFAy8HPuDRcvMxM 9jWEnGxajYM/2FYhlPYPwpYXO0AY4y+D6x0eWxc3dFDOoAM4LO3zjshFYJODnDdlze/y PEyrObcBPT9qhbRWY4q/K/F7v0uUYuHsZ44NFpBzqI4yC9FLE6kS8yP5SK9stqI/Hxeo MXNbrFHMZFes1hpT9GZw15ReB9+isEb34unz6AV8HLINYTNaHkoFEHOACBVKSTvO2ulK emtw== X-Gm-Message-State: AOJu0YzEEC+oq31sjeD9ruVhg+pZoS50Pd/DFqmwl08yZys283u0qgqp abAhitpgMtOo/Rcck9IrYTQQ/YAO6Kpi4rH8+UP9RJuBaObgCeMD2Dow5nYd+XdcU/laFMFkfGg = X-Received: by 2002:a05:600c:5251:b0:412:4a57:3852 with SMTP id fc17-20020a05600c525100b004124a573852mr686793wmb.15.1708077467348; Fri, 16 Feb 2024 01:57:47 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id jv14-20020a05600c570e00b0040fe3147babsm1820618wmb.0.2024.02.16.01.57.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Feb 2024 01:57:47 -0800 (PST) Message-ID: Date: Fri, 16 Feb 2024 10:57:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 1/4] x86: rename vec_encoding and vex_encoding_* Content-Language: en-US From: Jan Beulich To: Binutils Cc: "H.J. Lu" , Lili Cui References: <3098e797-3749-40ee-802c-ea8a6f63914c@suse.com> Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <3098e797-3749-40ee-802c-ea8a6f63914c@suse.com> X-Spam-Status: No, score=-3025.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791049050964192230 X-GMAIL-MSGID: 1791049050964192230 Even with just VEX these weren't limited to vector insns. With APX the set of non-vector ones covered has greatly increased. Drop the vec_ prefix. Also drop the vex_ ones off of the enumerators, as they weren't appropriate anyway: Should have been vec_ then, too. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -445,16 +445,16 @@ struct _i386_insn /* Disable instruction size optimization. */ bool no_optimize; - /* How to encode vector instructions. */ + /* How to encode instructions. */ enum { - vex_encoding_default = 0, - vex_encoding_vex, - vex_encoding_vex3, - vex_encoding_evex, - vex_encoding_evex512, - vex_encoding_error - } vec_encoding; + encoding_default = 0, + encoding_vex, + encoding_vex3, + encoding_evex, + encoding_evex512, + encoding_error + } encoding; /* REP prefix. */ const char *rep_prefix; @@ -1885,8 +1885,8 @@ static const i386_cpu_flags avx512 = CPU static INLINE bool need_evex_encoding (const insn_template *t) { - return i.vec_encoding == vex_encoding_evex - || i.vec_encoding == vex_encoding_evex512 + return i.encoding == encoding_evex + || i.encoding == encoding_evex512 || (t->opcode_modifier.vex && i.has_egpr) || i.mask.reg; } @@ -2489,7 +2489,7 @@ static INLINE int fits_in_imm4 (offsetT num) { /* Despite the name, check for imm3 if we're dealing with EVEX. */ - return (num & (i.vec_encoding != vex_encoding_evex ? 0xf : 7)) == num; + return (num & (i.encoding != encoding_evex ? 0xf : 7)) == num; } static i386_operand_type @@ -3800,7 +3800,7 @@ build_vex_prefix (const insn_template *t /* Use 2-byte VEX prefix by swapping destination and source operand if there are more than 1 register operand. */ if (i.reg_operands > 1 - && i.vec_encoding != vex_encoding_vex3 + && i.encoding != encoding_vex3 && i.dir_encoding == dir_encoding_default && i.operands == i.reg_operands && operand_type_equal (&i.types[0], &i.types[i.operands - 1]) @@ -3829,7 +3829,7 @@ build_vex_prefix (const insn_template *t /* Use 2-byte VEX prefix by swapping commutative source operands if there are no memory operands and at least 3 register ones. */ if (i.reg_operands >= 3 - && i.vec_encoding != vex_encoding_vex3 + && i.encoding != encoding_vex3 && i.reg_operands == i.operands - i.imm_operands && i.tm.opcode_modifier.vex && i.tm.opcode_modifier.commutative @@ -3892,7 +3892,7 @@ build_vex_prefix (const insn_template *t /* Use 2-byte VEX prefix if possible. */ if (w == 0 - && i.vec_encoding != vex_encoding_vex3 + && i.encoding != encoding_vex3 && i.tm.opcode_space == SPACE_0F && (i.rex & (REX_W | REX_X | REX_B)) == 0) { @@ -4758,7 +4758,7 @@ optimize_encoding (void) && (i.tm.opcode_modifier.vex || ((!i.mask.reg || i.mask.zeroing) && i.tm.opcode_modifier.evex - && (i.vec_encoding != vex_encoding_evex + && (i.encoding != encoding_evex || cpu_arch_isa_flags.bitfield.cpuavx512vl || is_cpu (&i.tm, CpuAVX512VL) || (i.tm.operand_types[2].bitfield.zmmword @@ -4808,12 +4808,12 @@ optimize_encoding (void) */ if (i.tm.opcode_modifier.evex) { - if (i.vec_encoding != vex_encoding_evex) + if (i.encoding != encoding_evex) { i.tm.opcode_modifier.vex = VEX128; i.tm.opcode_modifier.vexw = VEXW0; i.tm.opcode_modifier.evex = 0; - i.vec_encoding = vex_encoding_vex; + i.encoding = encoding_vex; i.mask.reg = NULL; } else if (optimize > 1) @@ -4836,7 +4836,7 @@ optimize_encoding (void) i.types[j].bitfield.ymmword = 0; } } - else if (i.vec_encoding != vex_encoding_evex + else if (i.encoding != encoding_evex && !i.types[0].bitfield.zmmword && !i.types[1].bitfield.zmmword && !i.mask.reg @@ -4978,7 +4978,7 @@ optimize_encoding (void) && i.tm.opcode_modifier.vex && !(i.op[0].regs->reg_flags & RegRex) && i.op[0].regs->reg_type.bitfield.xmmword - && i.vec_encoding != vex_encoding_vex3) + && i.encoding != encoding_vex3) { /* Optimize: -Os: vpbroadcastq %xmmN, %xmmM -> vpunpcklqdq %xmmN, %xmmN, %xmmM (N < 8) @@ -6839,10 +6839,10 @@ md_assemble (char *line) if (optimize && !i.no_optimize && i.tm.opcode_modifier.optimize) optimize_encoding (); - /* Past optimization there's no need to distinguish vex_encoding_evex and - vex_encoding_evex512 anymore. */ - if (i.vec_encoding == vex_encoding_evex512) - i.vec_encoding = vex_encoding_evex; + /* Past optimization there's no need to distinguish encoding_evex and + encoding_evex512 anymore. */ + if (i.encoding == encoding_evex512) + i.encoding = encoding_evex; if (use_unaligned_vector_move) encode_with_unaligned_vector_move (); @@ -7136,15 +7136,15 @@ parse_insn (const char *line, char *mnem break; case Prefix_VEX: /* {vex} */ - i.vec_encoding = vex_encoding_vex; + i.encoding = encoding_vex; break; case Prefix_VEX3: /* {vex3} */ - i.vec_encoding = vex_encoding_vex3; + i.encoding = encoding_vex3; break; case Prefix_EVEX: /* {evex} */ - i.vec_encoding = vex_encoding_evex; + i.encoding = encoding_evex; break; case Prefix_REX: /* {rex} */ @@ -8260,7 +8260,7 @@ check_VecOperands (const insn_template * static int VEX_check_encoding (const insn_template *t) { - if (i.vec_encoding == vex_encoding_error) + if (i.encoding == encoding_error) { i.error = unsupported; return 1; @@ -8277,8 +8277,8 @@ VEX_check_encoding (const insn_template return 1; } - if (i.vec_encoding == vex_encoding_evex - || i.vec_encoding == vex_encoding_evex512) + if (i.encoding == encoding_evex + || i.encoding == encoding_evex512) { /* This instruction must be encoded with EVEX prefix. */ if (!t->opcode_modifier.evex) @@ -8292,7 +8292,7 @@ VEX_check_encoding (const insn_template if (!t->opcode_modifier.vex) { /* This instruction template doesn't have VEX prefix. */ - if (i.vec_encoding != vex_encoding_default) + if (i.encoding != encoding_default) { i.error = no_vex_encoding; return 1; @@ -8967,7 +8967,7 @@ match_template (char mnem_suffix) Note that the semantics have not been changed. */ if (optimize && !i.no_optimize - && i.vec_encoding != vex_encoding_evex + && i.encoding != encoding_evex && ((t + 1 < current_templates.end && !t[1].opcode_modifier.evex && t[1].opcode_space <= SPACE_0F38 @@ -10157,7 +10157,7 @@ process_operands (void) if (dot_insn () && i.reg_operands == 2) { gas_assert (is_any_vex_encoding (&i.tm) - || i.vec_encoding != vex_encoding_default); + || i.encoding != encoding_default); i.vex.register_specifier = i.op[i.operands - 1].regs; } } @@ -10167,7 +10167,7 @@ process_operands (void) == InstanceNone) { gas_assert (is_any_vex_encoding (&i.tm) - || i.vec_encoding != vex_encoding_default); + || i.encoding != encoding_default); i.vex.register_specifier = i.op[i.operands - 1].regs; } @@ -10275,7 +10275,7 @@ build_modrm_byte (void) } exp->X_add_number |= register_number (i.op[reg_slot].regs) << (3 + !(i.tm.opcode_modifier.evex - || i.vec_encoding == vex_encoding_evex)); + || i.encoding == encoding_evex)); } if (i.tm.opcode_modifier.vexvvvv == VexVVVV_DST) @@ -12548,20 +12548,20 @@ s_insn (int dummy ATTRIBUTE_UNUSED) } if (vex || xop - ? i.vec_encoding == vex_encoding_evex + ? i.encoding == encoding_evex : evex - ? i.vec_encoding == vex_encoding_vex - || i.vec_encoding == vex_encoding_vex3 - : i.vec_encoding != vex_encoding_default) + ? i.encoding == encoding_vex + || i.encoding == encoding_vex3 + : i.encoding != encoding_default) { as_bad (_("pseudo-prefix conflicts with encoding specifier")); goto bad; } - if (line > end && i.vec_encoding == vex_encoding_default) - i.vec_encoding = evex ? vex_encoding_evex : vex_encoding_vex; + if (line > end && i.encoding == encoding_default) + i.encoding = evex ? encoding_evex : encoding_vex; - if (i.vec_encoding != vex_encoding_default) + if (i.encoding != encoding_default) { /* Only address size and segment override prefixes are permitted with VEX/XOP/EVEX encodings. */ @@ -12892,20 +12892,20 @@ s_insn (int dummy ATTRIBUTE_UNUSED) goto done; } - /* No need to distinguish vex_encoding_evex and vex_encoding_evex512. */ - if (i.vec_encoding == vex_encoding_evex512) - i.vec_encoding = vex_encoding_evex; + /* No need to distinguish encoding_evex and encoding_evex512. */ + if (i.encoding == encoding_evex512) + i.encoding = encoding_evex; /* Are we to emit ModR/M encoding? */ if (!i.short_form && (i.mem_operands - || i.reg_operands > (i.vec_encoding != vex_encoding_default) + || i.reg_operands > (i.encoding != encoding_default) || i.tm.extension_opcode != None)) i.tm.opcode_modifier.modrm = 1; if (!i.tm.opcode_modifier.modrm && (i.reg_operands - > i.short_form + 0U + (i.vec_encoding != vex_encoding_default) + > i.short_form + 0U + (i.encoding != encoding_default) || i.mem_operands)) { as_bad (_("too many register/memory operands")); @@ -12944,7 +12944,7 @@ s_insn (int dummy ATTRIBUTE_UNUSED) } /* Fall through. */ case 3: - if (i.vec_encoding != vex_encoding_default) + if (i.encoding != encoding_default) { i.tm.opcode_modifier.vexvvvv = 1; break; @@ -13000,13 +13000,13 @@ s_insn (int dummy ATTRIBUTE_UNUSED) || i.index_reg->reg_type.bitfield.ymmword || i.index_reg->reg_type.bitfield.zmmword)) { - if (i.vec_encoding == vex_encoding_default) + if (i.encoding == encoding_default) { as_bad (_("VSIB unavailable with legacy encoding")); goto done; } - if (i.vec_encoding == vex_encoding_evex + if (i.encoding == encoding_evex && i.reg_operands > 1) { /* We could allow two register operands, encoding the 2nd one in @@ -13026,7 +13026,7 @@ s_insn (int dummy ATTRIBUTE_UNUSED) for (j = i.imm_operands; j < i.operands; ++j) { /* Look for 8-bit operands that use old registers. */ - if (i.vec_encoding != vex_encoding_default + if (i.encoding != encoding_default && flag_code == CODE_64BIT && i.types[j].bitfield.class == Reg && i.types[j].bitfield.byte @@ -13085,7 +13085,7 @@ s_insn (int dummy ATTRIBUTE_UNUSED) case 4: combined.bitfield.dword = 1; break; } - if (i.vec_encoding == vex_encoding_default) + if (i.encoding == encoding_default) { if (flag_code == CODE_64BIT && combined.bitfield.qword) i.rex |= REX_W; @@ -13162,7 +13162,7 @@ s_insn (int dummy ATTRIBUTE_UNUSED) if (i.memshift >= 32) i.memshift = 0; else if (!evex) - i.vec_encoding = vex_encoding_error; + i.encoding = encoding_error; if (i.disp_operands && !optimize_disp (&i.tm)) goto done; @@ -13228,8 +13228,8 @@ s_insn (int dummy ATTRIBUTE_UNUSED) potential special casing there. */ i.tm.base_opcode |= val; - if (i.vec_encoding == vex_encoding_error - || (i.vec_encoding != vex_encoding_evex + if (i.encoding == encoding_error + || (i.encoding != encoding_evex ? i.broadcast.type || i.broadcast.bytes || i.rounding.type != rc_none || i.mask.reg @@ -13340,10 +13340,10 @@ RC_SAE_specifier (const char *pstr) return NULL; } - if (i.vec_encoding == vex_encoding_default) - i.vec_encoding = vex_encoding_evex512; - else if (i.vec_encoding != vex_encoding_evex - && i.vec_encoding != vex_encoding_evex512) + if (i.encoding == encoding_default) + i.encoding = encoding_evex512; + else if (i.encoding != encoding_evex + && i.encoding != encoding_evex512) return NULL; i.rounding.type = RC_NamesTable[j].type; @@ -13405,10 +13405,10 @@ check_VecOperations (char *op_string) } op_string++; - if (i.vec_encoding == vex_encoding_default) - i.vec_encoding = vex_encoding_evex; - else if (i.vec_encoding != vex_encoding_evex - && i.vec_encoding != vex_encoding_evex512) + if (i.encoding == encoding_default) + i.encoding = encoding_evex; + else if (i.encoding != encoding_evex + && i.encoding != encoding_evex512) goto unknown_vec_op; i.broadcast.type = bcst_type; @@ -15676,11 +15676,11 @@ static bool check_register (const reg_en if (vector_size < VSZ512) return false; - if (i.vec_encoding == vex_encoding_default) - i.vec_encoding = vex_encoding_evex512; - else if (i.vec_encoding != vex_encoding_evex - && i.vec_encoding != vex_encoding_evex512) - i.vec_encoding = vex_encoding_error; + if (i.encoding == encoding_default) + i.encoding = encoding_evex512; + else if (i.encoding != encoding_evex + && i.encoding != encoding_evex512) + i.encoding = encoding_error; } if (vector_size < VSZ256 && r->reg_type.bitfield.ymmword) @@ -15706,11 +15706,11 @@ static bool check_register (const reg_en || flag_code != CODE_64BIT) return false; - if (i.vec_encoding == vex_encoding_default - || i.vec_encoding == vex_encoding_evex512) - i.vec_encoding = vex_encoding_evex; - else if (i.vec_encoding != vex_encoding_evex) - i.vec_encoding = vex_encoding_error; + if (i.encoding == encoding_default + || i.encoding == encoding_evex512) + i.encoding = encoding_evex; + else if (i.encoding != encoding_evex) + i.encoding = encoding_error; } if (r->reg_flags & RegRex2) --- a/gas/config/tc-i386-intel.c +++ b/gas/config/tc-i386-intel.c @@ -209,10 +209,10 @@ operatorT i386_operator (const char *nam || i386_types[j].sz[0] > 8 || (i386_types[j].sz[0] & (i386_types[j].sz[0] - 1))) return O_illegal; - if (i.vec_encoding == vex_encoding_default) - i.vec_encoding = vex_encoding_evex; - else if (i.vec_encoding != vex_encoding_evex - && i.vec_encoding != vex_encoding_evex512) + if (i.encoding == encoding_default) + i.encoding = encoding_evex; + else if (i.encoding != encoding_evex + && i.encoding != encoding_evex512) return O_illegal; if (!i.broadcast.bytes && !i.broadcast.type) { From patchwork Fri Feb 16 09:58:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 202038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp406438dyb; Fri, 16 Feb 2024 01:58:30 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUz3momNvzRaFgIbrUUC2ykTWyOmAgAvm07iJEbpjXAdN0hDJ+Z5beSKIlNLsndtwLqLhiAb0HWbyjd1WJqPBoIeSL0sA== X-Google-Smtp-Source: AGHT+IEiTpPEa2r08gEZhQvh2D2xRV/MGn1i8PkID3lTWwqzOAHTql7++1Hht3B6M9IW686UAnj2 X-Received: by 2002:a05:620a:2953:b0:786:9b73:da23 with SMTP id n19-20020a05620a295300b007869b73da23mr6307015qkp.46.1708077510171; Fri, 16 Feb 2024 01:58:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708077510; cv=pass; d=google.com; s=arc-20160816; b=F84IPGXrrdkJjbaCKZACs1+XaYOXFwymulJdAwFh48qxLGBPguTtwYc0+UUCBUSQl9 N+nfFN5R4GWirNB6WkH4JeNTzcwpKB55T/XuRvkzk8lHVgarzVVkNwy6/1wjiYRrCkeA v5GjLS8WpVQODWxRJeUOCLQJ3d2BdALdX+4UD3j+b7Z7bKndVIG0xX0T3vjTLJanb/8a XbB7z8iF9YYesL2O6AqyDuHgqse78OsQeTyKyltse8dWvBltssH5rv29UrbBXnpzEd/c pA3L9L0maRwhcDrSt23QZxLlq4zjylPz4eOhFxTHIaCEgZzQxW8bItMjc8gCvnV3aE4G kRnw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :in-reply-to:autocrypt:references:cc:to:from:content-language :subject:user-agent:mime-version:date:message-id:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=oBJ3pOwIogcO7Kq26GdO3upOCRfAgYH7zCf96Cgenlo=; fh=2DbSPqOhyO7CNtGa024QKgSiHKlKGVt2h+1rlgWLnZI=; b=Oo0r674gqNHSLy0d/ZzkBQ009ji5WBdHncOlQhaP5NFDhEtQVtUOyEp5hvMYAn2GGa vjS0toDT+a7owixXkyspbYQGUFhSs2+KhkjUeCd21KGJOzYngxsoQa4rCa7unKF125Y7 nrpaddtduAgrw+lnYu6JZg/osOF5UWPCQwAFPXzmFyr9cJXPlPtIreLbCAgK8uCUbpeM +yQ+turX27MXnN1/2REeT/2X703Gx73aceRgaLJ4LbcKkliCZPwGM0gJNLttFt7FJ029 ZUdi6jJbuLvI38/p/LcdzMNa/mZQVysp0bSdd44n6xURYBpp5e08wGp8TMreWwY6DCXs qpUg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b=epPSfLpq; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id u13-20020a05620a120d00b00785d69d211fsi3506086qkj.444.2024.02.16.01.58.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 01:58:30 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b=epPSfLpq; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CDFB938582AE for ; Fri, 16 Feb 2024 09:58:29 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by sourceware.org (Postfix) with ESMTPS id 1FBA73858287 for ; Fri, 16 Feb 2024 09:58:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1FBA73858287 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1FBA73858287 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::232 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708077500; cv=none; b=tY77+02nMhZCL0OjIo/MAzIAEHtBfJa0ydWLq1nYswxv7IiyRCAooE3jg4hbZY3fAdj9o5k1CdLHUBpArKP1bnPOMtwXfmp1tJZe7noXEvImuUiRFYRffqsK/f06I35QAx9wf8LvaJGW188EX9bDwx6i4be1x6IuBLcI6ttsi+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708077500; c=relaxed/simple; bh=62SZGH8YJhP8nezrcT7feLj9rCugIVDfk0ome47f+c0=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=VtIx3eEOMKgTleKnaBajzGz0bMd4tTKevPhVKI23mUCKidckQV4Wg+JBUNWxtn7ksIODc5VX4sqtfZijmFT5S142eyFVoptKotGyxw92HM7Hf3Y97WL8R/uXYKgVss8XJ27xYuhsLlNmK4aT6tg7lxFAGJd+a2g+rfNkYHPccQo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2d21e2b2245so1024641fa.0 for ; Fri, 16 Feb 2024 01:58:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1708077495; x=1708682295; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=oBJ3pOwIogcO7Kq26GdO3upOCRfAgYH7zCf96Cgenlo=; b=epPSfLpqyAnGmA3XIpaChsh+V1k16n1vsVX5lWK/Gvr2azlcr8jszk0NYiKx4uZU7g 2jWdrXKefH+7DHBPU1S1ZbUxfFGiVZC6yvnauPPI2tFIRJWx0plUaTmmw15SyppgV/DB ciqJDfadmWmSFkAKpgDt9P6GOPmPUKsqJ32PKcioNUl1ZB2ICCYk6c+YQA22r1/+Sz2j R2kTEq7xc+5wrcq/iQprVzD9Lmcq0HuOB6axwYEES2FCJ44sUdNxy5gRYsoBReYu8Rj6 4wNWq53vCNAhehIY4J+GCZjZpNW2+w0x7uZZFyN6IcXchxMR5d42Jxyb1Bml3jqK0rzJ 91xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708077495; x=1708682295; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oBJ3pOwIogcO7Kq26GdO3upOCRfAgYH7zCf96Cgenlo=; b=nt71GcwQVYQ7XunO0pPvbh73BAP2WTxwCfxv+j8yKgMuxd9342OlRNmEZN0u+s59pT w6B5WyVJeTIvt00YEGPPAUjP/ZfM/Yqomo8RgstT6isiXoevuNAAR/Sjf79Vv1mUOL00 vMT5D/29E2T1KoTYjiE2bc2wuMBcRp04Mv5kv6r6Qo6OCTnqmQ4bKbBYbPqkcQR6IVI4 oJ3Ss7BPbjR5DOWGIyqj1re3aQXxfmoDSAV8IlhNnClBeMEIksPVUos+JS3PlQN0gxdg O8EA41JfoDHw/vXY5ItuiEYlK+rYyJHRbCVrt4T8MPtAp0jSJG8b8GbEaLW7wg/4ysGL y5Vg== X-Gm-Message-State: AOJu0YxifmmOuksSH/+x6Wx/23jwTKQSw43KUMIyujXy/q0mfQzaOzPL HCbpKPCL7XNHHE1KLFIvApBgft0FDLm8gBvHvt9f8DDIhFkMVpAcTCVnFrf3ROFP7txyayLm8Lg = X-Received: by 2002:a2e:8196:0:b0:2d0:c9af:a336 with SMTP id e22-20020a2e8196000000b002d0c9afa336mr2994141ljg.28.1708077495347; Fri, 16 Feb 2024 01:58:15 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id jv14-20020a05600c570e00b0040fe3147babsm1820618wmb.0.2024.02.16.01.58.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Feb 2024 01:58:14 -0800 (PST) Message-ID: <8a7e7a43-37d4-425c-8166-6ba8b758f0f4@suse.com> Date: Fri, 16 Feb 2024 10:58:14 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 2/4] x86/APX: respect {vex}/{vex3} Content-Language: en-US From: Jan Beulich To: Binutils Cc: "H.J. Lu" , Lili Cui References: <3098e797-3749-40ee-802c-ea8a6f63914c@suse.com> Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <3098e797-3749-40ee-802c-ea8a6f63914c@suse.com> X-Spam-Status: No, score=-3025.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791049083661052736 X-GMAIL-MSGID: 1791049083661052736 Even when an EVEX encoding is available, use of such a prefix ought to be respected (resulting in an error) rather than ignored. As requested during review already, introduce a new encoding enumerator to record use of eGPR-s, and update state transitions accordingly. The optimize_encoding() change also addresses an internal assembler error that was previously raised when respective memory operands used eGPR-s for addressing. While this results in a change of diagnostic issued for VEX-encoded insns, the new one is at least no worse than the prior one. --- Question is whether for the state transitions we want to introduce a couple of helper functions: check_register() has duplicates each of what RC_SAE_specifier() and check_VecOperations() also do. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -439,9 +439,6 @@ struct _i386_insn /* Prefer the REX2 prefix in encoding. */ bool rex2_encoding; - /* Need to use an Egpr capable encoding (REX2 or EVEX). */ - bool has_egpr; - /* Disable instruction size optimization. */ bool no_optimize; @@ -451,6 +448,7 @@ struct _i386_insn encoding_default = 0, encoding_vex, encoding_vex3, + encoding_egpr, /* REX2 or EVEX. */ encoding_evex, encoding_evex512, encoding_error @@ -1887,7 +1885,7 @@ static INLINE bool need_evex_encoding (c { return i.encoding == encoding_evex || i.encoding == encoding_evex512 - || (t->opcode_modifier.vex && i.has_egpr) + || (t->opcode_modifier.vex && i.encoding == encoding_egpr) || i.mask.reg; } @@ -2489,7 +2487,8 @@ static INLINE int fits_in_imm4 (offsetT num) { /* Despite the name, check for imm3 if we're dealing with EVEX. */ - return (num & (i.encoding != encoding_evex ? 0xf : 7)) == num; + return (num & (i.encoding != encoding_evex + && i.encoding != encoding_egpr ? 0xf : 7)) == num; } static i386_operand_type @@ -4837,6 +4836,7 @@ optimize_encoding (void) } } else if (i.encoding != encoding_evex + && i.encoding != encoding_egpr && !i.types[0].bitfield.zmmword && !i.types[1].bitfield.zmmword && !i.mask.reg @@ -6839,10 +6839,13 @@ md_assemble (char *line) if (optimize && !i.no_optimize && i.tm.opcode_modifier.optimize) optimize_encoding (); - /* Past optimization there's no need to distinguish encoding_evex and - encoding_evex512 anymore. */ + /* Past optimization there's no need to distinguish encoding_evex, + encoding_evex512, and encoding_egpr anymore. */ if (i.encoding == encoding_evex512) i.encoding = encoding_evex; + else if (i.encoding == encoding_egpr) + i.encoding = is_any_vex_encoding (&i.tm) ? encoding_evex + : encoding_default; if (use_unaligned_vector_move) encode_with_unaligned_vector_move (); @@ -8277,27 +8280,42 @@ VEX_check_encoding (const insn_template return 1; } - if (i.encoding == encoding_evex - || i.encoding == encoding_evex512) + switch (i.encoding) { + case encoding_default: + break; + + case encoding_vex: + case encoding_vex3: + /* This instruction must be encoded with VEX prefix. */ + if (!t->opcode_modifier.vex) + { + i.error = no_vex_encoding; + return 1; + } + break; + + case encoding_evex: + case encoding_evex512: /* This instruction must be encoded with EVEX prefix. */ if (!t->opcode_modifier.evex) { i.error = no_evex_encoding; return 1; } - return 0; - } + break; - if (!t->opcode_modifier.vex) - { - /* This instruction template doesn't have VEX prefix. */ - if (i.encoding != encoding_default) + case encoding_egpr: + /* This instruction must be encoded with REX2 or EVEX prefix. */ + if (t->opcode_modifier.vex && !t->opcode_modifier.evex) { - i.error = no_vex_encoding; + i.error = no_evex_encoding; return 1; } - return 0; + break; + + default: + abort (); } return 0; @@ -12896,6 +12914,19 @@ s_insn (int dummy ATTRIBUTE_UNUSED) if (i.encoding == encoding_evex512) i.encoding = encoding_evex; + if (i.encoding == encoding_egpr) + { + if (vex || xop) + { + as_bad (_("eGPR use conflicts with encoding specifier")); + goto done; + } + if (evex) + i.encoding = encoding_evex; + else + i.encoding = encoding_default; + } + /* Are we to emit ModR/M encoding? */ if (!i.short_form && (i.mem_operands @@ -13340,11 +13371,18 @@ RC_SAE_specifier (const char *pstr) return NULL; } - if (i.encoding == encoding_default) - i.encoding = encoding_evex512; - else if (i.encoding != encoding_evex - && i.encoding != encoding_evex512) - return NULL; + switch (i.encoding) + { + case encoding_default: + case encoding_egpr: + i.encoding = encoding_evex512; + break; + case encoding_evex: + case encoding_evex512: + break; + default: + return NULL; + } i.rounding.type = RC_NamesTable[j].type; @@ -13405,11 +13443,18 @@ check_VecOperations (char *op_string) } op_string++; - if (i.encoding == encoding_default) - i.encoding = encoding_evex; - else if (i.encoding != encoding_evex - && i.encoding != encoding_evex512) - goto unknown_vec_op; + switch (i.encoding) + { + case encoding_default: + case encoding_egpr: + i.encoding = encoding_evex; + break; + case encoding_evex: + case encoding_evex512: + break; + default: + goto unknown_vec_op; + } i.broadcast.type = bcst_type; i.broadcast.operand = this_operand; @@ -15676,11 +15721,19 @@ static bool check_register (const reg_en if (vector_size < VSZ512) return false; - if (i.encoding == encoding_default) - i.encoding = encoding_evex512; - else if (i.encoding != encoding_evex - && i.encoding != encoding_evex512) - i.encoding = encoding_error; + switch (i.encoding) + { + case encoding_default: + case encoding_egpr: + i.encoding = encoding_evex512; + break; + case encoding_evex: + case encoding_evex512: + break; + default: + i.encoding = encoding_error; + break; + } } if (vector_size < VSZ256 && r->reg_type.bitfield.ymmword) @@ -15706,11 +15759,19 @@ static bool check_register (const reg_en || flag_code != CODE_64BIT) return false; - if (i.encoding == encoding_default - || i.encoding == encoding_evex512) - i.encoding = encoding_evex; - else if (i.encoding != encoding_evex) - i.encoding = encoding_error; + switch (i.encoding) + { + case encoding_default: + case encoding_egpr: + case encoding_evex512: + i.encoding = encoding_evex; + break; + case encoding_evex: + break; + default: + i.encoding = encoding_error; + break; + } } if (r->reg_flags & RegRex2) @@ -15719,7 +15780,19 @@ static bool check_register (const reg_en || flag_code != CODE_64BIT) return false; - i.has_egpr = true; + switch (i.encoding) + { + case encoding_default: + i.encoding = encoding_egpr; + break; + case encoding_egpr: + case encoding_evex: + case encoding_evex512: + break; + default: + i.encoding = encoding_error; + break; + } } if (((r->reg_flags & (RegRex64 | RegRex)) || r->reg_type.bitfield.qword) --- a/gas/config/tc-i386-intel.c +++ b/gas/config/tc-i386-intel.c @@ -209,11 +209,18 @@ operatorT i386_operator (const char *nam || i386_types[j].sz[0] > 8 || (i386_types[j].sz[0] & (i386_types[j].sz[0] - 1))) return O_illegal; - if (i.encoding == encoding_default) - i.encoding = encoding_evex; - else if (i.encoding != encoding_evex - && i.encoding != encoding_evex512) - return O_illegal; + switch (i.encoding) + { + case encoding_default: + case encoding_egpr: + i.encoding = encoding_evex; + break; + case encoding_evex: + case encoding_evex512: + break; + default: + return O_illegal; + } if (!i.broadcast.bytes && !i.broadcast.type) { i.broadcast.bytes = i386_types[j].sz[0]; --- a/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.l +++ b/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.l @@ -101,102 +101,109 @@ .*:108: Error: extended GPR cannot be used as base/index for `gf2p8affineinvqb' .*:109: Error: extended GPR cannot be used as base/index for `gf2p8affineqb' .*:110: Error: extended GPR cannot be used as base/index for `gf2p8mulb' -.*:112: Error: extended GPR cannot be used as base/index for `vaesimc' -.*:113: Error: extended GPR cannot be used as base/index for `vaeskeygenassist' -.*:114: Error: extended GPR cannot be used as base/index for `vblendpd' -.*:115: Error: extended GPR cannot be used as base/index for `vblendpd' -.*:116: Error: extended GPR cannot be used as base/index for `vblendps' -.*:117: Error: extended GPR cannot be used as base/index for `vblendps' -.*:118: Error: extended GPR cannot be used as base/index for `vblendvpd' -.*:119: Error: extended GPR cannot be used as base/index for `vblendvpd' -.*:120: Error: extended GPR cannot be used as base/index for `vblendvps' -.*:121: Error: extended GPR cannot be used as base/index for `vblendvps' -.*:122: Error: extended GPR cannot be used as base/index for `vdppd' -.*:123: Error: extended GPR cannot be used as base/index for `vdpps' -.*:124: Error: extended GPR cannot be used as base/index for `vdpps' -.*:125: Error: extended GPR cannot be used as base/index for `vhaddpd' -.*:126: Error: extended GPR cannot be used as base/index for `vhaddpd' -.*:127: Error: extended GPR cannot be used as base/index for `vhsubps' -.*:128: Error: extended GPR cannot be used as base/index for `vhsubps' -.*:129: Error: extended GPR cannot be used as base/index for `vlddqu' -.*:130: Error: extended GPR cannot be used as base/index for `vlddqu' -.*:131: Error: extended GPR cannot be used as base/index for `vldmxcsr' -.*:132: Error: extended GPR cannot be used as base/index for `vmaskmovpd' -.*:133: Error: extended GPR cannot be used as base/index for `vmaskmovpd' -.*:134: Error: extended GPR cannot be used as base/index for `vmaskmovpd' -.*:135: Error: extended GPR cannot be used as base/index for `vmaskmovpd' -.*:136: Error: extended GPR cannot be used as base/index for `vmaskmovps' -.*:137: Error: extended GPR cannot be used as base/index for `vmaskmovps' -.*:138: Error: extended GPR cannot be used as base/index for `vmaskmovps' -.*:139: Error: extended GPR cannot be used as base/index for `vmaskmovps' -.*:140: Error: register type mismatch for `vmovmskpd' -.*:141: Error: register type mismatch for `vmovmskpd' -.*:142: Error: register type mismatch for `vmovmskps' -.*:143: Error: register type mismatch for `vmovmskps' -.*:144: Error: extended GPR cannot be used as base/index for `vpblendd' -.*:145: Error: extended GPR cannot be used as base/index for `vpblendd' -.*:146: Error: extended GPR cannot be used as base/index for `vpblendvb' -.*:147: Error: extended GPR cannot be used as base/index for `vpblendvb' -.*:148: Error: extended GPR cannot be used as base/index for `vpblendw' -.*:149: Error: extended GPR cannot be used as base/index for `vpblendw' -.*:150: Error: extended GPR cannot be used as base/index for `vpcmpeqb' -.*:151: Error: extended GPR cannot be used as base/index for `vpcmpeqd' -.*:152: Error: extended GPR cannot be used as base/index for `vpcmpeqq' -.*:153: Error: extended GPR cannot be used as base/index for `vpcmpeqw' -.*:154: Error: extended GPR cannot be used as base/index for `vpcmpestri' -.*:155: Error: extended GPR cannot be used as base/index for `vpcmpestrm' -.*:156: Error: extended GPR cannot be used as base/index for `vpcmpgtb' -.*:157: Error: extended GPR cannot be used as base/index for `vpcmpgtd' -.*:158: Error: extended GPR cannot be used as base/index for `vpcmpgtq' -.*:159: Error: extended GPR cannot be used as base/index for `vpcmpgtw' -.*:160: Error: extended GPR cannot be used as base/index for `vpcmpistri' -.*:161: Error: extended GPR cannot be used as base/index for `vpcmpistrm' -.*:162: Error: extended GPR cannot be used as base/index for `vperm2f128' -.*:163: Error: extended GPR cannot be used as base/index for `vperm2i128' -.*:164: Error: extended GPR cannot be used as base/index for `vphaddd' -.*:165: Error: extended GPR cannot be used as base/index for `vphaddd' -.*:166: Error: extended GPR cannot be used as base/index for `vphaddsw' -.*:167: Error: extended GPR cannot be used as base/index for `vphaddsw' -.*:168: Error: extended GPR cannot be used as base/index for `vphaddw' -.*:169: Error: extended GPR cannot be used as base/index for `vphaddw' -.*:170: Error: extended GPR cannot be used as base/index for `vphminposuw' -.*:171: Error: extended GPR cannot be used as base/index for `vphsubd' -.*:172: Error: extended GPR cannot be used as base/index for `vphsubd' -.*:173: Error: extended GPR cannot be used as base/index for `vphsubsw' -.*:174: Error: extended GPR cannot be used as base/index for `vphsubsw' -.*:175: Error: extended GPR cannot be used as base/index for `vphsubw' -.*:176: Error: extended GPR cannot be used as base/index for `vphsubw' -.*:177: Error: extended GPR cannot be used as base/index for `vpmaskmovd' -.*:178: Error: extended GPR cannot be used as base/index for `vpmaskmovd' -.*:179: Error: extended GPR cannot be used as base/index for `vpmaskmovd' -.*:180: Error: extended GPR cannot be used as base/index for `vpmaskmovd' -.*:181: Error: extended GPR cannot be used as base/index for `vpmaskmovq' -.*:182: Error: extended GPR cannot be used as base/index for `vpmaskmovq' -.*:183: Error: extended GPR cannot be used as base/index for `vpmaskmovq' -.*:184: Error: extended GPR cannot be used as base/index for `vpmaskmovq' -.*:185: Error: register type mismatch for `vpmovmskb' -.*:186: Error: register type mismatch for `vpmovmskb' -.*:187: Error: extended GPR cannot be used as base/index for `vpsignb' -.*:188: Error: extended GPR cannot be used as base/index for `vpsignb' -.*:189: Error: extended GPR cannot be used as base/index for `vpsignd' -.*:190: Error: extended GPR cannot be used as base/index for `vpsignd' -.*:191: Error: extended GPR cannot be used as base/index for `vpsignw' -.*:192: Error: extended GPR cannot be used as base/index for `vpsignw' -.*:193: Error: extended GPR cannot be used as base/index for `vptest' -.*:194: Error: extended GPR cannot be used as base/index for `vptest' -.*:195: Error: extended GPR cannot be used as base/index for `vrcpps' -.*:196: Error: extended GPR cannot be used as base/index for `vrcpps' -.*:197: Error: extended GPR cannot be used as base/index for `vrcpss' +.*:112: Error: no EVEX encoding for `vaesimc' +.*:113: Error: no EVEX encoding for `vaeskeygenassist' +.*:114: Error: no EVEX encoding for `vblendpd' +.*:115: Error: no EVEX encoding for `vblendpd' +.*:116: Error: no EVEX encoding for `vblendps' +.*:117: Error: no EVEX encoding for `vblendps' +.*:118: Error: no EVEX encoding for `vblendvpd' +.*:119: Error: no EVEX encoding for `vblendvpd' +.*:120: Error: no EVEX encoding for `vblendvps' +.*:121: Error: no EVEX encoding for `vblendvps' +.*:122: Error: no EVEX encoding for `vdppd' +.*:123: Error: no EVEX encoding for `vdpps' +.*:124: Error: no EVEX encoding for `vdpps' +.*:125: Error: no EVEX encoding for `vhaddpd' +.*:126: Error: no EVEX encoding for `vhaddpd' +.*:127: Error: no EVEX encoding for `vhsubps' +.*:128: Error: no EVEX encoding for `vhsubps' +.*:129: Error: no EVEX encoding for `vlddqu' +.*:130: Error: no EVEX encoding for `vlddqu' +.*:131: Error: no EVEX encoding for `vldmxcsr' +.*:132: Error: no EVEX encoding for `vmaskmovpd' +.*:133: Error: no EVEX encoding for `vmaskmovpd' +.*:134: Error: no EVEX encoding for `vmaskmovpd' +.*:135: Error: no EVEX encoding for `vmaskmovpd' +.*:136: Error: no EVEX encoding for `vmaskmovps' +.*:137: Error: no EVEX encoding for `vmaskmovps' +.*:138: Error: no EVEX encoding for `vmaskmovps' +.*:139: Error: no EVEX encoding for `vmaskmovps' +.*:140: Error: no EVEX encoding for `vmovmskpd' +.*:141: Error: no EVEX encoding for `vmovmskpd' +.*:142: Error: no EVEX encoding for `vmovmskps' +.*:143: Error: no EVEX encoding for `vmovmskps' +.*:144: Error: no EVEX encoding for `vpblendd' +.*:145: Error: no EVEX encoding for `vpblendd' +.*:146: Error: no EVEX encoding for `vpblendvb' +.*:147: Error: no EVEX encoding for `vpblendvb' +.*:148: Error: no EVEX encoding for `vpblendw' +.*:149: Error: no EVEX encoding for `vpblendw' +.*:150: Error: no EVEX encoding for `vpcmpeqb' +.*:151: Error: no EVEX encoding for `vpcmpeqd' +.*:152: Error: no EVEX encoding for `vpcmpeqq' +.*:153: Error: no EVEX encoding for `vpcmpeqw' +.*:154: Error: no EVEX encoding for `vpcmpestri' +.*:155: Error: no EVEX encoding for `vpcmpestrm' +.*:156: Error: no EVEX encoding for `vpcmpgtb' +.*:157: Error: no EVEX encoding for `vpcmpgtd' +.*:158: Error: no EVEX encoding for `vpcmpgtq' +.*:159: Error: no EVEX encoding for `vpcmpgtw' +.*:160: Error: no EVEX encoding for `vpcmpistri' +.*:161: Error: no EVEX encoding for `vpcmpistrm' +.*:162: Error: no EVEX encoding for `vperm2f128' +.*:163: Error: no EVEX encoding for `vperm2i128' +.*:164: Error: no EVEX encoding for `vphaddd' +.*:165: Error: no EVEX encoding for `vphaddd' +.*:166: Error: no EVEX encoding for `vphaddsw' +.*:167: Error: no EVEX encoding for `vphaddsw' +.*:168: Error: no EVEX encoding for `vphaddw' +.*:169: Error: no EVEX encoding for `vphaddw' +.*:170: Error: no EVEX encoding for `vphminposuw' +.*:171: Error: no EVEX encoding for `vphsubd' +.*:172: Error: no EVEX encoding for `vphsubd' +.*:173: Error: no EVEX encoding for `vphsubsw' +.*:174: Error: no EVEX encoding for `vphsubsw' +.*:175: Error: no EVEX encoding for `vphsubw' +.*:176: Error: no EVEX encoding for `vphsubw' +.*:177: Error: no EVEX encoding for `vpmaskmovd' +.*:178: Error: no EVEX encoding for `vpmaskmovd' +.*:179: Error: no EVEX encoding for `vpmaskmovd' +.*:180: Error: no EVEX encoding for `vpmaskmovd' +.*:181: Error: no EVEX encoding for `vpmaskmovq' +.*:182: Error: no EVEX encoding for `vpmaskmovq' +.*:183: Error: no EVEX encoding for `vpmaskmovq' +.*:184: Error: no EVEX encoding for `vpmaskmovq' +.*:185: Error: no EVEX encoding for `vpmovmskb' +.*:186: Error: no EVEX encoding for `vpmovmskb' +.*:187: Error: no EVEX encoding for `vpsignb' +.*:188: Error: no EVEX encoding for `vpsignb' +.*:189: Error: no EVEX encoding for `vpsignd' +.*:190: Error: no EVEX encoding for `vpsignd' +.*:191: Error: no EVEX encoding for `vpsignw' +.*:192: Error: no EVEX encoding for `vpsignw' +.*:193: Error: no EVEX encoding for `vptest' +.*:194: Error: no EVEX encoding for `vptest' +.*:195: Error: no EVEX encoding for `vrcpps' +.*:196: Error: no EVEX encoding for `vrcpps' +.*:197: Error: no EVEX encoding for `vrcpss' .*:198: Error: .* 4 bits for `vroundpd' .*:199: Error: .* 4 bits for `vroundps' .*:200: Error: .* 4 bits for `vroundsd' .*:201: Error: .* 4 bits for `vroundss' -.*:202: Error: extended GPR cannot be used as base/index for `vrsqrtps' -.*:203: Error: extended GPR cannot be used as base/index for `vrsqrtps' -.*:204: Error: extended GPR cannot be used as base/index for `vrsqrtss' -.*:205: Error: extended GPR cannot be used as base/index for `vstmxcsr' -.*:206: Error: extended GPR cannot be used as base/index for `vtestpd' -.*:207: Error: extended GPR cannot be used as base/index for `vtestpd' -.*:208: Error: extended GPR cannot be used as base/index for `vtestps' -.*:209: Error: extended GPR cannot be used as base/index for `vtestps' +.*:202: Error: no EVEX encoding for `vrsqrtps' +.*:203: Error: no EVEX encoding for `vrsqrtps' +.*:204: Error: no EVEX encoding for `vrsqrtss' +.*:205: Error: no EVEX encoding for `vstmxcsr' +.*:206: Error: no EVEX encoding for `vtestpd' +.*:207: Error: no EVEX encoding for `vtestpd' +.*:208: Error: no EVEX encoding for `vtestps' +.*:209: Error: no EVEX encoding for `vtestps' +.*:211: Error: no VEX/XOP encoding for `and' +.*:212: Error: no VEX/XOP encoding for `and' +.*:213: Error: .* `and' +.*:214: Error: no VEX/XOP encoding for `and' +.*:215: Error: no VEX/XOP encoding for `and' +.*:216: Error: .* `and' +.*:219: Error: .* `andn' #pass --- a/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.s +++ b/gas/testsuite/gas/i386/x86-64-apx-egpr-inval.s @@ -207,3 +207,13 @@ vtestpd (%r27),%ymm6 vtestps (%r27),%xmm6 vtestps (%r27),%ymm6 +# {vex} + {vex} and %eax, %eax + {vex} and %r8, %r8 + {vex} and %r16, %r16 + {vex} and %eax, %eax, %eax + {vex} and %r8, %r8, %r8 + {vex} and %r16, %r16, %r16 + {vex} andn %eax, %eax, %eax + {vex} andn %r8, %r8, %r8 + {vex} andn %r16, %r16, %r16 From patchwork Fri Feb 16 09:58:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 202041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp406722dyb; Fri, 16 Feb 2024 01:59:19 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUi6ouEFtCmWGfVGrUN6xkYnLyzpCQx50ZKQ26Ni25mTC7Mf1CB1lHjoHKfsyDDp31rrGjkzUcIuxSkUQkGR9hv7J8t3g== X-Google-Smtp-Source: AGHT+IGb7155gUdTeUMxySeAL/MwZzQoZe/PPUeWM0z/VcwkG+H7kEbboclyTJuesw8nRcEBuUez X-Received: by 2002:a05:620a:1359:b0:787:18cc:722f with SMTP id c25-20020a05620a135900b0078718cc722fmr4811917qkl.32.1708077559397; Fri, 16 Feb 2024 01:59:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708077559; cv=pass; d=google.com; s=arc-20160816; b=UwqWspB/VZEA8rPLF7SNzjoERtGl5uwhp5mlhAIHjr4UbDuLsr5RkzcLgNRE35CrAz NhAm9K+LRTJu2E9YdtULIGQ6gz4dASixl3+VL/w6csJqDUVIrwu79N1TVu4+hAWYObc6 k5AjqpfZniTzYOjWDDZyxu3kCRzrONDTKn7Oryj5aKnftAJxQNvy9qS/GdXmYrSxpKL/ /hC/BYO0D1qVtwTdx7/jsA3G0on5jjQW5+KyBtcLLeyLkq/1stViJoJWXZz+cYKko+Lk qAAc3UpdgZbQLo0uVT5F4pywm2w9JOU/Hu7MsELjlCsb06msN/dI+yIC64ux05Aeq/A7 ca6Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :in-reply-to:autocrypt:references:cc:to:from:content-language :subject:user-agent:mime-version:date:message-id:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=Bq/G2i5+7+R1+brOwp70SJTznB+bcFSAe4AFR/XaXAY=; fh=2DbSPqOhyO7CNtGa024QKgSiHKlKGVt2h+1rlgWLnZI=; b=dx3urDsPJc3zVD62eKRmy0XgnKRSDfwSR5c45wkXZIf+E26NyGLdtVCw1LDDh99hCC RYF50QXMFPx+LjtZ0AfAniWh+aPKEZiHbM2tYYWfH/7tSakN88vDjSvVLeYREa/OHdCq EQEoEVafDU8hlYbva3jPdfzW23AZGuQMpIVjEaG7N3ZhxrgTuiRaNY782w6KgbV77VMW Cp75NQVRlXXqNVqMoteMK65HuJ2SZ76qxGj+vE2LG8oveV9AEqpXfkxU4C7vaBDsoAYl DSa4sG5u5Lu9O3qKcgcdY0i6cfDPMe5Ji9ZLJkNH/4hesn+PiGRgQLYKk8OY+DUJY2fN 44bw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b=JYBNDH1P; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id u28-20020a05620a121c00b007873e71b3aesi1812713qkj.501.2024.02.16.01.59.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 01:59:19 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b=JYBNDH1P; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 08548385829F for ; Fri, 16 Feb 2024 09:59:19 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id 38C053858C54 for ; Fri, 16 Feb 2024 09:58:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 38C053858C54 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 38C053858C54 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708077540; cv=none; b=N5p/M6O2Z5HbRaQxlH/+zeTL92R9bLEklLJjaR4PEiglxXKvgltXabABP94IA5CkkKeurvDEud/a9DUbNMQSp3YD4JphXOTHirFkohdVYLQ65PbkSKzUUdcw14xt4/mX5PeXVDA/xb6nuNP+BkOLECm+yxOhHgJVQ/kBR3h+JN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708077540; c=relaxed/simple; bh=lbfG71bhtUTwMkc9w1jP/siyFXtY/Qk5A/e1CQdAxY0=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=Rn3WCGxGM5KOjhfqwGBdexfGSVVHb17Putdfbs+r5FSh+ECCzRYvMcs9GYvoSWNJ+Z2HM316l9q0hrNqfgS1bcGrDSXY3h6tLZs7rB9IoxchQtH9nvly10EVqWFcFh5oRFs+pVypOluHUzh9ktIDt30na7461+FdvlDRtfkzz9o= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-412191ed8aaso11675865e9.2 for ; Fri, 16 Feb 2024 01:58:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1708077537; x=1708682337; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=Bq/G2i5+7+R1+brOwp70SJTznB+bcFSAe4AFR/XaXAY=; b=JYBNDH1Pi3z5cUMrgJoGoPvg9KIBp7DU0FPIMWrNViilP2Az9+wm9Si+Q09S0RpV+R 42yAqEOfEiXtWPs5IrKE6xjynz/kaojcJ84OYFNRaF0jioWhopbeTo5cmB34AgN7GOzq Xhu+C3YOm6jxVe0apsCBOGm/nYj76lkQIuAm4Oy+pJhfjsYfDHn4BHa1M53BJrwv69FN ukN5lDMMirbbFHGY4vHZXlet8QZuohlWI/BglATWfgV4vDDCS1iEA4a7Fax/KhMkD6s1 qyD58FdHFtP5crkElS/tFQo1vXDL3uKhTrmJWDxCh+o7JN6g/W6YnvcYMHnyKz8e2dhh femQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708077537; x=1708682337; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Bq/G2i5+7+R1+brOwp70SJTznB+bcFSAe4AFR/XaXAY=; b=DlfHs2XVAe0g3uFzBDYW6WbPsb9v74fVcOxUbS7sKLPa9JsTIw6o6TwBu408s0IfN+ kux1i1gUECw7Uno+wlXMY7KW1UQAdwDl3Bkx0t9vHtkZmCKVpwfB0YiIqHG8cTdwjkSU poNVkDE4n2sJL5xpgUAFbVri8rrR9t0EuIHX22MYBNdJS/o9XgfwpZ/ZyIz/TCxGjufl IuP3hmJ7yJvzLPqrr8soKRB7fTObGqJO7H6xFJzTdBkwBNQhMMWm//mnrbf0NJFvXhSV LoBEAJtUP/CXG2RVtmbEqIRb+wR1DFv8ME2khNhuaQaiPbSd+VYpYk6Hb+Q6nY0o/Ig0 O8HQ== X-Gm-Message-State: AOJu0YwWWwbwb9M6fONfBYGuT6Xa3gfJ6SEf9/F0X3JtSB1RCCZp7YKP WiUugS87v+n7rx4O33/YW3B0V+k7R/RD+i+gx0M0QXoAFUzPEvtxAYYLVLoaNXFcOeG1qVfdCkA = X-Received: by 2002:a05:600c:4f14:b0:410:cf4f:68e1 with SMTP id l20-20020a05600c4f1400b00410cf4f68e1mr3083514wmq.2.1708077536398; Fri, 16 Feb 2024 01:58:56 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id jv14-20020a05600c570e00b0040fe3147babsm1820618wmb.0.2024.02.16.01.58.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Feb 2024 01:58:56 -0800 (PST) Message-ID: <74cf88e4-5b0d-40a3-9eb5-f0829ed490df@suse.com> Date: Fri, 16 Feb 2024 10:58:55 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 3/4] x86/APX: correct .insn opcode space determination when REX2 is needed Content-Language: en-US From: Jan Beulich To: Binutils Cc: "H.J. Lu" , Lili Cui References: <3098e797-3749-40ee-802c-ea8a6f63914c@suse.com> Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <3098e797-3749-40ee-802c-ea8a6f63914c@suse.com> X-Spam-Status: No, score=-3025.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791049135193153953 X-GMAIL-MSGID: 1791049135193153953 In this case spaces 0f38 and 0f3a may not be put in place. To achieve the intended effect, operand parsing (but not operand processing) needs pulling ahead, so we know whether eGRP-s are in use. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -12849,13 +12849,43 @@ s_insn (int dummy ATTRIBUTE_UNUSED) } } + /* Parse operands, if any, before evaluating encoding space. */ + if (*line == ',') + { + i.memshift = -1; + + ptr = parse_operands (line + 1, &i386_mnemonics[MN__insn]); + this_operand = -1; + if (!ptr) + goto bad; + line = ptr; + + if (!i.operands) + { + as_bad (_("expecting operand after ','; got nothing")); + goto done; + } + + if (i.mem_operands > 1) + { + as_bad (_("too many memory references for `%s'"), + &i386_mnemonics[MN__insn]); + goto done; + } + + /* No need to distinguish encoding_evex and encoding_evex512. */ + if (i.encoding == encoding_evex512) + i.encoding = encoding_evex; + } + /* Trim off encoding space. */ if (j > 1 && !i.insn_opcode_space && (val >> ((j - 1) * 8)) == 0x0f) { uint8_t byte = val >> ((--j - 1) * 8); i.insn_opcode_space = SPACE_0F; - switch (byte & -(j > 1)) + switch (byte & -(j > 1 && !i.rex2_encoding + && (i.encoding != encoding_egpr || evex))) { case 0x38: i.insn_opcode_space = SPACE_0F38; @@ -12878,42 +12908,17 @@ s_insn (int dummy ATTRIBUTE_UNUSED) if (j > 2) { as_bad (_("opcode residual (%#"PRIx64") too wide"), (uint64_t) val); - goto bad; + goto done; } i.opcode_length = j; /* Handle operands, if any. */ - if (*line == ',') + if (i.operands) { i386_operand_type combined; expressionS *disp_exp = NULL; bool changed; - i.memshift = -1; - - ptr = parse_operands (line + 1, &i386_mnemonics[MN__insn]); - this_operand = -1; - if (!ptr) - goto bad; - line = ptr; - - if (!i.operands) - { - as_bad (_("expecting operand after ','; got nothing")); - goto done; - } - - if (i.mem_operands > 1) - { - as_bad (_("too many memory references for `%s'"), - &i386_mnemonics[MN__insn]); - goto done; - } - - /* No need to distinguish encoding_evex and encoding_evex512. */ - if (i.encoding == encoding_evex512) - i.encoding = encoding_evex; - if (i.encoding == encoding_egpr) { if (vex || xop) --- /dev/null +++ b/gas/testsuite/gas/i386/insn-rex2.l @@ -0,0 +1,38 @@ +[ ]*[0-9]+[ ]+\.text +[ ]*[0-9]+[ ]+insn_rex2: +[ ]*[0-9]+ .... D58001C0[ ]+\.insn \{rex2\} 0x0f01/0, %eax +[ ]*[0-9]+ .... D58038C0[ ]+\.insn \{rex2\} 0x0f38/0, %eax +[ ]*[0-9]+ .... D5803801[ ]+\.insn \{rex2\} 0x0f3801/0, %eax +[ ]*[0-9]+ +C0 +[ ]*[0-9]+ .... D5803901[ ]+\.insn \{rex2\} 0x0f3901/0, %eax +[ ]*[0-9]+ +C0 +[ ]*[0-9]+ .... D5803A01[ ]+\.insn \{rex2\} 0x0f3a01/0, \$0xCC, %eax +[ ]*[0-9]+ +C0CC +[ ]*[0-9]+[ ]+ +[ ]*[0-9]+ .... D58801C0[ ]+\.insn \{rex2\} 0x0f01/0, %rax +[ ]*[0-9]+ .... D58838C0[ ]+\.insn \{rex2\} 0x0f38/0, %rax +[ ]*[0-9]+ .... D5883801[ ]+\.insn \{rex2\} 0x0f3801/0, %rax +[ ]*[0-9]+ +C0 +[ ]*[0-9]+ .... D5883901[ ]+\.insn \{rex2\} 0x0f3901/0, %rax +[ ]*[0-9]+ +C0 +[ ]*[0-9]+ .... D5883A01[ ]+\.insn \{rex2\} 0x0f3a01/0, \$0xCC, %rax +[ ]*[0-9]+ +C0CC +[ ]*[0-9]+[ ]+ +[ ]*[0-9]+ .... D58901C0[ ]+\.insn \{rex2\} 0x0f01/0, %r8 +[ ]*[0-9]+ .... D58938C0[ ]+\.insn \{rex2\} 0x0f38/0, %r8 +[ ]*[0-9]+ .... D5893801[ ]+\.insn \{rex2\} 0x0f3801/0, %r8 +[ ]*[0-9]+ +C0 +[ ]*[0-9]+ .... D5893901[ ]+\.insn \{rex2\} 0x0f3901/0, %r8 +[ ]*[0-9]+ +C0 +[ ]*[0-9]+ .... D5893A01[ ]+\.insn \{rex2\} 0x0f3a01/0, \$0xCC, %r8 +[ ]*[0-9]+ +C0CC +[ ]*[0-9]+[ ]+ +[ ]*[0-9]+ .... D59801C0[ ]+\.insn 0x0f01/0, %r16 +[ ]*[0-9]+ .... D59838C0[ ]+\.insn 0x0f38/0, %r16 +[ ]*[0-9]+ .... D5983801[ ]+\.insn 0x0f3801/0, %r16 +[ ]*[0-9]+ +C0 +[ ]*[0-9]+ .... D5983901[ ]+\.insn 0x0f3901/0, %r16 +[ ]*[0-9]+ +C0 +[ ]*[0-9]+ .... D5983A01[ ]+\.insn 0x0f3a01/0, \$0xCC, %r16 +[ ]*[0-9]+[ ]+C0CC +#pass --- /dev/null +++ b/gas/testsuite/gas/i386/insn-rex2.s @@ -0,0 +1,25 @@ + .text +insn_rex2: + .insn {rex2} 0x0f01/0, %eax + .insn {rex2} 0x0f38/0, %eax + .insn {rex2} 0x0f3801/0, %eax + .insn {rex2} 0x0f3901/0, %eax + .insn {rex2} 0x0f3a01/0, $0xCC, %eax + + .insn {rex2} 0x0f01/0, %rax + .insn {rex2} 0x0f38/0, %rax + .insn {rex2} 0x0f3801/0, %rax + .insn {rex2} 0x0f3901/0, %rax + .insn {rex2} 0x0f3a01/0, $0xCC, %rax + + .insn {rex2} 0x0f01/0, %r8 + .insn {rex2} 0x0f38/0, %r8 + .insn {rex2} 0x0f3801/0, %r8 + .insn {rex2} 0x0f3901/0, %r8 + .insn {rex2} 0x0f3a01/0, $0xCC, %r8 + + .insn 0x0f01/0, %r16 + .insn 0x0f38/0, %r16 + .insn 0x0f3801/0, %r16 + .insn 0x0f3901/0, %r16 + .insn 0x0f3a01/0, $0xCC, %r16 --- a/gas/testsuite/gas/i386/x86-64.exp +++ b/gas/testsuite/gas/i386/x86-64.exp @@ -126,6 +126,7 @@ run_dump_test "x86-64-sysenter-mixed" run_dump_test "x86-64-sysenter-amd" run_list_test "x86-64-sysenter-amd" "-mamd64" run_dump_test "insn-64" +run_list_test "insn-rex2" "-aln" run_dump_test "noreg64" run_list_test "noreg64" run_dump_test "noreg64-data16" From patchwork Fri Feb 16 09:59:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 202043 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp406843dyb; Fri, 16 Feb 2024 01:59:41 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXOSE9zhkAmxmHgbY5GOlK/WNCq9AGtxPiL8q97/tGo5Ubf3nLAGd2BCP1cTgvGuJ/3jcY6GLhIilTQgR8k55ZqJ04pXw== X-Google-Smtp-Source: AGHT+IGf9ni7Sq7hwKXsZ5782T773zzBtxUPpqeEBviNuH/Tfy8qQCKiXu0zbFenB+OzywK2oSar X-Received: by 2002:a05:6808:2e93:b0:3c1:3f84:7a95 with SMTP id gt19-20020a0568082e9300b003c13f847a95mr1505284oib.14.1708077581525; Fri, 16 Feb 2024 01:59:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708077581; cv=pass; d=google.com; s=arc-20160816; b=TC5KRhCdsCPiRDaNEzNidvW2iEXrnIcg15g7OprCAocoDQAFjw8ZaQpQcmTaYq/4s6 vIBiLISf7wQn36aQOCKAWRfx8wd8CfA5EBzTH9rzAdCYZzY4SxiQZ254psl0e/S4oaFu 3ogzIJXO92/w6gsQM74xz/GpYMfUfnRDqI1DJXP/ReqS3zGJ4mhuzU2OjAWVJ438BrTM sveW/4ECc7y+Y52elpdbVq8RyIsmzT2J7vAHXZ5fGNBQCkUgk40A54OqjOsoYL7HB35W 4pzE+lONlOWA+4Fi62r0ceG8e5wE9yP6YiesovJ+QHx4V68tiMSfPx66lMpRagNZkRWc 624g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :in-reply-to:autocrypt:references:cc:to:from:content-language :subject:user-agent:mime-version:date:message-id:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=j9vs3953WFVTvIDfMEcyn5LG6r3NG10TsLUww0lIlQc=; fh=2DbSPqOhyO7CNtGa024QKgSiHKlKGVt2h+1rlgWLnZI=; b=WWx4iXjRx5/KqtNV5nK7hWEcrtNXcuKzyjmm4fM/nK8/zyYiDVGKu0fl6otmXG0X/8 bVSe0kPV24i1b2rMvrE9uB5rkwkcBHHj9YHtE92UUees+3hl22HOcJgWpdOFZgy3y8zg 6CQtsybEg2yDuvzwarRMr+q0pEI2q+tIuFCW7iTjIQiLU5NjBOduAL1v/SXMrGzZpumy +UcJO/4Yzchps2n0LxU/hATTgV2B7GyV/RG25bYqYpE1TazmVv7x3OX87nB2gG1mPGGy mw9amnrFu6pbhNeZ7VEUPPfNh9AP0M2SK5hoqwKkYiFEaM/W7FVmfI1wCRAN6nW5DbY7 fF5g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=google header.b=eJcTwhnw; arc=pass (i=1); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id v4-20020a05622a188400b0042cfd7a19d9si3782197qtc.708.2024.02.16.01.59.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 01:59:41 -0800 (PST) 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=@suse.com header.s=google header.b=eJcTwhnw; arc=pass (i=1); 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 389A338582B6 for ; Fri, 16 Feb 2024 09:59:41 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id 68AAC3858003 for ; Fri, 16 Feb 2024 09:59:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 68AAC3858003 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 68AAC3858003 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708077570; cv=none; b=Kmr6mRa8kPnKogkmAY59aco3J4LLF+5f+jJAoz8kbIw7as14wJB0m8MpSQqcjRlDcoFHvM4E/vE7gey0DzZP6gKZVL8608r5BhaRd6C1GQFqQ9FC+BvX9Tlkydv3L6Ik2zOWS/v7tF3PehU5+TJ1iTdrjfPhi95u4JHLuuqwscY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708077570; c=relaxed/simple; bh=zCXIW4qUZZyDeE5OYLMpSfm9d2vaIaqZ4At3iRxp9B4=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=p3zPFOxcrciXUe51jJObDU9OPPaFId+qpUppfOUN++K6O9+UrGr2b7HO9syN14Y+aHxOed70cDwdJg/YVHp2br1AXCtBKVXNWPG6w2tgDkyM1f7wHO+iey5bpaM4F+7llSTpOe6J7nfnVbdShyJFObx2TMuIkNC02athPbwry90= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40fd2f7ef55so16399715e9.0 for ; Fri, 16 Feb 2024 01:59:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1708077566; x=1708682366; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=j9vs3953WFVTvIDfMEcyn5LG6r3NG10TsLUww0lIlQc=; b=eJcTwhnwVOGg9iSZiQcrPiidPpCeqba6+ZG0nkNuabvkN1jLTQoL+258QuHQEP2pDO BObnHwWpqqXYJ2S7NFyVoofq9xQtikXFRqU3wPTfJcBi5tLDO0uX7wPKwUaJaJA7NQK6 3wLYN6/KcqPySxMp5rfo1mQR/V0Iq8wBEUHwZQKSxjfjDhRJiJmgHX9XAp846IrIXnA+ 41g13Ok4O8Wq/SraGpFk7xbWdveFVuhAajxvkydKSozOW/UNvbgH75SfcMz0p9QcOGp0 ko77rB7ioJnPdqP+BSEF7ErKb1LTSaUyB8/Pbe+H69VG1EMSDyd+QgFqA6M6wVnAFl+I PwXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708077566; x=1708682366; h=content-transfer-encoding:in-reply-to:autocrypt:references:cc:to :from:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=j9vs3953WFVTvIDfMEcyn5LG6r3NG10TsLUww0lIlQc=; b=hUrqKR61zTXba+Atr4TDtI9UNVdSa0ENWjGxd2nAu37Ta1uubi/vycnTzktSbsuuZ5 0E3/3LPByH+uaMVl2AZj7Fz5rjzGvqcoWwamYx7zLVEpNzaXGjZVjC/7n0ddYbn5WdNc l7OTFVqON6gRTt8FqgAmuY0cnvtxmbQBklN3S7S4yLbRU1+sc4vnXZXLpa2eivb/Tbzt Iq3U2CqtOOSKXR0ii6OD6FwJeTlS3Fj9GXH+pckL/cFvjA3Ee2gi4nwZ1v6iGm1bA3B4 vBp8Hd+FWEsv9pEJRDIaQqECxqPTuZv/vuVPJBGIxqNZywCxb2NmT3HtpfejgJbbDoPA Q2Bg== X-Gm-Message-State: AOJu0YyLM7ngsRGjbjNEBunHMB8nojYKm7Ti8L+jMFdDHqsky2mrrSXQ m5c7j1qRE70B2sXoTZcR7aFN+jYnCD+Seu4RF/8tBVlAaXOoFLAOqOWWckWeQXH/TZTATHTRGyg = X-Received: by 2002:a05:600c:1c0a:b0:411:dd82:a23c with SMTP id j10-20020a05600c1c0a00b00411dd82a23cmr3818026wms.0.1708077566187; Fri, 16 Feb 2024 01:59:26 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id jv14-20020a05600c570e00b0040fe3147babsm1820618wmb.0.2024.02.16.01.59.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Feb 2024 01:59:25 -0800 (PST) Message-ID: <263f41dd-b7bf-42a5-92a4-3732c53e276e@suse.com> Date: Fri, 16 Feb 2024 10:59:25 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 4/4] x86/APX: optimize certain XOR and SUB forms Content-Language: en-US From: Jan Beulich To: Binutils Cc: "H.J. Lu" , Lili Cui References: <3098e797-3749-40ee-802c-ea8a6f63914c@suse.com> Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <3098e797-3749-40ee-802c-ea8a6f63914c@suse.com> X-Spam-Status: No, score=-3023.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, PERCENT_RANDOM, RCVD_IN_DNSWL_NONE, SCC_5_SHORT_WORD_LINES, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=no 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791049158198506366 X-GMAIL-MSGID: 1791049158198506366 While most logic in optimize_encoding() is already covering APX by way of the earlier NDD->REX2 conversion, there's a remaining set of cases which wants handling separately. --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -4693,6 +4693,34 @@ optimize_encoding (void) } } } + else if (i.reg_operands == 3 + && i.op[0].regs == i.op[1].regs + && i.encoding != encoding_evex + && (i.tm.mnem_off == MN_xor + || i.tm.mnem_off == MN_sub)) + { + /* Optimize: -O: + xorb %rNb, %rNb, %rMb -> xorl %rMd, %rMd + xorw %rNw, %rNw, %rMw -> xorl %rMd, %rMd + xorl %rNd, %rNd, %rMd -> xorl %rMd, %rMd + xorq %rN, %rN, %rM -> xorl %rMd, %rMd + subb %rNb, %rNb, %rMb -> subl %rMd, %rMd + subw %rNw, %rNw, %rMw -> subl %rMd, %rMd + subl %rNd, %rNd, %rMd -> subl %rMd, %rMd + subq %rN, %rN, %rM -> subl %rMd, %rMd + */ + i.tm.opcode_space = SPACE_BASE; + i.tm.opcode_modifier.evex = 0; + i.tm.opcode_modifier.size = SIZE32; + i.types[0].bitfield.byte = 0; + i.types[0].bitfield.word = 0; + i.types[0].bitfield.dword = 1; + i.types[0].bitfield.qword = 0; + i.op[0].regs = i.op[2].regs; + i.types[1] = i.types[0]; + i.op[1].regs = i.op[2].regs; + i.reg_operands = 2; + } else if (optimize > 1 && !optimize_for_space && i.reg_operands == 2 --- a/gas/testsuite/gas/i386/x86-64-optimize-1.d +++ b/gas/testsuite/gas/i386/x86-64-optimize-1.d @@ -71,4 +71,28 @@ Disassembly of section .text: +[a-f0-9]+: 48 0f ba f0 1f btr \$0x1f,%rax +[a-f0-9]+: 66 0f ba e8 0f bts \$0xf,%ax +[a-f0-9]+: 48 0f ba e8 1f bts \$0x1f,%rax + +[a-f0-9]+: 31 c9 xor %ecx,%ecx + +[a-f0-9]+: 48 31 d1 xor %rdx,%rcx + +[a-f0-9]+: 31 c9 xor %ecx,%ecx + +[a-f0-9]+: 29 c9 sub %ecx,%ecx + +[a-f0-9]+: 48 29 d1 sub %rdx,%rcx + +[a-f0-9]+: 29 c9 sub %ecx,%ecx + +[a-f0-9]+: d5 50 31 c9 xor %r17d,%r17d + +[a-f0-9]+: d5 58 31 d1 xor %r18,%r17 + +[a-f0-9]+: d5 50 31 c9 xor %r17d,%r17d + +[a-f0-9]+: d5 50 29 c9 sub %r17d,%r17d + +[a-f0-9]+: d5 58 29 d1 sub %r18,%r17 + +[a-f0-9]+: d5 50 29 c9 sub %r17d,%r17d + +[a-f0-9]+: 31 c9 xor %ecx,%ecx + +[a-f0-9]+: 62 f4 75 18 31 d1 xor %dx,%cx,%cx + +[a-f0-9]+: 31 c9 xor %ecx,%ecx + +[a-f0-9]+: 29 c9 sub %ecx,%ecx + +[a-f0-9]+: 62 f4 75 18 29 d1 sub %dx,%cx,%cx + +[a-f0-9]+: 29 c9 sub %ecx,%ecx + +[a-f0-9]+: d5 50 31 c9 xor %r17d,%r17d + +[a-f0-9]+: 62 ec 74 10 30 d1 xor %r18b,%r17b,%r17b + +[a-f0-9]+: d5 50 31 c9 xor %r17d,%r17d + +[a-f0-9]+: d5 50 29 c9 sub %r17d,%r17d + +[a-f0-9]+: 62 ec 74 10 28 d1 sub %r18b,%r17b,%r17b + +[a-f0-9]+: d5 50 29 c9 sub %r17d,%r17d #pass --- a/gas/testsuite/gas/i386/x86-64-optimize-1.s +++ b/gas/testsuite/gas/i386/x86-64-optimize-1.s @@ -65,3 +65,27 @@ _start: btr $31, %rax bts $15, %ax bts $31, %rax + xor %rcx, %rcx, %rcx + xor %rdx, %rcx, %rcx + xor %rdx, %rdx, %rcx + sub %rcx, %rcx, %rcx + sub %rdx, %rcx, %rcx + sub %rdx, %rdx, %rcx + xor %r17, %r17, %r17 + xor %r18, %r17, %r17 + xor %r18, %r18, %r17 + sub %r17, %r17, %r17 + sub %r18, %r17, %r17 + sub %r18, %r18, %r17 + xor %cx, %cx, %cx + xor %dx, %cx, %cx + xor %dx, %dx, %cx + sub %cx, %cx, %cx + sub %dx, %cx, %cx + sub %dx, %dx, %cx + xor %r17b, %r17b, %r17b + xor %r18b, %r17b, %r17b + xor %r18b, %r18b, %r17b + sub %r17b, %r17b, %r17b + sub %r18b, %r17b, %r17b + sub %r18b, %r18b, %r17b --- a/opcodes/i386-opc.tbl +++ b/opcodes/i386-opc.tbl @@ -320,7 +320,7 @@ inc, 0x40, No64, No_bSuf|No_sSuf|No_qSuf inc, 0xfe/0, APX_F, W|Modrm|No_sSuf|CheckOperandSize|DstVVVV|EVexMap4|NF, {Reg8|Reg16|Reg32|Reg64|Unspecified|BaseIndex, Reg8|Reg16|Reg32|Reg64} inc, 0xfe/0, 0, W|Modrm|No_sSuf|HLEPrefixLock, { Reg8|Reg16|Reg32|Reg64|Unspecified|BaseIndex } -sub, 0x28, APX_F, D|W|CheckOperandSize|Modrm|No_sSuf|DstVVVV|EVexMap4|NF, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Unspecified|BaseIndex, Reg8|Reg16|Reg32|Reg64, } +sub, 0x28, APX_F, D|W|CheckOperandSize|Modrm|No_sSuf|DstVVVV|EVexMap4|NF|Optimize, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Unspecified|BaseIndex, Reg8|Reg16|Reg32|Reg64, } sub, 0x28, 0, D|W|CheckOperandSize|Modrm|No_sSuf|HLEPrefixLock|Optimize, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Unspecified|BaseIndex } sub, 0x83/5, APX_F, Modrm|No_bSuf|No_sSuf|DstVVVV|EVexMap4|NF, { Imm8S, Reg16|Reg32|Reg64|Unspecified|BaseIndex, Reg16|Reg32|Reg64 } sub, 0x83/5, 0, Modrm|No_bSuf|No_sSuf|HLEPrefixLock, { Imm8S, Reg16|Reg32|Reg64|Unspecified|BaseIndex } @@ -366,7 +366,7 @@ or, 0xc, 0, W|No_sSuf, { Imm8|Imm16|Imm3 or, 0x80/1, APX_F, W|Modrm|CheckOperandSize|No_sSuf|DstVVVV|EVexMap4|NF, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Unspecified|BaseIndex, Reg8|Reg16|Reg32|Reg64 } or, 0x80/1, 0, W|Modrm|No_sSuf|HLEPrefixLock, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Unspecified|BaseIndex } -xor, 0x30, APX_F, D|C|W|CheckOperandSize|Modrm|No_sSuf|DstVVVV|EVexMap4|NF, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Unspecified|BaseIndex, Reg8|Reg16|Reg32|Reg64 } +xor, 0x30, APX_F, D|C|W|CheckOperandSize|Modrm|No_sSuf|DstVVVV|EVexMap4|NF|Optimize, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Unspecified|BaseIndex, Reg8|Reg16|Reg32|Reg64 } xor, 0x30, 0, D|W|CheckOperandSize|Modrm|No_sSuf|HLEPrefixLock|Optimize, { Reg8|Reg16|Reg32|Reg64, Reg8|Reg16|Reg32|Reg64|Unspecified|BaseIndex } xor, 0x83/6, APX_F, Modrm|CheckOperandSize|No_bSuf|No_sSuf|DstVVVV|EVexMap4|NF, { Imm8S, Reg16|Reg32|Reg64|Unspecified|BaseIndex, Reg16|Reg32|Reg64 } xor, 0x83/6, 0, Modrm|No_bSuf|No_sSuf|HLEPrefixLock, { Imm8S, Reg16|Reg32|Reg64|Unspecified|BaseIndex }