From 0c64d465b48e7018a75c761b167aca067a88eff0 Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Sat, 12 Nov 2022 17:37:09 +0000 Subject: [MCA][X86] Add missing AVX-GFNI YMM test coverage --- .../llvm-mca/X86/AlderlakeP/resources-avxgfni.s | 23 +++++++++++++++++++++- .../tools/llvm-mca/X86/Generic/resources-avxgfni.s | 23 +++++++++++++++++++++- .../llvm-mca/X86/IceLakeServer/resources-avxgfni.s | 23 +++++++++++++++++++++- 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/llvm/test/tools/llvm-mca/X86/AlderlakeP/resources-avxgfni.s b/llvm/test/tools/llvm-mca/X86/AlderlakeP/resources-avxgfni.s index 8728310759d7..2f9fe5dd23a1 100644 --- a/llvm/test/tools/llvm-mca/X86/AlderlakeP/resources-avxgfni.s +++ b/llvm/test/tools/llvm-mca/X86/AlderlakeP/resources-avxgfni.s @@ -4,12 +4,21 @@ vgf2p8affineinvqb $0, %xmm0, %xmm1, %xmm2 vgf2p8affineinvqb $0, (%rax), %xmm1, %xmm2 +vgf2p8affineinvqb $0, %ymm0, %ymm1, %ymm2 +vgf2p8affineinvqb $0, (%rax), %ymm1, %ymm2 + vgf2p8affineqb $0, %xmm0, %xmm1, %xmm2 vgf2p8affineqb $0, (%rax), %xmm1, %xmm2 +vgf2p8affineqb $0, %ymm0, %ymm1, %ymm2 +vgf2p8affineqb $0, (%rax), %ymm1, %ymm2 + vgf2p8mulb %xmm0, %xmm1, %xmm2 vgf2p8mulb (%rax), %xmm1, %xmm2 +vgf2p8mulb %ymm0, %ymm1, %ymm2 +vgf2p8mulb (%rax), %ymm1, %ymm2 + # CHECK: Instruction Info: # CHECK-NEXT: [1]: #uOps # CHECK-NEXT: [2]: Latency @@ -21,10 +30,16 @@ vgf2p8mulb (%rax), %xmm1, %xmm2 # CHECK: [1] [2] [3] [4] [5] [6] Instructions: # CHECK-NEXT: 1 5 0.50 vgf2p8affineinvqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 2 12 0.50 * vgf2p8affineinvqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 1 5 0.50 vgf2p8affineinvqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 2 12 0.50 * vgf2p8affineinvqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: 1 5 0.50 vgf2p8affineqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 2 12 0.50 * vgf2p8affineqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 1 5 0.50 vgf2p8affineqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 2 12 0.50 * vgf2p8affineqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: 1 5 0.50 vgf2p8mulb %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 2 12 0.50 * vgf2p8mulb (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 1 5 0.50 vgf2p8mulb %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 2 12 0.50 * vgf2p8mulb (%rax), %ymm1, %ymm2 # CHECK: Resources: # CHECK-NEXT: [0] - ADLPPort00 @@ -43,13 +58,19 @@ vgf2p8mulb (%rax), %xmm1, %xmm2 # CHECK: Resource pressure per iteration: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] -# CHECK-NEXT: 3.00 3.00 1.00 1.00 - - - - - - - 1.00 - +# CHECK-NEXT: 6.00 6.00 2.00 2.00 - - - - - - - 2.00 - # CHECK: Resource pressure by instruction: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] Instructions: # CHECK-NEXT: 0.50 0.50 - - - - - - - - - - - vgf2p8affineinvqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 0.50 0.50 0.33 0.33 - - - - - - - 0.33 - vgf2p8affineinvqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 0.50 0.50 - - - - - - - - - - - vgf2p8affineinvqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 0.50 0.50 0.33 0.33 - - - - - - - 0.33 - vgf2p8affineinvqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: 0.50 0.50 - - - - - - - - - - - vgf2p8affineqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 0.50 0.50 0.33 0.33 - - - - - - - 0.33 - vgf2p8affineqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 0.50 0.50 - - - - - - - - - - - vgf2p8affineqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 0.50 0.50 0.33 0.33 - - - - - - - 0.33 - vgf2p8affineqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: 0.50 0.50 - - - - - - - - - - - vgf2p8mulb %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 0.50 0.50 0.33 0.33 - - - - - - - 0.33 - vgf2p8mulb (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 0.50 0.50 - - - - - - - - - - - vgf2p8mulb %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 0.50 0.50 0.33 0.33 - - - - - - - 0.33 - vgf2p8mulb (%rax), %ymm1, %ymm2 diff --git a/llvm/test/tools/llvm-mca/X86/Generic/resources-avxgfni.s b/llvm/test/tools/llvm-mca/X86/Generic/resources-avxgfni.s index 8f86f2a880b3..729e0921679e 100644 --- a/llvm/test/tools/llvm-mca/X86/Generic/resources-avxgfni.s +++ b/llvm/test/tools/llvm-mca/X86/Generic/resources-avxgfni.s @@ -4,12 +4,21 @@ vgf2p8affineinvqb $0, %xmm0, %xmm1, %xmm2 vgf2p8affineinvqb $0, (%rax), %xmm1, %xmm2 +vgf2p8affineinvqb $0, %ymm0, %ymm1, %ymm2 +vgf2p8affineinvqb $0, (%rax), %ymm1, %ymm2 + vgf2p8affineqb $0, %xmm0, %xmm1, %xmm2 vgf2p8affineqb $0, (%rax), %xmm1, %xmm2 +vgf2p8affineqb $0, %ymm0, %ymm1, %ymm2 +vgf2p8affineqb $0, (%rax), %ymm1, %ymm2 + vgf2p8mulb %xmm0, %xmm1, %xmm2 vgf2p8mulb (%rax), %xmm1, %xmm2 +vgf2p8mulb %ymm0, %ymm1, %ymm2 +vgf2p8mulb (%rax), %ymm1, %ymm2 + # CHECK: Instruction Info: # CHECK-NEXT: [1]: #uOps # CHECK-NEXT: [2]: Latency @@ -21,10 +30,16 @@ vgf2p8mulb (%rax), %xmm1, %xmm2 # CHECK: [1] [2] [3] [4] [5] [6] Instructions: # CHECK-NEXT: 1 5 1.00 vgf2p8affineinvqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 2 11 1.00 * vgf2p8affineinvqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 1 5 1.00 vgf2p8affineinvqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 2 11 1.00 * vgf2p8affineinvqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: 1 5 1.00 vgf2p8affineqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 2 11 1.00 * vgf2p8affineqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 1 5 1.00 vgf2p8affineqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 2 11 1.00 * vgf2p8affineqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: 1 1 0.50 vgf2p8mulb %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 2 7 0.50 * vgf2p8mulb (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 1 1 0.50 vgf2p8mulb %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 2 7 0.50 * vgf2p8mulb (%rax), %ymm1, %ymm2 # CHECK: Resources: # CHECK-NEXT: [0] - SBDivider @@ -38,13 +53,19 @@ vgf2p8mulb (%rax), %xmm1, %xmm2 # CHECK: Resource pressure per iteration: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6.0] [6.1] -# CHECK-NEXT: - - 4.00 1.00 - 1.00 1.50 1.50 +# CHECK-NEXT: - - 8.00 2.00 - 2.00 3.00 3.00 # CHECK: Resource pressure by instruction: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6.0] [6.1] Instructions: # CHECK-NEXT: - - 1.00 - - - - - vgf2p8affineinvqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: - - 1.00 - - - 0.50 0.50 vgf2p8affineinvqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: - - 1.00 - - - - - vgf2p8affineinvqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: - - 1.00 - - - 0.50 0.50 vgf2p8affineinvqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: - - 1.00 - - - - - vgf2p8affineqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: - - 1.00 - - - 0.50 0.50 vgf2p8affineqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: - - 1.00 - - - - - vgf2p8affineqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: - - 1.00 - - - 0.50 0.50 vgf2p8affineqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: - - - 0.50 - 0.50 - - vgf2p8mulb %xmm0, %xmm1, %xmm2 # CHECK-NEXT: - - - 0.50 - 0.50 0.50 0.50 vgf2p8mulb (%rax), %xmm1, %xmm2 +# CHECK-NEXT: - - - 0.50 - 0.50 - - vgf2p8mulb %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: - - - 0.50 - 0.50 0.50 0.50 vgf2p8mulb (%rax), %ymm1, %ymm2 diff --git a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-avxgfni.s b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-avxgfni.s index c2f6d293ebae..10176e18e5d0 100644 --- a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-avxgfni.s +++ b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-avxgfni.s @@ -4,12 +4,21 @@ vgf2p8affineinvqb $0, %xmm0, %xmm1, %xmm2 vgf2p8affineinvqb $0, (%rax), %xmm1, %xmm2 +vgf2p8affineinvqb $0, %ymm0, %ymm1, %ymm2 +vgf2p8affineinvqb $0, (%rax), %ymm1, %ymm2 + vgf2p8affineqb $0, %xmm0, %xmm1, %xmm2 vgf2p8affineqb $0, (%rax), %xmm1, %xmm2 +vgf2p8affineqb $0, %ymm0, %ymm1, %ymm2 +vgf2p8affineqb $0, (%rax), %ymm1, %ymm2 + vgf2p8mulb %xmm0, %xmm1, %xmm2 vgf2p8mulb (%rax), %xmm1, %xmm2 +vgf2p8mulb %ymm0, %ymm1, %ymm2 +vgf2p8mulb (%rax), %ymm1, %ymm2 + # CHECK: Instruction Info: # CHECK-NEXT: [1]: #uOps # CHECK-NEXT: [2]: Latency @@ -21,10 +30,16 @@ vgf2p8mulb (%rax), %xmm1, %xmm2 # CHECK: [1] [2] [3] [4] [5] [6] Instructions: # CHECK-NEXT: 1 5 0.50 vgf2p8affineinvqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 2 11 0.50 * vgf2p8affineinvqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 1 5 0.50 vgf2p8affineinvqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 2 11 0.50 * vgf2p8affineinvqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: 1 5 0.50 vgf2p8affineqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 2 11 0.50 * vgf2p8affineqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 1 5 0.50 vgf2p8affineqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 2 11 0.50 * vgf2p8affineqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: 1 1 0.50 vgf2p8mulb %xmm0, %xmm1, %xmm2 # CHECK-NEXT: 2 7 0.50 * vgf2p8mulb (%rax), %xmm1, %xmm2 +# CHECK-NEXT: 1 1 0.50 vgf2p8mulb %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: 2 7 0.50 * vgf2p8mulb (%rax), %ymm1, %ymm2 # CHECK: Resources: # CHECK-NEXT: [0] - ICXDivider @@ -42,13 +57,19 @@ vgf2p8mulb (%rax), %xmm1, %xmm2 # CHECK: Resource pressure per iteration: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] -# CHECK-NEXT: - - 3.00 3.00 1.50 1.50 - - - - - - +# CHECK-NEXT: - - 6.00 6.00 3.00 3.00 - - - - - - # CHECK: Resource pressure by instruction: # CHECK-NEXT: [0] [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] Instructions: # CHECK-NEXT: - - 0.50 0.50 - - - - - - - - vgf2p8affineinvqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: - - 0.50 0.50 0.50 0.50 - - - - - - vgf2p8affineinvqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: - - 0.50 0.50 - - - - - - - - vgf2p8affineinvqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: - - 0.50 0.50 0.50 0.50 - - - - - - vgf2p8affineinvqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: - - 0.50 0.50 - - - - - - - - vgf2p8affineqb $0, %xmm0, %xmm1, %xmm2 # CHECK-NEXT: - - 0.50 0.50 0.50 0.50 - - - - - - vgf2p8affineqb $0, (%rax), %xmm1, %xmm2 +# CHECK-NEXT: - - 0.50 0.50 - - - - - - - - vgf2p8affineqb $0, %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: - - 0.50 0.50 0.50 0.50 - - - - - - vgf2p8affineqb $0, (%rax), %ymm1, %ymm2 # CHECK-NEXT: - - 0.50 0.50 - - - - - - - - vgf2p8mulb %xmm0, %xmm1, %xmm2 # CHECK-NEXT: - - 0.50 0.50 0.50 0.50 - - - - - - vgf2p8mulb (%rax), %xmm1, %xmm2 +# CHECK-NEXT: - - 0.50 0.50 - - - - - - - - vgf2p8mulb %ymm0, %ymm1, %ymm2 +# CHECK-NEXT: - - 0.50 0.50 0.50 0.50 - - - - - - vgf2p8mulb (%rax), %ymm1, %ymm2 -- cgit v1.2.3