diff --git a/gas/testsuite/gas/i386/adx.s b/gas/testsuite/gas/i386/adx.s
index a474d9403f3..6763f88c1af 100644
--- a/gas/testsuite/gas/i386/adx.s
+++ b/gas/testsuite/gas/i386/adx.s
@@ -1,5 +1,4 @@
 # Check ADX instructions.
-        .allow_index_reg
 	.text
 _start:
         adcx    400(%ecx), %eax
diff --git a/gas/testsuite/gas/i386/amx-complex-inval.l b/gas/testsuite/gas/i386/amx-complex-inval.l
index df6713c5d8b..712f1973efe 100644
--- a/gas/testsuite/gas/i386/amx-complex-inval.l
+++ b/gas/testsuite/gas/i386/amx-complex-inval.l
@@ -1,3 +1,3 @@
 .* Assembler messages:
-.*:6: Error: `tcmmimfp16ps' is only supported in 64-bit mode
-.*:7: Error: `tcmmrlfp16ps' is only supported in 64-bit mode
+.*:5: Error: `tcmmimfp16ps' is only supported in 64-bit mode
+.*:6: Error: `tcmmrlfp16ps' is only supported in 64-bit mode
diff --git a/gas/testsuite/gas/i386/amx-complex-inval.s b/gas/testsuite/gas/i386/amx-complex-inval.s
index b1bbf32585b..f008d294eb8 100644
--- a/gas/testsuite/gas/i386/amx-complex-inval.s
+++ b/gas/testsuite/gas/i386/amx-complex-inval.s
@@ -1,6 +1,5 @@
 # Check Illegal AMX-COMPLEX instructions
 
-	.allow_index_reg
 	.text
 _start:
 	tcmmimfp16ps	%tmm1, %tmm2, %tmm3
diff --git a/gas/testsuite/gas/i386/avx-ifma.s b/gas/testsuite/gas/i386/avx-ifma.s
index 81046966d70..9b71463cc9f 100644
--- a/gas/testsuite/gas/i386/avx-ifma.s
+++ b/gas/testsuite/gas/i386/avx-ifma.s
@@ -1,5 +1,3 @@
-       .allow_index_reg
-
 .macro test_insn mnemonic
        \mnemonic	%xmm2, %xmm4, %xmm2
        {evex} \mnemonic %xmm2, %xmm4, %xmm2
diff --git a/gas/testsuite/gas/i386/avx-ne-convert.s b/gas/testsuite/gas/i386/avx-ne-convert.s
index 7fb866630d9..6630dc0bd75 100644
--- a/gas/testsuite/gas/i386/avx-ne-convert.s
+++ b/gas/testsuite/gas/i386/avx-ne-convert.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX-NE-CONVERT instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vbcstnebf162ps	0x10000000(%esp, %esi, 8), %xmm6	 #AVX-NE-CONVERT
diff --git a/gas/testsuite/gas/i386/avx-scalar-2.s b/gas/testsuite/gas/i386/avx-scalar-2.s
index f48347f412e..971d1673077 100644
--- a/gas/testsuite/gas/i386/avx-scalar-2.s
+++ b/gas/testsuite/gas/i386/avx-scalar-2.s
@@ -1,6 +1,5 @@
 # Check VEX.128 scalar instructions with -mavxscalar=256 -msse2avx
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/avx-vnni-int8.s b/gas/testsuite/gas/i386/avx-vnni-int8.s
index e3cfeb6680d..6eb78ce4458 100644
--- a/gas/testsuite/gas/i386/avx-vnni-int8.s
+++ b/gas/testsuite/gas/i386/avx-vnni-int8.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX-VNNI-INT8 instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpdpbssd	%ymm4, %ymm5, %ymm6	 #AVX-VNNI-INT8
diff --git a/gas/testsuite/gas/i386/avx-vnni.s b/gas/testsuite/gas/i386/avx-vnni.s
index 6260330cca4..cadb2574277 100644
--- a/gas/testsuite/gas/i386/avx-vnni.s
+++ b/gas/testsuite/gas/i386/avx-vnni.s
@@ -1,5 +1,3 @@
-	.allow_index_reg
-
 .macro test_insn mnemonic
 	\mnemonic	%xmm2, %xmm4, %xmm2
 	{evex} \mnemonic %xmm2, %xmm4, %xmm2
diff --git a/gas/testsuite/gas/i386/avx-wig.s b/gas/testsuite/gas/i386/avx-wig.s
index 4d17ab43676..7d94f23f26a 100644
--- a/gas/testsuite/gas/i386/avx-wig.s
+++ b/gas/testsuite/gas/i386/avx-wig.s
@@ -1,6 +1,5 @@
 # Check AVX WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	andn (%eax), %eax, %eax
diff --git a/gas/testsuite/gas/i386/avx2-wig.s b/gas/testsuite/gas/i386/avx2-wig.s
index 7ed63c227ba..3764f4394db 100644
--- a/gas/testsuite/gas/i386/avx2-wig.s
+++ b/gas/testsuite/gas/i386/avx2-wig.s
@@ -1,6 +1,5 @@
 # Check AVX2 WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vmovntdqa (%ecx),%ymm4
diff --git a/gas/testsuite/gas/i386/avx2.s b/gas/testsuite/gas/i386/avx2.s
index 9c883a82880..be65aa2e3c1 100644
--- a/gas/testsuite/gas/i386/avx2.s
+++ b/gas/testsuite/gas/i386/avx2.s
@@ -1,6 +1,5 @@
 # Check i386 AVX2 instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/avx256int.s b/gas/testsuite/gas/i386/avx256int.s
index 4d3d13b3f2e..ad556b1ed0b 100644
--- a/gas/testsuite/gas/i386/avx256int.s
+++ b/gas/testsuite/gas/i386/avx256int.s
@@ -1,6 +1,5 @@
 # Check i386 256bit integer AVX instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/avx512_4fmaps.s b/gas/testsuite/gas/i386/avx512_4fmaps.s
index 316b7f7bddd..c70f8e028d6 100644
--- a/gas/testsuite/gas/i386/avx512_4fmaps.s
+++ b/gas/testsuite/gas/i386/avx512_4fmaps.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512_4FMAPS instructions
 
-	.allow_index_reg
 	.text
 _start:
 	v4fmaddps	(%ecx), %zmm4, %zmm1	 # AVX512_4FMAPS
diff --git a/gas/testsuite/gas/i386/avx512_4vnniw.s b/gas/testsuite/gas/i386/avx512_4vnniw.s
index a67d8547730..7e73c821e56 100644
--- a/gas/testsuite/gas/i386/avx512_4vnniw.s
+++ b/gas/testsuite/gas/i386/avx512_4vnniw.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512_4VNNIW instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vp4dpwssd	(%ecx), %zmm4, %zmm1	 # AVX512_4VNNIW
diff --git a/gas/testsuite/gas/i386/avx512_bf16.s b/gas/testsuite/gas/i386/avx512_bf16.s
index bc6a8ebf013..192ee4f50b9 100644
--- a/gas/testsuite/gas/i386/avx512_bf16.s
+++ b/gas/testsuite/gas/i386/avx512_bf16.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512_BF16 instructions
 
-	.allow_index_reg
 	.text
 bf16:
 	vcvtne2ps2bf16	%zmm4, %zmm5, %zmm6	 #AVX512_BF16
diff --git a/gas/testsuite/gas/i386/avx512_bf16_vl-inval.l b/gas/testsuite/gas/i386/avx512_bf16_vl-inval.l
index dfd21d6692b..badbc63d8fc 100644
--- a/gas/testsuite/gas/i386/avx512_bf16_vl-inval.l
+++ b/gas/testsuite/gas/i386/avx512_bf16_vl-inval.l
@@ -1,7 +1,7 @@
 .*: Assembler messages:
+.*:5: Error: .*
 .*:6: Error: .*
 .*:7: Error: .*
-.*:8: Error: .*
+.*:10: Error: .*
 .*:11: Error: .*
 .*:12: Error: .*
-.*:13: Error: .*
diff --git a/gas/testsuite/gas/i386/avx512_bf16_vl-inval.s b/gas/testsuite/gas/i386/avx512_bf16_vl-inval.s
index e9e36b0064c..f1b49a6312a 100644
--- a/gas/testsuite/gas/i386/avx512_bf16_vl-inval.s
+++ b/gas/testsuite/gas/i386/avx512_bf16_vl-inval.s
@@ -1,6 +1,5 @@
 # Check illegal AVX512{BF16,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vcvtneps2bf16	0x10000000(%rbp, %r14, 8), %xmm3{%k7}	 #AVX512{BF16,VL} MASK_ENABLING
diff --git a/gas/testsuite/gas/i386/avx512_bf16_vl.s b/gas/testsuite/gas/i386/avx512_bf16_vl.s
index 9d5d9bdc043..bdcdd20823f 100644
--- a/gas/testsuite/gas/i386/avx512_bf16_vl.s
+++ b/gas/testsuite/gas/i386/avx512_bf16_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{BF16,VL} instructions
 
-	.allow_index_reg
 	.text
 bf16:
 	vcvtne2ps2bf16	%ymm4, %ymm5, %ymm6	 #AVX512{BF16,VL}
diff --git a/gas/testsuite/gas/i386/avx512_fp16-inval-bcast.l b/gas/testsuite/gas/i386/avx512_fp16-inval-bcast.l
index cec63a68fe1..ab57eca4dea 100644
--- a/gas/testsuite/gas/i386/avx512_fp16-inval-bcast.l
+++ b/gas/testsuite/gas/i386/avx512_fp16-inval-bcast.l
@@ -1,27 +1,27 @@
 .*: Assembler messages:
-.*:6: Error: unsupported broadcast for `vcvtpd2ph'
-.*:7: Error: unsupported broadcast for `vcvtuqq2ph'
-.*:8: Error: unsupported broadcast for `vcvtdq2ph'
-.*:9: Error: unsupported broadcast for `vcvtudq2ph'
-.*:10: Error: unsupported broadcast for `vcmpph'
-.*:11: Error: Unsupported broadcast: `\{1to64\}'
-.*:12: Error: unsupported broadcast for `vfmadd132ph'
-.*:13: Error: unsupported broadcast for `vfcmaddcph'
-.*:14: Error: unsupported broadcast for `vfcmulcph'
-.*:15: Error: unsupported broadcast for `vcvtdq2ph'
-.*:16: Error: unsupported broadcast for `vfmaddcph'
+.*:5: Error: unsupported broadcast for `vcvtpd2ph'
+.*:6: Error: unsupported broadcast for `vcvtuqq2ph'
+.*:7: Error: unsupported broadcast for `vcvtdq2ph'
+.*:8: Error: unsupported broadcast for `vcvtudq2ph'
+.*:9: Error: unsupported broadcast for `vcmpph'
+.*:10: Error: Unsupported broadcast: `\{1to64\}'
+.*:11: Error: unsupported broadcast for `vfmadd132ph'
+.*:12: Error: unsupported broadcast for `vfcmaddcph'
+.*:13: Error: unsupported broadcast for `vfcmulcph'
+.*:14: Error: unsupported broadcast for `vcvtdq2ph'
+.*:15: Error: unsupported broadcast for `vfmaddcph'
+.*:16: Error: unsupported broadcast for `vfmulcph'
 .*:17: Error: unsupported broadcast for `vfmulcph'
-.*:18: Error: unsupported broadcast for `vfmulcph'
-.*:21: Error: unsupported broadcast for `vcvtpd2ph'
-.*:22: Error: unsupported broadcast for `vcvtuqq2ph'
-.*:23: Error: unsupported broadcast for `vcvtdq2ph'
-.*:24: Error: unsupported broadcast for `vcvtudq2ph'
-.*:25: Error: unsupported broadcast for `vcmpph'
-.*:26: Error: Unsupported broadcast: `\{1to64\}'
-.*:27: Error: unsupported broadcast for `vfmsubadd231ph'
-.*:28: Error: unsupported broadcast for `vfcmaddcph'
-.*:29: Error: unsupported broadcast for `vfcmulcph'
-.*:30: Error: unsupported broadcast for `vcvtdq2ph'
-.*:31: Error: unsupported broadcast for `vfcmaddcph'
+.*:20: Error: unsupported broadcast for `vcvtpd2ph'
+.*:21: Error: unsupported broadcast for `vcvtuqq2ph'
+.*:22: Error: unsupported broadcast for `vcvtdq2ph'
+.*:23: Error: unsupported broadcast for `vcvtudq2ph'
+.*:24: Error: unsupported broadcast for `vcmpph'
+.*:25: Error: Unsupported broadcast: `\{1to64\}'
+.*:26: Error: unsupported broadcast for `vfmsubadd231ph'
+.*:27: Error: unsupported broadcast for `vfcmaddcph'
+.*:28: Error: unsupported broadcast for `vfcmulcph'
+.*:29: Error: unsupported broadcast for `vcvtdq2ph'
+.*:30: Error: unsupported broadcast for `vfcmaddcph'
+.*:31: Error: unsupported broadcast for `vfmulcph'
 .*:32: Error: unsupported broadcast for `vfmulcph'
-.*:33: Error: unsupported broadcast for `vfmulcph'
diff --git a/gas/testsuite/gas/i386/avx512_fp16-inval-bcast.s b/gas/testsuite/gas/i386/avx512_fp16-inval-bcast.s
index d2e44e60ac1..eb557f13087 100644
--- a/gas/testsuite/gas/i386/avx512_fp16-inval-bcast.s
+++ b/gas/testsuite/gas/i386/avx512_fp16-inval-bcast.s
@@ -1,6 +1,5 @@
 # Check error for invalid {1toXX} and {2toXX} broadcasts.
 
-	.allow_index_reg
 	.text
 _start:
 	vcvtpd2ph (%ecx){1to16}, %xmm3
diff --git a/gas/testsuite/gas/i386/avx512_fp16.s b/gas/testsuite/gas/i386/avx512_fp16.s
index 1e8f6dc4618..53a8c9fc5af 100644
--- a/gas/testsuite/gas/i386/avx512_fp16.s
+++ b/gas/testsuite/gas/i386/avx512_fp16.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512-FP16 instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaddph	%zmm4, %zmm5, %zmm6	 #AVX512-FP16
diff --git a/gas/testsuite/gas/i386/avx512_fp16_pseudo_ops.s b/gas/testsuite/gas/i386/avx512_fp16_pseudo_ops.s
index a7b45be76f5..4c9f0cccf80 100644
--- a/gas/testsuite/gas/i386/avx512_fp16_pseudo_ops.s
+++ b/gas/testsuite/gas/i386/avx512_fp16_pseudo_ops.s
@@ -1,6 +1,5 @@
 # Check 32bit VCM.*{PH,SH} instructions
 
-        .allow_index_reg
         .text
 _start:
 	vcmpeq_oqph	%zmm5, %zmm6, %k5
diff --git a/gas/testsuite/gas/i386/avx512_fp16_vl.s b/gas/testsuite/gas/i386/avx512_fp16_vl.s
index b00739c233d..ede247dc064 100644
--- a/gas/testsuite/gas/i386/avx512_fp16_vl.s
+++ b/gas/testsuite/gas/i386/avx512_fp16_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512-FP16,AVX512VL instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaddph	%ymm4, %ymm5, %ymm6	 #AVX512-FP16,AVX512VL
diff --git a/gas/testsuite/gas/i386/avx512_vpopcntdq.s b/gas/testsuite/gas/i386/avx512_vpopcntdq.s
index d9cc9521b0f..1b9a0432bd0 100644
--- a/gas/testsuite/gas/i386/avx512_vpopcntdq.s
+++ b/gas/testsuite/gas/i386/avx512_vpopcntdq.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512_VPOPCNTDQ instructions
 
-	.allow_index_reg
 	.text
 vpopcnt:
 	vpopcntd	%zmm5, %zmm6	 # AVX512_VPOPCNTDQ
diff --git a/gas/testsuite/gas/i386/avx512bitalg.s b/gas/testsuite/gas/i386/avx512bitalg.s
index 4920fd26108..c2102c8cfb2 100644
--- a/gas/testsuite/gas/i386/avx512bitalg.s
+++ b/gas/testsuite/gas/i386/avx512bitalg.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512BITALG instructions
 
-	.allow_index_reg
 	.text
 bitalg:
 	vpshufbitqmb	%zmm4, %zmm5, %k5	 # AVX512BITALG
diff --git a/gas/testsuite/gas/i386/avx512bitalg_vl.s b/gas/testsuite/gas/i386/avx512bitalg_vl.s
index 6c54535c0a9..591d51a61cd 100644
--- a/gas/testsuite/gas/i386/avx512bitalg_vl.s
+++ b/gas/testsuite/gas/i386/avx512bitalg_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{BITALG,VL} instructions
 
-	.allow_index_reg
 	.text
 bitalg:
 	vpshufbitqmb	%xmm4, %xmm5, %k5{%k7}	 # AVX512{BITALG,VL}
