From 9ec1c8395710894618076e9931170f3e59e09f4b Mon Sep 17 00:00:00 2001
From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Sat, 12 Nov 2022 17:20:07 +0000
Subject: [X86] Always classify gf2p8affineqb/gf2p8affineinvqb instructions
 with SchedWriteVecIMul

There was a mismatch between the AVX512 and SSE/AVX versions
---
 llvm/lib/Target/X86/X86InstrSSE.td                 |  4 +-
 .../llvm-mca/X86/Generic/resources-avx512gfnivl.s  | 50 +++++++++++-----------
 .../tools/llvm-mca/X86/Generic/resources-avxgfni.s | 18 ++++----
 .../tools/llvm-mca/X86/Generic/resources-gfni.s    | 18 ++++----
 .../X86/IceLakeServer/resources-avx512gfnivl.s     | 24 +++++------
 .../llvm-mca/X86/IceLakeServer/resources-avxgfni.s |  8 ++--
 .../llvm-mca/X86/IceLakeServer/resources-gfni.s    |  8 ++--
 7 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/llvm/lib/Target/X86/X86InstrSSE.td b/llvm/lib/Target/X86/X86InstrSSE.td
index a31117e377ae..e648c30c30fb 100644
--- a/llvm/lib/Target/X86/X86InstrSSE.td
+++ b/llvm/lib/Target/X86/X86InstrSSE.td
@@ -8081,13 +8081,13 @@ multiclass GF2P8AFFINE_rmi<bits<8> Op, string OpStr, ValueType OpVT,
   def rri : Ii8<Op, MRMSrcReg, (outs RC:$dst),
               (ins RC:$src1, RC:$src2, u8imm:$src3), "",
               [(set RC:$dst, (OpVT (OpNode RC:$src1, RC:$src2, timm:$src3)))],
-              SSEPackedInt>, Sched<[SchedWriteVecALU.XMM]>;
+              SSEPackedInt>, Sched<[SchedWriteVecIMul.XMM]>;
   def rmi : Ii8<Op, MRMSrcMem, (outs RC:$dst),
               (ins RC:$src1, X86MemOp:$src2, u8imm:$src3), "",
               [(set RC:$dst, (OpVT (OpNode RC:$src1,
                                     (MemOpFrag addr:$src2),
                               timm:$src3)))], SSEPackedInt>,
-              Sched<[SchedWriteVecALU.XMM.Folded, SchedWriteVecALU.XMM.ReadAfterFold]>;
+              Sched<[SchedWriteVecIMul.XMM.Folded, SchedWriteVecIMul.XMM.ReadAfterFold]>;
   }
 }
 
diff --git a/llvm/test/tools/llvm-mca/X86/Generic/resources-avx512gfnivl.s b/llvm/test/tools/llvm-mca/X86/Generic/resources-avx512gfnivl.s
index afb8d5558863..9d3664d8a0db 100644
--- a/llvm/test/tools/llvm-mca/X86/Generic/resources-avx512gfnivl.s
+++ b/llvm/test/tools/llvm-mca/X86/Generic/resources-avx512gfnivl.s
@@ -64,8 +64,8 @@ vgf2p8mulb          (%rax), %ymm1, %ymm2 {z}{k1}
 # CHECK-NEXT: [6]: HasSideEffects (U)
 
 # CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2
+# CHECK-NEXT:  1      5     1.00                        vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineinvqb	$0, (%rax){1to2}, %xmm1, %xmm2
 # CHECK-NEXT:  1      5     1.00                        vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2 {%k1}
 # CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2 {%k1}
@@ -73,8 +73,8 @@ vgf2p8mulb          (%rax), %ymm1, %ymm2 {z}{k1}
 # CHECK-NEXT:  1      5     1.00                        vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineinvqb	$0, (%rax){1to2}, %xmm1, %xmm2 {%k1} {z}
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2
+# CHECK-NEXT:  1      5     1.00                        vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2
+# CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  2      12    1.00    *                   vgf2p8affineinvqb	$0, (%rax){1to4}, %ymm1, %ymm2
 # CHECK-NEXT:  1      5     1.00                        vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2 {%k1}
 # CHECK-NEXT:  2      12    1.00    *                   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2 {%k1}
