From patchwork Fri May 17 12:57:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 90375 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C48DF384AB7B for ; Fri, 17 May 2024 12:58:04 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 2F9853858D20 for ; Fri, 17 May 2024 12:57:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2F9853858D20 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 2F9853858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::336 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715950659; cv=none; b=v64GF/HCdVnrGEPh00nHF5cYr9ed8QUJ4qQiWv87dXkVV48tQYtau0kyveMHIrT1YX2A3YhG9qKoiNhWc//IS/MAo3PJUbGdJtC12wTSbR3moGS50C3faHdaO/IEO56kYY+bhcXTxxxVuzPchI2RNXRupu8b0FBSOHoQdClhfuE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715950659; c=relaxed/simple; bh=tDJszF61izVTOcwfyL3VdVEdrabqtS34bEo1d7MUstY=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=LYAQoPamEkW2MpYGyAPLecOLoRqU2yz7cyWOe1UhknpM5mX3Mnm3l/nmFSwdUKrZnjQYrH9Am/4mXdY013ZMNgje6YK32Xjo8JhI29d0OODBX60xjyqnvS524Sol2K6rTXPiLzYoTEs3NwdXlIV+I4BaJzSKDHBagdpN7GxjFJU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4200ee78e56so626085e9.3 for ; Fri, 17 May 2024 05:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1715950656; x=1716555456; darn=sourceware.org; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=wCFjAJM7ZXAjyoLKcgzvLp0qkSbb3mmt3IWB5QbgAAo=; b=WuXY46kyJplFD65tBw7Bv6aNLcE+V8if3P/ETqoxbGl+YpUjxN43JTq5oGzrp5iAvv G/AxO4YHeHzI+TUqjeUXugYsaQVbzV419pThY9pQJ2NxVctZUMBcoPbsA6in5uCbNJEB eBCgeSje1JzwUGo3LjuLmWjBVtdJzGsmQTPrR2ROHiwNuHU5fYw9MSg1clpxXcQWmVd/ HEoekn0kIuKhvH7Tqc7Z4fVvWMY+xrMnxYP66KZHM0PILJiGrpu8X07dVOXOSifcfre1 T9u5piNo0WneMK2tS+9LPS1Es/DQu7SXKEUKwK64LCki9Wb2z/F7wjVL/hhMb1SeSE09 T+rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715950656; x=1716555456; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wCFjAJM7ZXAjyoLKcgzvLp0qkSbb3mmt3IWB5QbgAAo=; b=iq3yIaGMeRwnyZm6XtRq+EQUN35Rl3UMLmRSe4adKvo67IbfuzUBZ4BbbjyN+LLYfV berDXNjkMRgsVPsTA0La5sI8aYITsMPBQPrHrAjGt0/30zjRxc1JsS9GRUYg0BOZZFB+ 4/DssyLVvPrI7m7JrpU4mI1JftSLyY/BoAtqRmXuf4e3qH+5B6btC4xQ/e0pCZN/8kaT j9jATJMhJSOlqxIWmYhn7KrMoguVbWj1b4ai++Yun5wz0Y/kfyrZzv++ybgc8/sVa/Ct dPnQ8gPUcs1cTLUa9xp9gl5ahArzAbIB7v4CQLeY5wFleiSSjRGHaDoVvQ9wY2CmNRuE TINA== X-Gm-Message-State: AOJu0YwjiWaB0pGle42zF/IVNpT9s+1pL+weeqsq8L4792sVHFFM8LU5 IgVw2jrLRPEEJirDFdBTcgK9nHT5VV0fJx5S3S8UQKNJIpHHGZxmS0rTeMxR39iURZ3N2oTbiTk = X-Google-Smtp-Source: AGHT+IGw4gBb7+H96LD1bYjKP4TqdFSX9ysxCj09wcVErBhErVbvwlhJMCgKstYhbDQmcxg0vPXh/g== X-Received: by 2002:a7b:c386:0:b0:41f:e098:53e with SMTP id 5b1f17b1804b1-41feaa447b2mr189453815e9.17.1715950655562; Fri, 17 May 2024 05:57:35 -0700 (PDT) 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 ffacd0b85a97d-3502b79be05sm21751058f8f.9.2024.05.17.05.57.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 May 2024 05:57:35 -0700 (PDT) Message-ID: <00d90388-e947-4f26-9933-68415b44667a@suse.com> Date: Fri, 17 May 2024 14:57:34 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Binutils Cc: Lili Cui , "H.J. Lu" From: Jan Beulich Subject: [PATCH] x86: simplify VexVVVV_SRC2 handling for the XOP case 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 X-Spam-Status: No, score=-3024.8 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 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+patchwork=sourceware.org@sourceware.org As already suggested during review, rather than having an extra conditional in build_modrm_byte() (a code path used for quite a few more insns, including even certain GPR ones), adjust the attribute in the installed template to properly describe things with operands swapped. --- I think we could even omit the conditional in match_template(), as all other insns where XOP.W / VEX.W controls operand order are Src1VVVV anyway. Opinions? --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -9255,6 +9255,10 @@ match_template (char mnem_suffix) flipping VEX.W. */ i.tm.opcode_modifier.vexw ^= VEXW0 ^ VEXW1; + /* In 3-operand insns XOP.W changes which operand goes into XOP.vvvv. */ + if (i.tm.opcode_modifier.vexvvvv == VexVVVV_SRC2) + i.tm.opcode_modifier.vexvvvv = VexVVVV_SRC1; + swap_first_2: j = i.tm.operand_types[0].bitfield.imm8; i.tm.operand_types[j] = operand_types[j + 1]; @@ -10441,15 +10445,8 @@ build_modrm_byte (void) { /* VEX.vvvv encodes the last source register operand. */ case VexVVVV_SRC2: - if (source != op) - { - v = source++; - break; - } - /* For vprot*, vpshl*, and vpsha*, XOP.W controls the swapping of src1 - and src2, and it requires fall through when the operands are swapped. - */ - /* Fall through. */ + v = source++; + break; /* VEX.vvvv encodes the first source register operand. */ case VexVVVV_SRC1: v = dest - 1;