diff --git a/gas/testsuite/gas/i386/avx512bw-opts.s b/gas/testsuite/gas/i386/avx512bw-opts.s
index 901c3f3bcdf..8237cabfdf6 100644
--- a/gas/testsuite/gas/i386/avx512bw-opts.s
+++ b/gas/testsuite/gas/i386/avx512bw-opts.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512BW swap instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vmovdqu8	%zmm5, %zmm6	 # AVX512BW
diff --git a/gas/testsuite/gas/i386/avx512bw-wig.s b/gas/testsuite/gas/i386/avx512bw-wig.s
index 94859c094e8..c7c34ed344a 100644
--- a/gas/testsuite/gas/i386/avx512bw-wig.s
+++ b/gas/testsuite/gas/i386/avx512bw-wig.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512BW WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpabsb	%zmm5, %zmm6	 # AVX512BW
diff --git a/gas/testsuite/gas/i386/avx512bw.s b/gas/testsuite/gas/i386/avx512bw.s
index 3101cfc74d6..79cd76a5329 100644
--- a/gas/testsuite/gas/i386/avx512bw.s
+++ b/gas/testsuite/gas/i386/avx512bw.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512BW instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpabsb	%zmm5, %zmm6	 # AVX512BW
diff --git a/gas/testsuite/gas/i386/avx512bw_vl-opts.s b/gas/testsuite/gas/i386/avx512bw_vl-opts.s
index c434cae95f9..de956d1e9ab 100644
--- a/gas/testsuite/gas/i386/avx512bw_vl-opts.s
+++ b/gas/testsuite/gas/i386/avx512bw_vl-opts.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{BW,VL} swap instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vmovdqu8	%xmm5, %xmm6{%k7}	 # AVX512{BW,VL}
diff --git a/gas/testsuite/gas/i386/avx512bw_vl-wig.s b/gas/testsuite/gas/i386/avx512bw_vl-wig.s
index 7e1df8a4ce9..f77b32c9e9e 100644
--- a/gas/testsuite/gas/i386/avx512bw_vl-wig.s
+++ b/gas/testsuite/gas/i386/avx512bw_vl-wig.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{BW,VL} WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpabsb	%xmm5, %xmm6{%k7}	 # AVX512{BW,VL}
diff --git a/gas/testsuite/gas/i386/avx512bw_vl.s b/gas/testsuite/gas/i386/avx512bw_vl.s
index 14e9882eb32..eeffe068e1d 100644
--- a/gas/testsuite/gas/i386/avx512bw_vl.s
+++ b/gas/testsuite/gas/i386/avx512bw_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{BW,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpabsb	%xmm5, %xmm6{%k7}	 # AVX512{BW,VL}
diff --git a/gas/testsuite/gas/i386/avx512cd.s b/gas/testsuite/gas/i386/avx512cd.s
index aec0dd859e5..d2ece631a4f 100644
--- a/gas/testsuite/gas/i386/avx512cd.s
+++ b/gas/testsuite/gas/i386/avx512cd.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512CD instructions
 
-	.allow_index_reg
 	.text
 cd:
 
diff --git a/gas/testsuite/gas/i386/avx512cd_vl.s b/gas/testsuite/gas/i386/avx512cd_vl.s
index bb53e5d5f8f..fbe518a519b 100644
--- a/gas/testsuite/gas/i386/avx512cd_vl.s
+++ b/gas/testsuite/gas/i386/avx512cd_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{CD,VL} instructions
 
-	.allow_index_reg
 	.text
 cd:
 	vpconflictd	%xmm5, %xmm6{%k7}	 # AVX512{CD,VL}
diff --git a/gas/testsuite/gas/i386/avx512dq-rcig.s b/gas/testsuite/gas/i386/avx512dq-rcig.s
index 7255ced1b70..7b5f467b84c 100644
--- a/gas/testsuite/gas/i386/avx512dq-rcig.s
+++ b/gas/testsuite/gas/i386/avx512dq-rcig.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512DQ-RCIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vrangepd	$0xab, {sae}, %zmm4, %zmm5, %zmm6	 # AVX512DQ
diff --git a/gas/testsuite/gas/i386/avx512dq.s b/gas/testsuite/gas/i386/avx512dq.s
index 7df5723ade9..8681c325462 100644
--- a/gas/testsuite/gas/i386/avx512dq.s
+++ b/gas/testsuite/gas/i386/avx512dq.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512DQ instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vbroadcastf32x8	(%ecx), %zmm6	 # AVX512DQ
diff --git a/gas/testsuite/gas/i386/avx512dq_vl.s b/gas/testsuite/gas/i386/avx512dq_vl.s
index 813e4d1be01..c6359d3e96d 100644
--- a/gas/testsuite/gas/i386/avx512dq_vl.s
+++ b/gas/testsuite/gas/i386/avx512dq_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{DQ,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vbroadcastf64x2	(%ecx), %ymm6{%k7}	 # AVX512{DQ,VL}
diff --git a/gas/testsuite/gas/i386/avx512er-rcig.s b/gas/testsuite/gas/i386/avx512er-rcig.s
index fe9a7a047c5..ff069a6d6da 100644
--- a/gas/testsuite/gas/i386/avx512er-rcig.s
+++ b/gas/testsuite/gas/i386/avx512er-rcig.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512ER-RCIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vexp2ps	{sae}, %zmm5, %zmm6	 # AVX512ER
diff --git a/gas/testsuite/gas/i386/avx512er.s b/gas/testsuite/gas/i386/avx512er.s
index 21098bf4aaa..e17d260c58c 100644
--- a/gas/testsuite/gas/i386/avx512er.s
+++ b/gas/testsuite/gas/i386/avx512er.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512ER instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/avx512f-opts.s b/gas/testsuite/gas/i386/avx512f-opts.s
index 91ccd2544af..d8fcbe4ffe1 100644
--- a/gas/testsuite/gas/i386/avx512f-opts.s
+++ b/gas/testsuite/gas/i386/avx512f-opts.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512F instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/avx512f-rcig.s b/gas/testsuite/gas/i386/avx512f-rcig.s
index 84e777b1c26..cbb5046cfd1 100644
--- a/gas/testsuite/gas/i386/avx512f-rcig.s
+++ b/gas/testsuite/gas/i386/avx512f-rcig.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512F-RCIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vcmppd	$0xab, {sae}, %zmm5, %zmm6, %k5	 # AVX512F
diff --git a/gas/testsuite/gas/i386/avx512f.s b/gas/testsuite/gas/i386/avx512f.s
index 3b0fb70fe68..a4e5b47cbde 100644
--- a/gas/testsuite/gas/i386/avx512f.s
+++ b/gas/testsuite/gas/i386/avx512f.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512F instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/avx512f_gfni.s b/gas/testsuite/gas/i386/avx512f_gfni.s
index 87cda8b3f30..40476258c7b 100644
--- a/gas/testsuite/gas/i386/avx512f_gfni.s
+++ b/gas/testsuite/gas/i386/avx512f_gfni.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512F,GFNI instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vgf2p8affineqb	$0xab, %zmm4, %zmm5, %zmm6	 # AVX512F,GFNI
diff --git a/gas/testsuite/gas/i386/avx512f_vaes.s b/gas/testsuite/gas/i386/avx512f_vaes.s
index eb76504b11d..1a23fa33503 100644
--- a/gas/testsuite/gas/i386/avx512f_vaes.s
+++ b/gas/testsuite/gas/i386/avx512f_vaes.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512F,VAES instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaesdec	%zmm4, %zmm5, %zmm6	 # AVX512F,VAES
diff --git a/gas/testsuite/gas/i386/avx512f_vl-opts.s b/gas/testsuite/gas/i386/avx512f_vl-opts.s
index abf37fc8d02..9bfdf0f1d49 100644
--- a/gas/testsuite/gas/i386/avx512f_vl-opts.s
+++ b/gas/testsuite/gas/i386/avx512f_vl-opts.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{F,VL} swap instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vmovapd	%xmm5, %xmm6{%k7}	 # AVX512{F,VL}
diff --git a/gas/testsuite/gas/i386/avx512f_vl-wig.s b/gas/testsuite/gas/i386/avx512f_vl-wig.s
index fcd8e874a17..76a824535c5 100644
--- a/gas/testsuite/gas/i386/avx512f_vl-wig.s
+++ b/gas/testsuite/gas/i386/avx512f_vl-wig.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{F,VL} WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpmovsxbd	%xmm5, %xmm6{%k7}	 # AVX512{F,VL}
diff --git a/gas/testsuite/gas/i386/avx512f_vl.s b/gas/testsuite/gas/i386/avx512f_vl.s
index 170d1d04306..69f4f564891 100644
--- a/gas/testsuite/gas/i386/avx512f_vl.s
+++ b/gas/testsuite/gas/i386/avx512f_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{F,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaddpd	%xmm4, %xmm5, %xmm6{%k7}	 # AVX512{F,VL}
diff --git a/gas/testsuite/gas/i386/avx512f_vpclmulqdq.s b/gas/testsuite/gas/i386/avx512f_vpclmulqdq.s
index be41dd9fb58..8bd46393f49 100644
--- a/gas/testsuite/gas/i386/avx512f_vpclmulqdq.s
+++ b/gas/testsuite/gas/i386/avx512f_vpclmulqdq.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512F,VPCLMULQDQ instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpclmulqdq	$0xab, %zmm1, %zmm3, %zmm1	 # AVX512F,VPCLMULQDQ
diff --git a/gas/testsuite/gas/i386/avx512ifma.s b/gas/testsuite/gas/i386/avx512ifma.s
index 96749cc93d2..3fded14ede3 100644
--- a/gas/testsuite/gas/i386/avx512ifma.s
+++ b/gas/testsuite/gas/i386/avx512ifma.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512IFMA instructions
 
-	.allow_index_reg
 	.text
 ifma:
 	vpmadd52luq	%zmm4, %zmm5, %zmm6	 # AVX512IFMA
diff --git a/gas/testsuite/gas/i386/avx512ifma_vl.s b/gas/testsuite/gas/i386/avx512ifma_vl.s
index 4096b10612e..f9bf75f5add 100644
--- a/gas/testsuite/gas/i386/avx512ifma_vl.s
+++ b/gas/testsuite/gas/i386/avx512ifma_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{IFMA,VL} instructions
 
-	.allow_index_reg
 	.text
 ifma:
 	vpmadd52luq	%xmm4, %xmm5, %xmm6{%k7}	 # AVX512{IFMA,VL}
diff --git a/gas/testsuite/gas/i386/avx512pf.s b/gas/testsuite/gas/i386/avx512pf.s
index bfb7a6117bb..331c9323368 100644
--- a/gas/testsuite/gas/i386/avx512pf.s
+++ b/gas/testsuite/gas/i386/avx512pf.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512PF instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/avx512vbmi.s b/gas/testsuite/gas/i386/avx512vbmi.s
index cbf560472eb..01229fc36d2 100644
--- a/gas/testsuite/gas/i386/avx512vbmi.s
+++ b/gas/testsuite/gas/i386/avx512vbmi.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512VBMI instructions
 
-	.allow_index_reg
 	.text
 vbmi:
 	vpermb	%zmm4, %zmm5, %zmm6	 # AVX512VBMI
diff --git a/gas/testsuite/gas/i386/avx512vbmi2.s b/gas/testsuite/gas/i386/avx512vbmi2.s
index 2b717203783..c6d25b570de 100644
--- a/gas/testsuite/gas/i386/avx512vbmi2.s
+++ b/gas/testsuite/gas/i386/avx512vbmi2.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512VBMI2 instructions
 
-	.allow_index_reg
 	.text
 vbmi2:
 	vpcompressb	%zmm6, (%ecx){%k7}	 # AVX512VBMI2
diff --git a/gas/testsuite/gas/i386/avx512vbmi2_vl.s b/gas/testsuite/gas/i386/avx512vbmi2_vl.s
index e83511b06d7..6e86b4481c9 100644
--- a/gas/testsuite/gas/i386/avx512vbmi2_vl.s
+++ b/gas/testsuite/gas/i386/avx512vbmi2_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{VBMI2,VL} instructions
 
-	.allow_index_reg
 	.text
 vbmi2:
 	vpcompressb	%xmm6, -123456(%esp,%esi,8){%k7}	 # AVX512{VBMI2,VL}
diff --git a/gas/testsuite/gas/i386/avx512vbmi_vl.s b/gas/testsuite/gas/i386/avx512vbmi_vl.s
index 5a3a57f8ba5..7a65c27c1f4 100644
--- a/gas/testsuite/gas/i386/avx512vbmi_vl.s
+++ b/gas/testsuite/gas/i386/avx512vbmi_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{VBMI,VL} instructions
 
-	.allow_index_reg
 	.text
 vbmi:
 	vpermb	%xmm4, %xmm5, %xmm6{%k7}	 # AVX512{VBMI,VL}
diff --git a/gas/testsuite/gas/i386/avx512vl_gfni.s b/gas/testsuite/gas/i386/avx512vl_gfni.s
index d288f22f248..d29a1c23658 100644
--- a/gas/testsuite/gas/i386/avx512vl_gfni.s
+++ b/gas/testsuite/gas/i386/avx512vl_gfni.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512VL,GFNI instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vgf2p8affineqb	$0xab, %xmm4, %xmm5, %xmm6{%k7}	 # AVX512VL,GFNI
diff --git a/gas/testsuite/gas/i386/avx512vl_vaes.s b/gas/testsuite/gas/i386/avx512vl_vaes.s
index d35f02113e5..c5c983637ed 100644
--- a/gas/testsuite/gas/i386/avx512vl_vaes.s
+++ b/gas/testsuite/gas/i386/avx512vl_vaes.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512VL,VAES instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaesdec	%xmm4, %xmm5, %xmm6	 # AVX512VL,VAES
diff --git a/gas/testsuite/gas/i386/avx512vl_vpclmulqdq.s b/gas/testsuite/gas/i386/avx512vl_vpclmulqdq.s
index 62efaa53f59..d2f11a0e69f 100644
--- a/gas/testsuite/gas/i386/avx512vl_vpclmulqdq.s
+++ b/gas/testsuite/gas/i386/avx512vl_vpclmulqdq.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512VL,VPCLMULQDQ instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpclmulqdq	$0xab, %xmm2, %xmm2, %xmm3	 # AVX512VL,VPCLMULQDQ
diff --git a/gas/testsuite/gas/i386/avx512vnni.s b/gas/testsuite/gas/i386/avx512vnni.s
index 3c3a8fe6ec8..05ab71d3e94 100644
--- a/gas/testsuite/gas/i386/avx512vnni.s
+++ b/gas/testsuite/gas/i386/avx512vnni.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512VNNI instructions
 
-	.allow_index_reg
 	.text
 vnni:
 	vpdpwssd	%zmm3, %zmm1, %zmm4	 # AVX512VNNI
diff --git a/gas/testsuite/gas/i386/avx512vnni_vl.s b/gas/testsuite/gas/i386/avx512vnni_vl.s
index 9268252fa98..7721b173357 100644
--- a/gas/testsuite/gas/i386/avx512vnni_vl.s
+++ b/gas/testsuite/gas/i386/avx512vnni_vl.s
@@ -1,6 +1,5 @@
 # Check 32bit AVX512{VNNI,VL} instructions
 
-	.allow_index_reg
 	.text
 vnni:
 	vpdpwssd	%xmm2, %xmm4, %xmm2{%k3}	 # AVX512{VNNI,VL}
diff --git a/gas/testsuite/gas/i386/bmi.s b/gas/testsuite/gas/i386/bmi.s
index fe221451050..e8b5075090e 100644
--- a/gas/testsuite/gas/i386/bmi.s
+++ b/gas/testsuite/gas/i386/bmi.s
@@ -1,6 +1,5 @@
 # Check 32bit BMI instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/bmi2.s b/gas/testsuite/gas/i386/bmi2.s
index 415994cf46f..3f75e233469 100644
--- a/gas/testsuite/gas/i386/bmi2.s
+++ b/gas/testsuite/gas/i386/bmi2.s
@@ -1,6 +1,5 @@
 # Check 32bit BMI2 instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/cldemote.s b/gas/testsuite/gas/i386/cldemote.s
index 28565597f3f..2fcd202f0e5 100644
--- a/gas/testsuite/gas/i386/cldemote.s
+++ b/gas/testsuite/gas/i386/cldemote.s
@@ -1,6 +1,5 @@
 # Check 32bit CLDEMOTE instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/clflushopt.s b/gas/testsuite/gas/i386/clflushopt.s
index a6d4990f8cd..855b4fa3c64 100644
--- a/gas/testsuite/gas/i386/clflushopt.s
+++ b/gas/testsuite/gas/i386/clflushopt.s
@@ -1,6 +1,5 @@
 # Check 32bit CLFLUSHOPT instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/clwb.s b/gas/testsuite/gas/i386/clwb.s
index 8132218257e..76c92c3bc3b 100644
--- a/gas/testsuite/gas/i386/clwb.s
+++ b/gas/testsuite/gas/i386/clwb.s
@@ -1,6 +1,5 @@
 # Check 32bit CLWB instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/cmpccxadd-inval.l b/gas/testsuite/gas/i386/cmpccxadd-inval.l
index 32538867aae..156d4e91ac9 100644
--- a/gas/testsuite/gas/i386/cmpccxadd-inval.l
+++ b/gas/testsuite/gas/i386/cmpccxadd-inval.l
@@ -1,5 +1,5 @@
 .* Assembler messages:
-.*:6: Error: `cmpbexadd' is only supported in 64-bit mode
-.*:7: Error: `cmpbxadd' is only supported in 64-bit mode
-.*:8: Error: `cmplexadd' is only supported in 64-bit mode
-.*:9: Error: `cmplxadd' is only supported in 64-bit mode
+.*:5: Error: `cmpbexadd' is only supported in 64-bit mode
+.*:6: Error: `cmpbxadd' is only supported in 64-bit mode
+.*:7: Error: `cmplexadd' is only supported in 64-bit mode
+.*:8: Error: `cmplxadd' is only supported in 64-bit mode
diff --git a/gas/testsuite/gas/i386/cmpccxadd-inval.s b/gas/testsuite/gas/i386/cmpccxadd-inval.s
index a349628863d..b89b303437e 100644
--- a/gas/testsuite/gas/i386/cmpccxadd-inval.s
+++ b/gas/testsuite/gas/i386/cmpccxadd-inval.s
@@ -1,6 +1,5 @@
 # Check Illegal CMPccXADD instructions
 
-	.allow_index_reg
 	.text
 _start:
 	cmpbexadd	%eax, %eax, 0x10000000(%esp, %esi, 8)
diff --git a/gas/testsuite/gas/i386/enqcmd-inval.l b/gas/testsuite/gas/i386/enqcmd-inval.l
index e5af4c796ed..b69847e9bf3 100644
--- a/gas/testsuite/gas/i386/enqcmd-inval.l
+++ b/gas/testsuite/gas/i386/enqcmd-inval.l
@@ -1,10 +1,10 @@
 .*: Assembler messages:
+.*:5: Error: invalid register operand size for `enqcmd'
 .*:6: Error: invalid register operand size for `enqcmd'
-.*:7: Error: invalid register operand size for `enqcmd'
+.*:7: Error: invalid register operand size for `enqcmds'
 .*:8: Error: invalid register operand size for `enqcmds'
-.*:9: Error: invalid register operand size for `enqcmds'
+.*:11: Error: invalid register operand size for `enqcmd'
 .*:12: Error: invalid register operand size for `enqcmd'
-.*:13: Error: invalid register operand size for `enqcmd'
+.*:13: Error: invalid register operand size for `enqcmds'
 .*:14: Error: invalid register operand size for `enqcmds'
-.*:15: Error: invalid register operand size for `enqcmds'
 
diff --git a/gas/testsuite/gas/i386/enqcmd-inval.s b/gas/testsuite/gas/i386/enqcmd-inval.s
index 33eb6c8c3e4..a6eac77112e 100644
--- a/gas/testsuite/gas/i386/enqcmd-inval.s
+++ b/gas/testsuite/gas/i386/enqcmd-inval.s
@@ -1,6 +1,5 @@
 # Check error for ENQCMD[S] 32-bit instructions
 
-	.allow_index_reg
 	.text
 _start:
 	enqcmd (%si),%eax
diff --git a/gas/testsuite/gas/i386/enqcmd.s b/gas/testsuite/gas/i386/enqcmd.s
index f7195fa7236..45699443b05 100644
--- a/gas/testsuite/gas/i386/enqcmd.s
+++ b/gas/testsuite/gas/i386/enqcmd.s
@@ -1,6 +1,5 @@
 # Check ENQCMD[S] 32-bit instructions
 
-	.allow_index_reg
 	.text
 _start:
 	enqcmd (%ecx),%eax
diff --git a/gas/testsuite/gas/i386/evex-lig-2.s b/gas/testsuite/gas/i386/evex-lig-2.s
index f69deceed86..cba293446d8 100644
--- a/gas/testsuite/gas/i386/evex-lig-2.s
+++ b/gas/testsuite/gas/i386/evex-lig-2.s
@@ -1,6 +1,5 @@
 # Check EVEX non-LIG instructions with with -mevexlig=256
 
-	.allow_index_reg
 	.text
 _start:
 	{evex} vmovd %xmm4,(%ecx)
diff --git a/gas/testsuite/gas/i386/evex-lig.s b/gas/testsuite/gas/i386/evex-lig.s
index db0891a12a0..d2adfcbd297 100644
--- a/gas/testsuite/gas/i386/evex-lig.s
+++ b/gas/testsuite/gas/i386/evex-lig.s
@@ -1,6 +1,5 @@
 # Check EVEX LIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/evex-wig.s b/gas/testsuite/gas/i386/evex-wig.s
index de8c16c7c20..2495595b135 100644
--- a/gas/testsuite/gas/i386/evex-wig.s
+++ b/gas/testsuite/gas/i386/evex-wig.s
@@ -1,6 +1,5 @@
 # Check EVEX WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/evex.s b/gas/testsuite/gas/i386/evex.s
index 29a5a89a2e7..b72e1cd1e4f 100644
--- a/gas/testsuite/gas/i386/evex.s
+++ b/gas/testsuite/gas/i386/evex.s
@@ -1,6 +1,5 @@
 # Check EVEX instructions
 
-	.allow_index_reg
 	.text
 _start:
 	.insn EVEX.LIG.F3.0F.W1 0x2a, %eax,{rd-sae},%xmm5,%xmm6
diff --git a/gas/testsuite/gas/i386/fma-scalar.s b/gas/testsuite/gas/i386/fma-scalar.s
index 2010eb369d6..35094699631 100644
--- a/gas/testsuite/gas/i386/fma-scalar.s
+++ b/gas/testsuite/gas/i386/fma-scalar.s
@@ -1,6 +1,5 @@
 # Check AVX scalar instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/fma.s b/gas/testsuite/gas/i386/fma.s
index f48661edba5..5ee7528d000 100644
--- a/gas/testsuite/gas/i386/fma.s
+++ b/gas/testsuite/gas/i386/fma.s
@@ -1,6 +1,5 @@
 # Check FMA instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/fma4.s b/gas/testsuite/gas/i386/fma4.s
index 8f4c950e1d5..aeb12ce05cf 100644
--- a/gas/testsuite/gas/i386/fma4.s
+++ b/gas/testsuite/gas/i386/fma4.s
@@ -1,6 +1,5 @@
 # Check FMA4 instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/gfni.s b/gas/testsuite/gas/i386/gfni.s
index e4166ec92a0..dc424a9ee1b 100644
--- a/gas/testsuite/gas/i386/gfni.s
+++ b/gas/testsuite/gas/i386/gfni.s
@@ -1,6 +1,5 @@
 # Check GFNI instructions
 
-	.allow_index_reg
 	.text
 _start:
 	gf2p8mulb %xmm4, %xmm5
diff --git a/gas/testsuite/gas/i386/hle.s b/gas/testsuite/gas/i386/hle.s
index 1beddc458f5..306d557a32d 100644
--- a/gas/testsuite/gas/i386/hle.s
+++ b/gas/testsuite/gas/i386/hle.s
@@ -1,6 +1,5 @@
 # Check 32bit HLE instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/ilp32/enqcmd.s b/gas/testsuite/gas/i386/ilp32/enqcmd.s
index 1f83e65b116..2da4d1fa83d 100644
--- a/gas/testsuite/gas/i386/ilp32/enqcmd.s
+++ b/gas/testsuite/gas/i386/ilp32/enqcmd.s
@@ -1,6 +1,5 @@
 # Check ENQCMD[S] 64-bit instructions in x32 mode
 
-	.allow_index_reg
 	.text
 _start:
 	enqcmd (%rcx),%rax
diff --git a/gas/testsuite/gas/i386/ilp32/movdir.s b/gas/testsuite/gas/i386/ilp32/movdir.s
index cbf178862bb..c18660fcbf7 100644
--- a/gas/testsuite/gas/i386/ilp32/movdir.s
+++ b/gas/testsuite/gas/i386/ilp32/movdir.s
@@ -1,6 +1,5 @@
 # Check MOVDIR[I,64B] 64-bit instructions in x32 mode
 
-	.allow_index_reg
 	.text
 _start:
 	movdiri %rax, (%rcx)
diff --git a/gas/testsuite/gas/i386/lwp.s b/gas/testsuite/gas/i386/lwp.s
index bdde3298059..a41832124dd 100644
--- a/gas/testsuite/gas/i386/lwp.s
+++ b/gas/testsuite/gas/i386/lwp.s
@@ -1,6 +1,5 @@
 # Check 64bit LWP instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/movdir.s b/gas/testsuite/gas/i386/movdir.s
index 00c57db141a..77d6f45a348 100644
--- a/gas/testsuite/gas/i386/movdir.s
+++ b/gas/testsuite/gas/i386/movdir.s
@@ -1,6 +1,5 @@
 # Check MOVDIR[I,64B] 32-bit instructions
 
-	.allow_index_reg
 	.text
 _start:
 	movdiri %eax, (%ecx)
diff --git a/gas/testsuite/gas/i386/movdir64b-reg.l b/gas/testsuite/gas/i386/movdir64b-reg.l
index e01d20deb35..5eb7f9aaeee 100644
--- a/gas/testsuite/gas/i386/movdir64b-reg.l
+++ b/gas/testsuite/gas/i386/movdir64b-reg.l
@@ -1,5 +1,5 @@
 .*: Assembler messages:
+.*:5: Error: invalid register operand size for `movdir64b'
 .*:6: Error: invalid register operand size for `movdir64b'
-.*:7: Error: invalid register operand size for `movdir64b'
+.*:9: Error: invalid register operand size for `movdir64b'
 .*:10: Error: invalid register operand size for `movdir64b'
-.*:11: Error: invalid register operand size for `movdir64b'
diff --git a/gas/testsuite/gas/i386/movdir64b-reg.s b/gas/testsuite/gas/i386/movdir64b-reg.s
index ace5e86edb7..fc8e8784f94 100644
--- a/gas/testsuite/gas/i386/movdir64b-reg.s
+++ b/gas/testsuite/gas/i386/movdir64b-reg.s
@@ -1,6 +1,5 @@
 # Check error for MOVDIR64B 32-bit instructions
 
-	.allow_index_reg
 	.text
 _start:
 	movdir64b (%si),%eax
diff --git a/gas/testsuite/gas/i386/mpx-inval-1.l b/gas/testsuite/gas/i386/mpx-inval-1.l
index f50fd7f06ca..f7fcfaae200 100644
--- a/gas/testsuite/gas/i386/mpx-inval-1.l
+++ b/gas/testsuite/gas/i386/mpx-inval-1.l
@@ -1,60 +1,59 @@
 .*: Assembler messages:
+.*:5: Error: expecting valid branch instruction after `bnd'
 .*:6: Error: expecting valid branch instruction after `bnd'
 .*:7: Error: expecting valid branch instruction after `bnd'
+.*:7: Warning: skipping prefixes on `lcall'
 .*:8: Error: expecting valid branch instruction after `bnd'
-.*:8: Warning: skipping prefixes on `lcall'
+.*:8: Warning: skipping prefixes on `ljmp'
 .*:9: Error: expecting valid branch instruction after `bnd'
-.*:9: Warning: skipping prefixes on `ljmp'
 .*:10: Error: expecting valid branch instruction after `bnd'
-.*:11: Error: expecting valid branch instruction after `bnd'
+.*:13: Error: expecting valid branch instruction after `bnd'
 .*:14: Error: expecting valid branch instruction after `bnd'
 .*:15: Error: expecting valid branch instruction after `bnd'
+.*:15: Warning: skipping prefixes on `lcall'
 .*:16: Error: expecting valid branch instruction after `bnd'
-.*:16: Warning: skipping prefixes on `lcall'
+.*:16: Warning: skipping prefixes on `ljmp'
 .*:17: Error: expecting valid branch instruction after `bnd'
-.*:17: Warning: skipping prefixes on `ljmp'
 .*:18: Error: expecting valid branch instruction after `bnd'
-.*:19: Error: expecting valid branch instruction after `bnd'
 GAS LISTING .*
 
 
 [ 	]*1[ 	]+\# MPX instructions
-[ 	]*2[ 	]+\.allow_index_reg
-[ 	]*3[ 	]+\.text
-[ 	]*4[ 	]+\.extern xxx
-[ 	]*5[ 	]+foo:
-[ 	]*6[ 	]+\?\?\?\? F201C3   		bnd add %eax, %ebx  		\# Bad
+[ 	]*2[ 	]+\.text
+[ 	]*3[ 	]+\.extern xxx
+[ 	]*4[ 	]+foo:
+[ 	]*5[ 	]+\?\?\?\? F201C3   		bnd add %eax, %ebx  		\# Bad
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*7[ 	]+\?\?\?\? 66F2AB   		bnd stosw \(%edi\)    		\# Bad
+[ 	]*6[ 	]+\?\?\?\? 66F2AB   		bnd stosw \(%edi\)    		\# Bad
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*8[ 	]+\?\?\?\? 9A000000 		bnd lcall \$0x1234,\$xxx
+[ 	]*7[ 	]+\?\?\?\? 9A000000 		bnd lcall \$0x1234,\$xxx
 .*  Error: expecting valid branch instruction after `bnd'
 .*  Warning: skipping prefixes on `lcall'
-[ 	]*8[ 	]+003412
-[ 	]*9[ 	]+\?\?\?\? EA000000 		bnd ljmp \$0x1234,\$xxx
+[ 	]*7[ 	]+003412
+[ 	]*8[ 	]+\?\?\?\? EA000000 		bnd ljmp \$0x1234,\$xxx
 .*  Error: expecting valid branch instruction after `bnd'
 .*  Warning: skipping prefixes on `ljmp'
-[ 	]*9[ 	]+003412
-[ 	]*10[ 	]+\?\?\?\? F2E2E9   		bnd loop foo
+[ 	]*8[ 	]+003412
+[ 	]*9[ 	]+\?\?\?\? F2E2E9   		bnd loop foo
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*11[ 	]+\?\?\?\? 67F2E3E5 		bnd jcxz foo
+[ 	]*10[ 	]+\?\?\?\? 67F2E3E5 		bnd jcxz foo
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*12[ 	]+
-[ 	]*13[ 	]+\.intel_syntax noprefix
-[ 	]*14[ 	]+\?\?\?\? F201C3   		bnd add ebx, eax		\# Bad
+[ 	]*11[ 	]+
+[ 	]*12[ 	]+\.intel_syntax noprefix
+[ 	]*13[ 	]+\?\?\?\? F201C3   		bnd add ebx, eax		\# Bad
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*15[ 	]+\?\?\?\? 66F2AB   		bnd stos WORD PTR\[edi]		\# Bad
+[ 	]*14[ 	]+\?\?\?\? 66F2AB   		bnd stos WORD PTR\[edi]		\# Bad
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*16[ 	]+\?\?\?\? 9A000000 		bnd lcall 0x1234,xxx
+[ 	]*15[ 	]+\?\?\?\? 9A000000 		bnd lcall 0x1234,xxx
 .*  Error: expecting valid branch instruction after `bnd'
 .*  Warning: skipping prefixes on `lcall'
-[ 	]*16[ 	]+003412
-[ 	]*17[ 	]+\?\?\?\? EA000000 		bnd ljmp 0x1234,xxx
+[ 	]*15[ 	]+003412
+[ 	]*16[ 	]+\?\?\?\? EA000000 		bnd ljmp 0x1234,xxx
 .*  Error: expecting valid branch instruction after `bnd'
 .*  Warning: skipping prefixes on `ljmp'
-[ 	]*17[ 	]+003412
-[ 	]*18[ 	]+\?\?\?\? F2E2CE   		bnd loop foo
+[ 	]*16[ 	]+003412
+[ 	]*17[ 	]+\?\?\?\? F2E2CE   		bnd loop foo
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*19[ 	]+\?\?\?\? 67F2E3CA 		bnd jcxz foo
+[ 	]*18[ 	]+\?\?\?\? 67F2E3CA 		bnd jcxz foo
 .*  Error: expecting valid branch instruction after `bnd'
 #pass
diff --git a/gas/testsuite/gas/i386/mpx-inval-1.s b/gas/testsuite/gas/i386/mpx-inval-1.s
index 74de4f77eeb..9511cdd40c0 100644
--- a/gas/testsuite/gas/i386/mpx-inval-1.s
+++ b/gas/testsuite/gas/i386/mpx-inval-1.s
@@ -1,5 +1,4 @@
 # MPX instructions
-	.allow_index_reg
 	.text
 	.extern xxx
 foo:
diff --git a/gas/testsuite/gas/i386/mpx.s b/gas/testsuite/gas/i386/mpx.s
index 593ff496ef9..bf1ca4280f5 100644
--- a/gas/testsuite/gas/i386/mpx.s
+++ b/gas/testsuite/gas/i386/mpx.s
@@ -1,5 +1,4 @@
 # MPX instructions
-	.allow_index_reg
 	.text
 start:
 	### bndmk
diff --git a/gas/testsuite/gas/i386/msrlist-inval.l b/gas/testsuite/gas/i386/msrlist-inval.l
index 456f41c38f7..6d9df71efc1 100644
--- a/gas/testsuite/gas/i386/msrlist-inval.l
+++ b/gas/testsuite/gas/i386/msrlist-inval.l
@@ -1,3 +1,3 @@
 .* Assembler messages:
-.*:6: Error: `rdmsrlist' is only supported in 64-bit mode
-.*:7: Error: `wrmsrlist' is only supported in 64-bit mode
+.*:5: Error: `rdmsrlist' is only supported in 64-bit mode
+.*:6: Error: `wrmsrlist' is only supported in 64-bit mode
diff --git a/gas/testsuite/gas/i386/msrlist-inval.s b/gas/testsuite/gas/i386/msrlist-inval.s
index 3c3258a375e..ac44c21269e 100644
--- a/gas/testsuite/gas/i386/msrlist-inval.s
+++ b/gas/testsuite/gas/i386/msrlist-inval.s
@@ -1,6 +1,5 @@
 # Check Illegal MSRLIST instructions
 
-	.allow_index_reg
 	.text
 _start:
 	rdmsrlist		 #MSRLIST
diff --git a/gas/testsuite/gas/i386/notrack.s b/gas/testsuite/gas/i386/notrack.s
index 52df4dc8df2..0d7842b80b6 100644
--- a/gas/testsuite/gas/i386/notrack.s
+++ b/gas/testsuite/gas/i386/notrack.s
@@ -1,6 +1,5 @@
 # Check 32bit NOTRACK prefix
 
-	.allow_index_reg
 	.text
 _start:
 	notrack call *%eax
diff --git a/gas/testsuite/gas/i386/notrackbad.l b/gas/testsuite/gas/i386/notrackbad.l
index 75d55536ee1..c4b8cab5887 100644
--- a/gas/testsuite/gas/i386/notrackbad.l
+++ b/gas/testsuite/gas/i386/notrackbad.l
@@ -1,31 +1,30 @@
 .*: Assembler messages:
+.*:5: Error: expecting indirect branch instruction after `notrack'
+.*:5: Warning: skipping prefixes on `call'
 .*:6: Error: expecting indirect branch instruction after `notrack'
-.*:6: Warning: skipping prefixes on `call'
-.*:7: Error: expecting indirect branch instruction after `notrack'
+.*:8: Error: same type of prefix used twice
 .*:9: Error: same type of prefix used twice
-.*:10: Error: same type of prefix used twice
+.*:12: Error: same type of prefix used twice
 .*:13: Error: same type of prefix used twice
-.*:14: Error: same type of prefix used twice
 GAS LISTING .*
 
 
 [ 	]*1[ 	]+\# Check 32bit unsupported NOTRACK prefix
 [ 	]*2[ 	]+
-[ 	]*3[ 	]+\.allow_index_reg
-[ 	]*4[ 	]+\.text
-[ 	]*5[ 	]+_start:
-[ 	]*6[ 	]+\?\?\?\? [0-9A-F]* 		notrack call foo
+[ 	]*3[ 	]+\.text
+[ 	]*4[ 	]+_start:
+[ 	]*5[ 	]+\?\?\?\? [0-9A-F]* 		notrack call foo
 \*\*\*\*  Error: expecting indirect branch instruction after `notrack'
 \*\*\*\*  Warning: skipping prefixes on `call'
-[ 	]*6[ 	]+[0-9A-F]*
-[ 	]*7[ 	]+\?\?\?\? [0-9A-F]* 		notrack jmp foo
+[ 	]*5[ 	]+[0-9A-F]*
+[ 	]*6[ 	]+\?\?\?\? [0-9A-F]* 		notrack jmp foo
 \*\*\*\*  Error: expecting indirect branch instruction after `notrack'
-[ 	]*7[ 	]+[0-9A-F]*
-[ 	]*8[ 	]+
-[ 	]*9[ 	]+fs notrack call \*%eax
-[ 	]*10[ 	]+notrack fs call \*%eax
-[ 	]*11[ 	]+
-[ 	]*12[ 	]+\.intel_syntax noprefix
-[ 	]*13[ 	]+fs notrack call eax
-[ 	]*14[ 	]+notrack fs call eax
+[ 	]*6[ 	]+[0-9A-F]*
+[ 	]*7[ 	]+
+[ 	]*8[ 	]+fs notrack call \*%eax
+[ 	]*9[ 	]+notrack fs call \*%eax
+[ 	]*10[ 	]+
+[ 	]*11[ 	]+\.intel_syntax noprefix
+[ 	]*12[ 	]+fs notrack call eax
+[ 	]*13[ 	]+notrack fs call eax
 #pass
diff --git a/gas/testsuite/gas/i386/notrackbad.s b/gas/testsuite/gas/i386/notrackbad.s
index 535ec56bba9..a42e4012baf 100644
--- a/gas/testsuite/gas/i386/notrackbad.s
+++ b/gas/testsuite/gas/i386/notrackbad.s
@@ -1,6 +1,5 @@
 # Check 32bit unsupported NOTRACK prefix
 
-	.allow_index_reg
 	.text
 _start:
 	notrack call foo
diff --git a/gas/testsuite/gas/i386/optimize-1.s b/gas/testsuite/gas/i386/optimize-1.s
index e253142db0c..f80301d9b8a 100644
--- a/gas/testsuite/gas/i386/optimize-1.s
+++ b/gas/testsuite/gas/i386/optimize-1.s
@@ -1,6 +1,5 @@
 # Check instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	vandnpd %zmm1, %zmm1, %zmm5{%k7}
diff --git a/gas/testsuite/gas/i386/optimize-2.s b/gas/testsuite/gas/i386/optimize-2.s
index 29399ae8473..5812ea365bb 100644
--- a/gas/testsuite/gas/i386/optimize-2.s
+++ b/gas/testsuite/gas/i386/optimize-2.s
@@ -1,6 +1,5 @@
 # Check instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	testl	$0x7f, %eax
diff --git a/gas/testsuite/gas/i386/optimize-3.s b/gas/testsuite/gas/i386/optimize-3.s
index efaaa070b10..badb8954603 100644
--- a/gas/testsuite/gas/i386/optimize-3.s
+++ b/gas/testsuite/gas/i386/optimize-3.s
@@ -1,6 +1,5 @@
 # Check instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	{nooptimize} testl $0x7f, %eax
diff --git a/gas/testsuite/gas/i386/optimize-6.s b/gas/testsuite/gas/i386/optimize-6.s
index 103200aa983..e672283ad08 100644
--- a/gas/testsuite/gas/i386/optimize-6.s
+++ b/gas/testsuite/gas/i386/optimize-6.s
@@ -1,6 +1,5 @@
 # Check instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	vandnpd %zmm1, %zmm1, %zmm5{%k7}
diff --git a/gas/testsuite/gas/i386/optimize-6a.l b/gas/testsuite/gas/i386/optimize-6a.l
index 4eaf87d8f26..86d709b4f0e 100644
--- a/gas/testsuite/gas/i386/optimize-6a.l
+++ b/gas/testsuite/gas/i386/optimize-6a.l
@@ -1,32 +1,32 @@
 .*: Assembler messages:
+.*:5: Error: .*
 .*:6: Error: .*
-.*:7: Error: .*
+.*:8: Error: .*
 .*:9: Error: .*
-.*:10: Error: .*
+.*:11: Error: .*
 .*:12: Error: .*
-.*:13: Error: .*
+.*:14: Error: .*
 .*:15: Error: .*
-.*:16: Error: .*
+.*:17: Error: .*
 .*:18: Error: .*
-.*:19: Error: .*
+.*:20: Error: .*
 .*:21: Error: .*
-.*:22: Error: .*
+.*:23: Error: .*
 .*:24: Error: .*
-.*:25: Error: .*
+.*:26: Error: .*
 .*:27: Error: .*
-.*:28: Error: .*
+.*:29: Error: .*
 .*:30: Error: .*
-.*:31: Error: .*
+.*:32: Error: .*
 .*:33: Error: .*
-.*:34: Error: .*
+.*:35: Error: .*
 .*:36: Error: .*
-.*:37: Error: .*
+.*:38: Error: .*
 .*:39: Error: .*
-.*:40: Error: .*
+.*:41: Error: .*
 .*:42: Error: .*
-.*:43: Error: .*
+.*:44: Error: .*
 .*:45: Error: .*
-.*:46: Error: .*
 GAS LISTING .*
 
 
@@ -35,48 +35,47 @@ GAS LISTING .*
 [ 	]*3[ 	]+\.include "optimize-6\.s"
 [ 	]*1[ 	]+\# Check instructions with optimized encoding
 [ 	]*2[ 	]+
-[ 	]*3[ 	]+\.allow_index_reg
-[ 	]*4[ 	]+\.text
-[ 	]*5[ 	]+_start:
-[ 	]*6[ 	]+vandnpd %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*7[ 	]+vandnpd %zmm1, %zmm1, %zmm5
-[ 	]*8[ 	]+
-[ 	]*9[ 	]+vandnps %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*10[ 	]+vandnps %zmm1, %zmm1, %zmm5
-[ 	]*11[ 	]+
-[ 	]*12[ 	]+vpandnd %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*13[ 	]+vpandnd %zmm1, %zmm1, %zmm5
-[ 	]*14[ 	]+
-[ 	]*15[ 	]+vpandnq %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*16[ 	]+vpandnq %zmm1, %zmm1, %zmm5
-[ 	]*17[ 	]+
-[ 	]*18[ 	]+vxorpd %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*19[ 	]+vxorpd %zmm1, %zmm1, %zmm5
-[ 	]*20[ 	]+
-[ 	]*21[ 	]+vxorps %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*22[ 	]+vxorps %zmm1, %zmm1, %zmm5
-[ 	]*23[ 	]+
-[ 	]*24[ 	]+vpxord %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*25[ 	]+vpxord %zmm1, %zmm1, %zmm5
-[ 	]*26[ 	]+
-[ 	]*27[ 	]+vpxorq %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*28[ 	]+vpxorq %zmm1, %zmm1, %zmm5
-[ 	]*29[ 	]+
-[ 	]*30[ 	]+vpsubb %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*31[ 	]+vpsubb %zmm1, %zmm1, %zmm5
-[ 	]*32[ 	]+
-[ 	]*33[ 	]+vpsubw %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*34[ 	]+vpsubw %zmm1, %zmm1, %zmm5
-[ 	]*35[ 	]+
-[ 	]*36[ 	]+vpsubd %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*37[ 	]+vpsubd %zmm1, %zmm1, %zmm5
-[ 	]*38[ 	]+
-[ 	]*39[ 	]+vpsubq %zmm1, %zmm1, %zmm5\{%k7\}
-[ 	]*40[ 	]+vpsubq %zmm1, %zmm1, %zmm5
-[ 	]*41[ 	]+
-[ 	]*42[ 	]+kxord %k1, %k1, %k5
-[ 	]*43[ 	]+kxorq %k1, %k1, %k5
-[ 	]*44[ 	]+
-[ 	]*45[ 	]+kandnd %k1, %k1, %k5
-[ 	]*46[ 	]+kandnq %k1, %k1, %k5
+[ 	]*3[ 	]+\.text
+[ 	]*4[ 	]+_start:
+[ 	]*5[ 	]+vandnpd %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*6[ 	]+vandnpd %zmm1, %zmm1, %zmm5
+[ 	]*7[ 	]+
+[ 	]*8[ 	]+vandnps %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*9[ 	]+vandnps %zmm1, %zmm1, %zmm5
+[ 	]*10[ 	]+
+[ 	]*11[ 	]+vpandnd %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*12[ 	]+vpandnd %zmm1, %zmm1, %zmm5
+[ 	]*13[ 	]+
+[ 	]*14[ 	]+vpandnq %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*15[ 	]+vpandnq %zmm1, %zmm1, %zmm5
+[ 	]*16[ 	]+
+[ 	]*17[ 	]+vxorpd %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*18[ 	]+vxorpd %zmm1, %zmm1, %zmm5
+[ 	]*19[ 	]+
+[ 	]*20[ 	]+vxorps %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*21[ 	]+vxorps %zmm1, %zmm1, %zmm5
+[ 	]*22[ 	]+
+[ 	]*23[ 	]+vpxord %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*24[ 	]+vpxord %zmm1, %zmm1, %zmm5
+[ 	]*25[ 	]+
+[ 	]*26[ 	]+vpxorq %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*27[ 	]+vpxorq %zmm1, %zmm1, %zmm5
+[ 	]*28[ 	]+
+[ 	]*29[ 	]+vpsubb %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*30[ 	]+vpsubb %zmm1, %zmm1, %zmm5
+[ 	]*31[ 	]+
+[ 	]*32[ 	]+vpsubw %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*33[ 	]+vpsubw %zmm1, %zmm1, %zmm5
+[ 	]*34[ 	]+
+[ 	]*35[ 	]+vpsubd %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*36[ 	]+vpsubd %zmm1, %zmm1, %zmm5
+[ 	]*37[ 	]+
+[ 	]*38[ 	]+vpsubq %zmm1, %zmm1, %zmm5\{%k7\}
+[ 	]*39[ 	]+vpsubq %zmm1, %zmm1, %zmm5
+[ 	]*40[ 	]+
+[ 	]*41[ 	]+kxord %k1, %k1, %k5
+[ 	]*42[ 	]+kxorq %k1, %k1, %k5
+[ 	]*43[ 	]+
+[ 	]*44[ 	]+kandnd %k1, %k1, %k5
+[ 	]*45[ 	]+kandnq %k1, %k1, %k5
 #pass
diff --git a/gas/testsuite/gas/i386/optimize-7.l b/gas/testsuite/gas/i386/optimize-7.l
index 7b72bedcc30..087d68a399c 100644
--- a/gas/testsuite/gas/i386/optimize-7.l
+++ b/gas/testsuite/gas/i386/optimize-7.l
@@ -1,12 +1,11 @@
 .*: Assembler messages:
-.*:6: Error: .*
+.*:5: Error: .*
 GAS LISTING .*
 
 
 [ 	]*1[ 	]+\# Check instructions with optimized encoding
 [ 	]*2[ 	]+
-[ 	]*3[ 	]+\.allow_index_reg
-[ 	]*4[ 	]+\.text
-[ 	]*5[ 	]+_start:
-[ 	]*6[ 	]+vmovdqa32	%ymm1, %ymm2
+[ 	]*3[ 	]+\.text
+[ 	]*4[ 	]+_start:
+[ 	]*5[ 	]+vmovdqa32	%ymm1, %ymm2
 #pass
diff --git a/gas/testsuite/gas/i386/optimize-7.s b/gas/testsuite/gas/i386/optimize-7.s
index 261b4afa270..e3099f46ac4 100644
--- a/gas/testsuite/gas/i386/optimize-7.s
+++ b/gas/testsuite/gas/i386/optimize-7.s
@@ -1,6 +1,5 @@
 # Check instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	vmovdqa32	%ymm1, %ymm2
diff --git a/gas/testsuite/gas/i386/opts.s b/gas/testsuite/gas/i386/opts.s
index 262ce1cbaf5..fa45e96a77e 100644
--- a/gas/testsuite/gas/i386/opts.s
+++ b/gas/testsuite/gas/i386/opts.s
@@ -1,6 +1,5 @@
 # Check instructions with encoding options
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/prefetchwt1.s b/gas/testsuite/gas/i386/prefetchwt1.s
index ae1b01a396a..7d9677bb5a2 100644
--- a/gas/testsuite/gas/i386/prefetchwt1.s
+++ b/gas/testsuite/gas/i386/prefetchwt1.s
@@ -1,6 +1,5 @@
-# Check 32bit AVX512PF instructions
+# Check 32bit PREFETCHWT1 instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/raoint.s b/gas/testsuite/gas/i386/raoint.s
index 04a13ddeb9e..c3f3fff0499 100644
--- a/gas/testsuite/gas/i386/raoint.s
+++ b/gas/testsuite/gas/i386/raoint.s
@@ -1,6 +1,5 @@
 # Check 32bit RAO-INT instructions
 
-	.allow_index_reg
 	.text
 _start:
         aadd    %edx, (%eax)     #RAO-INT
diff --git a/gas/testsuite/gas/i386/sha.s b/gas/testsuite/gas/i386/sha.s
index 59d9b5133c7..4c7fc958164 100644
--- a/gas/testsuite/gas/i386/sha.s
+++ b/gas/testsuite/gas/i386/sha.s
@@ -1,6 +1,5 @@
 # Check SHA instructions
 
-	.allow_index_reg
 	.text
 _start:
 	sha1rnds4 $9, %xmm2, %xmm1
diff --git a/gas/testsuite/gas/i386/sse2avx.s b/gas/testsuite/gas/i386/sse2avx.s
index 36b754b2420..f9cf0cbbb77 100644
--- a/gas/testsuite/gas/i386/sse2avx.s
+++ b/gas/testsuite/gas/i386/sse2avx.s
@@ -1,6 +1,5 @@
 # Check SSE to AVX instructions
 
-	.allow_index_reg
 	.text
 _start:
 # Tests for op mem64
diff --git a/gas/testsuite/gas/i386/tbm.s b/gas/testsuite/gas/i386/tbm.s
index b47fdecc2b6..71818084a2e 100644
--- a/gas/testsuite/gas/i386/tbm.s
+++ b/gas/testsuite/gas/i386/tbm.s
@@ -1,4 +1,3 @@
-	.allow_index_reg
 	.text
 	
 _start:
diff --git a/gas/testsuite/gas/i386/vaes.s b/gas/testsuite/gas/i386/vaes.s
index 71d6026c086..22630a2a99c 100644
--- a/gas/testsuite/gas/i386/vaes.s
+++ b/gas/testsuite/gas/i386/vaes.s
@@ -1,6 +1,5 @@
 # Check VAES instructions
 
-	.allow_index_reg
 	.text
 _start:
 # Tests for op ymm/mem256, ymm, ymm
diff --git a/gas/testsuite/gas/i386/vex-lig-2.s b/gas/testsuite/gas/i386/vex-lig-2.s
index dc74d71049f..10b153f4853 100644
--- a/gas/testsuite/gas/i386/vex-lig-2.s
+++ b/gas/testsuite/gas/i386/vex-lig-2.s
@@ -1,6 +1,5 @@
 # Check VEX non-LIG instructions with with -mavxscalar=256
 
-	.allow_index_reg
 	.text
 _start:
 	       vmovd	%eax, %xmm0
diff --git a/gas/testsuite/gas/i386/vp2intersect-inval-bcast.l b/gas/testsuite/gas/i386/vp2intersect-inval-bcast.l
index 4ee46a3425c..21d5ab02fad 100644
--- a/gas/testsuite/gas/i386/vp2intersect-inval-bcast.l
+++ b/gas/testsuite/gas/i386/vp2intersect-inval-bcast.l
@@ -1,13 +1,13 @@
 .*: Assembler messages:
+.*:5: Error: unsupported broadcast for `vp2intersectd'
 .*:6: Error: unsupported broadcast for `vp2intersectd'
 .*:7: Error: unsupported broadcast for `vp2intersectd'
-.*:8: Error: unsupported broadcast for `vp2intersectd'
+.*:8: Error: unsupported broadcast for `vp2intersectq'
 .*:9: Error: unsupported broadcast for `vp2intersectq'
 .*:10: Error: unsupported broadcast for `vp2intersectq'
-.*:11: Error: unsupported broadcast for `vp2intersectq'
+.*:13: Error: unsupported broadcast for `vp2intersectd'
 .*:14: Error: unsupported broadcast for `vp2intersectd'
 .*:15: Error: unsupported broadcast for `vp2intersectd'
-.*:16: Error: unsupported broadcast for `vp2intersectd'
+.*:16: Error: unsupported broadcast for `vp2intersectq'
 .*:17: Error: unsupported broadcast for `vp2intersectq'
 .*:18: Error: unsupported broadcast for `vp2intersectq'
-.*:19: Error: unsupported broadcast for `vp2intersectq'
diff --git a/gas/testsuite/gas/i386/vp2intersect-inval-bcast.s b/gas/testsuite/gas/i386/vp2intersect-inval-bcast.s
index b4479f60731..92a24ecb497 100644
--- a/gas/testsuite/gas/i386/vp2intersect-inval-bcast.s
+++ b/gas/testsuite/gas/i386/vp2intersect-inval-bcast.s
@@ -1,6 +1,5 @@
 # Check error for invalid {1toXX} and {2toXX} broadcasts.
 
-	.allow_index_reg
 	.text
 _start:
 	vp2intersectd 8(%eax){1to8}, %xmm2, %k3
diff --git a/gas/testsuite/gas/i386/vpclmulqdq.s b/gas/testsuite/gas/i386/vpclmulqdq.s
index be09d2c2a8b..ded630cdda7 100644
--- a/gas/testsuite/gas/i386/vpclmulqdq.s
+++ b/gas/testsuite/gas/i386/vpclmulqdq.s
@@ -1,6 +1,5 @@
 # Check VPCLMULQDQ instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpclmulqdq	$0xab, %ymm4, %ymm5, %ymm6
diff --git a/gas/testsuite/gas/i386/x86-64-adx.s b/gas/testsuite/gas/i386/x86-64-adx.s
index ff32b403c9a..685b01c3353 100644
--- a/gas/testsuite/gas/i386/x86-64-adx.s
+++ b/gas/testsuite/gas/i386/x86-64-adx.s
@@ -1,5 +1,4 @@
 # Check 64 bit ADX instructions.
-        .allow_index_reg
 	.text
 _start:
 	adcx    400(%ecx), %eax
diff --git a/gas/testsuite/gas/i386/x86-64-amx-complex.s b/gas/testsuite/gas/i386/x86-64-amx-complex.s
index 56f1a00fa9e..bedcac8f231 100644
--- a/gas/testsuite/gas/i386/x86-64-amx-complex.s
+++ b/gas/testsuite/gas/i386/x86-64-amx-complex.s
@@ -1,6 +1,5 @@
 # Check 64bit AMX-COMPLEX instructions
 
-	.allow_index_reg
 	.text
 _start:
 	tcmmimfp16ps	%tmm4, %tmm5, %tmm6	 #AMX-COMPLEX
diff --git a/gas/testsuite/gas/i386/x86-64-amx-fp16.s b/gas/testsuite/gas/i386/x86-64-amx-fp16.s
index 5a007904edb..d5ea6188241 100644
--- a/gas/testsuite/gas/i386/x86-64-amx-fp16.s
+++ b/gas/testsuite/gas/i386/x86-64-amx-fp16.s
@@ -1,6 +1,5 @@
 # Check 64bit AMX-FP16 instructions
 
-	.allow_index_reg
 	.text
 _start:
 	tdpfp16ps %tmm5, %tmm4, %tmm3
diff --git a/gas/testsuite/gas/i386/x86-64-avx-ifma.s b/gas/testsuite/gas/i386/x86-64-avx-ifma.s
index bfc524a1030..3a879609791 100644
--- a/gas/testsuite/gas/i386/x86-64-avx-ifma.s
+++ b/gas/testsuite/gas/i386/x86-64-avx-ifma.s
@@ -1,5 +1,3 @@
-       .allow_index_reg
-
 .macro test_insn mnemonic
        \mnemonic	%xmm12, %xmm4, %xmm2
        {evex} \mnemonic %xmm12, %xmm4, %xmm2
diff --git a/gas/testsuite/gas/i386/x86-64-avx-ne-convert.s b/gas/testsuite/gas/i386/x86-64-avx-ne-convert.s
index c01a95d943e..14b6a19b991 100644
--- a/gas/testsuite/gas/i386/x86-64-avx-ne-convert.s
+++ b/gas/testsuite/gas/i386/x86-64-avx-ne-convert.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX-NE-CONVERT instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vbcstnebf162ps	0x10000000(%rbp, %r14, 8), %xmm6	 #AVX-NE-CONVERT
diff --git a/gas/testsuite/gas/i386/x86-64-avx-scalar-2.s b/gas/testsuite/gas/i386/x86-64-avx-scalar-2.s
index 679ce517baf..f185c43c175 100644
--- a/gas/testsuite/gas/i386/x86-64-avx-scalar-2.s
+++ b/gas/testsuite/gas/i386/x86-64-avx-scalar-2.s
@@ -1,6 +1,5 @@
 # Check VEX.128 scalar instructions with -mavxscalar=256 -msse2avx
 
-	.allow_index_reg
 	.text
 _start:
 	movd %xmm4,(%rcx)
diff --git a/gas/testsuite/gas/i386/x86-64-avx-swap.s b/gas/testsuite/gas/i386/x86-64-avx-swap.s
index 5afe5ccba26..b269276cdb9 100644
--- a/gas/testsuite/gas/i386/x86-64-avx-swap.s
+++ b/gas/testsuite/gas/i386/x86-64-avx-swap.s
@@ -1,6 +1,5 @@
 # Check 64bit instructions with encoding options
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-avx-vnni-int8.s b/gas/testsuite/gas/i386/x86-64-avx-vnni-int8.s
index bc9145b26f6..f93f4238f55 100644
--- a/gas/testsuite/gas/i386/x86-64-avx-vnni-int8.s
+++ b/gas/testsuite/gas/i386/x86-64-avx-vnni-int8.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX-VNNI-INT8 instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpdpbssd	%ymm8, %ymm9, %ymm10	 #AVX-VNNI-INT8
diff --git a/gas/testsuite/gas/i386/x86-64-avx-vnni.s b/gas/testsuite/gas/i386/x86-64-avx-vnni.s
index 9c57e6f6a97..8d3ce633561 100644
--- a/gas/testsuite/gas/i386/x86-64-avx-vnni.s
+++ b/gas/testsuite/gas/i386/x86-64-avx-vnni.s
@@ -1,5 +1,3 @@
-	.allow_index_reg
-
 .macro test_insn mnemonic
 	\mnemonic	 %xmm12, %xmm4, %xmm2
 	{evex} \mnemonic %xmm12, %xmm4, %xmm2
diff --git a/gas/testsuite/gas/i386/x86-64-avx-wig.s b/gas/testsuite/gas/i386/x86-64-avx-wig.s
index 6bd3911de1c..df7b6de7132 100644
--- a/gas/testsuite/gas/i386/x86-64-avx-wig.s
+++ b/gas/testsuite/gas/i386/x86-64-avx-wig.s
@@ -1,6 +1,5 @@
 # Check AVX WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaddpd %ymm4,%ymm6,%ymm2
diff --git a/gas/testsuite/gas/i386/x86-64-avx2-wig.s b/gas/testsuite/gas/i386/x86-64-avx2-wig.s
index a42cb849483..8c723d58595 100644
--- a/gas/testsuite/gas/i386/x86-64-avx2-wig.s
+++ b/gas/testsuite/gas/i386/x86-64-avx2-wig.s
@@ -1,6 +1,5 @@
 # Check AVX2 WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vmovntdqa (%rcx),%ymm4
diff --git a/gas/testsuite/gas/i386/x86-64-avx2.s b/gas/testsuite/gas/i386/x86-64-avx2.s
index 0a844829753..3aa29490c37 100644
--- a/gas/testsuite/gas/i386/x86-64-avx2.s
+++ b/gas/testsuite/gas/i386/x86-64-avx2.s
@@ -1,6 +1,5 @@
 # Check x86-64 AVX2 instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-avx256int.s b/gas/testsuite/gas/i386/x86-64-avx256int.s
index 86d0b600a25..e8c3eb536a5 100644
--- a/gas/testsuite/gas/i386/x86-64-avx256int.s
+++ b/gas/testsuite/gas/i386/x86-64-avx256int.s
@@ -1,6 +1,5 @@
 # Check x86-64 256it integer AVX instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps.s b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps.s
index 5ba28152dbb..07dac3241cc 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512_4FMAPS instructions
 
-	.allow_index_reg
 	.text
 _start:
 	v4fmaddps	(%rcx), %zmm8, %zmm1	 # AVX512_4FMAPS
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_4vnniw.s b/gas/testsuite/gas/i386/x86-64-avx512_4vnniw.s
index b4295f93cb8..adec949100e 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_4vnniw.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_4vnniw.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512_4VNNIW instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vp4dpwssd	(%rcx), %zmm8, %zmm1	 # AVX512_4VNNIW
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_bf16.s b/gas/testsuite/gas/i386/x86-64-avx512_bf16.s
index 59f9636945b..02b34d1bf72 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_bf16.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_bf16.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512_BF16 instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vcvtne2ps2bf16	%zmm28, %zmm29, %zmm30	 #AVX512_BF16
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl-inval.l b/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl-inval.l
index dfd21d6692b..badbc63d8fc 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl-inval.l
+++ b/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl-inval.l
@@ -1,7 +1,7 @@
 .*: Assembler messages:
+.*:5: Error: .*
 .*:6: Error: .*
 .*:7: Error: .*
-.*:8: Error: .*
+.*:10: Error: .*
 .*:11: Error: .*
 .*:12: Error: .*
-.*:13: Error: .*
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl-inval.s b/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl-inval.s
index 045511b8034..9b611d3bbe8 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl-inval.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl-inval.s
@@ -1,6 +1,5 @@
 # Check illegal 64bit AVX512{BF16,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vcvtneps2bf16	0x10000000(%rbp, %r14, 8), %xmm30{%k7}	 #AVX512{BF16,VL} MASK_ENABLING
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl.s b/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl.s
index 2ac32c3da9b..09e7e0a23e1 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_bf16_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{BF16,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vcvtne2ps2bf16	%ymm28, %ymm29, %ymm30	 #AVX512{BF16,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-bcast.l b/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-bcast.l
index cec63a68fe1..ab57eca4dea 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-bcast.l
+++ b/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-bcast.l
@@ -1,27 +1,27 @@
 .*: Assembler messages:
-.*:6: Error: unsupported broadcast for `vcvtpd2ph'
-.*:7: Error: unsupported broadcast for `vcvtuqq2ph'
-.*:8: Error: unsupported broadcast for `vcvtdq2ph'
-.*:9: Error: unsupported broadcast for `vcvtudq2ph'
-.*:10: Error: unsupported broadcast for `vcmpph'
-.*:11: Error: Unsupported broadcast: `\{1to64\}'
-.*:12: Error: unsupported broadcast for `vfmadd132ph'
-.*:13: Error: unsupported broadcast for `vfcmaddcph'
-.*:14: Error: unsupported broadcast for `vfcmulcph'
-.*:15: Error: unsupported broadcast for `vcvtdq2ph'
-.*:16: Error: unsupported broadcast for `vfmaddcph'
+.*:5: Error: unsupported broadcast for `vcvtpd2ph'
+.*:6: Error: unsupported broadcast for `vcvtuqq2ph'
+.*:7: Error: unsupported broadcast for `vcvtdq2ph'
+.*:8: Error: unsupported broadcast for `vcvtudq2ph'
+.*:9: Error: unsupported broadcast for `vcmpph'
+.*:10: Error: Unsupported broadcast: `\{1to64\}'
+.*:11: Error: unsupported broadcast for `vfmadd132ph'
+.*:12: Error: unsupported broadcast for `vfcmaddcph'
+.*:13: Error: unsupported broadcast for `vfcmulcph'
+.*:14: Error: unsupported broadcast for `vcvtdq2ph'
+.*:15: Error: unsupported broadcast for `vfmaddcph'
+.*:16: Error: unsupported broadcast for `vfmulcph'
 .*:17: Error: unsupported broadcast for `vfmulcph'
-.*:18: Error: unsupported broadcast for `vfmulcph'
-.*:21: Error: unsupported broadcast for `vcvtpd2ph'
-.*:22: Error: unsupported broadcast for `vcvtuqq2ph'
-.*:23: Error: unsupported broadcast for `vcvtdq2ph'
-.*:24: Error: unsupported broadcast for `vcvtudq2ph'
-.*:25: Error: unsupported broadcast for `vcmpph'
-.*:26: Error: Unsupported broadcast: `\{1to64\}'
-.*:27: Error: unsupported broadcast for `vfmsubadd231ph'
-.*:28: Error: unsupported broadcast for `vfcmaddcph'
-.*:29: Error: unsupported broadcast for `vfcmulcph'
-.*:30: Error: unsupported broadcast for `vcvtdq2ph'
-.*:31: Error: unsupported broadcast for `vfcmaddcph'
+.*:20: Error: unsupported broadcast for `vcvtpd2ph'
+.*:21: Error: unsupported broadcast for `vcvtuqq2ph'
+.*:22: Error: unsupported broadcast for `vcvtdq2ph'
+.*:23: Error: unsupported broadcast for `vcvtudq2ph'
+.*:24: Error: unsupported broadcast for `vcmpph'
+.*:25: Error: Unsupported broadcast: `\{1to64\}'
+.*:26: Error: unsupported broadcast for `vfmsubadd231ph'
+.*:27: Error: unsupported broadcast for `vfcmaddcph'
+.*:28: Error: unsupported broadcast for `vfcmulcph'
+.*:29: Error: unsupported broadcast for `vcvtdq2ph'
+.*:30: Error: unsupported broadcast for `vfcmaddcph'
+.*:31: Error: unsupported broadcast for `vfmulcph'
 .*:32: Error: unsupported broadcast for `vfmulcph'
-.*:33: Error: unsupported broadcast for `vfmulcph'
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-bcast.s b/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-bcast.s
index 3ec8deb66f5..7b4db7d6aad 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-bcast.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-bcast.s
@@ -1,6 +1,5 @@
 # Check error for invalid {1toXX} and {2toXX} broadcasts.
 
-	.allow_index_reg
 	.text
 _start:
 	vcvtpd2ph (%ecx){1to16}, %xmm30
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-register.l b/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-register.l
index 4cff673fa1b..cf8111ea5a6 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-register.l
+++ b/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-register.l
@@ -1,11 +1,11 @@
 .*: Assembler messages:
+.*:5: Error: destination and source registers must be distinct for `vfcmaddcph'
 .*:6: Error: destination and source registers must be distinct for `vfcmaddcph'
 .*:7: Error: destination and source registers must be distinct for `vfcmaddcph'
-.*:8: Error: destination and source registers must be distinct for `vfcmaddcph'
-.*:9: Error: destination and source registers must be distinct for `vfcmaddcsh'
-.*:10: Error: destination and source registers must be distinct for `vfmaddcph'
-.*:11: Error: destination and source registers must be distinct for `vfmaddcsh'
-.*:12: Error: destination and source registers must be distinct for `vfcmulcph'
-.*:13: Error: destination and source registers must be distinct for `vfcmulcsh'
-.*:14: Error: destination and source registers must be distinct for `vfmulcph'
-.*:15: Error: destination and source registers must be distinct for `vfmulcsh'
+.*:8: Error: destination and source registers must be distinct for `vfcmaddcsh'
+.*:9: Error: destination and source registers must be distinct for `vfmaddcph'
+.*:10: Error: destination and source registers must be distinct for `vfmaddcsh'
+.*:11: Error: destination and source registers must be distinct for `vfcmulcph'
+.*:12: Error: destination and source registers must be distinct for `vfcmulcsh'
+.*:13: Error: destination and source registers must be distinct for `vfmulcph'
+.*:14: Error: destination and source registers must be distinct for `vfmulcsh'
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-register.s b/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-register.s
index 06b98922b40..adc8d552c89 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-register.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_fp16-inval-register.s
@@ -1,6 +1,5 @@
 # Check error for destination and source operands have the same register .
 
-	.allow_index_reg
 	.text
 _start:
 	vfcmaddcph 8128(%rcx), %zmm29, %zmm29
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_fp16.s b/gas/testsuite/gas/i386/x86-64-avx512_fp16.s
index af31a9e018d..f708cb574ab 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_fp16.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_fp16.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512-FP16 instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaddph	%zmm28, %zmm29, %zmm30	 #AVX512-FP16
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_fp16_pseudo_ops.s b/gas/testsuite/gas/i386/x86-64-avx512_fp16_pseudo_ops.s
index 167ea738107..f30a173c62c 100755
--- a/gas/testsuite/gas/i386/x86-64-avx512_fp16_pseudo_ops.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_fp16_pseudo_ops.s
@@ -1,6 +1,5 @@
 # Check 64bit VCM.*{PH,SH} instructions
 
-        .allow_index_reg
         .text
 _start:
 	vcmpeq_oqph	%zmm29, %zmm30, %k5
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_fp16_vl.s b/gas/testsuite/gas/i386/x86-64-avx512_fp16_vl.s
index 729ae8ccc61..181fa6950a6 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_fp16_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_fp16_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512-FP16,AVX512VL instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaddph	%ymm28, %ymm29, %ymm30	 #AVX512-FP16,AVX512VL
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_vpopcntdq.s b/gas/testsuite/gas/i386/x86-64-avx512_vpopcntdq.s
index 06e5ad2a5cf..70ae6f35797 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512_vpopcntdq.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512_vpopcntdq.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512_VPOPCNTDQ instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpopcntd	%zmm29, %zmm30	 # AVX512_VPOPCNTDQ
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bitalg.s b/gas/testsuite/gas/i386/x86-64-avx512bitalg.s
index 73224e992d3..950ad116c5d 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bitalg.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512bitalg.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512BITALG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpshufbitqmb	%zmm28, %zmm29, %k5	 # AVX512BITALG
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bitalg_vl.s b/gas/testsuite/gas/i386/x86-64-avx512bitalg_vl.s
index 9425ad587f6..3d1225721bd 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bitalg_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512bitalg_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{BITALG,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpshufbitqmb	%xmm28, %xmm29, %k5	 # AVX512{BITALG,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bw-opts.s b/gas/testsuite/gas/i386/x86-64-avx512bw-opts.s
index c907c2ca002..9710ea58a87 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bw-opts.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512bw-opts.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512BW swap instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vmovdqu8	%zmm29, %zmm30	 # AVX512BW
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bw-wig.s b/gas/testsuite/gas/i386/x86-64-avx512bw-wig.s
index 1e9a20b0f94..71afd02c0b7 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bw-wig.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512bw-wig.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512BW WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpabsb	%zmm29, %zmm30	 # AVX512BW
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bw.s b/gas/testsuite/gas/i386/x86-64-avx512bw.s
index d04ddfb68d5..5bd257edc9c 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bw.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512bw.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512BW instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpabsb	%zmm29, %zmm30	 # AVX512BW
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bw_vl-opts.s b/gas/testsuite/gas/i386/x86-64-avx512bw_vl-opts.s
index c2c18658c7f..bc0f6c9a4c0 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bw_vl-opts.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512bw_vl-opts.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{BW,VL} swap instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vmovdqu8	%xmm29, %xmm30	 # AVX512{BW,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bw_vl-wig.s b/gas/testsuite/gas/i386/x86-64-avx512bw_vl-wig.s
index 8eef0cffdb4..e1f2f167800 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bw_vl-wig.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512bw_vl-wig.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{BW,VL} WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpabsb	%xmm29, %xmm30	 # AVX512{BW,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bw_vl.s b/gas/testsuite/gas/i386/x86-64-avx512bw_vl.s
index 243a596e82f..776f998204b 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bw_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512bw_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{BW,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpabsb	%xmm29, %xmm30	 # AVX512{BW,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512cd.s b/gas/testsuite/gas/i386/x86-64-avx512cd.s
index 832874ea322..87f73f006f5 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512cd.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512cd.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512CD instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-avx512cd_vl.s b/gas/testsuite/gas/i386/x86-64-avx512cd_vl.s
index f96d55e470f..cdde6292d93 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512cd_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512cd_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{CD,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpconflictd	%xmm29, %xmm30	 # AVX512{CD,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512dq-rcig.s b/gas/testsuite/gas/i386/x86-64-avx512dq-rcig.s
index f375308ab5b..64f323f18a3 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512dq-rcig.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512dq-rcig.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512DQ-RCIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vrangepd	$0xab, {sae}, %zmm28, %zmm29, %zmm30	 # AVX512DQ
diff --git a/gas/testsuite/gas/i386/x86-64-avx512dq.s b/gas/testsuite/gas/i386/x86-64-avx512dq.s
index 3e6ae535e9f..81669e44a2a 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512dq.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512dq.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512DQ instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vbroadcastf32x8	(%rcx), %zmm30	 # AVX512DQ
diff --git a/gas/testsuite/gas/i386/x86-64-avx512dq_vl.s b/gas/testsuite/gas/i386/x86-64-avx512dq_vl.s
index 788dda54059..7a748053cc9 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512dq_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512dq_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{DQ,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vbroadcastf64x2	(%rcx), %ymm30	 # AVX512{DQ,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512er-rcig.s b/gas/testsuite/gas/i386/x86-64-avx512er-rcig.s
index 7f02ec4cd4b..f7f2c907d6f 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512er-rcig.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512er-rcig.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512ER-RCIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vexp2ps	{sae}, %zmm29, %zmm30	 # AVX512ER
diff --git a/gas/testsuite/gas/i386/x86-64-avx512er.s b/gas/testsuite/gas/i386/x86-64-avx512er.s
index 53f2312d8d3..436f9bec9f7 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512er.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512er.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512ER instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-avx512f-opts.s b/gas/testsuite/gas/i386/x86-64-avx512f-opts.s
index 27898a198af..5e92ef3830f 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512f-opts.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512f-opts.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512F instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-avx512f-rcig.s b/gas/testsuite/gas/i386/x86-64-avx512f-rcig.s
index 0fc3ea8bd9e..1a2b4a68407 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512f-rcig.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512f-rcig.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512F-RCIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vcmpeqpd	{sae}, %zmm29, %zmm30, %k5	 # AVX512F
diff --git a/gas/testsuite/gas/i386/x86-64-avx512f.s b/gas/testsuite/gas/i386/x86-64-avx512f.s
index 705ea17a6a4..bef5c013111 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512f.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512f.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512F instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-avx512f_gfni.s b/gas/testsuite/gas/i386/x86-64-avx512f_gfni.s
index d5a4d08c4e7..cc88058bb21 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512f_gfni.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512f_gfni.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512F,GFNI instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vgf2p8affineqb	$0xab, %zmm28, %zmm29, %zmm30	 # AVX512F,GFNI
diff --git a/gas/testsuite/gas/i386/x86-64-avx512f_vaes.s b/gas/testsuite/gas/i386/x86-64-avx512f_vaes.s
index feadd92d8d3..ecbe7eeaae8 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512f_vaes.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512f_vaes.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512F,VAES instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaesdec	%zmm28, %zmm29, %zmm30	 # AVX512F,VAES
diff --git a/gas/testsuite/gas/i386/x86-64-avx512f_vl-opts.s b/gas/testsuite/gas/i386/x86-64-avx512f_vl-opts.s
index af91b753aaa..4e3f5ecce01 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512f_vl-opts.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512f_vl-opts.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{F,VL} swap instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vmovapd	%xmm29, %xmm30	 # AVX512{F,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512f_vl-wig.s b/gas/testsuite/gas/i386/x86-64-avx512f_vl-wig.s
index f2967b3569c..05c7f2903ca 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512f_vl-wig.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512f_vl-wig.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{F,VL} WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpmovsxbd	%xmm29, %xmm30	 # AVX512{F,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512f_vl.s b/gas/testsuite/gas/i386/x86-64-avx512f_vl.s
index 429b185686b..8b9d0f76588 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512f_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512f_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{F,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaddpd	%xmm28, %xmm29, %xmm30	 # AVX512{F,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512f_vpclmulqdq.s b/gas/testsuite/gas/i386/x86-64-avx512f_vpclmulqdq.s
index cbf0bdc7b12..ada90dc37e1 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512f_vpclmulqdq.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512f_vpclmulqdq.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512F,VPCLMULQDQ instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpclmulqdq	$0xab, %zmm24, %zmm23, %zmm26	 # AVX512F,VPCLMULQDQ
diff --git a/gas/testsuite/gas/i386/x86-64-avx512ifma.s b/gas/testsuite/gas/i386/x86-64-avx512ifma.s
index ff1f78a5734..29208146255 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512ifma.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512ifma.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512IFMA instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpmadd52luq	%zmm28, %zmm29, %zmm30	 # AVX512IFMA
diff --git a/gas/testsuite/gas/i386/x86-64-avx512ifma_vl.s b/gas/testsuite/gas/i386/x86-64-avx512ifma_vl.s
index e10238344dd..dbf1c2216b6 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512ifma_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512ifma_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{IFMA,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpmadd52luq	%xmm28, %xmm29, %xmm30	 # AVX512{IFMA,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512pf.s b/gas/testsuite/gas/i386/x86-64-avx512pf.s
index b53f803ed6f..dc37d4f213c 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512pf.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512pf.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512PF instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-avx512vbmi.s b/gas/testsuite/gas/i386/x86-64-avx512vbmi.s
index 9b93bfcd993..9c27eec75a2 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512vbmi.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512vbmi.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512VBMI instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpermb	%zmm28, %zmm29, %zmm30	 # AVX512VBMI
diff --git a/gas/testsuite/gas/i386/x86-64-avx512vbmi2.s b/gas/testsuite/gas/i386/x86-64-avx512vbmi2.s
index 1f6515309d2..0d3751ea1fc 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512vbmi2.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512vbmi2.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512VBMI2 instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpcompressb	%zmm30, (%rcx){%k7}	 # AVX512VBMI2
diff --git a/gas/testsuite/gas/i386/x86-64-avx512vbmi2_vl.s b/gas/testsuite/gas/i386/x86-64-avx512vbmi2_vl.s
index 84abe2b8aab..cc6edfd0903 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512vbmi2_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512vbmi2_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{VBMI2,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpcompressb	%xmm30, (%rcx){%k7}	 # AVX512{VBMI2,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512vbmi_vl.s b/gas/testsuite/gas/i386/x86-64-avx512vbmi_vl.s
index fa451dffa66..c56af842def 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512vbmi_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512vbmi_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{VBMI,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpermb	%xmm28, %xmm29, %xmm30	 # AVX512{VBMI,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512vl_gfni.s b/gas/testsuite/gas/i386/x86-64-avx512vl_gfni.s
index ea73c57de7f..9a97232348a 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512vl_gfni.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512vl_gfni.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512VL,GFNI instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vgf2p8affineqb	$0xab, %xmm28, %xmm29, %xmm30	 # AVX512VL,GFNI
diff --git a/gas/testsuite/gas/i386/x86-64-avx512vl_vaes.s b/gas/testsuite/gas/i386/x86-64-avx512vl_vaes.s
index 0b5b111b527..17d1d18cde7 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512vl_vaes.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512vl_vaes.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512VL,VAES instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vaesdec	%xmm28, %xmm29, %xmm30	 # AVX512VL,VAES
diff --git a/gas/testsuite/gas/i386/x86-64-avx512vl_vpclmulqdq.s b/gas/testsuite/gas/i386/x86-64-avx512vl_vpclmulqdq.s
index c5c04c8e274..1a96fbe5a20 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512vl_vpclmulqdq.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512vl_vpclmulqdq.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512VL,VPCLMULQDQ instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpclmulqdq	$0xab, %xmm18, %xmm29, %xmm25	 # AVX512VL,VPCLMULQDQ
diff --git a/gas/testsuite/gas/i386/x86-64-avx512vnni.s b/gas/testsuite/gas/i386/x86-64-avx512vnni.s
index 8ae051c093f..072c4ffb1d0 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512vnni.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512vnni.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512VNNI instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpdpwssd	%zmm17, %zmm18, %zmm18	 # AVX512VNNI
diff --git a/gas/testsuite/gas/i386/x86-64-avx512vnni_vl.s b/gas/testsuite/gas/i386/x86-64-avx512vnni_vl.s
index 9c85ac7b156..152de6cfeb1 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512vnni_vl.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512vnni_vl.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX512{VNNI,VL} instructions
 
-	.allow_index_reg
 	.text
 _start:
 	vpdpwssd	%xmm20, %xmm22, %xmm26	 # AVX512{VNNI,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx_gfni.s b/gas/testsuite/gas/i386/x86-64-avx_gfni.s
index 7f56f8e00a7..c35cef7fb0e 100644
--- a/gas/testsuite/gas/i386/x86-64-avx_gfni.s
+++ b/gas/testsuite/gas/i386/x86-64-avx_gfni.s
@@ -1,7 +1,6 @@
 # Check AVX GFNI instructions
 
-.allow_index_reg
-.text
+	.text
 _start:
 	vgf2p8mulb %ymm4, %ymm5, %ymm6
 	vgf2p8mulb -123456(%rax,%r14,8), %ymm5, %ymm6
@@ -27,7 +26,7 @@ _start:
 	vgf2p8affineinvqb $123, -123456(%rax,%r14,8), %xmm5, %xmm6
 	vgf2p8affineinvqb $123, 126(%rdx), %xmm5, %xmm6
 
-.intel_syntax noprefix
+	.intel_syntax noprefix
 
 	vgf2p8mulb ymm6, ymm5, ymm4
 	vgf2p8mulb ymm6, ymm5, YMMWORD PTR [rax+r14*8-123456]
diff --git a/gas/testsuite/gas/i386/x86-64-bmi.s b/gas/testsuite/gas/i386/x86-64-bmi.s
index ef222c9d140..1e4f860bfa4 100644
--- a/gas/testsuite/gas/i386/x86-64-bmi.s
+++ b/gas/testsuite/gas/i386/x86-64-bmi.s
@@ -1,6 +1,5 @@
 # Check 64bit BMI instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-bmi2.s b/gas/testsuite/gas/i386/x86-64-bmi2.s
index 677421ff5a6..28d8f057f6a 100644
--- a/gas/testsuite/gas/i386/x86-64-bmi2.s
+++ b/gas/testsuite/gas/i386/x86-64-bmi2.s
@@ -1,6 +1,5 @@
 # Check 64bit BMI2 instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-cldemote.s b/gas/testsuite/gas/i386/x86-64-cldemote.s
index ecf203f53fb..693bc2664e3 100644
--- a/gas/testsuite/gas/i386/x86-64-cldemote.s
+++ b/gas/testsuite/gas/i386/x86-64-cldemote.s
@@ -1,6 +1,5 @@
 # Check 64bit CLDEMOTE instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-clflushopt.s b/gas/testsuite/gas/i386/x86-64-clflushopt.s
index 3e64d06f7c2..805fdad83d2 100644
--- a/gas/testsuite/gas/i386/x86-64-clflushopt.s
+++ b/gas/testsuite/gas/i386/x86-64-clflushopt.s
@@ -1,6 +1,5 @@
 # Check 64bit CLFLUSHOPT instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-clwb.s b/gas/testsuite/gas/i386/x86-64-clwb.s
index 817fe9ec555..48665055cf7 100644
--- a/gas/testsuite/gas/i386/x86-64-clwb.s
+++ b/gas/testsuite/gas/i386/x86-64-clwb.s
@@ -1,6 +1,5 @@
 # Check 64bit CLWB instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-cmpccxadd.s b/gas/testsuite/gas/i386/x86-64-cmpccxadd.s
index f2eb84a1a33..1bacd904f07 100644
--- a/gas/testsuite/gas/i386/x86-64-cmpccxadd.s
+++ b/gas/testsuite/gas/i386/x86-64-cmpccxadd.s
@@ -1,6 +1,5 @@
 # Check 64bit CMPccXADD instructions
 
-	.allow_index_reg
 	.text
 _start:
 	cmpbexadd	%eax, %ecx, 0x10000000(%rbp, %r14, 8)	 #CMPCCXADD
diff --git a/gas/testsuite/gas/i386/x86-64-enqcmd-inval.l b/gas/testsuite/gas/i386/x86-64-enqcmd-inval.l
index be8d48f5f1a..ee755baca81 100644
--- a/gas/testsuite/gas/i386/x86-64-enqcmd-inval.l
+++ b/gas/testsuite/gas/i386/x86-64-enqcmd-inval.l
@@ -1,13 +1,13 @@
 .* Assembler messages:
+.*5: Error: invalid register operand size for `enqcmd'
 .*6: Error: invalid register operand size for `enqcmd'
 .*7: Error: invalid register operand size for `enqcmd'
 .*8: Error: invalid register operand size for `enqcmd'
-.*9: Error: invalid register operand size for `enqcmd'
+.*9: Error: invalid register operand size for `enqcmds'
 .*10: Error: invalid register operand size for `enqcmds'
 .*11: Error: invalid register operand size for `enqcmds'
 .*12: Error: invalid register operand size for `enqcmds'
-.*13: Error: invalid register operand size for `enqcmds'
+.*15: Error: invalid register operand size for `enqcmd'
 .*16: Error: invalid register operand size for `enqcmd'
-.*17: Error: invalid register operand size for `enqcmd'
+.*17: Error: invalid register operand size for `enqcmds'
 .*18: Error: invalid register operand size for `enqcmds'
-.*19: Error: invalid register operand size for `enqcmds'
diff --git a/gas/testsuite/gas/i386/x86-64-enqcmd-inval.s b/gas/testsuite/gas/i386/x86-64-enqcmd-inval.s
index 6dd5c9c1820..339455e57f6 100644
--- a/gas/testsuite/gas/i386/x86-64-enqcmd-inval.s
+++ b/gas/testsuite/gas/i386/x86-64-enqcmd-inval.s
@@ -1,6 +1,5 @@
 # Check error for ENQCMD[S] 64-bit instructions
 
-	.allow_index_reg
 	.text
 _start:
 	enqcmd (%esi),%rax
diff --git a/gas/testsuite/gas/i386/x86-64-enqcmd.s b/gas/testsuite/gas/i386/x86-64-enqcmd.s
index 9abbdaea507..77535cdbd01 100644
--- a/gas/testsuite/gas/i386/x86-64-enqcmd.s
+++ b/gas/testsuite/gas/i386/x86-64-enqcmd.s
@@ -1,6 +1,5 @@
 # Check ENQCMD[S] 64-bit instructions
 
-	.allow_index_reg
 	.text
 _start:
 	enqcmd (%rcx),%rax
diff --git a/gas/testsuite/gas/i386/x86-64-evex-lig-2.s b/gas/testsuite/gas/i386/x86-64-evex-lig-2.s
index 9c64f6b2c2b..830c4d81edb 100644
--- a/gas/testsuite/gas/i386/x86-64-evex-lig-2.s
+++ b/gas/testsuite/gas/i386/x86-64-evex-lig-2.s
@@ -1,6 +1,5 @@
 # Check EVEX non-LIG instructions with with -mevexlig=256
 
-	.allow_index_reg
 	.text
 _start:
 	{evex} vmovd %xmm4,(%rcx)
diff --git a/gas/testsuite/gas/i386/x86-64-evex-lig.s b/gas/testsuite/gas/i386/x86-64-evex-lig.s
index 28e6607de6a..05b80fd57af 100644
--- a/gas/testsuite/gas/i386/x86-64-evex-lig.s
+++ b/gas/testsuite/gas/i386/x86-64-evex-lig.s
@@ -1,6 +1,5 @@
 # Check EVEX LIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-evex-wig.s b/gas/testsuite/gas/i386/x86-64-evex-wig.s
index 8dee163adea..e80d02faa1c 100644
--- a/gas/testsuite/gas/i386/x86-64-evex-wig.s
+++ b/gas/testsuite/gas/i386/x86-64-evex-wig.s
@@ -1,6 +1,5 @@
 # Check EVEX WIG instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-evex-wig2.s b/gas/testsuite/gas/i386/x86-64-evex-wig2.s
index 5fb1782d8f4..b3a0507a1fc 100644
--- a/gas/testsuite/gas/i386/x86-64-evex-wig2.s
+++ b/gas/testsuite/gas/i386/x86-64-evex-wig2.s
@@ -1,6 +1,5 @@
 # Check non-WIG EVEX instructions with -mevexwig=1
 
-	.allow_index_reg
 	.text
 _start:
 	vcvtsi2ss %eax, {rd-sae}, %xmm25, %xmm6
diff --git a/gas/testsuite/gas/i386/x86-64-fma-scalar.s b/gas/testsuite/gas/i386/x86-64-fma-scalar.s
index 422ce77f570..40625f8bf6e 100644
--- a/gas/testsuite/gas/i386/x86-64-fma-scalar.s
+++ b/gas/testsuite/gas/i386/x86-64-fma-scalar.s
@@ -1,6 +1,5 @@
 # Check 64bit AVX scalar instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-fma.s b/gas/testsuite/gas/i386/x86-64-fma.s
index a7d1e7a9136..410bf51a9c6 100644
--- a/gas/testsuite/gas/i386/x86-64-fma.s
+++ b/gas/testsuite/gas/i386/x86-64-fma.s
@@ -1,6 +1,5 @@
 # Check 64bit FMA instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-fma4.s b/gas/testsuite/gas/i386/x86-64-fma4.s
index df6e3d3fb90..028ac97ab3e 100644
--- a/gas/testsuite/gas/i386/x86-64-fma4.s
+++ b/gas/testsuite/gas/i386/x86-64-fma4.s
@@ -1,6 +1,5 @@
 # Check 64bit FMA4 instructions
 	
-	.allow_index_reg
 	.text
 _start:
 	
diff --git a/gas/testsuite/gas/i386/x86-64-fred.s b/gas/testsuite/gas/i386/x86-64-fred.s
index 0e5d3d3d469..c4cce20bb53 100644
--- a/gas/testsuite/gas/i386/x86-64-fred.s
+++ b/gas/testsuite/gas/i386/x86-64-fred.s
@@ -1,6 +1,5 @@
 # Check 64bit FRED instructions
 
-	.allow_index_reg
 	.text
 _start:
 	erets		 #FRED
diff --git a/gas/testsuite/gas/i386/x86-64-gfni.s b/gas/testsuite/gas/i386/x86-64-gfni.s
index 618e649bb02..882043f7fa8 100644
--- a/gas/testsuite/gas/i386/x86-64-gfni.s
+++ b/gas/testsuite/gas/i386/x86-64-gfni.s
@@ -1,6 +1,5 @@
 # Check 64bit GFNI instructions
 
-	.allow_index_reg
 	.text
 _start:
 	gf2p8mulb %xmm4, %xmm5
diff --git a/gas/testsuite/gas/i386/x86-64-hle.s b/gas/testsuite/gas/i386/x86-64-hle.s
index 035c4ac51e6..8a78ea46e14 100644
--- a/gas/testsuite/gas/i386/x86-64-hle.s
+++ b/gas/testsuite/gas/i386/x86-64-hle.s
@@ -1,6 +1,5 @@
 # Check 64bit HLE instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-lkgs.s b/gas/testsuite/gas/i386/x86-64-lkgs.s
index 546bbcc580a..a02d3a7446a 100644
--- a/gas/testsuite/gas/i386/x86-64-lkgs.s
+++ b/gas/testsuite/gas/i386/x86-64-lkgs.s
@@ -1,6 +1,5 @@
 # Check 64bit LKGS instructions
 
-	.allow_index_reg
 	.text
 _start:
 	lkgs	%r12	 #LKGS
diff --git a/gas/testsuite/gas/i386/x86-64-lwp.s b/gas/testsuite/gas/i386/x86-64-lwp.s
index f0166238751..7c15698c028 100644
--- a/gas/testsuite/gas/i386/x86-64-lwp.s
+++ b/gas/testsuite/gas/i386/x86-64-lwp.s
@@ -1,6 +1,5 @@
 # Check 64bit LWP instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-movdir.s b/gas/testsuite/gas/i386/x86-64-movdir.s
index 79f2977af8c..2b1ec92df05 100644
--- a/gas/testsuite/gas/i386/x86-64-movdir.s
+++ b/gas/testsuite/gas/i386/x86-64-movdir.s
@@ -1,6 +1,5 @@
 # Check MOVDIR[I,64B] 64-bit instructions
 
-	.allow_index_reg
 	.text
 _start:
 	movdiri %rax, (%rcx)
diff --git a/gas/testsuite/gas/i386/x86-64-movdir64b-reg.l b/gas/testsuite/gas/i386/x86-64-movdir64b-reg.l
index 2f0e13d6a53..e54ac2bc4b4 100644
--- a/gas/testsuite/gas/i386/x86-64-movdir64b-reg.l
+++ b/gas/testsuite/gas/i386/x86-64-movdir64b-reg.l
@@ -1,7 +1,7 @@
 .*: Assembler messages:
+.*:5: Error: invalid register operand size for `movdir64b'
 .*:6: Error: invalid register operand size for `movdir64b'
 .*:7: Error: invalid register operand size for `movdir64b'
 .*:8: Error: invalid register operand size for `movdir64b'
-.*:9: Error: invalid register operand size for `movdir64b'
+.*:11: Error: invalid register operand size for `movdir64b'
 .*:12: Error: invalid register operand size for `movdir64b'
-.*:13: Error: invalid register operand size for `movdir64b'
diff --git a/gas/testsuite/gas/i386/x86-64-movdir64b-reg.s b/gas/testsuite/gas/i386/x86-64-movdir64b-reg.s
index 8697a876010..3cc328111ef 100644
--- a/gas/testsuite/gas/i386/x86-64-movdir64b-reg.s
+++ b/gas/testsuite/gas/i386/x86-64-movdir64b-reg.s
@@ -1,6 +1,5 @@
 # Check error for MOVDIR64B 32-bit instructions
 
-	.allow_index_reg
 	.text
 _start:
 	movdir64b (%esi),%rax
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-inval-1.l b/gas/testsuite/gas/i386/x86-64-mpx-inval-1.l
index 361de10cea1..c83ea76148d 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-inval-1.l
+++ b/gas/testsuite/gas/i386/x86-64-mpx-inval-1.l
@@ -1,34 +1,33 @@
 .*: Assembler messages:
+.*:3: Error: expecting valid branch instruction after `bnd'
 .*:4: Error: expecting valid branch instruction after `bnd'
 .*:5: Error: expecting valid branch instruction after `bnd'
 .*:6: Error: expecting valid branch instruction after `bnd'
-.*:7: Error: expecting valid branch instruction after `bnd'
+.*:9: Error: expecting valid branch instruction after `bnd'
 .*:10: Error: expecting valid branch instruction after `bnd'
 .*:11: Error: expecting valid branch instruction after `bnd'
 .*:12: Error: expecting valid branch instruction after `bnd'
-.*:13: Error: expecting valid branch instruction after `bnd'
 GAS LISTING .*
 
 
 [ 	]*1[ 	]+\# MPX instructions
-[ 	]*2[ 	]+\.allow_index_reg
-[ 	]*3[ 	]+\.text
-[ 	]*4[ 	]+\?\?\?\? F24801C3 		bnd add %rax, %rbx  		\# Bad
+[ 	]*2[ 	]+\.text
+[ 	]*3[ 	]+\?\?\?\? F24801C3 		bnd add %rax, %rbx  		\# Bad
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*5[ 	]+\?\?\?\? 6766F2AB 		bnd stosw \(%edi\)    		\# Bad
+[ 	]*4[ 	]+\?\?\?\? 6766F2AB 		bnd stosw \(%edi\)    		\# Bad
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*6[ 	]+\?\?\?\? F2E2(00|0A)   		bnd loop foo
+[ 	]*5[ 	]+\?\?\?\? F2E2(00|0A)   		bnd loop foo
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*7[ 	]+\?\?\?\? F2E3(00|0D)   		bnd jrcxz foo
+[ 	]*6[ 	]+\?\?\?\? F2E3(00|0D)   		bnd jrcxz foo
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*8[ 	]+
-[ 	]*9[ 	]+\.intel_syntax noprefix
-[ 	]*10[ 	]+\?\?\?\? F24801C3 		bnd add rbx, rax		\# Bad
+[ 	]*7[ 	]+
+[ 	]*8[ 	]+\.intel_syntax noprefix
+[ 	]*9[ 	]+\?\?\?\? F24801C3 		bnd add rbx, rax		\# Bad
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*11[ 	]+\?\?\?\? 6766F2AB 		bnd stos WORD PTR \[edi]		\# Bad
+[ 	]*10[ 	]+\?\?\?\? 6766F2AB 		bnd stos WORD PTR \[edi]		\# Bad
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*12[ 	]+\?\?\?\? F2E2(00|18)   		bnd loop foo
+[ 	]*11[ 	]+\?\?\?\? F2E2(00|18)   		bnd loop foo
 .*  Error: expecting valid branch instruction after `bnd'
-[ 	]*13[ 	]+\?\?\?\? F2E3(00|1B)(  |90) 		bnd jrcxz foo
+[ 	]*12[ 	]+\?\?\?\? F2E3(00|1B)(  |90) 		bnd jrcxz foo
 .*  Error: expecting valid branch instruction after `bnd'
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-inval-1.s b/gas/testsuite/gas/i386/x86-64-mpx-inval-1.s
index afa04fc8f9f..2cee52f6f9c 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-inval-1.s
+++ b/gas/testsuite/gas/i386/x86-64-mpx-inval-1.s
@@ -1,5 +1,4 @@
 # MPX instructions
-	.allow_index_reg
 	.text
 	bnd add %rax, %rbx  		# Bad
 	bnd stosw (%edi)    		# Bad
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l b/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l
index 0fc4e31d51f..d830387208c 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l
+++ b/gas/testsuite/gas/i386/x86-64-mpx-inval-2.l
@@ -1,74 +1,73 @@
 .*: Assembler messages:
+.*:5: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:6: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:7: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:8: Error: `\(%rip\)' cannot be used here
-.*:9: Error: .*
+.*:7: Error: `\(%rip\)' cannot be used here
+.*:8: Error: .*
+.*:11: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:12: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:13: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
+.*:14: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:15: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:16: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
+.*:18: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:19: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:20: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
+.*:20: Error: .* `bndcl'
 .*:21: Error: .* `bndcl'
-.*:22: Error: .* `bndcl'
+.*:24: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:25: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:26: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
+.*:26: Error: .* `bndcu'
 .*:27: Error: .* `bndcu'
-.*:28: Error: .* `bndcu'
+.*:30: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:31: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:32: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
+.*:32: Error: .* `bndcn'
 .*:33: Error: .* `bndcn'
-.*:34: Error: .* `bndcn'
+.*:36: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:37: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:38: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:39: Warning: register scaling is being ignored here
-.*:40: Error: `base\(%rip\)' cannot be used here
-.*:41: Error: .*
+.*:38: Warning: register scaling is being ignored here
+.*:39: Error: `base\(%rip\)' cannot be used here
+.*:40: Error: .*
+.*:43: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:44: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:45: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:46: Warning: register scaling is being ignored here
-.*:47: Error: `base\(%rip\)' cannot be used here
-.*:48: Error: .*
+.*:45: Warning: register scaling is being ignored here
+.*:46: Error: `base\(%rip\)' cannot be used here
+.*:47: Error: .*
+.*:50: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:51: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:52: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:53: Error: `\[rip\]' cannot be used here
-.*:54: Error: .*
-.*:55: Error: `\[rax\+rsp\]' is not a valid base/index expression
+.*:52: Error: `\[rip\]' cannot be used here
+.*:53: Error: .*
+.*:54: Error: `\[rax\+rsp\]' is not a valid base/index expression
+.*:57: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:58: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:59: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
+.*:60: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:61: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:62: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
+.*:64: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:65: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:66: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
+.*:66: Error: .* `bndcl'
 .*:67: Error: .* `bndcl'
-.*:68: Error: .* `bndcl'
+.*:70: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:71: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:72: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
+.*:72: Error: .* `bndcu'
 .*:73: Error: .* `bndcu'
-.*:74: Error: .* `bndcu'
+.*:76: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:77: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:78: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
+.*:78: Error: .* `bndcn'
 .*:79: Error: .* `bndcn'
-.*:80: Error: .* `bndcn'
+.*:82: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:83: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:84: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:85: Warning: register scaling is being ignored here
-.*:86: Error: `\[rip\+base\]' cannot be used here
-.*:87: Error: .*
-.*:88: Error: `\[rax\+rsp\]' is not a valid base/index expression
+.*:84: Warning: register scaling is being ignored here
+.*:85: Error: `\[rip\+base\]' cannot be used here
+.*:86: Error: .*
+.*:87: Error: `\[rax\+rsp\]' is not a valid base/index expression
+.*:90: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
 .*:91: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:92: Error: 32-bit address isn't allowed in 64-bit MPX instructions.
-.*:93: Warning: register scaling is being ignored here
-.*:94: Error: `\[rip\+base\]' cannot be used here
-.*:95: Error: .*
-.*:96: Error: `\[rax\+rsp\]' is not a valid base/index expression
+.*:92: Warning: register scaling is being ignored here
+.*:93: Error: `\[rip\+base\]' cannot be used here
+.*:94: Error: .*
+.*:95: Error: `\[rax\+rsp\]' is not a valid base/index expression
 GAS LISTING .*
 
 
 [ 	]*1[ 	]+\# MPX instructions
-[ 	]*2[ 	]+\.allow_index_reg
-[ 	]*3[ 	]+\.text
-[ 	]*4[ 	]+
+[ 	]*2[ 	]+\.text
+[ 	]*3[ 	]+
 [ 	]*[1-9][0-9]*[ 	]+\#\#\# bndmk
 [ 	]*[1-9][0-9]*[ 	]+\?\?\?\? 67F30F1B 		bndmk \(%eax\), %bnd1
 .*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
@@ -122,10 +121,10 @@ GAS LISTING .*
 .*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*[1-9][0-9]*[ 	]+4C0103
 [ 	]*[1-9][0-9]*[ 	]+bndcn %ecx, %bnd1
+[ 	]*[1-9][0-9]*[ 	]+bndcn %cx, %bnd1
 GAS LISTING .*
 
 
-[ 	]*[1-9][0-9]*[ 	]+bndcn %cx, %bnd1
 [ 	]*[1-9][0-9]*[ 	]+
 [ 	]*[1-9][0-9]*[ 	]+\#\#\# bndstx
 [ 	]*[1-9][0-9]*[ 	]+\?\?\?\? 670F1B44 		bndstx %bnd0, 0x3\(%eax,%ebx,1\)
@@ -182,10 +181,10 @@ GAS LISTING .*
 [ 	]*[1-9][0-9]*[ 	]+\#\#\# bndcl
 [ 	]*[1-9][0-9]*[ 	]+\?\?\?\? 67F30F1A 		bndcl bnd1, \[eax\]
 .*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
+[ 	]*[1-9][0-9]*[ 	]+08
 GAS LISTING .*
 
 
-[ 	]*[1-9][0-9]*[ 	]+08
 [ 	]*[1-9][0-9]*[ 	]+\?\?\?\? 67F30F1A 		bndcl bnd1, \[edx\+1\*eax\+0x3\]
 .*  Error: 32-bit address isn't allowed in 64-bit MPX instructions\.
 [ 	]*[1-9][0-9]*[ 	]+4C0203
diff --git a/gas/testsuite/gas/i386/x86-64-mpx-inval-2.s b/gas/testsuite/gas/i386/x86-64-mpx-inval-2.s
index dc555eb3bac..6297c80615e 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx-inval-2.s
+++ b/gas/testsuite/gas/i386/x86-64-mpx-inval-2.s
@@ -1,5 +1,4 @@
 # MPX instructions
-	.allow_index_reg
 	.text
 
 	### bndmk
diff --git a/gas/testsuite/gas/i386/x86-64-mpx.s b/gas/testsuite/gas/i386/x86-64-mpx.s
index 2d328ac2077..452adcaabed 100644
--- a/gas/testsuite/gas/i386/x86-64-mpx.s
+++ b/gas/testsuite/gas/i386/x86-64-mpx.s
@@ -1,5 +1,4 @@
 # MPX instructions
-	.allow_index_reg
 	.text
 start:
 	### bndmk
diff --git a/gas/testsuite/gas/i386/x86-64-notrack.s b/gas/testsuite/gas/i386/x86-64-notrack.s
index 2681c2de89c..0146bbe60e2 100644
--- a/gas/testsuite/gas/i386/x86-64-notrack.s
+++ b/gas/testsuite/gas/i386/x86-64-notrack.s
@@ -1,6 +1,5 @@
 # Check 64bit NOTRACK prefix
 
-	.allow_index_reg
 	.text
 _start:
 	notrack call *%rax
diff --git a/gas/testsuite/gas/i386/x86-64-notrackbad.l b/gas/testsuite/gas/i386/x86-64-notrackbad.l
index 173b3d1508c..bf54666d5b2 100644
--- a/gas/testsuite/gas/i386/x86-64-notrackbad.l
+++ b/gas/testsuite/gas/i386/x86-64-notrackbad.l
@@ -1,31 +1,30 @@
 .*: Assembler messages:
+.*:5: Error: expecting indirect branch instruction after `notrack'
+.*:5: Warning: skipping prefixes on `call'
 .*:6: Error: expecting indirect branch instruction after `notrack'
-.*:6: Warning: skipping prefixes on `call'
-.*:7: Error: expecting indirect branch instruction after `notrack'
+.*:8: Error: same type of prefix used twice
 .*:9: Error: same type of prefix used twice
-.*:10: Error: same type of prefix used twice
+.*:12: Error: same type of prefix used twice
 .*:13: Error: same type of prefix used twice
-.*:14: Error: same type of prefix used twice
 GAS LISTING .*
 
 
 [ 	]*1[ 	]+\# Check 64bit unsupported NOTRACK prefix
 [ 	]*2[ 	]+
-[ 	]*3[ 	]+\.allow_index_reg
-[ 	]*4[ 	]+\.text
-[ 	]*5[ 	]+_start:
-[ 	]*6[ 	]+\?\?\?\? [0-9A-F]* 		notrack call foo
+[ 	]*3[ 	]+\.text
+[ 	]*4[ 	]+_start:
+[ 	]*5[ 	]+\?\?\?\? [0-9A-F]* 		notrack call foo
 \*\*\*\*  Error: expecting indirect branch instruction after `notrack'
 \*\*\*\*  Warning: skipping prefixes on `call'
-[ 	]*6[ 	]+[0-9A-F]*
-[ 	]*7[ 	]+\?\?\?\? [0-9A-F]* 		notrack jmp foo
+[ 	]*5[ 	]+[0-9A-F]*
+[ 	]*6[ 	]+\?\?\?\? [0-9A-F]* 		notrack jmp foo
 \*\*\*\*  Error: expecting indirect branch instruction after `notrack'
-[ 	]*7[ 	]+[0-9A-F]*
-[ 	]*8[ 	]+
-[ 	]*9[ 	]+fs notrack call \*%rax
-[ 	]*10[ 	]+notrack fs call \*%rax
-[ 	]*11[ 	]+
-[ 	]*12[ 	]+\.intel_syntax noprefix
-[ 	]*13[ 	]+fs notrack call rax
-[ 	]*14[ 	]+notrack fs call rax
+[ 	]*6[ 	]+[0-9A-F]*
+[ 	]*7[ 	]+
+[ 	]*8[ 	]+fs notrack call \*%rax
+[ 	]*9[ 	]+notrack fs call \*%rax
+[ 	]*10[ 	]+
+[ 	]*11[ 	]+\.intel_syntax noprefix
+[ 	]*12[ 	]+fs notrack call rax
+[ 	]*13[ 	]+notrack fs call rax
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-notrackbad.s b/gas/testsuite/gas/i386/x86-64-notrackbad.s
index 4f49328ac5b..bc781aac259 100644
--- a/gas/testsuite/gas/i386/x86-64-notrackbad.s
+++ b/gas/testsuite/gas/i386/x86-64-notrackbad.s
@@ -1,6 +1,5 @@
 # Check 64bit unsupported NOTRACK prefix
 
-	.allow_index_reg
 	.text
 _start:
 	notrack call foo
diff --git a/gas/testsuite/gas/i386/x86-64-optimize-1.s b/gas/testsuite/gas/i386/x86-64-optimize-1.s
index 80421553a78..ed48412cb58 100644
--- a/gas/testsuite/gas/i386/x86-64-optimize-1.s
+++ b/gas/testsuite/gas/i386/x86-64-optimize-1.s
@@ -1,6 +1,5 @@
 # Check 64bit instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	andq	$foo, %rax
diff --git a/gas/testsuite/gas/i386/x86-64-optimize-2.s b/gas/testsuite/gas/i386/x86-64-optimize-2.s
index 3d16a7875a3..1d1b8e14782 100644
--- a/gas/testsuite/gas/i386/x86-64-optimize-2.s
+++ b/gas/testsuite/gas/i386/x86-64-optimize-2.s
@@ -1,6 +1,5 @@
 # Check 64bit instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	vandnpd %zmm1, %zmm1, %zmm15{%k7}
diff --git a/gas/testsuite/gas/i386/x86-64-optimize-3.s b/gas/testsuite/gas/i386/x86-64-optimize-3.s
index bab99cf1eae..843c3e491a4 100644
--- a/gas/testsuite/gas/i386/x86-64-optimize-3.s
+++ b/gas/testsuite/gas/i386/x86-64-optimize-3.s
@@ -1,6 +1,5 @@
 # Check 64bit instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	testq	$0x7f, %rax
diff --git a/gas/testsuite/gas/i386/x86-64-optimize-4.s b/gas/testsuite/gas/i386/x86-64-optimize-4.s
index 97264e25d3f..988d9ec165f 100644
--- a/gas/testsuite/gas/i386/x86-64-optimize-4.s
+++ b/gas/testsuite/gas/i386/x86-64-optimize-4.s
@@ -1,6 +1,5 @@
 # Check 64bit instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	{nooptimize} testl $0x7f, %eax
diff --git a/gas/testsuite/gas/i386/x86-64-optimize-7.s b/gas/testsuite/gas/i386/x86-64-optimize-7.s
index 0112f47b030..dc6bb6b749e 100644
--- a/gas/testsuite/gas/i386/x86-64-optimize-7.s
+++ b/gas/testsuite/gas/i386/x86-64-optimize-7.s
@@ -1,6 +1,5 @@
 # Check 64bit instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	vandnpd %zmm1, %zmm1, %zmm15{%k7}
diff --git a/gas/testsuite/gas/i386/x86-64-optimize-7a.l b/gas/testsuite/gas/i386/x86-64-optimize-7a.l
index a0fd01d42d4..77bb769fb5c 100644
--- a/gas/testsuite/gas/i386/x86-64-optimize-7a.l
+++ b/gas/testsuite/gas/i386/x86-64-optimize-7a.l
@@ -1,52 +1,52 @@
 .*: Assembler messages:
+.*:5: Error: .*
 .*:6: Error: .*
 .*:7: Error: .*
 .*:8: Error: .*
-.*:9: Error: .*
+.*:10: Error: .*
 .*:11: Error: .*
 .*:12: Error: .*
 .*:13: Error: .*
-.*:14: Error: .*
+.*:15: Error: .*
 .*:16: Error: .*
 .*:17: Error: .*
 .*:18: Error: .*
-.*:19: Error: .*
+.*:20: Error: .*
 .*:21: Error: .*
 .*:22: Error: .*
 .*:23: Error: .*
-.*:24: Error: .*
+.*:25: Error: .*
 .*:26: Error: .*
 .*:27: Error: .*
 .*:28: Error: .*
-.*:29: Error: .*
+.*:30: Error: .*
 .*:31: Error: .*
 .*:32: Error: .*
 .*:33: Error: .*
-.*:34: Error: .*
+.*:35: Error: .*
 .*:36: Error: .*
 .*:37: Error: .*
 .*:38: Error: .*
-.*:39: Error: .*
+.*:40: Error: .*
 .*:41: Error: .*
 .*:42: Error: .*
 .*:43: Error: .*
-.*:44: Error: .*
+.*:45: Error: .*
 .*:46: Error: .*
 .*:47: Error: .*
 .*:48: Error: .*
-.*:49: Error: .*
+.*:50: Error: .*
 .*:51: Error: .*
 .*:52: Error: .*
 .*:53: Error: .*
-.*:54: Error: .*
+.*:55: Error: .*
 .*:56: Error: .*
 .*:57: Error: .*
 .*:58: Error: .*
-.*:59: Error: .*
+.*:60: Error: .*
 .*:61: Error: .*
 .*:62: Error: .*
 .*:63: Error: .*
-.*:64: Error: .*
 GAS LISTING .*
 
 
@@ -55,69 +55,68 @@ GAS LISTING .*
 [ 	]*3[ 	]+\.include "x86-64-optimize-7\.s"
 [ 	]*1[ 	]+\# Check 64bit instructions with optimized encoding
 [ 	]*2[ 	]+
-[ 	]*3[ 	]+\.allow_index_reg
-[ 	]*4[ 	]+\.text
-[ 	]*5[ 	]+_start:
-[ 	]*6[ 	]+vandnpd %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*7[ 	]+vandnpd %zmm1, %zmm1, %zmm15
-[ 	]*8[ 	]+vandnpd %zmm1, %zmm1, %zmm16
-[ 	]*9[ 	]+vandnpd %zmm17, %zmm17, %zmm1
-[ 	]*10[ 	]+
-[ 	]*11[ 	]+vandnps %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*12[ 	]+vandnps %zmm1, %zmm1, %zmm15
-[ 	]*13[ 	]+vandnps %zmm1, %zmm1, %zmm16
-[ 	]*14[ 	]+vandnps %zmm17, %zmm17, %zmm1
-[ 	]*15[ 	]+
-[ 	]*16[ 	]+vpandnd %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*17[ 	]+vpandnd %zmm1, %zmm1, %zmm15
-[ 	]*18[ 	]+vpandnd %zmm1, %zmm1, %zmm16
-[ 	]*19[ 	]+vpandnd %zmm17, %zmm17, %zmm1
-[ 	]*20[ 	]+
-[ 	]*21[ 	]+vpandnq %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*22[ 	]+vpandnq %zmm1, %zmm1, %zmm15
-[ 	]*23[ 	]+vpandnq %zmm1, %zmm1, %zmm16
-[ 	]*24[ 	]+vpandnq %zmm17, %zmm17, %zmm1
-[ 	]*25[ 	]+
-[ 	]*26[ 	]+vxorpd %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*27[ 	]+vxorpd %zmm1, %zmm1, %zmm15
-[ 	]*28[ 	]+vxorpd %zmm1, %zmm1, %zmm16
-[ 	]*29[ 	]+vxorpd %zmm17, %zmm17, %zmm1
-[ 	]*30[ 	]+
-[ 	]*31[ 	]+vxorps %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*32[ 	]+vxorps %zmm1, %zmm1, %zmm15
-[ 	]*33[ 	]+vxorps %zmm1, %zmm1, %zmm16
-[ 	]*34[ 	]+vxorps %zmm17, %zmm17, %zmm1
-[ 	]*35[ 	]+
-[ 	]*36[ 	]+vpxord %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*37[ 	]+vpxord %zmm1, %zmm1, %zmm15
-[ 	]*38[ 	]+vpxord %zmm1, %zmm1, %zmm16
-[ 	]*39[ 	]+vpxord %zmm17, %zmm17, %zmm1
-[ 	]*40[ 	]+
-[ 	]*41[ 	]+vpxorq %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*42[ 	]+vpxorq %zmm1, %zmm1, %zmm15
-[ 	]*43[ 	]+vpxorq %zmm1, %zmm1, %zmm16
-[ 	]*44[ 	]+vpxorq %zmm17, %zmm17, %zmm1
-[ 	]*45[ 	]+
-[ 	]*46[ 	]+vpsubb %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*47[ 	]+vpsubb %zmm1, %zmm1, %zmm15
-[ 	]*48[ 	]+vpsubb %zmm1, %zmm1, %zmm16
-[ 	]*49[ 	]+vpsubb %zmm17, %zmm17, %zmm1
-[ 	]*50[ 	]+
-[ 	]*51[ 	]+vpsubw %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*52[ 	]+vpsubw %zmm1, %zmm1, %zmm15
-[ 	]*53[ 	]+vpsubw %zmm1, %zmm1, %zmm16
-[ 	]*54[ 	]+vpsubw %zmm17, %zmm17, %zmm1
+[ 	]*3[ 	]+\.text
+[ 	]*4[ 	]+_start:
+[ 	]*5[ 	]+vandnpd %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*6[ 	]+vandnpd %zmm1, %zmm1, %zmm15
+[ 	]*7[ 	]+vandnpd %zmm1, %zmm1, %zmm16
+[ 	]*8[ 	]+vandnpd %zmm17, %zmm17, %zmm1
+[ 	]*9[ 	]+
+[ 	]*10[ 	]+vandnps %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*11[ 	]+vandnps %zmm1, %zmm1, %zmm15
+[ 	]*12[ 	]+vandnps %zmm1, %zmm1, %zmm16
+[ 	]*13[ 	]+vandnps %zmm17, %zmm17, %zmm1
+[ 	]*14[ 	]+
+[ 	]*15[ 	]+vpandnd %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*16[ 	]+vpandnd %zmm1, %zmm1, %zmm15
+[ 	]*17[ 	]+vpandnd %zmm1, %zmm1, %zmm16
+[ 	]*18[ 	]+vpandnd %zmm17, %zmm17, %zmm1
+[ 	]*19[ 	]+
+[ 	]*20[ 	]+vpandnq %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*21[ 	]+vpandnq %zmm1, %zmm1, %zmm15
+[ 	]*22[ 	]+vpandnq %zmm1, %zmm1, %zmm16
+[ 	]*23[ 	]+vpandnq %zmm17, %zmm17, %zmm1
+[ 	]*24[ 	]+
+[ 	]*25[ 	]+vxorpd %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*26[ 	]+vxorpd %zmm1, %zmm1, %zmm15
+[ 	]*27[ 	]+vxorpd %zmm1, %zmm1, %zmm16
+[ 	]*28[ 	]+vxorpd %zmm17, %zmm17, %zmm1
+[ 	]*29[ 	]+
+[ 	]*30[ 	]+vxorps %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*31[ 	]+vxorps %zmm1, %zmm1, %zmm15
+[ 	]*32[ 	]+vxorps %zmm1, %zmm1, %zmm16
+[ 	]*33[ 	]+vxorps %zmm17, %zmm17, %zmm1
+[ 	]*34[ 	]+
+[ 	]*35[ 	]+vpxord %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*36[ 	]+vpxord %zmm1, %zmm1, %zmm15
+[ 	]*37[ 	]+vpxord %zmm1, %zmm1, %zmm16
+[ 	]*38[ 	]+vpxord %zmm17, %zmm17, %zmm1
+[ 	]*39[ 	]+
+[ 	]*40[ 	]+vpxorq %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*41[ 	]+vpxorq %zmm1, %zmm1, %zmm15
+[ 	]*42[ 	]+vpxorq %zmm1, %zmm1, %zmm16
+[ 	]*43[ 	]+vpxorq %zmm17, %zmm17, %zmm1
+[ 	]*44[ 	]+
+[ 	]*45[ 	]+vpsubb %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*46[ 	]+vpsubb %zmm1, %zmm1, %zmm15
+[ 	]*47[ 	]+vpsubb %zmm1, %zmm1, %zmm16
+[ 	]*48[ 	]+vpsubb %zmm17, %zmm17, %zmm1
+[ 	]*49[ 	]+
+[ 	]*50[ 	]+vpsubw %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*51[ 	]+vpsubw %zmm1, %zmm1, %zmm15
+[ 	]*52[ 	]+vpsubw %zmm1, %zmm1, %zmm16
+[ 	]*53[ 	]+vpsubw %zmm17, %zmm17, %zmm1
+[ 	]*54[ 	]+
 GAS LISTING .*
 
 
-[ 	]*55[ 	]+
-[ 	]*56[ 	]+vpsubd %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*57[ 	]+vpsubd %zmm1, %zmm1, %zmm15
-[ 	]*58[ 	]+vpsubd %zmm1, %zmm1, %zmm16
-[ 	]*59[ 	]+vpsubd %zmm17, %zmm17, %zmm1
-[ 	]*60[ 	]+
-[ 	]*61[ 	]+vpsubq %zmm1, %zmm1, %zmm15\{%k7\}
-[ 	]*62[ 	]+vpsubq %zmm1, %zmm1, %zmm15
-[ 	]*63[ 	]+vpsubq %zmm1, %zmm1, %zmm16
-[ 	]*64[ 	]+vpsubq %zmm17, %zmm17, %zmm1
+[ 	]*55[ 	]+vpsubd %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*56[ 	]+vpsubd %zmm1, %zmm1, %zmm15
+[ 	]*57[ 	]+vpsubd %zmm1, %zmm1, %zmm16
+[ 	]*58[ 	]+vpsubd %zmm17, %zmm17, %zmm1
+[ 	]*59[ 	]+
+[ 	]*60[ 	]+vpsubq %zmm1, %zmm1, %zmm15\{%k7\}
+[ 	]*61[ 	]+vpsubq %zmm1, %zmm1, %zmm15
+[ 	]*62[ 	]+vpsubq %zmm1, %zmm1, %zmm16
+[ 	]*63[ 	]+vpsubq %zmm17, %zmm17, %zmm1
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-optimize-8.l b/gas/testsuite/gas/i386/x86-64-optimize-8.l
index c08b182d585..7f5727eb46f 100644
--- a/gas/testsuite/gas/i386/x86-64-optimize-8.l
+++ b/gas/testsuite/gas/i386/x86-64-optimize-8.l
@@ -1,12 +1,11 @@
 .*: Assembler messages:
-.*:6: Error: .*
+.*:5: Error: .*
 GAS LISTING .*
 
 
 [ 	]*1[ 	]+\# Check 64bit instructions with optimized encoding
 [ 	]*2[ 	]+
-[ 	]*3[ 	]+\.allow_index_reg
-[ 	]*4[ 	]+\.text
-[ 	]*5[ 	]+_start:
-[ 	]*6[ 	]+vmovdqa32	%ymm1, %ymm2
+[ 	]*3[ 	]+\.text
+[ 	]*4[ 	]+_start:
+[ 	]*5[ 	]+vmovdqa32	%ymm1, %ymm2
 #pass
diff --git a/gas/testsuite/gas/i386/x86-64-optimize-8.s b/gas/testsuite/gas/i386/x86-64-optimize-8.s
index 4b9865a91be..ca925208954 100644
--- a/gas/testsuite/gas/i386/x86-64-optimize-8.s
+++ b/gas/testsuite/gas/i386/x86-64-optimize-8.s
@@ -1,6 +1,5 @@
 # Check 64bit instructions with optimized encoding
 
-	.allow_index_reg
 	.text
 _start:
 	vmovdqa32	%ymm1, %ymm2
diff --git a/gas/testsuite/gas/i386/x86-64-opts.s b/gas/testsuite/gas/i386/x86-64-opts.s
index 74c39f0f545..c1e746642b0 100644
--- a/gas/testsuite/gas/i386/x86-64-opts.s
+++ b/gas/testsuite/gas/i386/x86-64-opts.s
@@ -1,6 +1,5 @@
 # Check 64bit instructions with encoding options
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-prefetchi-warn.s b/gas/testsuite/gas/i386/x86-64-prefetchi-warn.s
index 330ff31c756..74935e894e8 100644
--- a/gas/testsuite/gas/i386/x86-64-prefetchi-warn.s
+++ b/gas/testsuite/gas/i386/x86-64-prefetchi-warn.s
@@ -1,6 +1,5 @@
 # Check error for ICACHE-PREFETCH 64-bit instruction
 
-	.allow_index_reg
 	.text
 _start:
 	prefetchit0     0x12345678(%rax)
diff --git a/gas/testsuite/gas/i386/x86-64-prefetchi.s b/gas/testsuite/gas/i386/x86-64-prefetchi.s
index cc7c61e9a93..4b8bfec748c 100644
--- a/gas/testsuite/gas/i386/x86-64-prefetchi.s
+++ b/gas/testsuite/gas/i386/x86-64-prefetchi.s
@@ -1,6 +1,5 @@
 # Check 64bit PREFETCHI instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-prefetchwt1.s b/gas/testsuite/gas/i386/x86-64-prefetchwt1.s
index ae63b42240d..4c037f9901e 100644
--- a/gas/testsuite/gas/i386/x86-64-prefetchwt1.s
+++ b/gas/testsuite/gas/i386/x86-64-prefetchwt1.s
@@ -1,6 +1,5 @@
-# Check 64bit AVX512PF instructions
+# Check 64bit PREFETCHWT1 instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-raoint.s b/gas/testsuite/gas/i386/x86-64-raoint.s
index 645bcfc3c47..3954d7bac9e 100644
--- a/gas/testsuite/gas/i386/x86-64-raoint.s
+++ b/gas/testsuite/gas/i386/x86-64-raoint.s
@@ -1,6 +1,5 @@
 # Check 64bit RAO_INT instructions
 
-	.allow_index_reg
 	.text
 _start:
         aadd    %rdx, (%rax)     #RAO-INT
diff --git a/gas/testsuite/gas/i386/x86-64-sha.s b/gas/testsuite/gas/i386/x86-64-sha.s
index cc4d60e0394..cee97c28721 100644
--- a/gas/testsuite/gas/i386/x86-64-sha.s
+++ b/gas/testsuite/gas/i386/x86-64-sha.s
@@ -1,6 +1,5 @@
 # Check SHA instructions
 
-	.allow_index_reg
 	.text
 _start:
 	sha1rnds4 $9, %xmm2, %xmm1
diff --git a/gas/testsuite/gas/i386/x86-64-sse2avx.s b/gas/testsuite/gas/i386/x86-64-sse2avx.s
index dda8b7ec07d..3452de9c387 100644
--- a/gas/testsuite/gas/i386/x86-64-sse2avx.s
+++ b/gas/testsuite/gas/i386/x86-64-sse2avx.s
@@ -1,6 +1,5 @@
 # Check 64bit SSE to AVX instructions
 
-	.allow_index_reg
 	.text
 _start:
 # Tests for op mem64
diff --git a/gas/testsuite/gas/i386/x86-64-tbm.s b/gas/testsuite/gas/i386/x86-64-tbm.s
index 8937179f593..409e7e0c76a 100644
--- a/gas/testsuite/gas/i386/x86-64-tbm.s
+++ b/gas/testsuite/gas/i386/x86-64-tbm.s
@@ -1,4 +1,3 @@
-	.allow_index_reg
 	.text
 	
 _start:
diff --git a/gas/testsuite/gas/i386/x86-64-vaes.s b/gas/testsuite/gas/i386/x86-64-vaes.s
index 083e6590059..50e446f15ab 100644
--- a/gas/testsuite/gas/i386/x86-64-vaes.s
+++ b/gas/testsuite/gas/i386/x86-64-vaes.s
@@ -1,6 +1,5 @@
 # Check 64bit VAES instructions
 
-	.allow_index_reg
 	.text
 _start:
 # Tests for op ymm/mem256, ymm, ymm
diff --git a/gas/testsuite/gas/i386/x86-64-vex-lig-2.s b/gas/testsuite/gas/i386/x86-64-vex-lig-2.s
index 26338feb687..38ab8640680 100644
--- a/gas/testsuite/gas/i386/x86-64-vex-lig-2.s
+++ b/gas/testsuite/gas/i386/x86-64-vex-lig-2.s
@@ -1,6 +1,5 @@
 # Check VEX non-LIG instructions with with -mavxscalar=256
 
-	.allow_index_reg
 	.text
 _start:
 	        vmovd	%eax, %xmm0
diff --git a/gas/testsuite/gas/i386/x86-64-vp2intersect-inval-bcast.l b/gas/testsuite/gas/i386/x86-64-vp2intersect-inval-bcast.l
index 4ee46a3425c..21d5ab02fad 100644
--- a/gas/testsuite/gas/i386/x86-64-vp2intersect-inval-bcast.l
+++ b/gas/testsuite/gas/i386/x86-64-vp2intersect-inval-bcast.l
@@ -1,13 +1,13 @@
 .*: Assembler messages:
+.*:5: Error: unsupported broadcast for `vp2intersectd'
 .*:6: Error: unsupported broadcast for `vp2intersectd'
 .*:7: Error: unsupported broadcast for `vp2intersectd'
-.*:8: Error: unsupported broadcast for `vp2intersectd'
+.*:8: Error: unsupported broadcast for `vp2intersectq'
 .*:9: Error: unsupported broadcast for `vp2intersectq'
 .*:10: Error: unsupported broadcast for `vp2intersectq'
-.*:11: Error: unsupported broadcast for `vp2intersectq'
+.*:13: Error: unsupported broadcast for `vp2intersectd'
 .*:14: Error: unsupported broadcast for `vp2intersectd'
 .*:15: Error: unsupported broadcast for `vp2intersectd'
-.*:16: Error: unsupported broadcast for `vp2intersectd'
+.*:16: Error: unsupported broadcast for `vp2intersectq'
 .*:17: Error: unsupported broadcast for `vp2intersectq'
 .*:18: Error: unsupported broadcast for `vp2intersectq'
-.*:19: Error: unsupported broadcast for `vp2intersectq'
diff --git a/gas/testsuite/gas/i386/x86-64-vp2intersect-inval-bcast.s b/gas/testsuite/gas/i386/x86-64-vp2intersect-inval-bcast.s
index e5afe4c108b..a972190c189 100644
--- a/gas/testsuite/gas/i386/x86-64-vp2intersect-inval-bcast.s
+++ b/gas/testsuite/gas/i386/x86-64-vp2intersect-inval-bcast.s
@@ -1,6 +1,5 @@
 # Check error for invalid {1toXX} and {2toXX} broadcasts.
 
-	.allow_index_reg
 	.text
 _start:
 	vp2intersectd 8(%rax){1to8}, %zmm2, %k3
diff --git a/gas/testsuite/gas/i386/x86-64-vpclmulqdq.s b/gas/testsuite/gas/i386/x86-64-vpclmulqdq.s
index 653730237f9..0f08af6a8ce 100644
--- a/gas/testsuite/gas/i386/x86-64-vpclmulqdq.s
+++ b/gas/testsuite/gas/i386/x86-64-vpclmulqdq.s
@@ -1,6 +1,5 @@
+# Check 64bit VPCLMULQDQ instructions
 
-
-	.allow_index_reg
 	.text
 _start:
 	vpclmulqdq	$0xab, %ymm8, %ymm9, %ymm10
diff --git a/gas/testsuite/gas/i386/x86-64-xop.s b/gas/testsuite/gas/i386/x86-64-xop.s
index f63bebed519..a6af1201b22 100644
--- a/gas/testsuite/gas/i386/x86-64-xop.s
+++ b/gas/testsuite/gas/i386/x86-64-xop.s
@@ -1,6 +1,5 @@
 # Check XOP instructions (maxcombos=16, maxops=3, archbits=64, seed=1)
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-xsavec.s b/gas/testsuite/gas/i386/x86-64-xsavec.s
index 7d446d017ad..d42b10ac5ee 100644
--- a/gas/testsuite/gas/i386/x86-64-xsavec.s
+++ b/gas/testsuite/gas/i386/x86-64-xsavec.s
@@ -1,6 +1,5 @@
 # Check 64bit XSAVEC instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/x86-64-xsaves.s b/gas/testsuite/gas/i386/x86-64-xsaves.s
index f65b51c8638..94998fe3644 100644
--- a/gas/testsuite/gas/i386/x86-64-xsaves.s
+++ b/gas/testsuite/gas/i386/x86-64-xsaves.s
@@ -1,6 +1,5 @@
 # Check 64bit XSAVES instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/xop.s b/gas/testsuite/gas/i386/xop.s
index 0a8d411e6ef..63b98b35754 100644
--- a/gas/testsuite/gas/i386/xop.s
+++ b/gas/testsuite/gas/i386/xop.s
@@ -1,6 +1,5 @@
 # Check XOP instructions (maxcombos=16, maxops=3, archbits=32, seed=1)
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/xsavec.s b/gas/testsuite/gas/i386/xsavec.s
index 93415d856af..599854c0f87 100644
--- a/gas/testsuite/gas/i386/xsavec.s
+++ b/gas/testsuite/gas/i386/xsavec.s
@@ -1,6 +1,5 @@
 # Check 32bit XSAVEC instructions
 
-	.allow_index_reg
 	.text
 _start:
 
diff --git a/gas/testsuite/gas/i386/xsaves.s b/gas/testsuite/gas/i386/xsaves.s
index 697b3dd21b4..f91c1d7cbb4 100644
--- a/gas/testsuite/gas/i386/xsaves.s
+++ b/gas/testsuite/gas/i386/xsaves.s
@@ -1,6 +1,5 @@
 # Check 32bit XSAVES instructions
 
-	.allow_index_reg
 	.text
 _start:
 