@@ -82,20 +82,20 @@ vgf2p8mulb          (%rax), %ymm1, %ymm2 {z}{k1}
 # CHECK-NEXT:  1      5     1.00                        vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2 {%k1} {z}
 # CHECK-NEXT:  2      12    1.00    *                   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2 {%k1} {z}
 # CHECK-NEXT:  2      12    1.00    *                   vgf2p8affineinvqb	$0, (%rax){1to4}, %ymm1, %ymm2 {%k1} {z}
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
+# CHECK-NEXT:  1      5     1.00                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineqb	$0, (%rax){1to2}, %xmm1, %xmm2
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
+# CHECK-NEXT:  1      5     1.00                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineqb	$0, (%rax){1to2}, %xmm1, %xmm2
 # CHECK-NEXT:  1      5     1.00                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineqb	$0, (%rax){1to2}, %xmm1, %xmm2 {%k1} {z}
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2
+# CHECK-NEXT:  1      5     1.00                        vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2
+# CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  2      12    1.00    *                   vgf2p8affineqb	$0, (%rax){1to4}, %ymm1, %ymm2
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2
+# CHECK-NEXT:  1      5     1.00                        vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2
+# CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  2      12    1.00    *                   vgf2p8affineqb	$0, (%rax){1to4}, %ymm1, %ymm2
 # CHECK-NEXT:  1      5     1.00                        vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2 {%k1} {z}
 # CHECK-NEXT:  2      12    1.00    *                   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2 {%k1} {z}
@@ -125,12 +125,12 @@ vgf2p8mulb          (%rax), %ymm1, %ymm2 {z}{k1}
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]
-# CHECK-NEXT:  -      -     24.00  12.00   -     12.00  15.00  15.00
+# CHECK-NEXT:  -      -     36.00  6.00    -     6.00   15.00  15.00
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]  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:  -      -     1.00    -      -      -      -      -     vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineinvqb	$0, (%rax){1to2}, %xmm1, %xmm2
 # CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2 {%k1}
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2 {%k1}
@@ -138,8 +138,8 @@ vgf2p8mulb          (%rax), %ymm1, %ymm2 {z}{k1}
 # CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineinvqb	$0, (%rax){1to2}, %xmm1, %xmm2 {%k1} {z}
-# 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:  -      -     1.00    -      -      -      -      -     vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2
+# CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineinvqb	$0, (%rax){1to4}, %ymm1, %ymm2
 # CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2 {%k1}
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2 {%k1}
@@ -147,20 +147,20 @@ vgf2p8mulb          (%rax), %ymm1, %ymm2 {z}{k1}
 # CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2 {%k1} {z}
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2 {%k1} {z}
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineinvqb	$0, (%rax){1to4}, %ymm1, %ymm2 {%k1} {z}
-# 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:  -      -     1.00    -      -      -      -      -     vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax){1to2}, %xmm1, %xmm2
-# 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:  -      -     1.00    -      -      -      -      -     vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax){1to2}, %xmm1, %xmm2
 # CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax){1to2}, %xmm1, %xmm2 {%k1} {z}
-# 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:  -      -     1.00    -      -      -      -      -     vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2
+# CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax){1to4}, %ymm1, %ymm2
-# 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:  -      -     1.00    -      -      -      -      -     vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2
+# CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax){1to4}, %ymm1, %ymm2
 # CHECK-NEXT:  -      -     1.00    -      -      -      -      -     vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2 {%k1} {z}
 # CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2 {%k1} {z}
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 e394e301be71..8f86f2a880b3 100644
--- a/llvm/test/tools/llvm-mca/X86/Generic/resources-avxgfni.s
+++ b/llvm/test/tools/llvm-mca/X86/Generic/resources-avxgfni.s
@@ -19,10 +19,10 @@ vgf2p8mulb          (%rax), %xmm1, %xmm2
 # CHECK-NEXT: [6]: HasSideEffects (U)
 
 # CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
+# 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                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  2      11    1.00    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     0.50                        vgf2p8mulb	%xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      7     0.50    *                   vgf2p8mulb	(%rax), %xmm1, %xmm2
 
@@ -38,13 +38,13 @@ vgf2p8mulb          (%rax), %xmm1, %xmm2
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]
-# CHECK-NEXT:  -      -      -     3.00    -     3.00   1.50   1.50
+# CHECK-NEXT:  -      -     4.00   1.00    -     1.00   1.50   1.50
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]  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    -      -     vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  -      -      -     0.50    -     0.50   0.50   0.50   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
+# 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    -      -      -      -      -     vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -     0.50    -     0.50    -      -     vgf2p8mulb	%xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  -      -      -     0.50    -     0.50   0.50   0.50   vgf2p8mulb	(%rax), %xmm1, %xmm2
diff --git a/llvm/test/tools/llvm-mca/X86/Generic/resources-gfni.s b/llvm/test/tools/llvm-mca/X86/Generic/resources-gfni.s
index e781874f37fb..7c65980e9126 100644
--- a/llvm/test/tools/llvm-mca/X86/Generic/resources-gfni.s
+++ b/llvm/test/tools/llvm-mca/X86/Generic/resources-gfni.s
@@ -19,10 +19,10 @@ gf2p8mulb           (%rax), %xmm1
 # CHECK-NEXT: [6]: HasSideEffects (U)
 
 # CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
