+2018-05-30 Amit Pawar <amit.pawar@amd.com>
+
+ * config/tc-i386.c (cpu_flag_init): Add CPU_ZNVER2_FLAGS.
+ * doc/c-i386.texi : Document znver2.
+ * gas/testsuite/gas/i386/arch-13.s: Updated for znver2.
+ * gas/testsuite/gas/i386/arch-13.d: Updated.
+ * gas/testsuite/gas/i386/arch-13-znver1.d: Updated.
+ * gas/testsuite/gas/i386/arch-13-znver2.d: New file.
+ * gas/testsuite/gas/i386/x86-64-arch-3.s: Updated for znver2.
+ * gas/testsuite/gas/i386/x86-64-arch-3.d: Updated.
+ * gas/testsuite/gas/i386/x86-64-arch-3-znver1.d: Updated.
+ * gas/testsuite/gas/i386/x86-64-arch-3-znver2.d: New file.
+ * gas/testsuite/gas/i386/i386.exp: Updated for new test.
+
2018-05-25 Alan Modra <amodra@gmail.com>
* po/POTFILES.in: Regenerate.
CPU_BDVER4_FLAGS, 0 },
{ STRING_COMMA_LEN ("znver1"), PROCESSOR_ZNVER,
CPU_ZNVER1_FLAGS, 0 },
+ { STRING_COMMA_LEN ("znver2"), PROCESSOR_ZNVER,
+ CPU_ZNVER2_FLAGS, 0 },
{ STRING_COMMA_LEN ("btver1"), PROCESSOR_BT,
CPU_BTVER1_FLAGS, 0 },
{ STRING_COMMA_LEN ("btver2"), PROCESSOR_BT,
@code{bdver3},
@code{bdver4},
@code{znver1},
+@code{znver2},
@code{btver1},
@code{btver2},
@code{generic32} and
@item @samp{corei7} @tab @samp{l1om} @tab @samp{k1om} @samp{iamcu}
@item @samp{k6} @tab @samp{k6_2} @tab @samp{athlon} @tab @samp{k8}
@item @samp{amdfam10} @tab @samp{bdver1} @tab @samp{bdver2} @tab @samp{bdver3}
-@item @samp{bdver4} @tab @samp{znver1} @tab @samp{btver1} @tab @samp{btver2}
-@item @samp{generic32} @tab @samp{generic64}
+@item @samp{bdver4} @tab @samp{znver1} @tab @samp{znver2} @tab @samp{btver1}
+@item @samp{btver2} @samp{generic32} @tab @samp{generic64}
@item @samp{.mmx} @tab @samp{.sse} @tab @samp{.sse2} @tab @samp{.sse3}
@item @samp{.ssse3} @tab @samp{.sse4.1} @tab @samp{.sse4.2} @tab @samp{.sse4}
@item @samp{.avx} @tab @samp{.vmx} @tab @samp{.smx} @tab @samp{.ept}
#source: arch-13.s
-#as: -march=znver1
+#as: -march=znver1+rdpid+clwb+wbnoinvd
#objdump: -dw
-#name: i386 arch 13 (znver1)
+#name: i386 arch 13 (znver1)
.*: file format .*
[ ]*[a-f0-9]+: 0f 01 fa monitorx %eax,%ecx,%edx
[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
+[ ]*[a-f0-9]+:[ ]*66 0f ae 31[ ]*clwb \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*66 0f ae b4 f4 c0 1d fe ff[ ]*clwb -0x1e240\(%esp,%esi,8\)
+[ ]*[a-f0-9]+:[ ]*f3 0f c7 f8[ ]*rdpid %eax
+[ ]*[a-f0-9]+:[ ]*f3 0f 09[ ]*wbnoinvd[ ]*
#pass
--- /dev/null
+#source: arch-13.s
+#as: -march=znver2
+#objdump: -dw
+#name: i386 arch 13 (znver2)
+
+.*: file format .*
+
+Disassembly of section .text:
+
+0+ <.text>:
+[ ]*[a-f0-9]+: 0f 01 ca clac[ ]*
+[ ]*[a-f0-9]+: 0f 01 cb stac[ ]*
+[ ]*[a-f0-9]+: 66 0f 38 f6 ca adcx %edx,%ecx
+[ ]*[a-f0-9]+: f3 0f 38 f6 ca adox %edx,%ecx
+[ ]*[a-f0-9]+: 0f c7 f8 rdseed %eax
+[ ]*[a-f0-9]+: 0f 01 fc clzero[ ]*
+[ ]*[a-f0-9]+: 0f c7 21 xsavec \(%ecx\)
+[ ]*[a-f0-9]+: 0f c7 29 xsaves \(%ecx\)
+[ ]*[a-f0-9]+: 66 0f ae 39 clflushopt \(%ecx\)
+[ ]*[a-f0-9]+: 0f 01 fa monitorx %eax,%ecx,%edx
+[ ]*[a-f0-9]+: 67 0f 01 fa monitorx %ax,%ecx,%edx
+[ ]*[a-f0-9]+: 0f 01 fa monitorx %eax,%ecx,%edx
+[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
+[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
+[ ]*[a-f0-9]+:[ ]*66 0f ae 31[ ]*clwb \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*66 0f ae b4 f4 c0 1d fe ff[ ]*clwb -0x1e240\(%esp,%esi,8\)
+[ ]*[a-f0-9]+:[ ]*f3 0f c7 f8[ ]*rdpid %eax
+[ ]*[a-f0-9]+:[ ]*f3 0f 09[ ]*wbnoinvd[ ]*
+#pass
-#as: -march=i686+smap+adx+rdseed+clzero+xsavec+xsaves+clflushopt+mwaitx
+#as: -march=i686+smap+adx+rdseed+clzero+xsavec+xsaves+clflushopt+mwaitx+rdpid+clwb+wbnoinvd
#objdump: -dw
#name: i386 arch 13
[ ]*[a-f0-9]+: 0f 01 fa monitorx %eax,%ecx,%edx
[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
[ ]*[a-f0-9]+: 0f 01 fb mwaitx %eax,%ecx,%ebx
+[ ]*[a-f0-9]+:[ ]*66 0f ae 31[ ]*clwb \(%ecx\)
+[ ]*[a-f0-9]+:[ ]*66 0f ae b4 f4 c0 1d fe ff[ ]*clwb -0x1e240\(%esp,%esi,8\)
+[ ]*[a-f0-9]+:[ ]*f3 0f c7 f8[ ]*rdpid %eax
+[ ]*[a-f0-9]+:[ ]*f3 0f 09[ ]*wbnoinvd[ ]*
#pass
# Test -march=
.text
+
#SMAP feature
-clac
-stac
+ clac
+ stac
#ADCX ADOX
-adcx %edx, %ecx
-adox %edx, %ecx
+ adcx %edx, %ecx
+ adox %edx, %ecx
#RDSEED
-rdseed %eax
+ rdseed %eax
#CLZERO
-clzero
+ clzero
#XSAVEC
-xsavec (%ecx)
+ xsavec (%ecx)
#XSAVES
-xsaves (%ecx)
+ xsaves (%ecx)
#CLFLUSHOPT
-clflushopt (%ecx)
-monitorx %eax, %ecx, %edx
-monitorx %ax, %ecx, %edx
-monitorx
-mwaitx %eax, %ecx, %ebx
-mwaitx
+ clflushopt (%ecx)
+ monitorx %eax, %ecx, %edx
+ monitorx %ax, %ecx, %edx
+ monitorx
+ mwaitx %eax, %ecx, %ebx
+ mwaitx
+
+#CLWB instruction
+ clwb (%ecx) # CLWB
+ clwb -123456(%esp,%esi,8) # CLWB
+
+# rdpid instruction
+ rdpid %eax
+
+# wbnoinvd instruction
+ wbnoinvd
run_dump_test "arch-10-bdver3"
run_dump_test "arch-10-bdver4"
run_dump_test "arch-13-znver1"
+ run_dump_test "arch-13-znver2"
run_dump_test "arch-10-btver1"
run_dump_test "arch-10-btver2"
run_list_test "arch-10-1" "-march=generic32 -I${srcdir}/$subdir -al"
run_dump_test "x86-64-arch-2-bdver3"
run_dump_test "x86-64-arch-2-bdver4"
run_dump_test "x86-64-arch-3-znver1"
+ run_dump_test "x86-64-arch-3-znver2"
run_dump_test "x86-64-arch-2-btver1"
run_dump_test "x86-64-arch-2-btver2"
run_list_test "x86-64-arch-2-1" "-march=generic64 -I${srcdir}/$subdir -al"
#source: x86-64-arch-3.s
-#as: -march=znver1
+#as: -march=znver1+rdpid+clwb+wbnoinvd
#objdump: -dw
#name: x86-64 arch 3 (znver1)
[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%rcx,%rdx
[ ]*[a-f0-9]+: 0f 01 fb mwaitx %rax,%rcx,%rbx
[ ]*[a-f0-9]+: 0f 01 fb mwaitx %rax,%rcx,%rbx
+[ ]*[a-f0-9]+:[ ]*66 0f ae 31[ ]*clwb \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*66 42 0f ae b4 f0 23 01 00 00[ ]*clwb 0x123\(%rax,%r14,8\)
+[ ]*[a-f0-9]+:[ ]*f3 0f c7 f8[ ]*rdpid %rax
+[ ]*[a-f0-9]+:[ ]*f3 41 0f c7 fa[ ]*rdpid %r10
+[ ]*[a-f0-9]+:[ ]*f3 0f 09[ ]*wbnoinvd[ ]*
#pass
--- /dev/null
+#source: x86-64-arch-3.s
+#as: -march=znver2
+#objdump: -dw
+#name: x86-64 arch 3 (znver2)
+
+.*: file format .*
+
+Disassembly of section .text:
+
+0+ <.text>:
+[ ]*[a-f0-9]+: 0f 01 ca clac[ ]*
+[ ]*[a-f0-9]+: 0f 01 cb stac[ ]*
+[ ]*[a-f0-9]+: 66 0f 38 f6 ca adcx %edx,%ecx
+[ ]*[a-f0-9]+: f3 0f 38 f6 ca adox %edx,%ecx
+[ ]*[a-f0-9]+: 0f c7 f8 rdseed %eax
+[ ]*[a-f0-9]+: 0f 01 fc clzero[ ]*
+[ ]*[a-f0-9]+: 44 0f 38 c8 00 sha1nexte \(%rax\),%xmm8
+[ ]*[a-f0-9]+: 48 0f c7 21 xsavec64 \(%rcx\)
+[ ]*[a-f0-9]+: 48 0f c7 29 xsaves64 \(%rcx\)
+[ ]*[a-f0-9]+: 66 0f ae 39 clflushopt \(%rcx\)
+[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%rcx,%rdx
+[ ]*[a-f0-9]+: 67 0f 01 fa monitorx %eax,%rcx,%rdx
+[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%rcx,%rdx
+[ ]*[a-f0-9]+: 0f 01 fb mwaitx %rax,%rcx,%rbx
+[ ]*[a-f0-9]+: 0f 01 fb mwaitx %rax,%rcx,%rbx
+[ ]*[a-f0-9]+:[ ]*66 0f ae 31[ ]*clwb \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*66 42 0f ae b4 f0 23 01 00 00[ ]*clwb 0x123\(%rax,%r14,8\)
+[ ]*[a-f0-9]+:[ ]*f3 0f c7 f8[ ]*rdpid %rax
+[ ]*[a-f0-9]+:[ ]*f3 41 0f c7 fa[ ]*rdpid %r10
+[ ]*[a-f0-9]+:[ ]*f3 0f 09[ ]*wbnoinvd[ ]*
+#pass
-#as: -march=generic64+smap+adx+rdseed+clzero+sha+xsavec+xsaves+clflushopt+mwaitx
+#as: -march=generic64+smap+adx+rdseed+clzero+sha+xsavec+xsaves+clflushopt+mwaitx+rdpid+clwb+wbnoinvd
#objdump: -dw
#name: x86-64 arch 3
[ ]*[a-f0-9]+: 0f 01 fa monitorx %rax,%rcx,%rdx
[ ]*[a-f0-9]+: 0f 01 fb mwaitx %rax,%rcx,%rbx
[ ]*[a-f0-9]+: 0f 01 fb mwaitx %rax,%rcx,%rbx
+[ ]*[a-f0-9]+:[ ]*66 0f ae 31[ ]*clwb \(%rcx\)
+[ ]*[a-f0-9]+:[ ]*66 42 0f ae b4 f0 23 01 00 00[ ]*clwb 0x123\(%rax,%r14,8\)
+[ ]*[a-f0-9]+:[ ]*f3 0f c7 f8[ ]*rdpid %rax
+[ ]*[a-f0-9]+:[ ]*f3 41 0f c7 fa[ ]*rdpid %r10
+[ ]*[a-f0-9]+:[ ]*f3 0f 09[ ]*wbnoinvd[ ]*
#pass
# Test -march=
.text
#SMAP
-clac
-stac
+ clac
+ stac
#ADCX ADOX
-adcx %edx, %ecx
-adox %edx, %ecx
+ adcx %edx, %ecx
+ adox %edx, %ecx
#RDSEED
-rdseed %eax
+ rdseed %eax
#CLZERO
-clzero
+ clzero
#SHA
-sha1nexte (%rax), %xmm8
+ sha1nexte (%rax), %xmm8
#XSAVEC
-xsavec64 (%rcx)
+ xsavec64 (%rcx)
#XSAVES
-xsaves64 (%rcx)
+ xsaves64 (%rcx)
#CLFLUSHOPT
-clflushopt (%rcx)
-monitorx %rax,%rcx,%rdx
-monitorx %eax,%rcx,%rdx
-monitorx
-mwaitx %rax,%rcx,%rbx
-mwaitx
+ clflushopt (%rcx)
+ monitorx %rax,%rcx,%rdx
+ monitorx %eax,%rcx,%rdx
+ monitorx
+ mwaitx %rax,%rcx,%rbx
+ mwaitx
+# clwb instruction
+ clwb (%rcx) # CLWB
+ clwb 0x123(%rax,%r14,8) # CLWB
+
+# rdpid instruction
+ rdpid %rax
+ rdpid %r10
+
+# wbnoinvd instruction
+ wbnoinvd
+2018-05-30 Amit Pawar <Amit.Pawar@amd.com>
+
+ * i386-gen.c (cpu_flag_init): Add CPU_ZNVER2_FLAGS.
+ * i386-init.h : Regenerated.
+
2018-05-25 Alan Modra <amodra@gmail.com>
* Makefile.in: Regenerate.
"CPU_BDVER3_FLAGS|CpuAVX2|CpuMovbe|CpuBMI2|CpuRdRnd|CpuMWAITX" },
{ "CPU_ZNVER1_FLAGS",
"CPU_GENERIC64_FLAGS|CpuFISTTP|CpuRdtscp|CpuCX16|CPU_AVX2_FLAGS|CpuSSE4A|CpuABM|CpuSVME|CpuAES|CpuPCLMUL|CpuLZCNT|CpuPRFCHW|CpuFMA|CpuBMI|CpuF16C|CpuXsaveopt|CpuFSGSBase|CpuMovbe|CpuBMI2|CpuRdRnd|CpuADX|CpuRdSeed|CpuSMAP|CpuSHA|CpuXSAVEC|CpuXSAVES|CpuClflushOpt|CpuCLZERO|CpuMWAITX" },
+ { "CPU_ZNVER2_FLAGS",
+ "CPU_ZNVER1_FLAGS|CpuRDPID|CpuWBNOINVD|CpuCLWB" },
{ "CPU_BTVER1_FLAGS",
"CPU_GENERIC64_FLAGS|CpuFISTTP|CpuCX16|CpuRdtscp|CPU_SSSE3_FLAGS|CpuSSE4A|CpuABM|CpuPRFCHW|CpuCX16|CpuClflush|CpuFISTTP|CpuSVME|CpuLZCNT" },
{ "CPU_BTVER2_FLAGS",
0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
0, 0, 0, 0, 0 } }
+#define CPU_ZNVER2_FLAGS \
+ { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, \
+ 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
+ 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, \
+ 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, \
+ 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, \
+ 0, 0, 0, 0, 0 } }
+
#define CPU_BTVER1_FLAGS \
{ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, \
0, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \