From: Andrea Di Biagio Date: Sun, 28 Apr 2019 10:54:45 +0000 (+0000) Subject: [MCA] Fix typo in AVX2 gather tests. NFC X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75bade7f3a58a80c9f079ac991c83dc0423f7731;p=llvm [MCA] Fix typo in AVX2 gather tests. NFC git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@359397 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/tools/llvm-mca/X86/Broadwell/resources-avx2.s b/test/tools/llvm-mca/X86/Broadwell/resources-avx2.s index 6286511acd0..e57395ac7e0 100644 --- a/test/tools/llvm-mca/X86/Broadwell/resources-avx2.s +++ b/test/tools/llvm-mca/X86/Broadwell/resources-avx2.s @@ -171,7 +171,7 @@ vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 @@ -573,7 +573,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: 1 5 0.50 * vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 1 5 0.50 * vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: 1 5 0.50 * vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: 1 5 0.50 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: 1 5 0.50 * vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: 1 5 0.50 * vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 1 5 0.50 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: 3 3 2.00 vphaddd %ymm0, %ymm1, %ymm2 @@ -893,7 +893,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: - - - - 0.50 0.50 - - - - vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - - - 0.50 0.50 - - - - vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: - - - - 0.50 0.50 - - - - vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: - - - - 0.50 0.50 - - - - vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: - - - - 0.50 0.50 - - - - vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: - - - - 0.50 0.50 - - - - vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - - - 0.50 0.50 - - - - vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: - - - 0.50 - - - 2.50 - - vphaddd %ymm0, %ymm1, %ymm2 diff --git a/test/tools/llvm-mca/X86/Generic/resources-avx2.s b/test/tools/llvm-mca/X86/Generic/resources-avx2.s index 301292d3f2f..f84d3bc1645 100644 --- a/test/tools/llvm-mca/X86/Generic/resources-avx2.s +++ b/test/tools/llvm-mca/X86/Generic/resources-avx2.s @@ -171,7 +171,7 @@ vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 @@ -573,7 +573,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: 1 5 0.50 * vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 1 5 0.50 * vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: 1 5 0.50 * vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: 1 5 0.50 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: 1 5 0.50 * vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: 1 5 0.50 * vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 1 5 0.50 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: 3 3 1.50 vphaddd %ymm0, %ymm1, %ymm2 @@ -891,7 +891,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: - - - - - - 0.50 0.50 vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - - - - - 0.50 0.50 vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: - - - - - - 0.50 0.50 vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: - - - - - - 0.50 0.50 vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: - - - - - - 0.50 0.50 vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: - - - - - - 0.50 0.50 vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - - - - - 0.50 0.50 vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: - - - 1.50 - 1.50 - - vphaddd %ymm0, %ymm1, %ymm2 diff --git a/test/tools/llvm-mca/X86/Haswell/resources-avx2.s b/test/tools/llvm-mca/X86/Haswell/resources-avx2.s index b7223d31c87..bd5e368a5f4 100644 --- a/test/tools/llvm-mca/X86/Haswell/resources-avx2.s +++ b/test/tools/llvm-mca/X86/Haswell/resources-avx2.s @@ -171,7 +171,7 @@ vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 @@ -573,7 +573,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: 12 26 2.67 * vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 20 27 4.00 * vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: 22 25 5.00 * vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: 22 24 5.00 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: 22 28 5.00 * vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: 14 23 3.33 * vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 22 24 5.00 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: 3 3 2.00 vphaddd %ymm0, %ymm1, %ymm2 @@ -893,7 +893,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: - - 4.00 1.50 1.00 1.00 - 3.50 1.00 - vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - 6.67 2.17 2.00 2.00 - 5.17 2.00 - vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: - - 8.67 2.17 2.00 2.00 - 5.17 2.00 - vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: - - 8.67 2.17 2.00 2.00 - 5.17 2.00 - vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: - - 8.67 2.17 2.00 2.00 - 5.17 2.00 - vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: - - 5.00 1.50 1.00 1.00 - 4.50 1.00 - vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - 8.67 2.17 2.00 2.00 - 5.17 2.00 - vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: - - - 0.50 - - - 2.50 - - vphaddd %ymm0, %ymm1, %ymm2 diff --git a/test/tools/llvm-mca/X86/SkylakeClient/resources-avx2.s b/test/tools/llvm-mca/X86/SkylakeClient/resources-avx2.s index 26b5ef97dc0..78e7ac0d876 100644 --- a/test/tools/llvm-mca/X86/SkylakeClient/resources-avx2.s +++ b/test/tools/llvm-mca/X86/SkylakeClient/resources-avx2.s @@ -171,7 +171,7 @@ vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 @@ -573,7 +573,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: 5 22 1.00 * vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 5 25 1.00 * vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: 5 22 1.00 * vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: 5 25 1.00 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: 5 25 1.00 * vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: 5 22 1.00 * vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 5 25 1.00 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: 3 3 2.00 vphaddd %ymm0, %ymm1, %ymm2 @@ -893,7 +893,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: - - 0.33 0.33 - - - 2.33 - - vphaddd %ymm0, %ymm1, %ymm2 diff --git a/test/tools/llvm-mca/X86/SkylakeServer/resources-avx2.s b/test/tools/llvm-mca/X86/SkylakeServer/resources-avx2.s index 823ed8e7e09..7d5257c2699 100644 --- a/test/tools/llvm-mca/X86/SkylakeServer/resources-avx2.s +++ b/test/tools/llvm-mca/X86/SkylakeServer/resources-avx2.s @@ -171,7 +171,7 @@ vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 @@ -573,7 +573,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: 5 22 1.00 * vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 5 25 1.00 * vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: 5 22 1.00 * vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: 5 25 1.00 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: 5 25 1.00 * vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: 5 22 1.00 * vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 5 25 1.00 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: 3 3 2.00 vphaddd %ymm0, %ymm1, %ymm2 @@ -893,7 +893,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - 1.33 0.33 1.00 1.00 - 1.33 - - vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: - - 0.33 0.33 - - - 2.33 - - vphaddd %ymm0, %ymm1, %ymm2 diff --git a/test/tools/llvm-mca/X86/Znver1/resources-avx2.s b/test/tools/llvm-mca/X86/Znver1/resources-avx2.s index 79eb2a44fcf..3d7f92fd36b 100644 --- a/test/tools/llvm-mca/X86/Znver1/resources-avx2.s +++ b/test/tools/llvm-mca/X86/Znver1/resources-avx2.s @@ -171,7 +171,7 @@ vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 @@ -573,7 +573,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: 1 100 0.25 * vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 1 100 0.25 * vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: 1 100 0.25 * vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: 1 100 0.25 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: 1 100 0.25 * vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: 1 100 0.25 * vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: 1 100 0.25 * vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: 1 100 0.25 vphaddd %ymm0, %ymm1, %ymm2 @@ -895,7 +895,7 @@ vpxor (%rax), %ymm1, %ymm2 # CHECK-NEXT: - - - - - - - - - - - - vpgatherdq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - - - - - - - - - - - vpgatherdq %ymm0, (%rax,%xmm1,2), %ymm2 # CHECK-NEXT: - - - - - - - - - - - - vpgatherqd %xmm0, (%rax,%xmm1,2), %xmm2 -# CHECK-NEXT: - - - - - - - - - - - - vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 +# CHECK-NEXT: - - - - - - - - - - - - vpgatherqd %xmm0, (%rax,%ymm1,2), %xmm2 # CHECK-NEXT: - - - - - - - - - - - - vpgatherqq %xmm0, (%rax,%xmm1,2), %xmm2 # CHECK-NEXT: - - - - - - - - - - - - vpgatherqq %ymm0, (%rax,%ymm1,2), %ymm2 # CHECK-NEXT: - - - - - - - - - - - - vphaddd %ymm0, %ymm1, %ymm2