-# CHECK-NEXT:  1      1     0.50                        gf2p8affineinvqb	$0, %xmm0, %xmm1
-# CHECK-NEXT:  2      7     0.50    *                   gf2p8affineinvqb	$0, (%rax), %xmm1
-# CHECK-NEXT:  1      1     0.50                        gf2p8affineqb	$0, %xmm0, %xmm1
-# CHECK-NEXT:  2      7     0.50    *                   gf2p8affineqb	$0, (%rax), %xmm1
+# CHECK-NEXT:  1      5     1.00                        gf2p8affineinvqb	$0, %xmm0, %xmm1
+# CHECK-NEXT:  2      11    1.00    *                   gf2p8affineinvqb	$0, (%rax), %xmm1
+# CHECK-NEXT:  1      5     1.00                        gf2p8affineqb	$0, %xmm0, %xmm1
+# CHECK-NEXT:  2      11    1.00    *                   gf2p8affineqb	$0, (%rax), %xmm1
 # CHECK-NEXT:  1      1     0.50                        gf2p8mulb	%xmm0, %xmm1
 # CHECK-NEXT:  2      7     0.50    *                   gf2p8mulb	(%rax), %xmm1
 
@@ -38,13 +38,13 @@ gf2p8mulb           (%rax), %xmm1
 
 # CHECK:      Resource pressure per iteration:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]
-# CHECK-NEXT:  -      -      -     3.00    -     3.00   1.50   1.50
+# CHECK-NEXT:  -      -     4.00   1.00    -     1.00   1.50   1.50
 
 # CHECK:      Resource pressure by instruction:
 # CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6.0]  [6.1]  Instructions:
-# CHECK-NEXT:  -      -      -     0.50    -     0.50    -      -     gf2p8affineinvqb	$0, %xmm0, %xmm1
-# CHECK-NEXT:  -      -      -     0.50    -     0.50   0.50   0.50   gf2p8affineinvqb	$0, (%rax), %xmm1
-# CHECK-NEXT:  -      -      -     0.50    -     0.50    -      -     gf2p8affineqb	$0, %xmm0, %xmm1
-# CHECK-NEXT:  -      -      -     0.50    -     0.50   0.50   0.50   gf2p8affineqb	$0, (%rax), %xmm1
+# CHECK-NEXT:  -      -     1.00    -      -      -      -      -     gf2p8affineinvqb	$0, %xmm0, %xmm1
+# CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   gf2p8affineinvqb	$0, (%rax), %xmm1
+# CHECK-NEXT:  -      -     1.00    -      -      -      -      -     gf2p8affineqb	$0, %xmm0, %xmm1
+# CHECK-NEXT:  -      -     1.00    -      -      -     0.50   0.50   gf2p8affineqb	$0, (%rax), %xmm1
 # CHECK-NEXT:  -      -      -     0.50    -     0.50    -      -     gf2p8mulb	%xmm0, %xmm1
 # CHECK-NEXT:  -      -      -     0.50    -     0.50   0.50   0.50   gf2p8mulb	(%rax), %xmm1
diff --git a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-avx512gfnivl.s b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-avx512gfnivl.s
index fa53da99cd83..c284985ae3b1 100644
--- a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-avx512gfnivl.s
+++ b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-avx512gfnivl.s
@@ -64,8 +64,8 @@ vgf2p8mulb          (%rax), %ymm1, %ymm2 {z}{k1}
 # CHECK-NEXT: [6]: HasSideEffects (U)
 
 # CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2
+# CHECK-NEXT:  1      5     0.50                        vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineinvqb	$0, (%rax){1to2}, %xmm1, %xmm2
 # CHECK-NEXT:  1      5     0.50                        vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2 {%k1}
 # CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2 {%k1}
@@ -73,8 +73,8 @@ vgf2p8mulb          (%rax), %ymm1, %ymm2 {z}{k1}
 # CHECK-NEXT:  1      5     0.50                        vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineinvqb	$0, (%rax){1to2}, %xmm1, %xmm2 {%k1} {z}
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2
+# CHECK-NEXT:  1      5     0.50                        vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2
+# CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  2      12    0.50    *                   vgf2p8affineinvqb	$0, (%rax){1to4}, %ymm1, %ymm2
 # CHECK-NEXT:  1      5     0.50                        vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2 {%k1}
 # CHECK-NEXT:  2      12    0.50    *                   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2 {%k1}
