[PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns

Jan Beulich-2
Just like their packed counterparts the memory operand is always 16
bytes wide, and the Disp8 scaling is the same for all of them. (As a
side note: I'm also surprised by there being AVX512VL variants of
these as well as the AVX512_4VNNIW ones - the SDM doesn't define any
such.)

Adjust the test cases also for the packed forms to actually live up to
their promise of testing correct Disp8 encoding.

gas/
2018-01-10  Jan Beulich  <[hidden email]>

        * testsuite/gas/i386/avx512_4fmaps.s,
        testsuite/gas/i386/avx512_4fmaps_vl.s,
        testsuite/gas/i386/x86-64-avx512_4fmaps.s,
        testsuite/gas/i386/x86-64-avx512_4fmaps_vl.s: Actually test
        Disp8 forms (and the transition happening at the right
        boundary).
        * testsuite/gas/i386/avx512_4fmaps.d,
        testsuite/gas/i386/avx512_4fmaps-intel.d,
        testsuite/gas/i386/avx512_4fmaps_vl.d,
        testsuite/gas/i386/avx512_4fmaps_vl-intel.d,
        testsuite/gas/i386/x86-64-avx512_4fmaps.d,
        testsuite/gas/i386/x86-64-avx512_4fmaps-intel.d,
        testsuite/gas/i386/x86-64-avx512_4fmaps_vl.d,
        testsuite/gas/i386/x86-64-avx512_4fmaps_vl-intel.d: Adjust
        expectations.

opcodes/
2018-01-10  Jan Beulich  <[hidden email]>

        * i386-opc.tbl (v4fmaddss, v4fnmaddss): Adjust Disp8MemShift.
        * i386-tbl.h: Re-generate.

--- a/gas/testsuite/gas/i386/avx512_4fmaps-intel.d
+++ b/gas/testsuite/gas/i386/avx512_4fmaps-intel.d
@@ -12,68 +12,68 @@ Disassembly of section \.text:
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 4f 9a 09[ ]*v4fmaddps zmm1\{k7\},zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f cf 9a 09[ ]*v4fmaddps zmm1\{k7\}\{z\},zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a e0 0f 00 00[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 10 00 00[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 f0 ff ff[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a e0 ef ff ff[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 4a 7f[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 08 00 00[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 4a 80[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a f0 f7 ff ff[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 09[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 4f aa 09[ ]*v4fnmaddps zmm1\{k7\},zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f cf aa 09[ ]*v4fnmaddps zmm1\{k7\}\{z\},zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a e0 0f 00 00[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 10 00 00[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 f0 ff ff[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a e0 ef ff ff[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 4a 7f[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 08 00 00[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 4a 80[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a f0 f7 ff ff[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 09[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f 9b 09[ ]*v4fmaddss xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f 9b 09[ ]*v4fmaddss xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8c f4 c0 1d fe ff[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a e0 0f 00 00[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 10 00 00[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 f0 ff ff[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a e0 ef ff ff[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 4a 7f[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 08 00 00[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 4a 80[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a f0 f7 ff ff[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 09[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f ab 09[ ]*v4fnmaddss xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f ab 09[ ]*v4fnmaddss xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8c f4 c0 1d fe ff[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a e0 0f 00 00[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 10 00 00[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 f0 ff ff[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a e0 ef ff ff[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 4a 7f[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 08 00 00[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 4a 80[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a f0 f7 ff ff[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 09[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 09[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 4f 9a 09[ ]*v4fmaddps zmm1\{k7\},zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f cf 9a 09[ ]*v4fmaddps zmm1\{k7\}\{z\},zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a e0 0f 00 00[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 10 00 00[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 f0 ff ff[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a e0 ef ff ff[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 4a 7f[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 08 00 00[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 4a 80[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a f0 f7 ff ff[ ]*v4fmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 09[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 09[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 4f aa 09[ ]*v4fnmaddps zmm1\{k7\},zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f cf aa 09[ ]*v4fnmaddps zmm1\{k7\}\{z\},zmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a e0 0f 00 00[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 10 00 00[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 f0 ff ff[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a e0 ef ff ff[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 4a 7f[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 08 00 00[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 4a 80[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a f0 f7 ff ff[ ]*v4fnmaddps zmm1,zmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 09[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 09[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f 9b 09[ ]*v4fmaddss xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f 9b 09[ ]*v4fmaddss xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8c f4 c0 1d fe ff[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a e0 0f 00 00[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 10 00 00[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 f0 ff ff[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a e0 ef ff ff[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 4a 7f[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 08 00 00[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 4a 80[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a f0 f7 ff ff[ ]*v4fmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 09[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 09[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f ab 09[ ]*v4fnmaddss xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f ab 09[ ]*v4fnmaddss xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8c f4 c0 1d fe ff[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a e0 0f 00 00[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 10 00 00[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 f0 ff ff[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a e0 ef ff ff[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 4a 7f[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 08 00 00[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 4a 80[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a f0 f7 ff ff[ ]*v4fnmaddss xmm1,xmm4,XMMWORD PTR \[edx-0x810\]
 #pass
--- a/gas/testsuite/gas/i386/avx512_4fmaps.d
+++ b/gas/testsuite/gas/i386/avx512_4fmaps.d
@@ -12,68 +12,68 @@ Disassembly of section \.text:
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 4f 9a 09[ ]*v4fmaddps \(%ecx\),%zmm4,%zmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f cf 9a 09[ ]*v4fmaddps \(%ecx\),%zmm4,%zmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%esp,%esi,8\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 4a 80[ ]*v4fmaddps -0x800\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%edx\),%zmm4,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 09[ ]*v4fnmaddps \(%ecx\),%zmm4,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 4f aa 09[ ]*v4fnmaddps \(%ecx\),%zmm4,%zmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f cf aa 09[ ]*v4fnmaddps \(%ecx\),%zmm4,%zmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%esp,%esi,8\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 4a 80[ ]*v4fnmaddps -0x800\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%edx\),%zmm4,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 09[ ]*v4fmaddss \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f 9b 09[ ]*v4fmaddss \(%ecx\),%xmm4,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f 9b 09[ ]*v4fmaddss \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8c f4 c0 1d fe ff[ ]*v4fmaddss -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a e0 0f 00 00[ ]*v4fmaddss 0xfe0\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 10 00 00[ ]*v4fmaddss 0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 f0 ff ff[ ]*v4fmaddss -0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a e0 ef ff ff[ ]*v4fmaddss -0x1020\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 4a 7f[ ]*v4fmaddss 0x7f0\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 08 00 00[ ]*v4fmaddss 0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 4a 80[ ]*v4fmaddss -0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a f0 f7 ff ff[ ]*v4fmaddss -0x810\(%edx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 09[ ]*v4fnmaddss \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f ab 09[ ]*v4fnmaddss \(%ecx\),%xmm4,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f ab 09[ ]*v4fnmaddss \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8c f4 c0 1d fe ff[ ]*v4fnmaddss -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a e0 0f 00 00[ ]*v4fnmaddss 0xfe0\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 10 00 00[ ]*v4fnmaddss 0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 f0 ff ff[ ]*v4fnmaddss -0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a e0 ef ff ff[ ]*v4fnmaddss -0x1020\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 4a 7f[ ]*v4fnmaddss 0x7f0\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 08 00 00[ ]*v4fnmaddss 0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 4a 80[ ]*v4fnmaddss -0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a f0 f7 ff ff[ ]*v4fnmaddss -0x810\(%edx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 09[ ]*v4fmaddps \(%ecx\),%zmm4,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 09[ ]*v4fmaddps \(%ecx\),%zmm4,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 4f 9a 09[ ]*v4fmaddps \(%ecx\),%zmm4,%zmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f cf 9a 09[ ]*v4fmaddps \(%ecx\),%zmm4,%zmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%esp,%esi,8\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 4a 80[ ]*v4fmaddps -0x800\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%edx\),%zmm4,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 09[ ]*v4fnmaddps \(%ecx\),%zmm4,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 09[ ]*v4fnmaddps \(%ecx\),%zmm4,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 4f aa 09[ ]*v4fnmaddps \(%ecx\),%zmm4,%zmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f cf aa 09[ ]*v4fnmaddps \(%ecx\),%zmm4,%zmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%esp,%esi,8\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%edx\),%zmm4,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 4a 80[ ]*v4fnmaddps -0x800\(%edx\),%zmm4,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 48 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%edx\),%zmm4,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 09[ ]*v4fmaddss \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 09[ ]*v4fmaddss \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f 9b 09[ ]*v4fmaddss \(%ecx\),%xmm4,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f 9b 09[ ]*v4fmaddss \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8c f4 c0 1d fe ff[ ]*v4fmaddss -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a e0 0f 00 00[ ]*v4fmaddss 0xfe0\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 10 00 00[ ]*v4fmaddss 0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 f0 ff ff[ ]*v4fmaddss -0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a e0 ef ff ff[ ]*v4fmaddss -0x1020\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 4a 7f[ ]*v4fmaddss 0x7f0\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a 00 08 00 00[ ]*v4fmaddss 0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 4a 80[ ]*v4fmaddss -0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9b 8a f0 f7 ff ff[ ]*v4fmaddss -0x810\(%edx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 09[ ]*v4fnmaddss \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 09[ ]*v4fnmaddss \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f ab 09[ ]*v4fnmaddss \(%ecx\),%xmm4,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f ab 09[ ]*v4fnmaddss \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8c f4 c0 1d fe ff[ ]*v4fnmaddss -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a e0 0f 00 00[ ]*v4fnmaddss 0xfe0\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 10 00 00[ ]*v4fnmaddss 0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 f0 ff ff[ ]*v4fnmaddss -0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a e0 ef ff ff[ ]*v4fnmaddss -0x1020\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 4a 7f[ ]*v4fnmaddss 0x7f0\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a 00 08 00 00[ ]*v4fnmaddss 0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 4a 80[ ]*v4fnmaddss -0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 ab 8a f0 f7 ff ff[ ]*v4fnmaddss -0x810\(%edx\),%xmm4,%xmm1
 #pass
--- a/gas/testsuite/gas/i386/avx512_4fmaps.s
+++ b/gas/testsuite/gas/i386/avx512_4fmaps.s
@@ -7,34 +7,34 @@ _start:
  v4fmaddps (%ecx), %zmm4, %zmm1{%k7} # AVX512_4FMAPS
  v4fmaddps (%ecx), %zmm4, %zmm1{%k7}{z} # AVX512_4FMAPS
  v4fmaddps -123456(%esp,%esi,8), %zmm4, %zmm1 # AVX512_4FMAPS
- v4fmaddps 4064(%edx), %zmm4, %zmm1 # AVX512_4FMAPS Disp8
- v4fmaddps 4096(%edx), %zmm4, %zmm1 # AVX512_4FMAPS
- v4fmaddps -4096(%edx), %zmm4, %zmm1 # AVX512_4FMAPS Disp8
- v4fmaddps -4128(%edx), %zmm4, %zmm1 # AVX512_4FMAPS
+ v4fmaddps 0x7f0(%edx), %zmm4, %zmm1 # AVX512_4FMAPS Disp8
+ v4fmaddps 0x800(%edx), %zmm4, %zmm1 # AVX512_4FMAPS
+ v4fmaddps -0x800(%edx), %zmm4, %zmm1 # AVX512_4FMAPS Disp8
+ v4fmaddps -0x810(%edx), %zmm4, %zmm1 # AVX512_4FMAPS
  v4fnmaddps (%ecx), %zmm4, %zmm1 # AVX512_4FMAPS
  v4fnmaddps (%ecx), %zmm4, %zmm1{%k7} # AVX512_4FMAPS
  v4fnmaddps (%ecx), %zmm4, %zmm1{%k7}{z} # AVX512_4FMAPS
  v4fnmaddps -123456(%esp,%esi,8), %zmm4, %zmm1 # AVX512_4FMAPS
- v4fnmaddps 4064(%edx), %zmm4, %zmm1 # AVX512_4FMAPS Disp8
- v4fnmaddps 4096(%edx), %zmm4, %zmm1 # AVX512_4FMAPS
- v4fnmaddps -4096(%edx), %zmm4, %zmm1 # AVX512_4FMAPS Disp8
- v4fnmaddps -4128(%edx), %zmm4, %zmm1 # AVX512_4FMAPS
+ v4fnmaddps 0x7f0(%edx), %zmm4, %zmm1 # AVX512_4FMAPS Disp8
+ v4fnmaddps 0x800(%edx), %zmm4, %zmm1 # AVX512_4FMAPS
+ v4fnmaddps -0x800(%edx), %zmm4, %zmm1 # AVX512_4FMAPS Disp8
+ v4fnmaddps -0x810(%edx), %zmm4, %zmm1 # AVX512_4FMAPS
  v4fmaddss (%ecx), %xmm4, %xmm1 # AVX512_4FMAPS
  v4fmaddss (%ecx), %xmm4, %xmm1{%k7} # AVX512_4FMAPS
  v4fmaddss (%ecx), %xmm4, %xmm1{%k7}{z} # AVX512_4FMAPS
  v4fmaddss -123456(%esp,%esi,8), %xmm4, %xmm1 # AVX512_4FMAPS
- v4fmaddss 4064(%edx), %xmm4, %xmm1 # AVX512_4FMAPS Disp8
- v4fmaddss 4096(%edx), %xmm4, %xmm1 # AVX512_4FMAPS
- v4fmaddss -4096(%edx), %xmm4, %xmm1 # AVX512_4FMAPS Disp8
- v4fmaddss -4128(%edx), %xmm4, %xmm1 # AVX512_4FMAPS
+ v4fmaddss 0x7f0(%edx), %xmm4, %xmm1 # AVX512_4FMAPS Disp8
+ v4fmaddss 0x800(%edx), %xmm4, %xmm1 # AVX512_4FMAPS
+ v4fmaddss -0x800(%edx), %xmm4, %xmm1 # AVX512_4FMAPS Disp8
+ v4fmaddss -0x810(%edx), %xmm4, %xmm1 # AVX512_4FMAPS
  v4fnmaddss (%ecx), %xmm4, %xmm1 # AVX512_4FMAPS
  v4fnmaddss (%ecx), %xmm4, %xmm1{%k7} # AVX512_4FMAPS
  v4fnmaddss (%ecx), %xmm4, %xmm1{%k7}{z} # AVX512_4FMAPS
  v4fnmaddss -123456(%esp,%esi,8), %xmm4, %xmm1 # AVX512_4FMAPS
- v4fnmaddss 4064(%edx), %xmm4, %xmm1 # AVX512_4FMAPS Disp8
- v4fnmaddss 4096(%edx), %xmm4, %xmm1 # AVX512_4FMAPS
- v4fnmaddss -4096(%edx), %xmm4, %xmm1 # AVX512_4FMAPS Disp8
- v4fnmaddss -4128(%edx), %xmm4, %xmm1 # AVX512_4FMAPS
+ v4fnmaddss 0x7f0(%edx), %xmm4, %xmm1 # AVX512_4FMAPS Disp8
+ v4fnmaddss 0x800(%edx), %xmm4, %xmm1 # AVX512_4FMAPS
+ v4fnmaddss -0x800(%edx), %xmm4, %xmm1 # AVX512_4FMAPS Disp8
+ v4fnmaddss -0x810(%edx), %xmm4, %xmm1 # AVX512_4FMAPS
 
  .intel_syntax noprefix
  v4fmaddps zmm1, zmm4, [ecx] # AVX512_4FMAPS
@@ -42,34 +42,34 @@ _start:
  v4fmaddps zmm1{k7}, zmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fmaddps zmm1{k7}{z}, zmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fmaddps zmm1, zmm4, XMMWORD PTR [esp+esi*8-123456] # AVX512_4FMAPS
- v4fmaddps zmm1, zmm4, XMMWORD PTR [edx+4064] # AVX512_4FMAPS Disp8
- v4fmaddps zmm1, zmm4, XMMWORD PTR [edx+4096] # AVX512_4FMAPS
- v4fmaddps zmm1, zmm4, XMMWORD PTR [edx-4096] # AVX512_4FMAPS Disp8
- v4fmaddps zmm1, zmm4, XMMWORD PTR [edx-4128] # AVX512_4FMAPS
+ v4fmaddps zmm1, zmm4, XMMWORD PTR [edx+0x7f0] # AVX512_4FMAPS Disp8
+ v4fmaddps zmm1, zmm4, XMMWORD PTR [edx+0x800] # AVX512_4FMAPS
+ v4fmaddps zmm1, zmm4, XMMWORD PTR [edx-0x800] # AVX512_4FMAPS Disp8
+ v4fmaddps zmm1, zmm4, XMMWORD PTR [edx-0x810] # AVX512_4FMAPS
  v4fnmaddps zmm1, zmm4, [ecx] # AVX512_4FMAPS
  v4fnmaddps zmm1, zmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fnmaddps zmm1{k7}, zmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fnmaddps zmm1{k7}{z}, zmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fnmaddps zmm1, zmm4, XMMWORD PTR [esp+esi*8-123456] # AVX512_4FMAPS
- v4fnmaddps zmm1, zmm4, XMMWORD PTR [edx+4064] # AVX512_4FMAPS Disp8
- v4fnmaddps zmm1, zmm4, XMMWORD PTR [edx+4096] # AVX512_4FMAPS
- v4fnmaddps zmm1, zmm4, XMMWORD PTR [edx-4096] # AVX512_4FMAPS Disp8
- v4fnmaddps zmm1, zmm4, XMMWORD PTR [edx-4128] # AVX512_4FMAPS
+ v4fnmaddps zmm1, zmm4, XMMWORD PTR [edx+0x7f0] # AVX512_4FMAPS Disp8
+ v4fnmaddps zmm1, zmm4, XMMWORD PTR [edx+0x800] # AVX512_4FMAPS
+ v4fnmaddps zmm1, zmm4, XMMWORD PTR [edx-0x800] # AVX512_4FMAPS Disp8
+ v4fnmaddps zmm1, zmm4, XMMWORD PTR [edx-0x810] # AVX512_4FMAPS
  v4fmaddss xmm1, xmm4, [ecx] # AVX512_4FMAPS
  v4fmaddss xmm1, xmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fmaddss xmm1{k7}, xmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fmaddss xmm1{k7}{z}, xmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fmaddss xmm1, xmm4, XMMWORD PTR [esp+esi*8-123456] # AVX512_4FMAPS
- v4fmaddss xmm1, xmm4, XMMWORD PTR [edx+4064] # AVX512_4FMAPS Disp8
- v4fmaddss xmm1, xmm4, XMMWORD PTR [edx+4096] # AVX512_4FMAPS
- v4fmaddss xmm1, xmm4, XMMWORD PTR [edx-4096] # AVX512_4FMAPS Disp8
- v4fmaddss xmm1, xmm4, XMMWORD PTR [edx-4128] # AVX512_4FMAPS
+ v4fmaddss xmm1, xmm4, XMMWORD PTR [edx+0x7f0] # AVX512_4FMAPS Disp8
+ v4fmaddss xmm1, xmm4, XMMWORD PTR [edx+0x800] # AVX512_4FMAPS
+ v4fmaddss xmm1, xmm4, XMMWORD PTR [edx-0x800] # AVX512_4FMAPS Disp8
+ v4fmaddss xmm1, xmm4, XMMWORD PTR [edx-0x810] # AVX512_4FMAPS
  v4fnmaddss xmm1, xmm4, [ecx] # AVX512_4FMAPS
  v4fnmaddss xmm1, xmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fnmaddss xmm1{k7}, xmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fnmaddss xmm1{k7}{z}, xmm4, XMMWORD PTR [ecx] # AVX512_4FMAPS
  v4fnmaddss xmm1, xmm4, XMMWORD PTR [esp+esi*8-123456] # AVX512_4FMAPS
- v4fnmaddss xmm1, xmm4, XMMWORD PTR [edx+4064] # AVX512_4FMAPS Disp8
- v4fnmaddss xmm1, xmm4, XMMWORD PTR [edx+4096] # AVX512_4FMAPS
- v4fnmaddss xmm1, xmm4, XMMWORD PTR [edx-4096] # AVX512_4FMAPS Disp8
- v4fnmaddss xmm1, xmm4, XMMWORD PTR [edx-4128] # AVX512_4FMAPS
+ v4fnmaddss xmm1, xmm4, XMMWORD PTR [edx+0x7f0] # AVX512_4FMAPS Disp8
+ v4fnmaddss xmm1, xmm4, XMMWORD PTR [edx+0x800] # AVX512_4FMAPS
+ v4fnmaddss xmm1, xmm4, XMMWORD PTR [edx-0x800] # AVX512_4FMAPS Disp8
+ v4fnmaddss xmm1, xmm4, XMMWORD PTR [edx-0x810] # AVX512_4FMAPS
--- a/gas/testsuite/gas/i386/avx512_4fmaps_vl-intel.d
+++ b/gas/testsuite/gas/i386/avx512_4fmaps_vl-intel.d
@@ -12,67 +12,68 @@ Disassembly of section \.text:
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f 9a 09[ ]*v4fmaddps xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f 9a 09[ ]*v4fmaddps xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a e0 0f 00 00[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 10 00 00[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 f0 ff ff[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a e0 ef ff ff[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 4a 7f[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 08 00 00[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 4a 80[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a f0 f7 ff ff[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 09[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 2f 9a 09[ ]*v4fmaddps ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f af 9a 09[ ]*v4fmaddps ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a e0 0f 00 00[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 10 00 00[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 f0 ff ff[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a e0 ef ff ff[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 4a 7f[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 08 00 00[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 4a 80[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a f0 f7 ff ff[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 09[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f aa 09[ ]*v4fnmaddps xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f aa 09[ ]*v4fnmaddps xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a e0 0f 00 00[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 10 00 00[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 f0 ff ff[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a e0 ef ff ff[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 4a 7f[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 08 00 00[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 4a 80[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a f0 f7 ff ff[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 09[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 2f aa 09[ ]*v4fnmaddps ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f af aa 09[ ]*v4fnmaddps ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a e0 0f 00 00[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 10 00 00[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 f0 ff ff[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 4a 7f[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 08 00 00[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 4a 80[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a f0 f7 ff ff[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 09[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 09[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f 9a 09[ ]*v4fmaddps xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f 9a 09[ ]*v4fmaddps xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a e0 0f 00 00[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 10 00 00[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 f0 ff ff[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a e0 ef ff ff[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 4a 7f[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 08 00 00[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 4a 80[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a f0 f7 ff ff[ ]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 09[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 09[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 2f 9a 09[ ]*v4fmaddps ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f af 9a 09[ ]*v4fmaddps ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a e0 0f 00 00[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 10 00 00[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 f0 ff ff[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a e0 ef ff ff[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 4a 7f[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 08 00 00[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 4a 80[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a f0 f7 ff ff[ ]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 09[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 09[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f aa 09[ ]*v4fnmaddps xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f aa 09[ ]*v4fnmaddps xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a e0 0f 00 00[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 10 00 00[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 f0 ff ff[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a e0 ef ff ff[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 4a 7f[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 08 00 00[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 4a 80[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a f0 f7 ff ff[ ]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 09[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 09[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 2f aa 09[ ]*v4fnmaddps ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f af aa 09[ ]*v4fnmaddps ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a e0 0f 00 00[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 10 00 00[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 f0 ff ff[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a e0 ef ff ff[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 4a 7f[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 08 00 00[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 4a 80[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a f0 f7 ff ff[ ]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x810\]
 #pass
--- a/gas/testsuite/gas/i386/avx512_4fmaps_vl.d
+++ b/gas/testsuite/gas/i386/avx512_4fmaps_vl.d
@@ -12,67 +12,68 @@ Disassembly of section \.text:
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f 9a 09[ ]*v4fmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f 9a 09[ ]*v4fmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 4a 80[ ]*v4fmaddps -0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%edx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 09[ ]*v4fmaddps \(%ecx\),%ymm4,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 2f 9a 09[ ]*v4fmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f af 9a 09[ ]*v4fmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 4a 80[ ]*v4fmaddps -0x800\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%edx\),%ymm4,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 09[ ]*v4fnmaddps \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f aa 09[ ]*v4fnmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f aa 09[ ]*v4fnmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 4a 80[ ]*v4fnmaddps -0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%edx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 09[ ]*v4fnmaddps \(%ecx\),%ymm4,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 2f aa 09[ ]*v4fnmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f af aa 09[ ]*v4fnmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 4a 80[ ]*v4fnmaddps -0x800\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%edx\),%ymm4,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 09[ ]*v4fmaddps \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 09[ ]*v4fmaddps \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f 9a 09[ ]*v4fmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f 9a 09[ ]*v4fmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 4a 80[ ]*v4fmaddps -0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%edx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 09[ ]*v4fmaddps \(%ecx\),%ymm4,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 09[ ]*v4fmaddps \(%ecx\),%ymm4,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 2f 9a 09[ ]*v4fmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f af 9a 09[ ]*v4fmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8c f4 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 4a 80[ ]*v4fmaddps -0x800\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%edx\),%ymm4,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 09[ ]*v4fnmaddps \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 09[ ]*v4fnmaddps \(%ecx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 0f aa 09[ ]*v4fnmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 8f aa 09[ ]*v4fnmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%edx\),%xmm4,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 4a 80[ ]*v4fnmaddps -0x800\(%edx\),%xmm4,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 08 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%edx\),%xmm4,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 09[ ]*v4fnmaddps \(%ecx\),%ymm4,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 09[ ]*v4fnmaddps \(%ecx\),%ymm4,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 2f aa 09[ ]*v4fnmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f af aa 09[ ]*v4fnmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8c f4 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%edx\),%ymm4,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 4a 80[ ]*v4fnmaddps -0x800\(%edx\),%ymm4,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 5f 28 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%edx\),%ymm4,%ymm1
 #pass
--- a/gas/testsuite/gas/i386/avx512_4fmaps_vl.s
+++ b/gas/testsuite/gas/i386/avx512_4fmaps_vl.s
@@ -7,33 +7,34 @@ _start:
  v4fmaddps (%ecx), %xmm4, %xmm1{%k7} # AVX512{_4FMAPS,VL}
  v4fmaddps (%ecx), %xmm4, %xmm1{%k7}{z} # AVX512{_4FMAPS,VL}
  v4fmaddps -123456(%esp,%esi,8), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
- v4fmaddps 4064(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps 4096(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
- v4fmaddps -4096(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps -4128(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
+ v4fmaddps 0x7f0(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps 0x800(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
+ v4fmaddps -0x800(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps -0x810(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
  v4fmaddps (%ecx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
  v4fmaddps (%ecx), %ymm4, %ymm1{%k7} # AVX512{_4FMAPS,VL}
  v4fmaddps (%ecx), %ymm4, %ymm1{%k7}{z} # AVX512{_4FMAPS,VL}
  v4fmaddps -123456(%esp,%esi,8), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
- v4fmaddps 4064(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps 4096(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
- v4fmaddps -4096(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps -4128(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
+ v4fmaddps 0x7f0(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps 0x800(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
+ v4fmaddps -0x800(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps -0x810(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
  v4fnmaddps (%ecx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
  v4fnmaddps (%ecx), %xmm4, %xmm1{%k7} # AVX512{_4FMAPS,VL}
  v4fnmaddps (%ecx), %xmm4, %xmm1{%k7}{z} # AVX512{_4FMAPS,VL}
  v4fnmaddps -123456(%esp,%esi,8), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
- v4fnmaddps 4064(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps 4096(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
- v4fnmaddps -4096(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps -4128(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
+ v4fnmaddps 0x7f0(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps 0x800(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
+ v4fnmaddps -0x800(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps -0x810(%edx), %xmm4, %xmm1 # AVX512{_4FMAPS,VL}
  v4fnmaddps (%ecx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
  v4fnmaddps (%ecx), %ymm4, %ymm1{%k7} # AVX512{_4FMAPS,VL}
  v4fnmaddps (%ecx), %ymm4, %ymm1{%k7}{z} # AVX512{_4FMAPS,VL}
  v4fnmaddps -123456(%esp,%esi,8), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
- v4fnmaddps 4064(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps 4096(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
- v4fnmaddps -4096(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps 0x7f0(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps 0x800(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
+ v4fnmaddps -0x800(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps -0x810(%edx), %ymm4, %ymm1 # AVX512{_4FMAPS,VL}
 
  .intel_syntax noprefix
  v4fmaddps xmm1, xmm4, [ecx] # AVX512{_4FMAPS,VL}
@@ -41,34 +42,34 @@ _start:
  v4fmaddps xmm1{k7}, xmm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fmaddps xmm1{k7}{z}, xmm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fmaddps xmm1, xmm4, XMMWORD PTR [esp+esi*8-123456] # AVX512{_4FMAPS,VL}
- v4fmaddps xmm1, xmm4, XMMWORD PTR [edx+4064] # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps xmm1, xmm4, XMMWORD PTR [edx+4096] # AVX512{_4FMAPS,VL}
- v4fmaddps xmm1, xmm4, XMMWORD PTR [edx-4096] # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps xmm1, xmm4, XMMWORD PTR [edx-4128] # AVX512{_4FMAPS,VL}
+ v4fmaddps xmm1, xmm4, XMMWORD PTR [edx+0x7f0] # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps xmm1, xmm4, XMMWORD PTR [edx+0x800] # AVX512{_4FMAPS,VL}
+ v4fmaddps xmm1, xmm4, XMMWORD PTR [edx-0x800] # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps xmm1, xmm4, XMMWORD PTR [edx-0x810] # AVX512{_4FMAPS,VL}
  v4fmaddps ymm1, ymm4, [ecx] # AVX512{_4FMAPS,VL}
  v4fmaddps ymm1, ymm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fmaddps ymm1{k7}, ymm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fmaddps ymm1{k7}{z}, ymm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fmaddps ymm1, ymm4, XMMWORD PTR [esp+esi*8-123456] # AVX512{_4FMAPS,VL}
- v4fmaddps ymm1, ymm4, XMMWORD PTR [edx+4064] # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps ymm1, ymm4, XMMWORD PTR [edx+4096] # AVX512{_4FMAPS,VL}
- v4fmaddps ymm1, ymm4, XMMWORD PTR [edx-4096] # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps ymm1, ymm4, XMMWORD PTR [edx-4128] # AVX512{_4FMAPS,VL}
+ v4fmaddps ymm1, ymm4, XMMWORD PTR [edx+0x7f0] # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps ymm1, ymm4, XMMWORD PTR [edx+0x800] # AVX512{_4FMAPS,VL}
+ v4fmaddps ymm1, ymm4, XMMWORD PTR [edx-0x800] # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps ymm1, ymm4, XMMWORD PTR [edx-0x810] # AVX512{_4FMAPS,VL}
  v4fnmaddps xmm1, xmm4, [ecx] # AVX512{_4FMAPS,VL}
  v4fnmaddps xmm1, xmm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fnmaddps xmm1{k7}, xmm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fnmaddps xmm1{k7}{z}, xmm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fnmaddps xmm1, xmm4, XMMWORD PTR [esp+esi*8-123456] # AVX512{_4FMAPS,VL}
- v4fnmaddps xmm1, xmm4, XMMWORD PTR [edx+4064] # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps xmm1, xmm4, XMMWORD PTR [edx+4096] # AVX512{_4FMAPS,VL}
- v4fnmaddps xmm1, xmm4, XMMWORD PTR [edx-4096] # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps xmm1, xmm4, XMMWORD PTR [edx-4128] # AVX512{_4FMAPS,VL}
+ v4fnmaddps xmm1, xmm4, XMMWORD PTR [edx+0x7f0] # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps xmm1, xmm4, XMMWORD PTR [edx+0x800] # AVX512{_4FMAPS,VL}
+ v4fnmaddps xmm1, xmm4, XMMWORD PTR [edx-0x800] # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps xmm1, xmm4, XMMWORD PTR [edx-0x810] # AVX512{_4FMAPS,VL}
  v4fnmaddps ymm1, ymm4, [ecx] # AVX512{_4FMAPS,VL}
  v4fnmaddps ymm1, ymm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fnmaddps ymm1{k7}, ymm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fnmaddps ymm1{k7}{z}, ymm4, XMMWORD PTR [ecx] # AVX512{_4FMAPS,VL}
  v4fnmaddps ymm1, ymm4, XMMWORD PTR [esp+esi*8-123456] # AVX512{_4FMAPS,VL}
- v4fnmaddps ymm1, ymm4, XMMWORD PTR [edx+4064] # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps ymm1, ymm4, XMMWORD PTR [edx+4096] # AVX512{_4FMAPS,VL}
- v4fnmaddps ymm1, ymm4, XMMWORD PTR [edx-4096] # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps ymm1, ymm4, XMMWORD PTR [edx-4128] # AVX512{_4FMAPS,VL}
+ v4fnmaddps ymm1, ymm4, XMMWORD PTR [edx+0x7f0] # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps ymm1, ymm4, XMMWORD PTR [edx+0x800] # AVX512{_4FMAPS,VL}
+ v4fnmaddps ymm1, ymm4, XMMWORD PTR [edx-0x800] # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps ymm1, ymm4, XMMWORD PTR [edx-0x810] # AVX512{_4FMAPS,VL}
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps-intel.d
@@ -12,68 +12,68 @@ Disassembly of section \.text:
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 4f 9a 09[ ]*v4fmaddps zmm1\{k7\},zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f cf 9a 09[ ]*v4fmaddps zmm1\{k7\}\{z\},zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 48 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a e0 0f 00 00[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 10 00 00[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 f0 ff ff[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a e0 ef ff ff[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 4a 7f[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 08 00 00[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 4a 80[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a f0 f7 ff ff[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 09[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 4f aa 09[ ]*v4fnmaddps zmm1\{k7\},zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f cf aa 09[ ]*v4fnmaddps zmm1\{k7\}\{z\},zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 48 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a e0 0f 00 00[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 10 00 00[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 f0 ff ff[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a e0 ef ff ff[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 4a 7f[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 08 00 00[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 4a 80[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a f0 f7 ff ff[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 09[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f 9b 09[ ]*v4fmaddss xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f 9b 09[ ]*v4fmaddss xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 9b 8c f0 c0 1d fe ff[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a e0 0f 00 00[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 10 00 00[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 f0 ff ff[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a e0 ef ff ff[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 4a 7f[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 08 00 00[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 4a 80[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a f0 f7 ff ff[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 09[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f ab 09[ ]*v4fnmaddss xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f ab 09[ ]*v4fnmaddss xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 ab 8c f0 c0 1d fe ff[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a e0 0f 00 00[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 10 00 00[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 f0 ff ff[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a e0 ef ff ff[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 4a 7f[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 08 00 00[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 4a 80[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a f0 f7 ff ff[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 09[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 09[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 4f 9a 09[ ]*v4fmaddps zmm1\{k7\},zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f cf 9a 09[ ]*v4fmaddps zmm1\{k7\}\{z\},zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 48 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a e0 0f 00 00[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 10 00 00[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 f0 ff ff[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a e0 ef ff ff[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 4a 7f[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 08 00 00[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 4a 80[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a f0 f7 ff ff[ ]*v4fmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 09[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 09[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 4f aa 09[ ]*v4fnmaddps zmm1\{k7\},zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f cf aa 09[ ]*v4fnmaddps zmm1\{k7\}\{z\},zmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 48 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a e0 0f 00 00[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 10 00 00[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 f0 ff ff[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a e0 ef ff ff[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 4a 7f[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 08 00 00[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 4a 80[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a f0 f7 ff ff[ ]*v4fnmaddps zmm1,zmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 09[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 09[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f 9b 09[ ]*v4fmaddss xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f 9b 09[ ]*v4fmaddss xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 9b 8c f0 c0 1d fe ff[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a e0 0f 00 00[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 10 00 00[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 f0 ff ff[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a e0 ef ff ff[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 4a 7f[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 08 00 00[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 4a 80[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a f0 f7 ff ff[ ]*v4fmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 09[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 09[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f ab 09[ ]*v4fnmaddss xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f ab 09[ ]*v4fnmaddss xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 ab 8c f0 c0 1d fe ff[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a e0 0f 00 00[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 10 00 00[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 f0 ff ff[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a e0 ef ff ff[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 4a 7f[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 08 00 00[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 4a 80[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a f0 f7 ff ff[ ]*v4fnmaddss xmm1,xmm8,XMMWORD PTR \[rdx-0x810\]
 #pass
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps.d
+++ b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps.d
@@ -12,68 +12,68 @@ Disassembly of section \.text:
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 4f 9a 09[ ]*v4fmaddps \(%rcx\),%zmm8,%zmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f cf 9a 09[ ]*v4fmaddps \(%rcx\),%zmm8,%zmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 48 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%rax,%r14,8\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 4a 80[ ]*v4fmaddps -0x800\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%rdx\),%zmm8,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 09[ ]*v4fnmaddps \(%rcx\),%zmm8,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 4f aa 09[ ]*v4fnmaddps \(%rcx\),%zmm8,%zmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f cf aa 09[ ]*v4fnmaddps \(%rcx\),%zmm8,%zmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 48 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%rax,%r14,8\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 4a 80[ ]*v4fnmaddps -0x800\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%rdx\),%zmm8,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 09[ ]*v4fmaddss \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f 9b 09[ ]*v4fmaddss \(%rcx\),%xmm8,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f 9b 09[ ]*v4fmaddss \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 9b 8c f0 c0 1d fe ff[ ]*v4fmaddss -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a e0 0f 00 00[ ]*v4fmaddss 0xfe0\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 10 00 00[ ]*v4fmaddss 0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 f0 ff ff[ ]*v4fmaddss -0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a e0 ef ff ff[ ]*v4fmaddss -0x1020\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 4a 7f[ ]*v4fmaddss 0x7f0\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 08 00 00[ ]*v4fmaddss 0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 4a 80[ ]*v4fmaddss -0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a f0 f7 ff ff[ ]*v4fmaddss -0x810\(%rdx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 09[ ]*v4fnmaddss \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f ab 09[ ]*v4fnmaddss \(%rcx\),%xmm8,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f ab 09[ ]*v4fnmaddss \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 ab 8c f0 c0 1d fe ff[ ]*v4fnmaddss -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a e0 0f 00 00[ ]*v4fnmaddss 0xfe0\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 10 00 00[ ]*v4fnmaddss 0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 f0 ff ff[ ]*v4fnmaddss -0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a e0 ef ff ff[ ]*v4fnmaddss -0x1020\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 4a 7f[ ]*v4fnmaddss 0x7f0\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 08 00 00[ ]*v4fnmaddss 0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 4a 80[ ]*v4fnmaddss -0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a f0 f7 ff ff[ ]*v4fnmaddss -0x810\(%rdx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 09[ ]*v4fmaddps \(%rcx\),%zmm8,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 09[ ]*v4fmaddps \(%rcx\),%zmm8,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 4f 9a 09[ ]*v4fmaddps \(%rcx\),%zmm8,%zmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f cf 9a 09[ ]*v4fmaddps \(%rcx\),%zmm8,%zmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 48 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%rax,%r14,8\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 4a 80[ ]*v4fmaddps -0x800\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%rdx\),%zmm8,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 09[ ]*v4fnmaddps \(%rcx\),%zmm8,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 09[ ]*v4fnmaddps \(%rcx\),%zmm8,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 4f aa 09[ ]*v4fnmaddps \(%rcx\),%zmm8,%zmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f cf aa 09[ ]*v4fnmaddps \(%rcx\),%zmm8,%zmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 48 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%rax,%r14,8\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%rdx\),%zmm8,%zmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 4a 80[ ]*v4fnmaddps -0x800\(%rdx\),%zmm8,%zmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 48 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%rdx\),%zmm8,%zmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 09[ ]*v4fmaddss \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 09[ ]*v4fmaddss \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f 9b 09[ ]*v4fmaddss \(%rcx\),%xmm8,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f 9b 09[ ]*v4fmaddss \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 9b 8c f0 c0 1d fe ff[ ]*v4fmaddss -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a e0 0f 00 00[ ]*v4fmaddss 0xfe0\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 10 00 00[ ]*v4fmaddss 0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 f0 ff ff[ ]*v4fmaddss -0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a e0 ef ff ff[ ]*v4fmaddss -0x1020\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 4a 7f[ ]*v4fmaddss 0x7f0\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a 00 08 00 00[ ]*v4fmaddss 0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 4a 80[ ]*v4fmaddss -0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9b 8a f0 f7 ff ff[ ]*v4fmaddss -0x810\(%rdx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 09[ ]*v4fnmaddss \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 09[ ]*v4fnmaddss \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f ab 09[ ]*v4fnmaddss \(%rcx\),%xmm8,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f ab 09[ ]*v4fnmaddss \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 ab 8c f0 c0 1d fe ff[ ]*v4fnmaddss -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a e0 0f 00 00[ ]*v4fnmaddss 0xfe0\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 10 00 00[ ]*v4fnmaddss 0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 f0 ff ff[ ]*v4fnmaddss -0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a e0 ef ff ff[ ]*v4fnmaddss -0x1020\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 4a 7f[ ]*v4fnmaddss 0x7f0\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a 00 08 00 00[ ]*v4fnmaddss 0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 4a 80[ ]*v4fnmaddss -0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 ab 8a f0 f7 ff ff[ ]*v4fnmaddss -0x810\(%rdx\),%xmm8,%xmm1
 #pass
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps.s
@@ -7,34 +7,34 @@ _start:
  v4fmaddps (%rcx), %zmm8, %zmm1{%k7} # AVX512_4FMAPS
  v4fmaddps (%rcx), %zmm8, %zmm1{%k7}{z} # AVX512_4FMAPS
  v4fmaddps -123456(%rax,%r14,8), %zmm8, %zmm1 # AVX512_4FMAPS
- v4fmaddps 4064(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS Disp8
- v4fmaddps 4096(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS
- v4fmaddps -4096(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS Disp8
- v4fmaddps -4128(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS
+ v4fmaddps 0x7f0(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS Disp8
+ v4fmaddps 0x800(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS
+ v4fmaddps -0x800(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS Disp8
+ v4fmaddps -0x810(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS
  v4fnmaddps (%rcx), %zmm8, %zmm1 # AVX512_4FMAPS
  v4fnmaddps (%rcx), %zmm8, %zmm1{%k7} # AVX512_4FMAPS
  v4fnmaddps (%rcx), %zmm8, %zmm1{%k7}{z} # AVX512_4FMAPS
  v4fnmaddps -123456(%rax,%r14,8), %zmm8, %zmm1 # AVX512_4FMAPS
- v4fnmaddps 4064(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS Disp8
- v4fnmaddps 4096(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS
- v4fnmaddps -4096(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS Disp8
- v4fnmaddps -4128(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS
+ v4fnmaddps 0x7f0(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS Disp8
+ v4fnmaddps 0x800(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS
+ v4fnmaddps -0x800(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS Disp8
+ v4fnmaddps -0x810(%rdx), %zmm8, %zmm1 # AVX512_4FMAPS
  v4fmaddss (%rcx), %xmm8, %xmm1 # AVX512_4FMAPS
  v4fmaddss (%rcx), %xmm8, %xmm1{%k7} # AVX512_4FMAPS
  v4fmaddss (%rcx), %xmm8, %xmm1{%k7}{z} # AVX512_4FMAPS
  v4fmaddss -123456(%rax,%r14,8), %xmm8, %xmm1 # AVX512_4FMAPS
- v4fmaddss 4064(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS Disp8
- v4fmaddss 4096(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS
- v4fmaddss -4096(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS Disp8
- v4fmaddss -4128(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS
+ v4fmaddss 0x7f0(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS Disp8
+ v4fmaddss 0x800(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS
+ v4fmaddss -0x800(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS Disp8
+ v4fmaddss -0x810(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS
  v4fnmaddss (%rcx), %xmm8, %xmm1 # AVX512_4FMAPS
  v4fnmaddss (%rcx), %xmm8, %xmm1{%k7} # AVX512_4FMAPS
  v4fnmaddss (%rcx), %xmm8, %xmm1{%k7}{z} # AVX512_4FMAPS
  v4fnmaddss -123456(%rax,%r14,8), %xmm8, %xmm1 # AVX512_4FMAPS
- v4fnmaddss 4064(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS Disp8
- v4fnmaddss 4096(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS
- v4fnmaddss -4096(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS Disp8
- v4fnmaddss -4128(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS
+ v4fnmaddss 0x7f0(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS Disp8
+ v4fnmaddss 0x800(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS
+ v4fnmaddss -0x800(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS Disp8
+ v4fnmaddss -0x810(%rdx), %xmm8, %xmm1 # AVX512_4FMAPS
 
  .intel_syntax noprefix
  v4fmaddps zmm1, zmm8, [rcx] # AVX512_4FMAPS
@@ -42,34 +42,34 @@ _start:
  v4fmaddps zmm1{k7}, zmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fmaddps zmm1{k7}{z}, zmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fmaddps zmm1, zmm8, XMMWORD PTR [rax+r14*8-123456] # AVX512_4FMAPS
- v4fmaddps zmm1, zmm8, XMMWORD PTR [rdx+4064] # AVX512_4FMAPS Disp8
- v4fmaddps zmm1, zmm8, XMMWORD PTR [rdx+4096] # AVX512_4FMAPS
- v4fmaddps zmm1, zmm8, XMMWORD PTR [rdx-4096] # AVX512_4FMAPS Disp8
- v4fmaddps zmm1, zmm8, XMMWORD PTR [rdx-4128] # AVX512_4FMAPS
+ v4fmaddps zmm1, zmm8, XMMWORD PTR [rdx+0x7f0] # AVX512_4FMAPS Disp8
+ v4fmaddps zmm1, zmm8, XMMWORD PTR [rdx+0x800] # AVX512_4FMAPS
+ v4fmaddps zmm1, zmm8, XMMWORD PTR [rdx-0x800] # AVX512_4FMAPS Disp8
+ v4fmaddps zmm1, zmm8, XMMWORD PTR [rdx-0x810] # AVX512_4FMAPS
  v4fnmaddps zmm1, zmm8, [rcx] # AVX512_4FMAPS
  v4fnmaddps zmm1, zmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fnmaddps zmm1{k7}, zmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fnmaddps zmm1{k7}{z}, zmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fnmaddps zmm1, zmm8, XMMWORD PTR [rax+r14*8-123456] # AVX512_4FMAPS
- v4fnmaddps zmm1, zmm8, XMMWORD PTR [rdx+4064] # AVX512_4FMAPS Disp8
- v4fnmaddps zmm1, zmm8, XMMWORD PTR [rdx+4096] # AVX512_4FMAPS
- v4fnmaddps zmm1, zmm8, XMMWORD PTR [rdx-4096] # AVX512_4FMAPS Disp8
- v4fnmaddps zmm1, zmm8, XMMWORD PTR [rdx-4128] # AVX512_4FMAPS
+ v4fnmaddps zmm1, zmm8, XMMWORD PTR [rdx+0x7f0] # AVX512_4FMAPS Disp8
+ v4fnmaddps zmm1, zmm8, XMMWORD PTR [rdx+0x800] # AVX512_4FMAPS
+ v4fnmaddps zmm1, zmm8, XMMWORD PTR [rdx-0x800] # AVX512_4FMAPS Disp8
+ v4fnmaddps zmm1, zmm8, XMMWORD PTR [rdx-0x810] # AVX512_4FMAPS
  v4fmaddss xmm1, xmm8, [rcx] # AVX512_4FMAPS
  v4fmaddss xmm1, xmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fmaddss xmm1{k7}, xmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fmaddss xmm1{k7}{z}, xmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fmaddss xmm1, xmm8, XMMWORD PTR [rax+r14*8-123456] # AVX512_4FMAPS
- v4fmaddss xmm1, xmm8, XMMWORD PTR [rdx+4064] # AVX512_4FMAPS Disp8
- v4fmaddss xmm1, xmm8, XMMWORD PTR [rdx+4096] # AVX512_4FMAPS
- v4fmaddss xmm1, xmm8, XMMWORD PTR [rdx-4096] # AVX512_4FMAPS Disp8
- v4fmaddss xmm1, xmm8, XMMWORD PTR [rdx-4128] # AVX512_4FMAPS
+ v4fmaddss xmm1, xmm8, XMMWORD PTR [rdx+0x7f0] # AVX512_4FMAPS Disp8
+ v4fmaddss xmm1, xmm8, XMMWORD PTR [rdx+0x800] # AVX512_4FMAPS
+ v4fmaddss xmm1, xmm8, XMMWORD PTR [rdx-0x800] # AVX512_4FMAPS Disp8
+ v4fmaddss xmm1, xmm8, XMMWORD PTR [rdx-0x810] # AVX512_4FMAPS
  v4fnmaddss xmm1, xmm8, [rcx] # AVX512_4FMAPS
  v4fnmaddss xmm1, xmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fnmaddss xmm1{k7}, xmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fnmaddss xmm1{k7}{z}, xmm8, XMMWORD PTR [rcx] # AVX512_4FMAPS
  v4fnmaddss xmm1, xmm8, XMMWORD PTR [rax+r14*8-123456] # AVX512_4FMAPS
- v4fnmaddss xmm1, xmm8, XMMWORD PTR [rdx+4064] # AVX512_4FMAPS Disp8
- v4fnmaddss xmm1, xmm8, XMMWORD PTR [rdx+4096] # AVX512_4FMAPS
- v4fnmaddss xmm1, xmm8, XMMWORD PTR [rdx-4096] # AVX512_4FMAPS Disp8
- v4fnmaddss xmm1, xmm8, XMMWORD PTR [rdx-4128] # AVX512_4FMAPS
+ v4fnmaddss xmm1, xmm8, XMMWORD PTR [rdx+0x7f0] # AVX512_4FMAPS Disp8
+ v4fnmaddss xmm1, xmm8, XMMWORD PTR [rdx+0x800] # AVX512_4FMAPS
+ v4fnmaddss xmm1, xmm8, XMMWORD PTR [rdx-0x800] # AVX512_4FMAPS Disp8
+ v4fnmaddss xmm1, xmm8, XMMWORD PTR [rdx-0x810] # AVX512_4FMAPS
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-intel.d
@@ -12,68 +12,68 @@ Disassembly of section \.text:
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f 9a 09[ ]*v4fmaddps xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f 9a 09[ ]*v4fmaddps xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a e0 0f 00 00[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 10 00 00[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 f0 ff ff[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a e0 ef ff ff[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 4a 7f[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 08 00 00[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 4a 80[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a f0 f7 ff ff[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 09[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 2f 9a 09[ ]*v4fmaddps ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f af 9a 09[ ]*v4fmaddps ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 28 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a e0 0f 00 00[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 10 00 00[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 f0 ff ff[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a e0 ef ff ff[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 4a 7f[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 08 00 00[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 4a 80[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a f0 f7 ff ff[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 09[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f aa 09[ ]*v4fnmaddps xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f aa 09[ ]*v4fnmaddps xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a e0 0f 00 00[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 10 00 00[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 f0 ff ff[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a e0 ef ff ff[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 4a 7f[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 08 00 00[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 4a 80[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a f0 f7 ff ff[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 09[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 2f aa 09[ ]*v4fnmaddps ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f af aa 09[ ]*v4fnmaddps ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 28 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a e0 0f 00 00[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 10 00 00[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 f0 ff ff[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a e0 ef ff ff[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 4a 7f[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 08 00 00[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 4a 80[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a f0 f7 ff ff[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 09[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 09[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f 9a 09[ ]*v4fmaddps xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f 9a 09[ ]*v4fmaddps xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a e0 0f 00 00[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 10 00 00[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 f0 ff ff[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a e0 ef ff ff[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 4a 7f[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 08 00 00[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 4a 80[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a f0 f7 ff ff[ ]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 09[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 09[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 2f 9a 09[ ]*v4fmaddps ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f af 9a 09[ ]*v4fmaddps ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 28 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a e0 0f 00 00[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 10 00 00[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 f0 ff ff[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a e0 ef ff ff[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 4a 7f[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 08 00 00[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 4a 80[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a f0 f7 ff ff[ ]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 09[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 09[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f aa 09[ ]*v4fnmaddps xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f aa 09[ ]*v4fnmaddps xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a e0 0f 00 00[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 10 00 00[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 f0 ff ff[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a e0 ef ff ff[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 4a 7f[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 08 00 00[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 4a 80[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a f0 f7 ff ff[ ]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x810\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 09[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 09[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 2f aa 09[ ]*v4fnmaddps ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 f2 3f af aa 09[ ]*v4fnmaddps ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 28 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a e0 0f 00 00[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 10 00 00[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 f0 ff ff[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a e0 ef ff ff[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 4a 7f[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x7f0\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 08 00 00[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 4a 80[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x800\]
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a f0 f7 ff ff[ ]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x810\]
 #pass
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.d
+++ b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.d
@@ -12,68 +12,68 @@ Disassembly of section \.text:
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f 9a 09[ ]*v4fmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f 9a 09[ ]*v4fmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 4a 80[ ]*v4fmaddps -0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%rdx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 09[ ]*v4fmaddps \(%rcx\),%ymm8,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 2f 9a 09[ ]*v4fmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f af 9a 09[ ]*v4fmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 28 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 4a 80[ ]*v4fmaddps -0x800\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%rdx\),%ymm8,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 09[ ]*v4fnmaddps \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f aa 09[ ]*v4fnmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f aa 09[ ]*v4fnmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 4a 80[ ]*v4fnmaddps -0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%rdx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 09[ ]*v4fnmaddps \(%rcx\),%ymm8,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 2f aa 09[ ]*v4fnmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f af aa 09[ ]*v4fnmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 28 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 4a 80[ ]*v4fnmaddps -0x800\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%rdx\),%ymm8,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 09[ ]*v4fmaddps \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 09[ ]*v4fmaddps \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f 9a 09[ ]*v4fmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f 9a 09[ ]*v4fmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 4a 80[ ]*v4fmaddps -0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%rdx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 09[ ]*v4fmaddps \(%rcx\),%ymm8,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 09[ ]*v4fmaddps \(%rcx\),%ymm8,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 2f 9a 09[ ]*v4fmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f af 9a 09[ ]*v4fmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 28 9a 8c f0 c0 1d fe ff[ ]*v4fmaddps -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a e0 0f 00 00[ ]*v4fmaddps 0xfe0\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 10 00 00[ ]*v4fmaddps 0x1000\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 f0 ff ff[ ]*v4fmaddps -0x1000\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a e0 ef ff ff[ ]*v4fmaddps -0x1020\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 4a 7f[ ]*v4fmaddps 0x7f0\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a 00 08 00 00[ ]*v4fmaddps 0x800\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 4a 80[ ]*v4fmaddps -0x800\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 9a 8a f0 f7 ff ff[ ]*v4fmaddps -0x810\(%rdx\),%ymm8,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 09[ ]*v4fnmaddps \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 09[ ]*v4fnmaddps \(%rcx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 0f aa 09[ ]*v4fnmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 8f aa 09[ ]*v4fnmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 08 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%rdx\),%xmm8,%xmm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 4a 80[ ]*v4fnmaddps -0x800\(%rdx\),%xmm8,%xmm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 08 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%rdx\),%xmm8,%xmm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 09[ ]*v4fnmaddps \(%rcx\),%ymm8,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 09[ ]*v4fnmaddps \(%rcx\),%ymm8,%ymm1
 [ ]*[a-f0-9]+:[ ]*62 f2 3f 2f aa 09[ ]*v4fnmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}
 [ ]*[a-f0-9]+:[ ]*62 f2 3f af aa 09[ ]*v4fnmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
 [ ]*[a-f0-9]+:[ ]*62 b2 3f 28 aa 8c f0 c0 1d fe ff[ ]*v4fnmaddps -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a e0 0f 00 00[ ]*v4fnmaddps 0xfe0\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 10 00 00[ ]*v4fnmaddps 0x1000\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 f0 ff ff[ ]*v4fnmaddps -0x1000\(%rdx\),%ymm8,%ymm1
-[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a e0 ef ff ff[ ]*v4fnmaddps -0x1020\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 4a 7f[ ]*v4fnmaddps 0x7f0\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a 00 08 00 00[ ]*v4fnmaddps 0x800\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 4a 80[ ]*v4fnmaddps -0x800\(%rdx\),%ymm8,%ymm1
+[ ]*[a-f0-9]+:[ ]*62 f2 3f 28 aa 8a f0 f7 ff ff[ ]*v4fnmaddps -0x810\(%rdx\),%ymm8,%ymm1
 #pass
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.s
@@ -7,34 +7,34 @@ _start:
  v4fmaddps (%rcx), %xmm8, %xmm1{%k7} # AVX512{_4FMAPS,VL}
  v4fmaddps (%rcx), %xmm8, %xmm1{%k7}{z} # AVX512{_4FMAPS,VL}
  v4fmaddps -123456(%rax,%r14,8), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
- v4fmaddps 4064(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps 4096(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
- v4fmaddps -4096(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps -4128(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
+ v4fmaddps 0x7f0(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps 0x800(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
+ v4fmaddps -0x800(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps -0x810(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
  v4fmaddps (%rcx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
  v4fmaddps (%rcx), %ymm8, %ymm1{%k7} # AVX512{_4FMAPS,VL}
  v4fmaddps (%rcx), %ymm8, %ymm1{%k7}{z} # AVX512{_4FMAPS,VL}
  v4fmaddps -123456(%rax,%r14,8), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
- v4fmaddps 4064(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps 4096(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
- v4fmaddps -4096(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps -4128(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
+ v4fmaddps 0x7f0(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps 0x800(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
+ v4fmaddps -0x800(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps -0x810(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
  v4fnmaddps (%rcx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
  v4fnmaddps (%rcx), %xmm8, %xmm1{%k7} # AVX512{_4FMAPS,VL}
  v4fnmaddps (%rcx), %xmm8, %xmm1{%k7}{z} # AVX512{_4FMAPS,VL}
  v4fnmaddps -123456(%rax,%r14,8), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
- v4fnmaddps 4064(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps 4096(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
- v4fnmaddps -4096(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps -4128(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
+ v4fnmaddps 0x7f0(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps 0x800(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
+ v4fnmaddps -0x800(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps -0x810(%rdx), %xmm8, %xmm1 # AVX512{_4FMAPS,VL}
  v4fnmaddps (%rcx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
  v4fnmaddps (%rcx), %ymm8, %ymm1{%k7} # AVX512{_4FMAPS,VL}
  v4fnmaddps (%rcx), %ymm8, %ymm1{%k7}{z} # AVX512{_4FMAPS,VL}
  v4fnmaddps -123456(%rax,%r14,8), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
- v4fnmaddps 4064(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps 4096(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
- v4fnmaddps -4096(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps -4128(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
+ v4fnmaddps 0x7f0(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps 0x800(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
+ v4fnmaddps -0x800(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps -0x810(%rdx), %ymm8, %ymm1 # AVX512{_4FMAPS,VL}
 
  .intel_syntax noprefix
  v4fmaddps xmm1, xmm8, [rcx] # AVX512{_4FMAPS,VL}
@@ -42,34 +42,34 @@ _start:
  v4fmaddps xmm1{k7}, xmm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fmaddps xmm1{k7}{z}, xmm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fmaddps xmm1, xmm8, XMMWORD PTR [rax+r14*8-123456] # AVX512{_4FMAPS,VL}
- v4fmaddps xmm1, xmm8, XMMWORD PTR [rdx+4064] # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps xmm1, xmm8, XMMWORD PTR [rdx+4096] # AVX512{_4FMAPS,VL}
- v4fmaddps xmm1, xmm8, XMMWORD PTR [rdx-4096] # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps xmm1, xmm8, XMMWORD PTR [rdx-4128] # AVX512{_4FMAPS,VL}
+ v4fmaddps xmm1, xmm8, XMMWORD PTR [rdx+0x7f0] # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps xmm1, xmm8, XMMWORD PTR [rdx+0x800] # AVX512{_4FMAPS,VL}
+ v4fmaddps xmm1, xmm8, XMMWORD PTR [rdx-0x800] # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps xmm1, xmm8, XMMWORD PTR [rdx-0x810] # AVX512{_4FMAPS,VL}
  v4fmaddps ymm1, ymm8, [rcx] # AVX512{_4FMAPS,VL}
  v4fmaddps ymm1, ymm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fmaddps ymm1{k7}, ymm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fmaddps ymm1{k7}{z}, ymm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fmaddps ymm1, ymm8, XMMWORD PTR [rax+r14*8-123456] # AVX512{_4FMAPS,VL}
- v4fmaddps ymm1, ymm8, XMMWORD PTR [rdx+4064] # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps ymm1, ymm8, XMMWORD PTR [rdx+4096] # AVX512{_4FMAPS,VL}
- v4fmaddps ymm1, ymm8, XMMWORD PTR [rdx-4096] # AVX512{_4FMAPS,VL} Disp8
- v4fmaddps ymm1, ymm8, XMMWORD PTR [rdx-4128] # AVX512{_4FMAPS,VL}
+ v4fmaddps ymm1, ymm8, XMMWORD PTR [rdx+0x7f0] # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps ymm1, ymm8, XMMWORD PTR [rdx+0x800] # AVX512{_4FMAPS,VL}
+ v4fmaddps ymm1, ymm8, XMMWORD PTR [rdx-0x800] # AVX512{_4FMAPS,VL} Disp8
+ v4fmaddps ymm1, ymm8, XMMWORD PTR [rdx-0x810] # AVX512{_4FMAPS,VL}
  v4fnmaddps xmm1, xmm8, [rcx] # AVX512{_4FMAPS,VL}
  v4fnmaddps xmm1, xmm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fnmaddps xmm1{k7}, xmm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fnmaddps xmm1{k7}{z}, xmm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fnmaddps xmm1, xmm8, XMMWORD PTR [rax+r14*8-123456] # AVX512{_4FMAPS,VL}
- v4fnmaddps xmm1, xmm8, XMMWORD PTR [rdx+4064] # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps xmm1, xmm8, XMMWORD PTR [rdx+4096] # AVX512{_4FMAPS,VL}
- v4fnmaddps xmm1, xmm8, XMMWORD PTR [rdx-4096] # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps xmm1, xmm8, XMMWORD PTR [rdx-4128] # AVX512{_4FMAPS,VL}
+ v4fnmaddps xmm1, xmm8, XMMWORD PTR [rdx+0x7f0] # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps xmm1, xmm8, XMMWORD PTR [rdx+0x800] # AVX512{_4FMAPS,VL}
+ v4fnmaddps xmm1, xmm8, XMMWORD PTR [rdx-0x800] # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps xmm1, xmm8, XMMWORD PTR [rdx-0x810] # AVX512{_4FMAPS,VL}
  v4fnmaddps ymm1, ymm8, [rcx] # AVX512{_4FMAPS,VL}
  v4fnmaddps ymm1, ymm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fnmaddps ymm1{k7}, ymm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fnmaddps ymm1{k7}{z}, ymm8, XMMWORD PTR [rcx] # AVX512{_4FMAPS,VL}
  v4fnmaddps ymm1, ymm8, XMMWORD PTR [rax+r14*8-123456] # AVX512{_4FMAPS,VL}
- v4fnmaddps ymm1, ymm8, XMMWORD PTR [rdx+4064] # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps ymm1, ymm8, XMMWORD PTR [rdx+4096] # AVX512{_4FMAPS,VL}
- v4fnmaddps ymm1, ymm8, XMMWORD PTR [rdx-4096] # AVX512{_4FMAPS,VL} Disp8
- v4fnmaddps ymm1, ymm8, XMMWORD PTR [rdx-4128] # AVX512{_4FMAPS,VL}
+ v4fnmaddps ymm1, ymm8, XMMWORD PTR [rdx+0x7f0] # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps ymm1, ymm8, XMMWORD PTR [rdx+0x800] # AVX512{_4FMAPS,VL}
+ v4fnmaddps ymm1, ymm8, XMMWORD PTR [rdx-0x800] # AVX512{_4FMAPS,VL} Disp8
+ v4fnmaddps ymm1, ymm8, XMMWORD PTR [rdx-0x810] # AVX512{_4FMAPS,VL}
--- a/opcodes/i386-opc.tbl
+++ b/opcodes/i386-opc.tbl
@@ -5903,9 +5903,9 @@ v4fnmaddps, 3, 0xf2aa, None, 1, CpuAVX51
 v4fnmaddps, 3, 0xf2aa, None, 1, CpuAVX512_4FMAPS|CpuAVX512VL, Modrm|EVex=2|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex, RegXMM, RegXMM }
 v4fnmaddps, 3, 0xf2aa, None, 1, CpuAVX512_4FMAPS|CpuAVX512VL, Modrm|EVex=3|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex, RegYMM, RegYMM }
 
-v4fmaddss, 3, 0xf29b, None, 1, CpuAVX512_4FMAPS, Modrm|EVex=4|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=2|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex, RegXMM, RegXMM }
+v4fmaddss, 3, 0xf29b, None, 1, CpuAVX512_4FMAPS, Modrm|EVex=4|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex, RegXMM, RegXMM }
 
-v4fnmaddss, 3, 0xf2ab, None, 1, CpuAVX512_4FMAPS, Modrm|EVex=4|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=2|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex, RegXMM, RegXMM }
+v4fnmaddss, 3, 0xf2ab, None, 1, CpuAVX512_4FMAPS, Modrm|EVex=4|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex, RegXMM, RegXMM }
 
 // AVX512_4FMAPS instructions end
 


Reply | Threaded
Open this post in threaded view
|

RE: [PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns

Tsimbalist, Igor V
> -----Original Message-----
> From: [hidden email] [mailto:binutils-
> [hidden email]] On Behalf Of Jan Beulich
> Sent: Wednesday, January 10, 2018 10:34 AM
> To: [hidden email]
> Cc: H.J. Lu <[hidden email]>
> Subject: [PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns
>
> Just like their packed counterparts the memory operand is always 16
> bytes wide, and the Disp8 scaling is the same for all of them. (As a
> side note: I'm also surprised by there being AVX512VL variants of
> these as well as the AVX512_4VNNIW ones - the SDM doesn't define any
> such.)
Yes, you are correct about AVX512VL variants. Could you please remove VL variants for
AVX512_4FMAPS and AVX512_4FMAPS insns?

Thanks,
Igor

Reply | Threaded
Open this post in threaded view
|

RE: [PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns

Tsimbalist, Igor V
> -----Original Message-----
> From: Tsimbalist, Igor V
> Sent: Wednesday, January 10, 2018 2:12 PM
> To: Jan Beulich <[hidden email]>; [hidden email]
> Cc: H.J. Lu <[hidden email]>; Tsimbalist, Igor V
> <[hidden email]>
> Subject: RE: [PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns
>
> > -----Original Message-----
> > From: [hidden email] [mailto:binutils-
> > [hidden email]] On Behalf Of Jan Beulich
> > Sent: Wednesday, January 10, 2018 10:34 AM
> > To: [hidden email]
> > Cc: H.J. Lu <[hidden email]>
> > Subject: [PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns
> >
> > Just like their packed counterparts the memory operand is always 16
> > bytes wide, and the Disp8 scaling is the same for all of them. (As a
> > side note: I'm also surprised by there being AVX512VL variants of
> > these as well as the AVX512_4VNNIW ones - the SDM doesn't define any
> > such.)
> Yes, you are correct about AVX512VL variants. Could you please remove VL
> variants for
> AVX512_4FMAPS and AVX512_4FMAPS insns?
Sorry for the typo. AVX512_4FMAPS and AVX512_4VNNIW, of course.

> Thanks,
> Igor

Reply | Threaded
Open this post in threaded view
|

RE: [PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns

Jan Beulich-2
In reply to this post by Tsimbalist, Igor V
>>> On 10.01.18 at 14:12, <[hidden email]> wrote:
>>  -----Original Message-----
>> From: [hidden email] [mailto:binutils-
>> [hidden email]] On Behalf Of Jan Beulich
>> Sent: Wednesday, January 10, 2018 10:34 AM
>> To: [hidden email]
>> Cc: H.J. Lu <[hidden email]>
>> Subject: [PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns
>>
>> Just like their packed counterparts the memory operand is always 16
>> bytes wide, and the Disp8 scaling is the same for all of them. (As a
>> side note: I'm also surprised by there being AVX512VL variants of
>> these as well as the AVX512_4VNNIW ones - the SDM doesn't define any
>> such.)
> Yes, you are correct about AVX512VL variants. Could you please remove VL
> variants for
> AVX512_4FMAPS and AVX512_4FMAPS insns?

Not right now, and unlikely in time for 2.30. I was barely finding
enough time to submit the two actual bug fixes.

Jan

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns

H.J. Lu-30
On Wed, Jan 10, 2018 at 5:23 AM, Jan Beulich <[hidden email]> wrote:

>>>> On 10.01.18 at 14:12, <[hidden email]> wrote:
>>>  -----Original Message-----
>>> From: [hidden email] [mailto:binutils-
>>> [hidden email]] On Behalf Of Jan Beulich
>>> Sent: Wednesday, January 10, 2018 10:34 AM
>>> To: [hidden email]
>>> Cc: H.J. Lu <[hidden email]>
>>> Subject: [PATCH] x86: fix Disp8 handling for scalar AVX512_4FMAPS insns
>>>
>>> Just like their packed counterparts the memory operand is always 16
>>> bytes wide, and the Disp8 scaling is the same for all of them. (As a
>>> side note: I'm also surprised by there being AVX512VL variants of
>>> these as well as the AVX512_4VNNIW ones - the SDM doesn't define any
>>> such.)
>> Yes, you are correct about AVX512VL variants. Could you please remove VL
>> variants for
>> AVX512_4FMAPS and AVX512_4FMAPS insns?
>
> Not right now, and unlikely in time for 2.30. I was barely finding
> enough time to submit the two actual bug fixes.

Jan, your patch is OK.

Igor, please submit a patch to remove VL variants for AVX512_4FMAPS
and AVX512_4FMAPS insns.

Thanks.

--
H.J.