From: H.J. Lu <hjl.tools@gmail.com>
Date: Thu, 22 Jun 2023 19:37:51 +0000 (-0700)
Subject: Revert "x86: Don't check if AVX512 template requires AVX512VL"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a61cb9dbc6a8be0922ec5992cf125a5cd389e016;p=binutils-gdb.git

Revert "x86: Don't check if AVX512 template requires AVX512VL"

This reverts commit c7face14225296a2f5d3ebeb8ace88c166d80c3e.
---

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index dcafac0c0cd..de35ee2a2c6 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -6288,10 +6288,11 @@ check_VecOperands (const insn_template *t)
   /* Templates allowing for ZMMword as well as YMMword and/or XMMword for
      any one operand are implicity requiring AVX512VL support if the actual
      operand size is YMMword or XMMword.  Since this function runs after
-     template matching, there's no need to check for YMMword/XMMword nor
-     AVX512VL in the template.  */
+     template matching, there's no need to check for YMMword/XMMword in
+     the template.  */
   cpu = cpu_flags_and (t->cpu_flags, avx512);
   if (!cpu_flags_all_zero (&cpu)
+      && !t->cpu_flags.bitfield.cpuavx512vl
       && !cpu_arch_flags.bitfield.cpuavx512vl)
     {
       for (op = 0; op < t->operands; ++op)