@@ -82,20 +82,20 @@ vgf2p8mulb          (%rax), %ymm1, %ymm2 {z}{k1}
 # CHECK-NEXT:  1      5     0.50                        vgf2p8affineinvqb	$0, %ymm0, %ymm1, %ymm2 {%k1} {z}
 # CHECK-NEXT:  2      12    0.50    *                   vgf2p8affineinvqb	$0, (%rax), %ymm1, %ymm2 {%k1} {z}
 # CHECK-NEXT:  2      12    0.50    *                   vgf2p8affineinvqb	$0, (%rax){1to4}, %ymm1, %ymm2 {%k1} {z}
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
+# CHECK-NEXT:  1      5     0.50                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineqb	$0, (%rax){1to2}, %xmm1, %xmm2
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
+# CHECK-NEXT:  1      5     0.50                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineqb	$0, (%rax){1to2}, %xmm1, %xmm2
 # CHECK-NEXT:  1      5     0.50                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2 {%k1} {z}
 # CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineqb	$0, (%rax){1to2}, %xmm1, %xmm2 {%k1} {z}
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2
+# CHECK-NEXT:  1      5     0.50                        vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2
+# CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  2      12    0.50    *                   vgf2p8affineqb	$0, (%rax){1to4}, %ymm1, %ymm2
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2
+# CHECK-NEXT:  1      5     0.50                        vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2
+# CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2
 # CHECK-NEXT:  2      12    0.50    *                   vgf2p8affineqb	$0, (%rax){1to4}, %ymm1, %ymm2
 # CHECK-NEXT:  1      5     0.50                        vgf2p8affineqb	$0, %ymm0, %ymm1, %ymm2 {%k1} {z}
 # CHECK-NEXT:  2      12    0.50    *                   vgf2p8affineqb	$0, (%rax), %ymm1, %ymm2 {%k1} {z}
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 75b1291d95be..c2f6d293ebae 100644
--- a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-avxgfni.s
+++ b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-avxgfni.s
@@ -19,10 +19,10 @@ vgf2p8mulb          (%rax), %xmm1, %xmm2
 # CHECK-NEXT: [6]: HasSideEffects (U)
 
 # CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineinvqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineinvqb	$0, (%rax), %xmm1, %xmm2
-# CHECK-NEXT:  1      1     0.50                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
-# CHECK-NEXT:  2      7     0.50    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
+# 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                        vgf2p8affineqb	$0, %xmm0, %xmm1, %xmm2
+# CHECK-NEXT:  2      11    0.50    *                   vgf2p8affineqb	$0, (%rax), %xmm1, %xmm2
 # CHECK-NEXT:  1      1     0.50                        vgf2p8mulb	%xmm0, %xmm1, %xmm2
 # CHECK-NEXT:  2      7     0.50    *                   vgf2p8mulb	(%rax), %xmm1, %xmm2
 
diff --git a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-gfni.s b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-gfni.s
index 0fef4065f3df..f65339de7ebe 100644
--- a/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-gfni.s
+++ b/llvm/test/tools/llvm-mca/X86/IceLakeServer/resources-gfni.s
@@ -19,10 +19,10 @@ gf2p8mulb           (%rax), %xmm1
 # CHECK-NEXT: [6]: HasSideEffects (U)
 
 # CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
-# CHECK-NEXT:  1      1     0.50                        gf2p8affineinvqb	$0, %xmm0, %xmm1
-# CHECK-NEXT:  2      7     0.50    *                   gf2p8affineinvqb	$0, (%rax), %xmm1
-# CHECK-NEXT:  1      1     0.50                        gf2p8affineqb	$0, %xmm0, %xmm1
-# CHECK-NEXT:  2      7     0.50    *                   gf2p8affineqb	$0, (%rax), %xmm1
+# CHECK-NEXT:  1      5     0.50                        gf2p8affineinvqb	$0, %xmm0, %xmm1
+# CHECK-NEXT:  2      11    0.50    *                   gf2p8affineinvqb	$0, (%rax), %xmm1
+# CHECK-NEXT:  1      5     0.50                        gf2p8affineqb	$0, %xmm0, %xmm1
+# CHECK-NEXT:  2      11    0.50    *                   gf2p8affineqb	$0, (%rax), %xmm1
 # CHECK-NEXT:  1      1     0.50                        gf2p8mulb	%xmm0, %xmm1
 # CHECK-NEXT:  2      7     0.50    *                   gf2p8mulb	(%rax), %xmm1
 
-- 
cgit v1.2.3