[llvm] fa01521 - [RISCV] Add scheduler definitions for XiangShan-KunMingHu (#148581)

via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 6 21:16:43 PDT 2026


Author: Lin Wang
Date: 2026-08-07T04:16:37Z
New Revision: fa01521e37e1b2db4edbf6a41687a00153505a37

URL: https://github.com/llvm/llvm-project/commit/fa01521e37e1b2db4edbf6a41687a00153505a37
DIFF: https://github.com/llvm/llvm-project/commit/fa01521e37e1b2db4edbf6a41687a00153505a37.diff

LOG: [RISCV] Add scheduler definitions for XiangShan-KunMingHu (#148581)

This patch adds an initial scheduler model for the XiangShan KunMingHu
microarchitecture in the RISC-V backend, covering scalar instructions
only. Support for vector instructions is not included in this patch.

The model includes initial ProcResource definitions and WriteRes
mappings for scalar instructions, derived from the publicly available
XiangShan KunMingHu documentations:

* [XiangShan Docs](https://docs.xiangshan.cc/projects/design/en/latest/).
* [XiangShan User Guide](https://docs.xiangshan.cc/projects/user-guide/en/latest/).
* [XiangShan KunMingHu RTL](https://github.com/OpenXiangShan/XiangShan).

Simulator-based validation results will be provided in a follow-up
update. Measurement results from real hardware will also be added
afterwards to further validate and refine the model if necessary.

This implementation was contributed by the
[XSCC Team](https://github.com/orgs/OpenXiangShan/teams/xscc).

---------

Co-authored-by: Chyaka <lilium23187 at gmail.com>
Co-authored-by: Bhe6669 <hebo at bosc.ac.cn>
Co-authored-by: Tang Haojin <tanghaojin at outlook.com>
Co-authored-by: buggfg <wangyingying at bosc.ac.cn>

Added: 
    llvm/lib/Target/RISCV/RISCVSchedXiangShanKunMingHu.td
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/atomic.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/branch.s
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/cascade-fma.s
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/div-fdiv.s
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/floating-point.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/fpr-bypass.s
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/gpr-bypass.s
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/integer.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/load-to-alu.s
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/load-to-fpu.s
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/mul-div-rv32.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/mul-div.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zba.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbb.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbc.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbs.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zfh.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zfhmin.test
    llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zicond.test

Modified: 
    llvm/lib/Target/RISCV/RISCV.td
    llvm/lib/Target/RISCV/RISCVProcessors.td

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/RISCV/RISCV.td b/llvm/lib/Target/RISCV/RISCV.td
index 94de554ddfdce..bc56b3e059ca5 100644
--- a/llvm/lib/Target/RISCV/RISCV.td
+++ b/llvm/lib/Target/RISCV/RISCV.td
@@ -66,6 +66,7 @@ include "RISCVSchedSyntacoreSCR1.td"
 include "RISCVSchedSyntacoreSCR345.td"
 include "RISCVSchedSyntacoreSCR7.td"
 include "RISCVSchedTTAscalonX.td"
+include "RISCVSchedXiangShanKunMingHu.td"
 include "RISCVSchedXiangShanNanHu.td"
 
 //===----------------------------------------------------------------------===//

diff  --git a/llvm/lib/Target/RISCV/RISCVProcessors.td b/llvm/lib/Target/RISCV/RISCVProcessors.td
index d447f50c88b24..1ce73d67feed6 100644
--- a/llvm/lib/Target/RISCV/RISCVProcessors.td
+++ b/llvm/lib/Target/RISCV/RISCVProcessors.td
@@ -826,7 +826,7 @@ def XIANGSHAN_NANHU : RISCVProcessorModel<"xiangshan-nanhu",
                                             TuneShiftedZExtWFusion]>;
 
 def XIANGSHAN_KUNMINGHU : RISCVProcessorModel<"xiangshan-kunminghu",
-                                              NoSchedModel,
+                                              XiangShanKunMingHuModel,
                                               !listconcat(RVA23S64Features,
                                               [FeatureStdExtZacas,
                                                FeatureStdExtZbc,

diff  --git a/llvm/lib/Target/RISCV/RISCVSchedXiangShanKunMingHu.td b/llvm/lib/Target/RISCV/RISCVSchedXiangShanKunMingHu.td
new file mode 100644
index 0000000000000..1f065e254ec78
--- /dev/null
+++ b/llvm/lib/Target/RISCV/RISCVSchedXiangShanKunMingHu.td
@@ -0,0 +1,433 @@
+//==- RISCVSchedXiangShanKunMingHu.td - KMH Scheduling Defs -*- tablegen -*-=//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// The XiangShan is a high-performance open-source RISC-V processor project
+// initiated by the Institute of Computing Technology(ICT),
+// Chinese Academy of Sciences(CAS).
+// The KunMingHu architecture is its third-generation derivative,
+// developed by the Institute of Computing Technology(ICT),
+// Chinese Academy of Sciences(CAS)
+// and the Beijing Institute of Open Source Chip (BOSC),
+// with a focus on achieving higher performance.
+// Source: https://github.com/OpenXiangShan/XiangShan
+// Documentation: https://docs.xiangshan.cc/projects/design/en/latest/
+// User Guide: https://docs.xiangshan.cc/projects/user-guide/en/latest/
+// Typical Configurations & Instruction Latency:
+// https://docs.xiangshan.cc/projects/user-guide/en/kunminghu-v2/typical-configuration/
+
+def XiangShanKunMingHuModel : SchedMachineModel {
+  let IssueWidth = 6;   // 6-way decode and dispatch
+  let MicroOpBufferSize = 160; // ROB size
+  let LoadLatency = 4;
+  let MispredictPenalty = 13; // Based on estimate of pipeline depth.
+  let CompleteModel = 0;
+  let UnsupportedFeatures = [HasStdExtZcmt, HasStdExtZkr,
+                             HasVInstructions,
+                             HasVInstructionsI64];
+}
+
+let SchedModel = XiangShanKunMingHuModel in {
+// Define each kind of processor resource and number available.
+// Individual pipeline resources (no BufferSize - they share Issue Queues)
+// Integer execution units
+def XSPipeALU0 : ProcResource<1>; // ALU, MUL, BKU
+def XSPipeALU1 : ProcResource<1>; // ALU, MUL, BKU
+def XSPipeALU2 : ProcResource<1>; // ALU
+def XSPipeALU3 : ProcResource<1>; // ALU
+
+def XSPipeBJU0 : ProcResource<1>; // BRU, JMP
+def XSPipeBJU1 : ProcResource<1>; // BRU, JMP
+def XSPipeBJU2 : ProcResource<1>; // BRU, JMP, I2F, VSet
+def XSPipeBJU3 : ProcResource<1>; // CSR, Fence, DIV
+
+// Floating-point execution units
+def XSPipeFEX0 : ProcResource<1>; // FALU, FMA, FCVT
+def XSPipeFEX1 : ProcResource<1>; // FDIV
+def XSPipeFEX2 : ProcResource<1>; // FALU, FMA
+def XSPipeFEX3 : ProcResource<1>; // FDIV
+def XSPipeFEX4 : ProcResource<1>; // FALU, FMA
+
+// Parent groups containing all resources to satisfy TableGen overlap rules
+def XSPipeGroupInt : ProcResGroup<[XSPipeALU0, XSPipeALU1,
+                                   XSPipeALU2, XSPipeALU3,
+                                   XSPipeBJU0, XSPipeBJU1,
+                                   XSPipeBJU2, XSPipeBJU3]>;
+def XSPipeGroupFP  : ProcResGroup<[XSPipeFEX0, XSPipeFEX1,
+                                   XSPipeFEX2, XSPipeFEX3, XSPipeFEX4]>;
+
+// Issue Queue groups with BufferSize for llvm-mca buffer tracking
+// Integer Issue Queues: ALU + BJU share the same IQ
+let BufferSize = 24 in {
+  def XSPipeIntIQ0 : ProcResGroup<[XSPipeALU0, XSPipeBJU0]>;
+  def XSPipeIntIQ1 : ProcResGroup<[XSPipeALU1, XSPipeBJU1]>;
+  def XSPipeIntIQ2 : ProcResGroup<[XSPipeALU2, XSPipeBJU2]>;
+  def XSPipeIntIQ3 : ProcResGroup<[XSPipeALU3, XSPipeBJU3]>;
+}
+
+// Floating-point Issue Queues:
+let BufferSize = 18 in {
+  def XSPipeFpIQ0 : ProcResGroup<[XSPipeFEX0, XSPipeFEX1]>;
+  def XSPipeFpIQ1 : ProcResGroup<[XSPipeFEX2, XSPipeFEX3]>;
+  def XSPipeFpIQ2 : ProcResGroup<[XSPipeFEX4]>;
+}
+
+// Memory execution resources.
+def XSPipeLDU : ProcResource<3>; // LDU
+def XSPipeSTA : ProcResource<2>; // STA
+def XSPipeSTD : ProcResource<2>; // STD
+
+// One shared memory issue queue for LDU/STA/STD.
+let BufferSize = 16 in
+def XSPipeMemIQ : ProcResGroup<[XSPipeLDU, XSPipeSTA, XSPipeSTD]>;
+
+// Instruction dispatch groups for scheduling
+def XSPipeGroupALU : ProcResGroup<[XSPipeALU0, XSPipeALU1, XSPipeALU2,
+                                   XSPipeALU3]>;
+def XSPipeGroupMUL : ProcResGroup<[XSPipeALU0, XSPipeALU1]>;
+def XSPipeGroupBKU : ProcResGroup<[XSPipeALU0, XSPipeALU1]>;
+def XSPipeGroupBRU : ProcResGroup<[XSPipeBJU0, XSPipeBJU1, XSPipeBJU2]>;
+
+def XSPipeGroupFALU : ProcResGroup<[XSPipeFEX0, XSPipeFEX2, XSPipeFEX4]>;
+def XSPipeGroupFMA  : ProcResGroup<[XSPipeFEX0, XSPipeFEX2, XSPipeFEX4]>;
+def XSPipeGroupFDIV : ProcResGroup<[XSPipeFEX1, XSPipeFEX3]>;
+
+//===----------------------------------------------------------------------===//
+
+
+// Jump
+def : WriteRes<WriteJmp, [XSPipeGroupBRU]>;
+def : WriteRes<WriteJal, [XSPipeGroupBRU]>;
+def : WriteRes<WriteJalr, [XSPipeGroupBRU]>;
+
+// Integer arithmetic and logic
+def : WriteRes<WriteIALU32, [XSPipeGroupALU]>;
+def : WriteRes<WriteIALU, [XSPipeGroupALU]>;
+def : WriteRes<WriteShiftImm32, [XSPipeGroupALU]>;
+def : WriteRes<WriteShiftImm, [XSPipeGroupALU]>;
+def : WriteRes<WriteShiftReg32, [XSPipeGroupALU]>;
+def : WriteRes<WriteShiftReg, [XSPipeGroupALU]>;
+
+// IMUL
+let Latency = 3 in {
+  def : WriteRes<WriteIMul, [XSPipeGroupMUL]>;
+  def : WriteRes<WriteIMul32, [XSPipeGroupMUL]>;
+}
+
+// IDIV
+let Latency = 11, ReleaseAtCycles = [11] in {
+  def : WriteRes<WriteIDiv32, [XSPipeBJU3]>;
+  def : WriteRes<WriteIRem32, [XSPipeBJU3]>;
+}
+let Latency = 19, ReleaseAtCycles = [19] in {
+  def : WriteRes<WriteIDiv, [XSPipeBJU3]>;
+  def : WriteRes<WriteIRem, [XSPipeBJU3]>;
+}
+
+// LOAD
+let Latency = 4 in {
+  def : WriteRes<WriteLDB, [XSPipeLDU]>;
+  def : WriteRes<WriteLDH, [XSPipeLDU]>;
+  def : WriteRes<WriteLDW, [XSPipeLDU]>;
+  def : WriteRes<WriteLDD, [XSPipeLDU]>;
+
+  def : WriteRes<WriteFLD16, [XSPipeLDU]>;
+  def : WriteRes<WriteFLD32, [XSPipeLDU]>;
+  def : WriteRes<WriteFLD64, [XSPipeLDU]>;
+
+  def : WriteRes<WriteAtomicW, [XSPipeLDU]>;
+  def : WriteRes<WriteAtomicD, [XSPipeLDU]>;
+  def : WriteRes<WriteAtomicLDW, [XSPipeLDU]>;
+  def : WriteRes<WriteAtomicLDD, [XSPipeLDU]>;
+}
+
+// STORE
+class XSWriteStore<SchedWrite write>
+    : WriteRes<write, [XSPipeSTA, XSPipeSTD]> {
+  let Latency = 4;
+  let ReleaseAtCycles = [1, 1];
+}
+
+def : XSWriteStore<WriteSTB>;
+def : XSWriteStore<WriteSTH>;
+def : XSWriteStore<WriteSTW>;
+def : XSWriteStore<WriteSTD>;
+def : XSWriteStore<WriteFST16>;
+def : XSWriteStore<WriteFST32>;
+def : XSWriteStore<WriteFST64>;
+def : XSWriteStore<WriteAtomicSTW>;
+def : XSWriteStore<WriteAtomicSTD>;
+
+// FADD
+def : WriteRes<WriteFAdd16, [XSPipeGroupFALU]>;
+def : WriteRes<WriteFAdd32, [XSPipeGroupFALU]>;
+def : WriteRes<WriteFAdd64, [XSPipeGroupFALU]>;
+
+let Latency = 2 in {
+  def : WriteRes<WriteFCmp16, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFCmp32, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFCmp64, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFMinMax16, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFMinMax32, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFMinMax64, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFClass16, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFClass32, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFClass64, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFSGNJ16, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFSGNJ32, [XSPipeGroupFALU]>;
+  def : WriteRes<WriteFSGNJ64, [XSPipeGroupFALU]>;
+}
+
+// FMUL
+let Latency = 4 in {
+  def : WriteRes<WriteFMul16, [XSPipeGroupFMA]>;
+  def : WriteRes<WriteFMul32, [XSPipeGroupFMA]>;
+  def : WriteRes<WriteFMul64, [XSPipeGroupFMA]>;
+  def : WriteRes<WriteFMA16, [XSPipeGroupFMA]>;
+  def : WriteRes<WriteFMA32, [XSPipeGroupFMA]>;
+  def : WriteRes<WriteFMA64, [XSPipeGroupFMA]>;
+}
+
+// FDIV
+let Latency = 9, ReleaseAtCycles = [9] in {
+  def : WriteRes<WriteFDiv16, [XSPipeGroupFDIV]>;
+  def : WriteRes<WriteFDiv32, [XSPipeGroupFDIV]>;
+}
+let Latency = 14, ReleaseAtCycles = [14] in {
+  def : WriteRes<WriteFDiv64, [XSPipeGroupFDIV]>;
+}
+
+// FSQRT
+let Latency = 10, ReleaseAtCycles = [10] in {
+  def : WriteRes<WriteFSqrt16, [XSPipeGroupFDIV]>;
+  def : WriteRes<WriteFSqrt32, [XSPipeGroupFDIV]>;
+}
+let Latency = 16, ReleaseAtCycles = [16] in {
+  def : WriteRes<WriteFSqrt64, [XSPipeGroupFDIV]>;
+}
+
+let Latency = 3 in {
+  // FCVT (F2I)
+  def : WriteRes<WriteFCvtF16ToI32, [XSPipeFEX0]>;
+  def : WriteRes<WriteFCvtF16ToI64, [XSPipeFEX0]>;
+  def : WriteRes<WriteFCvtF32ToI32, [XSPipeFEX0]>;
+  def : WriteRes<WriteFCvtF32ToI64, [XSPipeFEX0]>;
+  def : WriteRes<WriteFCvtF64ToI32, [XSPipeFEX0]>;
+  def : WriteRes<WriteFCvtF64ToI64, [XSPipeFEX0]>;
+
+  // FCVT (F2F)
+  def : WriteRes<WriteFCvtF16ToF32, [XSPipeFEX0]>;
+  def : WriteRes<WriteFCvtF16ToF64, [XSPipeFEX0]>;
+  def : WriteRes<WriteFCvtF32ToF16, [XSPipeFEX0]>;
+  def : WriteRes<WriteFCvtF32ToF64, [XSPipeFEX0]>;
+  def : WriteRes<WriteFCvtF64ToF16, [XSPipeFEX0]>;
+  def : WriteRes<WriteFCvtF64ToF32, [XSPipeFEX0]>;
+
+  // FCVT (I2F)
+  def : WriteRes<WriteFCvtI32ToF16, [XSPipeBJU2]>;
+  def : WriteRes<WriteFCvtI32ToF32, [XSPipeBJU2]>;
+  def : WriteRes<WriteFCvtI32ToF64, [XSPipeBJU2]>;
+  def : WriteRes<WriteFCvtI64ToF16, [XSPipeBJU2]>;
+  def : WriteRes<WriteFCvtI64ToF32, [XSPipeBJU2]>;
+  def : WriteRes<WriteFCvtI64ToF64, [XSPipeBJU2]>;
+}
+
+// FMV (F2I)
+let Latency = 3 in {
+  def : WriteRes<WriteFMovF16ToI16, [XSPipeFEX0]>;
+  def : WriteRes<WriteFMovF32ToI32, [XSPipeFEX0]>;
+  def : WriteRes<WriteFMovF64ToI64, [XSPipeFEX0]>;
+}
+// FMV (I2F)
+def : WriteRes<WriteFMovI16ToF16, [XSPipeBJU2]>;
+def : WriteRes<WriteFMovI64ToF64, [XSPipeBJU2]>;
+def : WriteRes<WriteFMovI32ToF32, [XSPipeBJU2]>;
+
+/// Zb*
+// Zba
+def : WriteRes<WriteSHXADD, [XSPipeGroupALU]>;
+def : WriteRes<WriteSHXADD32, [XSPipeGroupALU]>;
+
+// Zbb
+def : WriteRes<WriteRotateImm, [XSPipeGroupALU]>;
+def : WriteRes<WriteRotateImm32, [XSPipeGroupALU]>;
+def : WriteRes<WriteRotateReg, [XSPipeGroupALU]>;
+def : WriteRes<WriteRotateReg32, [XSPipeGroupALU]>;
+def : WriteRes<WriteREV8, [XSPipeGroupALU]>;
+def : WriteRes<WriteORCB, [XSPipeGroupALU]>;
+def : WriteRes<WriteIMinMax, [XSPipeGroupALU]>;
+
+// Zbs
+def : WriteRes<WriteSingleBit, [XSPipeGroupALU]>;
+def : WriteRes<WriteSingleBitImm, [XSPipeGroupALU]>;
+def : WriteRes<WriteBEXT, [XSPipeGroupALU]>;
+def : WriteRes<WriteBEXTI, [XSPipeGroupALU]>;
+
+// Zbkb
+def : WriteRes<WriteBREV8, [XSPipeGroupALU]>;
+def : WriteRes<WritePACK, [XSPipeGroupALU]>;
+def : WriteRes<WritePACK32, [XSPipeGroupALU]>;
+def : WriteRes<WriteZIP, [XSPipeGroupALU]>;
+
+let Latency = 3 in {
+  // Zbb
+  def : WriteRes<WriteCLZ, [XSPipeGroupBKU]>;
+  def : WriteRes<WriteCLZ32, [XSPipeGroupBKU]>;
+  def : WriteRes<WriteCTZ, [XSPipeGroupBKU]>;
+  def : WriteRes<WriteCTZ32, [XSPipeGroupBKU]>;
+  def : WriteRes<WriteCPOP, [XSPipeGroupBKU]>;
+  def : WriteRes<WriteCPOP32, [XSPipeGroupBKU]>;
+
+  // Zbc
+  def : WriteRes<WriteCLMUL, [XSPipeGroupBKU]>;
+
+  // Zbkx
+  def : WriteRes<WriteXPERM, [XSPipeGroupBKU]>;
+}
+
+// Others
+def : WriteRes<WriteCSR, [XSPipeBJU3]>;
+def : WriteRes<WriteNop, []>;
+
+def : InstRW<[WriteIALU], (instrs COPY)>;
+
+//===----------------------------------------------------------------------===//
+
+// Bypass and advance
+
+class XSLDUtoAnyBypass<SchedRead read, int cycles = 2>
+    : ReadAdvance<read, cycles, [WriteLDB, WriteLDH,
+                                 WriteLDW, WriteLDD,
+                                 WriteFLD32, WriteFLD64,
+                                 WriteAtomicW, WriteAtomicD,
+                                 WriteAtomicLDW, WriteAtomicLDD]>;
+
+def : ReadAdvance<ReadJmp, 0>;
+def : ReadAdvance<ReadJalr, 0>;
+def : ReadAdvance<ReadCSR, 0>;
+def : ReadAdvance<ReadStoreData, 0>;
+def : ReadAdvance<ReadMemBase, 0>;
+def : XSLDUtoAnyBypass<ReadIALU>;
+def : XSLDUtoAnyBypass<ReadIALU32>;
+def : XSLDUtoAnyBypass<ReadShiftImm>;
+def : XSLDUtoAnyBypass<ReadShiftImm32>;
+def : XSLDUtoAnyBypass<ReadShiftReg>;
+def : XSLDUtoAnyBypass<ReadShiftReg32>;
+def : ReadAdvance<ReadIDiv, 0>;
+def : ReadAdvance<ReadIDiv32, 0>;
+def : ReadAdvance<ReadIRem, 0>;
+def : ReadAdvance<ReadIRem32, 0>;
+def : ReadAdvance<ReadIMul, 0>;
+def : ReadAdvance<ReadIMul32, 0>;
+def : XSLDUtoAnyBypass<ReadAtomicWA>;
+def : XSLDUtoAnyBypass<ReadAtomicWD>;
+def : XSLDUtoAnyBypass<ReadAtomicDA>;
+def : XSLDUtoAnyBypass<ReadAtomicDD>;
+def : XSLDUtoAnyBypass<ReadAtomicLDW>;
+def : XSLDUtoAnyBypass<ReadAtomicLDD>;
+def : ReadAdvance<ReadAtomicSTW, 0>;
+def : ReadAdvance<ReadAtomicSTD, 0>;
+def : ReadAdvance<ReadFStoreData, 0>;
+def : ReadAdvance<ReadFMemBase, 0>;
+def : ReadAdvance<ReadFAdd16, 0>;
+def : ReadAdvance<ReadFAdd32, 0>;
+def : ReadAdvance<ReadFAdd64, 0>;
+def : ReadAdvance<ReadFMul16, 0>;
+def : ReadAdvance<ReadFMul32, 0>;
+def : ReadAdvance<ReadFMul64, 0>;
+def : ReadAdvance<ReadFMA16, 0>;
+def : ReadAdvance<ReadFMA32, 0>;
+def : ReadAdvance<ReadFMA64, 0>;
+def : ReadAdvance<ReadFMA16Addend, 0>;
+def : ReadAdvance<ReadFMA32Addend, 0>;
+def : ReadAdvance<ReadFMA64Addend, 0>;
+def : ReadAdvance<ReadFDiv16, 0>;
+def : ReadAdvance<ReadFDiv32, 0>;
+def : ReadAdvance<ReadFDiv64, 0>;
+def : ReadAdvance<ReadFSqrt16, 0>;
+def : ReadAdvance<ReadFSqrt32, 0>;
+def : ReadAdvance<ReadFSqrt64, 0>;
+def : ReadAdvance<ReadFCmp16, 0>;
+def : ReadAdvance<ReadFCmp32, 0>;
+def : ReadAdvance<ReadFCmp64, 0>;
+def : ReadAdvance<ReadFSGNJ16, 0>;
+def : ReadAdvance<ReadFSGNJ32, 0>;
+def : ReadAdvance<ReadFSGNJ64, 0>;
+def : ReadAdvance<ReadFMinMax16, 0>;
+def : ReadAdvance<ReadFMinMax32, 0>;
+def : ReadAdvance<ReadFMinMax64, 0>;
+def : ReadAdvance<ReadFClass16, 0>;
+def : ReadAdvance<ReadFClass32, 0>;
+def : ReadAdvance<ReadFClass64, 0>;
+def : ReadAdvance<ReadFCvtF16ToI32, 0>;
+def : ReadAdvance<ReadFCvtF16ToI64, 0>;
+def : ReadAdvance<ReadFCvtF32ToI32, 0>;
+def : ReadAdvance<ReadFCvtF32ToI64, 0>;
+def : ReadAdvance<ReadFCvtF64ToI32, 0>;
+def : ReadAdvance<ReadFCvtF64ToI64, 0>;
+def : ReadAdvance<ReadFCvtI32ToF16, 0>;
+def : ReadAdvance<ReadFCvtI32ToF32, 0>;
+def : ReadAdvance<ReadFCvtI32ToF64, 0>;
+def : ReadAdvance<ReadFCvtI64ToF16, 0>;
+def : ReadAdvance<ReadFCvtI64ToF32, 0>;
+def : ReadAdvance<ReadFCvtI64ToF64, 0>;
+def : ReadAdvance<ReadFCvtF16ToF32, 0>;
+def : ReadAdvance<ReadFCvtF16ToF64, 0>;
+def : ReadAdvance<ReadFCvtF32ToF16, 0>;
+def : ReadAdvance<ReadFCvtF32ToF64, 0>;
+def : ReadAdvance<ReadFCvtF64ToF16, 0>;
+def : ReadAdvance<ReadFCvtF64ToF32, 0>;
+def : ReadAdvance<ReadFMovF16ToI16, 0>;
+def : ReadAdvance<ReadFMovF32ToI32, 0>;
+def : ReadAdvance<ReadFMovF64ToI64, 0>;
+def : ReadAdvance<ReadFMovI16ToF16, 0>;
+def : ReadAdvance<ReadFMovI32ToF32, 0>;
+def : ReadAdvance<ReadFMovI64ToF64, 0>;
+
+
+/// B extension
+// Zba
+def : ReadAdvance<ReadSHXADD, 0>;
+def : ReadAdvance<ReadSHXADD32, 0>;
+// Zbb
+def : ReadAdvance<ReadRotateImm, 0>;
+def : ReadAdvance<ReadRotateImm32, 0>;
+def : ReadAdvance<ReadRotateReg, 0>;
+def : ReadAdvance<ReadRotateReg32, 0>;
+def : ReadAdvance<ReadCLZ, 0>;
+def : ReadAdvance<ReadCLZ32, 0>;
+def : ReadAdvance<ReadCTZ, 0>;
+def : ReadAdvance<ReadCTZ32, 0>;
+def : ReadAdvance<ReadCPOP, 0>;
+def : ReadAdvance<ReadCPOP32, 0>;
+def : ReadAdvance<ReadREV8, 0>;
+def : ReadAdvance<ReadORCB, 0>;
+def : ReadAdvance<ReadIMinMax, 0>;
+// Zbc
+def : ReadAdvance<ReadCLMUL, 0>;
+// Zbs
+def : ReadAdvance<ReadSingleBit, 0>;
+def : ReadAdvance<ReadSingleBitImm, 0>;
+// Zbkb
+def : ReadAdvance<ReadBREV8, 0>;
+def : ReadAdvance<ReadPACK, 0>;
+def : ReadAdvance<ReadPACK32, 0>;
+def : ReadAdvance<ReadZIP, 0>;
+// Zbkx
+def : ReadAdvance<ReadXPERM, 0>;
+
+//===----------------------------------------------------------------------===//
+// Unsupported extensions
+defm : UnsupportedSchedQ;
+defm : UnsupportedSchedV;
+defm : UnsupportedSchedZfa;
+defm : UnsupportedSchedSFB;
+defm : UnsupportedSchedZabha;
+defm : UnsupportedSchedXsf;
+defm : UnsupportedSchedZvk;
+
+} // SchedModel

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/atomic.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/atomic.test
new file mode 100644
index 0000000000000..7867e8315be35
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/atomic.test
@@ -0,0 +1,255 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full  %p/../Inputs/atomic.s | FileCheck  %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      4     0.33    *                    2     XSPipeLDU,XSPipeMemIQ                      LR_W                       lr.w	t0, (t1)
+# CHECK-NEXT:  1      4     0.33    *                    2     XSPipeLDU,XSPipeMemIQ                      LR_W_AQ                    lr.w.aq	t1, (t2)
+# CHECK-NEXT:  1      4     0.33    *                    2     XSPipeLDU,XSPipeMemIQ                      LR_W_RL                    lr.w.rl	t2, (t3)
+# CHECK-NEXT:  1      4     0.33    *                    2     XSPipeLDU,XSPipeMemIQ                      LR_W_AQRL                  lr.w.aqrl	t3, (t4)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SC_W                       sc.w	t6, t5, (t4)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SC_W_AQ                    sc.w.aq	t5, t4, (t3)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SC_W_RL                    sc.w.rl	t4, t3, (t2)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SC_W_AQRL                  sc.w.aqrl	t3, t2, (t1)
+# CHECK-NEXT:  1      4     0.33    *                    2     XSPipeLDU,XSPipeMemIQ                      LR_D                       lr.d	t0, (t1)
+# CHECK-NEXT:  1      4     0.33    *                    2     XSPipeLDU,XSPipeMemIQ                      LR_D_AQ                    lr.d.aq	t1, (t2)
+# CHECK-NEXT:  1      4     0.33    *                    2     XSPipeLDU,XSPipeMemIQ                      LR_D_RL                    lr.d.rl	t2, (t3)
+# CHECK-NEXT:  1      4     0.33    *                    2     XSPipeLDU,XSPipeMemIQ                      LR_D_AQRL                  lr.d.aqrl	t3, (t4)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SC_D                       sc.d	t6, t5, (t4)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SC_D_AQ                    sc.d.aq	t5, t4, (t3)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SC_D_RL                    sc.d.rl	t4, t3, (t2)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SC_D_AQRL                  sc.d.aqrl	t3, t2, (t1)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOSWAP_W                  amoswap.w	a4, ra, (s0)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOADD_W                   amoadd.w	a1, a2, (a3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOXOR_W                   amoxor.w	a2, a3, (a4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOAND_W                   amoand.w	a3, a4, (a5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOOR_W                    amoor.w	a4, a5, (a6)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMIN_W                   amomin.w	a5, a6, (a7)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAX_W                   amomax.w	s7, s6, (s5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMINU_W                  amominu.w	s6, s5, (s4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAXU_W                  amomaxu.w	s5, s4, (s3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOSWAP_W_AQ               amoswap.w.aq	a4, ra, (s0)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOADD_W_AQ                amoadd.w.aq	a1, a2, (a3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOXOR_W_AQ                amoxor.w.aq	a2, a3, (a4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOAND_W_AQ                amoand.w.aq	a3, a4, (a5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOOR_W_AQ                 amoor.w.aq	a4, a5, (a6)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMIN_W_AQ                amomin.w.aq	a5, a6, (a7)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAX_W_AQ                amomax.w.aq	s7, s6, (s5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMINU_W_AQ               amominu.w.aq	s6, s5, (s4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAXU_W_AQ               amomaxu.w.aq	s5, s4, (s3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOSWAP_W_RL               amoswap.w.rl	a4, ra, (s0)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOADD_W_RL                amoadd.w.rl	a1, a2, (a3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOXOR_W_RL                amoxor.w.rl	a2, a3, (a4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOAND_W_RL                amoand.w.rl	a3, a4, (a5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOOR_W_RL                 amoor.w.rl	a4, a5, (a6)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMIN_W_RL                amomin.w.rl	a5, a6, (a7)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAX_W_RL                amomax.w.rl	s7, s6, (s5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMINU_W_RL               amominu.w.rl	s6, s5, (s4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAXU_W_RL               amomaxu.w.rl	s5, s4, (s3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOSWAP_W_AQRL             amoswap.w.aqrl	a4, ra, (s0)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOADD_W_AQRL              amoadd.w.aqrl	a1, a2, (a3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOXOR_W_AQRL              amoxor.w.aqrl	a2, a3, (a4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOAND_W_AQRL              amoand.w.aqrl	a3, a4, (a5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOOR_W_AQRL               amoor.w.aqrl	a4, a5, (a6)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMIN_W_AQRL              amomin.w.aqrl	a5, a6, (a7)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAX_W_AQRL              amomax.w.aqrl	s7, s6, (s5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMINU_W_AQRL             amominu.w.aqrl	s6, s5, (s4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAXU_W_AQRL             amomaxu.w.aqrl	s5, s4, (s3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOSWAP_D                  amoswap.d	a4, ra, (s0)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOADD_D                   amoadd.d	a1, a2, (a3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOXOR_D                   amoxor.d	a2, a3, (a4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOAND_D                   amoand.d	a3, a4, (a5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOOR_D                    amoor.d	a4, a5, (a6)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMIN_D                   amomin.d	a5, a6, (a7)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAX_D                   amomax.d	s7, s6, (s5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMINU_D                  amominu.d	s6, s5, (s4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAXU_D                  amomaxu.d	s5, s4, (s3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOSWAP_D_AQ               amoswap.d.aq	a4, ra, (s0)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOADD_D_AQ                amoadd.d.aq	a1, a2, (a3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOXOR_D_AQ                amoxor.d.aq	a2, a3, (a4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOAND_D_AQ                amoand.d.aq	a3, a4, (a5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOOR_D_AQ                 amoor.d.aq	a4, a5, (a6)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMIN_D_AQ                amomin.d.aq	a5, a6, (a7)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAX_D_AQ                amomax.d.aq	s7, s6, (s5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMINU_D_AQ               amominu.d.aq	s6, s5, (s4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAXU_D_AQ               amomaxu.d.aq	s5, s4, (s3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOSWAP_D_RL               amoswap.d.rl	a4, ra, (s0)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOADD_D_RL                amoadd.d.rl	a1, a2, (a3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOXOR_D_RL                amoxor.d.rl	a2, a3, (a4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOAND_D_RL                amoand.d.rl	a3, a4, (a5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOOR_D_RL                 amoor.d.rl	a4, a5, (a6)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMIN_D_RL                amomin.d.rl	a5, a6, (a7)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAX_D_RL                amomax.d.rl	s7, s6, (s5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMINU_D_RL               amominu.d.rl	s6, s5, (s4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAXU_D_RL               amomaxu.d.rl	s5, s4, (s3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOSWAP_D_AQRL             amoswap.d.aqrl	a4, ra, (s0)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOADD_D_AQRL              amoadd.d.aqrl	a1, a2, (a3)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOXOR_D_AQRL              amoxor.d.aqrl	a2, a3, (a4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOAND_D_AQRL              amoand.d.aqrl	a3, a4, (a5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOOR_D_AQRL               amoor.d.aqrl	a4, a5, (a6)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMIN_D_AQRL              amomin.d.aqrl	a5, a6, (a7)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAX_D_AQRL              amomax.d.aqrl	s7, s6, (s5)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMINU_D_AQRL             amominu.d.aqrl	s6, s5, (s4)
+# CHECK-NEXT:  1      4     0.33    *      *             2     XSPipeLDU,XSPipeMemIQ                      AMOMAXU_D_AQRL             amomaxu.d.aqrl	s5, s4, (s3)
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     26.67  26.67  26.67  4.00   4.00   4.00   4.00
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lr.w	t0, (t1)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lr.w.aq	t1, (t2)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lr.w.rl	t2, (t3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lr.w.aqrl	t3, (t4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sc.w	t6, t5, (t4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sc.w.aq	t5, t4, (t3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sc.w.rl	t4, t3, (t2)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sc.w.aqrl	t3, t2, (t1)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lr.d	t0, (t1)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lr.d.aq	t1, (t2)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lr.d.rl	t2, (t3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lr.d.aqrl	t3, (t4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sc.d	t6, t5, (t4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sc.d.aq	t5, t4, (t3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sc.d.rl	t4, t3, (t2)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sc.d.aqrl	t3, t2, (t1)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoswap.w	a4, ra, (s0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoadd.w	a1, a2, (a3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoxor.w	a2, a3, (a4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoand.w	a3, a4, (a5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoor.w	a4, a5, (a6)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomin.w	a5, a6, (a7)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomax.w	s7, s6, (s5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amominu.w	s6, s5, (s4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomaxu.w	s5, s4, (s3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoswap.w.aq	a4, ra, (s0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoadd.w.aq	a1, a2, (a3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoxor.w.aq	a2, a3, (a4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoand.w.aq	a3, a4, (a5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoor.w.aq	a4, a5, (a6)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomin.w.aq	a5, a6, (a7)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomax.w.aq	s7, s6, (s5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amominu.w.aq	s6, s5, (s4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomaxu.w.aq	s5, s4, (s3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoswap.w.rl	a4, ra, (s0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoadd.w.rl	a1, a2, (a3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoxor.w.rl	a2, a3, (a4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoand.w.rl	a3, a4, (a5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoor.w.rl	a4, a5, (a6)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomin.w.rl	a5, a6, (a7)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomax.w.rl	s7, s6, (s5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amominu.w.rl	s6, s5, (s4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomaxu.w.rl	s5, s4, (s3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoswap.w.aqrl	a4, ra, (s0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoadd.w.aqrl	a1, a2, (a3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoxor.w.aqrl	a2, a3, (a4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoand.w.aqrl	a3, a4, (a5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoor.w.aqrl	a4, a5, (a6)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomin.w.aqrl	a5, a6, (a7)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomax.w.aqrl	s7, s6, (s5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amominu.w.aqrl	s6, s5, (s4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomaxu.w.aqrl	s5, s4, (s3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoswap.d	a4, ra, (s0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoadd.d	a1, a2, (a3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoxor.d	a2, a3, (a4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoand.d	a3, a4, (a5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoor.d	a4, a5, (a6)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomin.d	a5, a6, (a7)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomax.d	s7, s6, (s5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amominu.d	s6, s5, (s4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomaxu.d	s5, s4, (s3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoswap.d.aq	a4, ra, (s0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoadd.d.aq	a1, a2, (a3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoxor.d.aq	a2, a3, (a4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoand.d.aq	a3, a4, (a5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoor.d.aq	a4, a5, (a6)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomin.d.aq	a5, a6, (a7)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomax.d.aq	s7, s6, (s5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amominu.d.aq	s6, s5, (s4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomaxu.d.aq	s5, s4, (s3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoswap.d.rl	a4, ra, (s0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoadd.d.rl	a1, a2, (a3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoxor.d.rl	a2, a3, (a4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoand.d.rl	a3, a4, (a5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoor.d.rl	a4, a5, (a6)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomin.d.rl	a5, a6, (a7)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomax.d.rl	s7, s6, (s5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amominu.d.rl	s6, s5, (s4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomaxu.d.rl	s5, s4, (s3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoswap.d.aqrl	a4, ra, (s0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoadd.d.aqrl	a1, a2, (a3)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoxor.d.aqrl	a2, a3, (a4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoand.d.aqrl	a3, a4, (a5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amoor.d.aqrl	a4, a5, (a6)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomin.d.aqrl	a5, a6, (a7)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomax.d.aqrl	s7, s6, (s5)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amominu.d.aqrl	s6, s5, (s4)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     amomaxu.d.aqrl	s5, s4, (s3)

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/branch.s b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/branch.s
new file mode 100644
index 0000000000000..d153cecf582b4
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/branch.s
@@ -0,0 +1,84 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 < %s | FileCheck %s
+
+j 1f
+1:
+jr ra
+
+beq a0, a1, 1f
+1:
+bne a0, a1, 1f
+1:
+blt a0, a1, 1f
+1:
+bge a0, a1, 1f
+1:
+bltu a0, a1, 1f
+1:
+bgeu a0, a1, 1f
+1:
+
+# CHECK:      Iterations:        1
+# CHECK-NEXT: Instructions:      8
+# CHECK-NEXT: Total Cycles:      6
+# CHECK-NEXT: Total uOps:        8
+
+# CHECK:      Dispatch Width:    6
+# CHECK-NEXT: uOps Per Cycle:    1.33
+# CHECK-NEXT: IPC:               1.33
+# CHECK-NEXT: Block RThroughput: 2.7
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
+# CHECK-NEXT:  1      1     0.33                        j	.Ltmp0
+# CHECK-NEXT:  1      1     0.33                        ret
+# CHECK-NEXT:  1      1     0.33                        beq	a0, a1, .Ltmp1
+# CHECK-NEXT:  1      1     0.33                        bne	a0, a1, .Ltmp2
+# CHECK-NEXT:  1      1     0.33                        blt	a0, a1, .Ltmp3
+# CHECK-NEXT:  1      1     0.33                        bge	a0, a1, .Ltmp4
+# CHECK-NEXT:  1      1     0.33                        bltu	a0, a1, .Ltmp5
+# CHECK-NEXT:  1      1     0.33                        bgeu	a0, a1, .Ltmp6
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT:  -      -      -      -     2.00   3.00   3.00    -      -      -      -      -      -      -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     j	.Ltmp0
+# CHECK-NEXT:  -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -      -     ret
+# CHECK-NEXT:  -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     beq	a0, a1, .Ltmp1
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     bne	a0, a1, .Ltmp2
+# CHECK-NEXT:  -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -      -     blt	a0, a1, .Ltmp3
+# CHECK-NEXT:  -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     bge	a0, a1, .Ltmp4
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     bltu	a0, a1, .Ltmp5
+# CHECK-NEXT:  -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -      -     bgeu	a0, a1, .Ltmp6

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/cascade-fma.s b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/cascade-fma.s
new file mode 100644
index 0000000000000..f37012f1cf13e
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/cascade-fma.s
@@ -0,0 +1,55 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu < %s | FileCheck %s
+
+fmadd.s fa0, fa1, fa2, fa0
+
+# CHECK:      Iterations:        100
+# CHECK-NEXT: Instructions:      100
+# CHECK-NEXT: Total Cycles:      403
+# CHECK-NEXT: Total uOps:        100
+
+# CHECK:      Dispatch Width:    6
+# CHECK-NEXT: uOps Per Cycle:    0.25
+# CHECK-NEXT: IPC:               0.25
+# CHECK-NEXT: Block RThroughput: 0.3
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
+# CHECK-NEXT:  1      4     0.33                        fmadd.s	fa0, fa1, fa2, fa0
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.34    -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.34    -      -      -      -      -      -      -     fmadd.s	fa0, fa1, fa2, fa0

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/div-fdiv.s b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/div-fdiv.s
new file mode 100644
index 0000000000000..fffc44b1e3386
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/div-fdiv.s
@@ -0,0 +1,120 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -timeline -iterations=1 < %s | FileCheck %s
+
+div a0, a1, a2
+divu a0, a1, a2
+divw a0, a1, a2
+divuw a0, a1, a2
+rem a0, a1, a2
+remu a0, a1, a2
+remw a0, a1, a2
+remuw a0, a1, a2
+
+fdiv.s fa0, fa1, fa2
+fdiv.d fa0, fa1, fa2
+fsqrt.s fa0, fa1
+fsqrt.d fa0, fa1
+
+# CHECK:      Iterations:        1
+# CHECK-NEXT: Instructions:      12
+# CHECK-NEXT: Total Cycles:      123
+# CHECK-NEXT: Total uOps:        12
+
+# CHECK:      Dispatch Width:    6
+# CHECK-NEXT: uOps Per Cycle:    0.10
+# CHECK-NEXT: IPC:               0.10
+# CHECK-NEXT: Block RThroughput: 120.0
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
+# CHECK-NEXT:  1      19    19.00                       div	a0, a1, a2
+# CHECK-NEXT:  1      19    19.00                       divu	a0, a1, a2
+# CHECK-NEXT:  1      11    11.00                       divw	a0, a1, a2
+# CHECK-NEXT:  1      11    11.00                       divuw	a0, a1, a2
+# CHECK-NEXT:  1      19    19.00                       rem	a0, a1, a2
+# CHECK-NEXT:  1      19    19.00                       remu	a0, a1, a2
+# CHECK-NEXT:  1      11    11.00                       remw	a0, a1, a2
+# CHECK-NEXT:  1      11    11.00                       remuw	a0, a1, a2
+# CHECK-NEXT:  1      9     4.50                        fdiv.s	fa0, fa1, fa2
+# CHECK-NEXT:  1      14    7.00                        fdiv.d	fa0, fa1, fa2
+# CHECK-NEXT:  1      10    5.00                        fsqrt.s	fa0, fa1
+# CHECK-NEXT:  1      16    8.00                        fsqrt.d	fa0, fa1
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT:  -      -      -      -      -      -      -     120.00  -     30.00   -     19.00   -      -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     div	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     divu	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     11.00   -      -      -      -      -      -      -      -      -      -      -      -     divw	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     11.00   -      -      -      -      -      -      -      -      -      -      -      -     divuw	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     rem	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     remu	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     11.00   -      -      -      -      -      -      -      -      -      -      -      -     remw	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     11.00   -      -      -      -      -      -      -      -      -      -      -      -     remuw	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -     9.00    -      -      -      -      -      -      -      -     fdiv.s	fa0, fa1, fa2
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -     14.00   -      -      -      -      -      -      -      -      -      -     fdiv.d	fa0, fa1, fa2
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -     10.00   -      -      -      -      -      -      -      -     fsqrt.s	fa0, fa1
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -     16.00   -      -      -      -      -      -      -      -      -      -     fsqrt.d	fa0, fa1
+
+# CHECK:      Timeline view:
+# CHECK-NEXT:                     0123456789          0123456789          0123456789
+# CHECK-NEXT: Index     0123456789          0123456789          0123456789          012
+
+# CHECK:      [0,0]     DeeeeeeeeeeeeeeeeeeeER   .    .    .    .    .    .    .    . .   div	a0, a1, a2
+# CHECK-NEXT: [0,1]     D===================eeeeeeeeeeeeeeeeeeeER    .    .    .    . .   divu	a0, a1, a2
+# CHECK-NEXT: [0,2]     D======================================eeeeeeeeeeeER   .    . .   divw	a0, a1, a2
+# CHECK-NEXT: [0,3]     D=================================================eeeeeeeeeeeER   divuw	a0, a1, a2
+# CHECK-NEXT: Truncated display due to cycle limit
+
+# CHECK:      Average Wait times (based on the timeline view):
+# CHECK-NEXT: [0]: Executions
+# CHECK-NEXT: [1]: Average time spent waiting in a scheduler's queue
+# CHECK-NEXT: [2]: Average time spent waiting in a scheduler's queue while ready
+# CHECK-NEXT: [3]: Average time elapsed from WB until retire stage
+
+# CHECK:            [0]    [1]    [2]    [3]
+# CHECK-NEXT: 0.     1     1.0    1.0    0.0       div	a0, a1, a2
+# CHECK-NEXT: 1.     1     20.0   20.0   0.0       divu	a0, a1, a2
+# CHECK-NEXT: 2.     1     39.0   39.0   0.0       divw	a0, a1, a2
+# CHECK-NEXT: 3.     1     50.0   50.0   0.0       divuw	a0, a1, a2
+# CHECK-NEXT: 4.     1     61.0   61.0   0.0       rem	a0, a1, a2
+# CHECK-NEXT: 5.     1     80.0   80.0   0.0       remu	a0, a1, a2
+# CHECK-NEXT: 6.     1     98.0   98.0   0.0       remw	a0, a1, a2
+# CHECK-NEXT: 7.     1     109.0  109.0  0.0       remuw	a0, a1, a2
+# CHECK-NEXT: 8.     1     1.0    1.0    110.0     fdiv.s	fa0, fa1, fa2
+# CHECK-NEXT: 9.     1     1.0    1.0    105.0     fdiv.d	fa0, fa1, fa2
+# CHECK-NEXT: 10.    1     10.0   10.0   100.0     fsqrt.s	fa0, fa1
+# CHECK-NEXT: 11.    1     15.0   15.0   89.0      fsqrt.d	fa0, fa1
+# CHECK-NEXT:        12    40.4   40.4   33.7      <total>

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/floating-point.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/floating-point.test
new file mode 100644
index 0000000000000..aa06881688a68
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/floating-point.test
@@ -0,0 +1,199 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full  %p/../Inputs/floating-point.s | FileCheck  %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      4     0.33    *                    4     XSPipeLDU,XSPipeMemIQ                      FLW                        flw	ft0, 0(a0)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         FSW                        fsw	ft0, 0(a0)
+# CHECK-NEXT:  1      4     0.33    *                    4     XSPipeLDU,XSPipeMemIQ                      FLD                        fld	ft0, 0(a0)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         FSD                        fsd	ft0, 0(a0)
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FADD_S                   fadd.s	fs10, fs11, ft8
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FSUB_S                   fsub.s	ft9, ft10, ft11
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMUL_S                   fmul.s	ft0, ft1, ft2
+# CHECK-NEXT:  1      9     4.50                         9     XSPipeGroupFDIV[9],XSPipeGroupFP[9]        FDIV_S                     fdiv.s	ft3, ft4, ft5
+# CHECK-NEXT:  1      10    5.00                         10    XSPipeGroupFDIV[10],XSPipeGroupFP[10]      FSQRT_S                    fsqrt.s	ft6, ft7
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMIN_S                   fmin.s	fa5, fa6, fa7
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMAX_S                   fmax.s	fs2, fs3, fs4
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMADD_S                  fmadd.s	fa0, fa1, fa2, ft11
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMSUB_S                  fmsub.s	fa4, fa5, fa6, fa7
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FNMSUB_S                 fnmsub.s	fs2, fs3, fs4, fs5
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FNMADD_S                 fnmadd.s	fs6, fs7, fs8, fs9
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FADD_D                   fadd.d	fs10, fs11, ft8
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FSUB_D                   fsub.d	ft9, ft10, ft11
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMUL_D                   fmul.d	ft0, ft1, ft2
+# CHECK-NEXT:  1      14    7.00                         14    XSPipeGroupFDIV[14],XSPipeGroupFP[14]      FDIV_D                     fdiv.d	ft3, ft4, ft5
+# CHECK-NEXT:  1      16    8.00                         16    XSPipeGroupFDIV[16],XSPipeGroupFP[16]      FSQRT_D                    fsqrt.d	ft6, ft7
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMIN_D                   fmin.d	fa5, fa6, fa7
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMAX_D                   fmax.d	fs2, fs3, fs4
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMADD_D                  fmadd.d	fa0, fa1, fa2, ft11
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMSUB_D                  fmsub.d	fa4, fa5, fa6, fa7
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FNMSUB_D                 fnmsub.d	fs2, fs3, fs4, fs5
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FNMADD_D                 fnmadd.d	fs6, fs7, fs8, fs9
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_W_S fcvt.w.s	a0, fs5
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_WU_S fcvt.wu.s	a1, fs6
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FCVT_S_W        fcvt.s.w	ft11, a4
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FCVT_S_WU       fcvt.s.wu	ft0, a5
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_L_S fcvt.l.s	a0, ft0
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_LU_S fcvt.lu.s	a1, ft1
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FCVT_S_L        fcvt.s.l	ft2, a2
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FCVT_S_LU       fcvt.s.lu	ft3, a3
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMV_X_W fmv.x.w	a2, fs7
+# CHECK-NEXT:  1      1     1.00                         1     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FMV_W_X         fmv.w.x	ft1, a6
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FSGNJ_S                  fsgnj.s	fs1, fa0, fa1
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FSGNJN_S                 fsgnjn.s	fa1, fa3, fa4
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_WU_D fcvt.wu.d	a4, ft11
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_W_D fcvt.w.d	a4, ft11
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FCVT_D_W        fcvt.d.w	ft0, a5
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FCVT_D_WU       fcvt.d.wu	ft1, a6
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_S_D fcvt.s.d	fs5, fs6
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_D_S fcvt.d.s	fs7, fs8
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_L_D fcvt.l.d	a0, ft0
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_LU_D fcvt.lu.d	a1, ft1
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FCVT_D_L        fcvt.d.l	ft3, a3
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FCVT_D_LU       fcvt.d.lu	ft4, a4
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMV_X_D fmv.x.d	a2, ft2
+# CHECK-NEXT:  1      1     1.00                         1     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FMV_D_X         fmv.d.x	ft5, a5
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FSGNJ_D                  fsgnj.d	fs1, fa0, fa1
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FSGNJN_D                 fsgnjn.d	fa1, fa3, fa4
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FEQ_S                    feq.s	a1, fs8, fs9
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FLT_S                    flt.s	a2, fs10, fs11
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FLE_S                    fle.s	a3, ft8, ft9
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FEQ_D                    feq.d	a1, fs8, fs9
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FLT_D                    flt.d	a2, fs10, fs11
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FLE_D                    fle.d	a3, ft8, ft9
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCLASS_S                 fclass.s	a3, ft10
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCLASS_D                 fclass.d	a3, ft10
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT:  -      -      -      -      -      -     10.00   -     22.00  24.50  10.00  24.50  10.00  0.67   0.67   0.67   1.00   1.00   1.00   1.00
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     flw	ft0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   fsw	ft0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     fld	ft0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   fsd	ft0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fadd.s	fs10, fs11, ft8
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fsub.s	ft9, ft10, ft11
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmul.s	ft0, ft1, ft2
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -     4.50    -     4.50    -      -      -      -      -      -      -      -     fdiv.s	ft3, ft4, ft5
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -     5.00    -     5.00    -      -      -      -      -      -      -      -     fsqrt.s	ft6, ft7
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmin.s	fa5, fa6, fa7
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmax.s	fs2, fs3, fs4
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmadd.s	fa0, fa1, fa2, ft11
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmsub.s	fa4, fa5, fa6, fa7
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fnmsub.s	fs2, fs3, fs4, fs5
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fnmadd.s	fs6, fs7, fs8, fs9
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fadd.d	fs10, fs11, ft8
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fsub.d	ft9, ft10, ft11
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmul.d	ft0, ft1, ft2
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -     7.00    -     7.00    -      -      -      -      -      -      -      -     fdiv.d	ft3, ft4, ft5
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -     8.00    -     8.00    -      -      -      -      -      -      -      -     fsqrt.d	ft6, ft7
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmin.d	fa5, fa6, fa7
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmax.d	fs2, fs3, fs4
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmadd.d	fa0, fa1, fa2, ft11
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmsub.d	fa4, fa5, fa6, fa7
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fnmsub.d	fs2, fs3, fs4, fs5
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fnmadd.d	fs6, fs7, fs8, fs9
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.w.s	a0, fs5
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.wu.s	a1, fs6
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fcvt.s.w	ft11, a4
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fcvt.s.wu	ft0, a5
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.l.s	a0, ft0
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.lu.s	a1, ft1
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fcvt.s.l	ft2, a2
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fcvt.s.lu	ft3, a3
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fmv.x.w	a2, fs7
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fmv.w.x	ft1, a6
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fsgnj.s	fs1, fa0, fa1
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fsgnjn.s	fa1, fa3, fa4
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.wu.d	a4, ft11
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.w.d	a4, ft11
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fcvt.d.w	ft0, a5
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fcvt.d.wu	ft1, a6
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.s.d	fs5, fs6
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.d.s	fs7, fs8
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.l.d	a0, ft0
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.lu.d	a1, ft1
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fcvt.d.l	ft3, a3
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fcvt.d.lu	ft4, a4
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fmv.x.d	a2, ft2
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fmv.d.x	ft5, a5
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fsgnj.d	fs1, fa0, fa1
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fsgnjn.d	fa1, fa3, fa4
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     feq.s	a1, fs8, fs9
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     flt.s	a2, fs10, fs11
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fle.s	a3, ft8, ft9
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     feq.d	a1, fs8, fs9
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     flt.d	a2, fs10, fs11
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fle.d	a3, ft8, ft9
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fclass.s	a3, ft10
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fclass.d	a3, ft10

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/fpr-bypass.s b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/fpr-bypass.s
new file mode 100644
index 0000000000000..63e1a73608602
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/fpr-bypass.s
@@ -0,0 +1,58 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu < %s | FileCheck %s
+
+fadd.s fa0, fa1, fa2
+fadd.s fa0, fa0, fa2
+
+# CHECK:      Iterations:        100
+# CHECK-NEXT: Instructions:      200
+# CHECK-NEXT: Total Cycles:      71
+# CHECK-NEXT: Total uOps:        200
+
+# CHECK:      Dispatch Width:    6
+# CHECK-NEXT: uOps Per Cycle:    2.82
+# CHECK-NEXT: IPC:               2.82
+# CHECK-NEXT: Block RThroughput: 0.7
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
+# CHECK-NEXT:  1      1     0.33                        fadd.s	fa0, fa1, fa2
+# CHECK-NEXT:  1      1     0.33                        fadd.s	fa0, fa0, fa2
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.66    -     0.67    -     0.67    -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.34    -      -      -      -      -      -      -     fadd.s	fa0, fa1, fa2
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.34    -     0.33    -      -      -      -      -      -      -     fadd.s	fa0, fa0, fa2

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/gpr-bypass.s b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/gpr-bypass.s
new file mode 100644
index 0000000000000..8bdcddeca560a
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/gpr-bypass.s
@@ -0,0 +1,58 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu < %s | FileCheck %s
+
+add a0, a1, a2
+add a0, a0, a2
+
+# CHECK:      Iterations:        100
+# CHECK-NEXT: Instructions:      200
+# CHECK-NEXT: Total Cycles:      54
+# CHECK-NEXT: Total uOps:        200
+
+# CHECK:      Dispatch Width:    6
+# CHECK-NEXT: uOps Per Cycle:    3.70
+# CHECK-NEXT: IPC:               3.70
+# CHECK-NEXT: Block RThroughput: 0.5
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
+# CHECK-NEXT:  1      1     0.25                        add	a0, a1, a2
+# CHECK-NEXT:  1      1     0.25                        add	a0, a0, a2
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT: 0.50   0.50   0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -     0.50   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     add	a0, a1, a2
+# CHECK-NEXT: 0.50    -     0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     add	a0, a0, a2

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/integer.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/integer.test
new file mode 100644
index 0000000000000..7907ae226c7bf
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/integer.test
@@ -0,0 +1,191 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full  %p/../Inputs/integer.s | FileCheck  %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_ADDI                     addi	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_ADDIW                    addiw	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SLTI                       slti	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SLTIU                      seqz	a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_ANDI                     andi	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              ORI                        ori	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              XORI                       xori	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_SLLI                     slli	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_SRLI                     srli	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_SRAI                     srai	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SLLIW                      slliw	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SRLIW                      srliw	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SRAIW                      sraiw	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_LUI                      lui	a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              AUIPC                      auipc	a1, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_ADD                      add	a0, a0, a1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_ADDW                     addw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SLT                        slt	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SLTU                       sltu	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_AND                      and	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_OR                       or	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_XOR                      xor	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SLL                        sll	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SRL                        srl	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SRA                        sra	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SLLW                       sllw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SRLW                       srlw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SRAW                       sraw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_SUB                      sub	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_SUBW                     subw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupBRU,XSPipeGroupInt              JAL                        jal	a0, .Ltmp0
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupBRU,XSPipeGroupInt              C_JALR                     jalr	a0
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupBRU,XSPipeGroupInt              BEQ                        beq	a0, a0, .Ltmp1
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupBRU,XSPipeGroupInt              BNE                        bne	a0, a0, .Ltmp2
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupBRU,XSPipeGroupInt              BLT                        blt	a0, a0, .Ltmp3
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupBRU,XSPipeGroupInt              BLTU                       bltu	a0, a0, .Ltmp4
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupBRU,XSPipeGroupInt              BGE                        bge	a0, a0, .Ltmp5
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupBRU,XSPipeGroupInt              BGEU                       bgeu	a0, a0, .Ltmp6
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_ADD                      add	a0, a0, a0
+# CHECK-NEXT:  1      4     0.33    *                    4     XSPipeLDU,XSPipeMemIQ                      LB                         lb	t0, 0(a0)
+# CHECK-NEXT:  1      4     0.33    *                    4     XSPipeLDU,XSPipeMemIQ                      LBU                        lbu	t0, 0(a0)
+# CHECK-NEXT:  1      4     0.33    *                    4     XSPipeLDU,XSPipeMemIQ                      LH                         lh	t0, 0(a0)
+# CHECK-NEXT:  1      4     0.33    *                    4     XSPipeLDU,XSPipeMemIQ                      LHU                        lhu	t0, 0(a0)
+# CHECK-NEXT:  1      4     0.33    *                    4     XSPipeLDU,XSPipeMemIQ                      LW                         lw	t0, 0(a0)
+# CHECK-NEXT:  1      4     0.33    *                    4     XSPipeLDU,XSPipeMemIQ                      LWU                        lwu	t0, 0(a0)
+# CHECK-NEXT:  1      4     0.33    *                    4     XSPipeLDU,XSPipeMemIQ                      LD                         ld	t0, 0(a0)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SB                         sb	t0, 0(a0)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SH                         sh	t0, 0(a0)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SW                         sw	t0, 0(a0)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         SD                         sd	t0, 0(a0)
+# CHECK-NEXT:  1      1     1.00                  U      1     XSPipeBJU3,XSPipeGroupInt,XSPipeIntIQ3     CSRRW                      csrrw	t0, 4095, t1
+# CHECK-NEXT:  1      1     1.00                  U      1     XSPipeBJU3,XSPipeGroupInt,XSPipeIntIQ3     CSRRS                      csrrs	s3, fflags, s5
+# CHECK-NEXT:  1      1     1.00                  U      1     XSPipeBJU3,XSPipeGroupInt,XSPipeIntIQ3     CSRRC                      csrrc	sp, 0, ra
+# CHECK-NEXT:  1      1     1.00                  U      1     XSPipeBJU3,XSPipeGroupInt,XSPipeIntIQ3     CSRRWI                     csrrwi	a5, 0, 0
+# CHECK-NEXT:  1      1     1.00                  U      1     XSPipeBJU3,XSPipeGroupInt,XSPipeIntIQ3     CSRRSI                     csrrsi	t2, 4095, 31
+# CHECK-NEXT:  1      1     1.00                  U      1     XSPipeBJU3,XSPipeGroupInt,XSPipeIntIQ3     CSRRCI                     csrrci	t1, sscratch, 5
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT: 7.75   7.75   7.75   7.75   2.67   2.67   2.67   6.00    -      -      -      -      -     2.33   2.33   2.33   2.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]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     addi	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     addiw	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     slti	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     seqz	a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     andi	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     ori	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     xori	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     slli	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     srli	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     srai	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     slliw	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     srliw	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sraiw	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     lui	a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     auipc	a1, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     add	a0, a0, a1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     addw	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     slt	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sltu	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     and	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     or	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     xor	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sll	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     srl	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sra	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sllw	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     srlw	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sraw	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sub	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     subw	a0, a0, a0
+# CHECK-NEXT:  -      -      -      -     0.33   0.33   0.33    -      -      -      -      -      -      -      -      -      -      -      -      -     jal	a0, .Ltmp0
+# CHECK-NEXT:  -      -      -      -     0.33   0.33   0.33    -      -      -      -      -      -      -      -      -      -      -      -      -     jalr	a0
+# CHECK-NEXT:  -      -      -      -     0.33   0.33   0.33    -      -      -      -      -      -      -      -      -      -      -      -      -     beq	a0, a0, .Ltmp1
+# CHECK-NEXT:  -      -      -      -     0.33   0.33   0.33    -      -      -      -      -      -      -      -      -      -      -      -      -     bne	a0, a0, .Ltmp2
+# CHECK-NEXT:  -      -      -      -     0.33   0.33   0.33    -      -      -      -      -      -      -      -      -      -      -      -      -     blt	a0, a0, .Ltmp3
+# CHECK-NEXT:  -      -      -      -     0.33   0.33   0.33    -      -      -      -      -      -      -      -      -      -      -      -      -     bltu	a0, a0, .Ltmp4
+# CHECK-NEXT:  -      -      -      -     0.33   0.33   0.33    -      -      -      -      -      -      -      -      -      -      -      -      -     bge	a0, a0, .Ltmp5
+# CHECK-NEXT:  -      -      -      -     0.33   0.33   0.33    -      -      -      -      -      -      -      -      -      -      -      -      -     bgeu	a0, a0, .Ltmp6
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     add	a0, a0, a0
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lb	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lbu	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lh	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lhu	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lw	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     lwu	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     ld	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sb	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sh	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sw	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   sd	t0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -     csrrw	t0, 4095, t1
+# CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -     csrrs	s3, fflags, s5
+# CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -     csrrc	sp, 0, ra
+# CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -     csrrwi	a5, 0, 0
+# CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -     csrrsi	t2, 4095, 31
+# CHECK-NEXT:  -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -     csrrci	t1, sscratch, 5

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/load-to-alu.s b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/load-to-alu.s
new file mode 100644
index 0000000000000..71c8bc1bb1f7d
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/load-to-alu.s
@@ -0,0 +1,75 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -timeline -iterations=1 < %s | FileCheck %s
+
+ld a1, 0(a0)
+addi a2, a1, 1
+
+# CHECK:      Iterations:        1
+# CHECK-NEXT: Instructions:      2
+# CHECK-NEXT: Total Cycles:      7
+# CHECK-NEXT: Total uOps:        2
+
+# CHECK:      Dispatch Width:    6
+# CHECK-NEXT: uOps Per Cycle:    0.29
+# CHECK-NEXT: IPC:               0.29
+# CHECK-NEXT: Block RThroughput: 0.3
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
+# CHECK-NEXT:  1      4     0.33    *                   ld	a1, 0(a0)
+# CHECK-NEXT:  1      1     0.25                        addi	a2, a1, 1
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT:  -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     1.00    -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     1.00    -      -      -      -     ld	a1, 0(a0)
+# CHECK-NEXT:  -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     addi	a2, a1, 1
+
+# CHECK:      Timeline view:
+# CHECK-NEXT: Index     0123456
+
+# CHECK:      [0,0]     DeeeeER   ld	a1, 0(a0)
+# CHECK-NEXT: [0,1]     D==eE-R   addi	a2, a1, 1
+
+# CHECK:      Average Wait times (based on the timeline view):
+# CHECK-NEXT: [0]: Executions
+# CHECK-NEXT: [1]: Average time spent waiting in a scheduler's queue
+# CHECK-NEXT: [2]: Average time spent waiting in a scheduler's queue while ready
+# CHECK-NEXT: [3]: Average time elapsed from WB until retire stage
+
+# CHECK:            [0]    [1]    [2]    [3]
+# CHECK-NEXT: 0.     1     1.0    1.0    0.0       ld	a1, 0(a0)
+# CHECK-NEXT: 1.     1     3.0    0.0    1.0       addi	a2, a1, 1
+# CHECK-NEXT:        2     2.0    0.5    0.5       <total>

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/load-to-fpu.s b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/load-to-fpu.s
new file mode 100644
index 0000000000000..7df24eba73256
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/load-to-fpu.s
@@ -0,0 +1,75 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -timeline -iterations=1 < %s | FileCheck %s
+
+fld fa1, 0(a0)
+fadd.s fa2, fa1, fa3
+
+# CHECK:      Iterations:        1
+# CHECK-NEXT: Instructions:      2
+# CHECK-NEXT: Total Cycles:      8
+# CHECK-NEXT: Total uOps:        2
+
+# CHECK:      Dispatch Width:    6
+# CHECK-NEXT: uOps Per Cycle:    0.25
+# CHECK-NEXT: IPC:               0.25
+# CHECK-NEXT: Block RThroughput: 0.3
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    Instructions:
+# CHECK-NEXT:  1      4     0.33    *                   fld	fa1, 0(a0)
+# CHECK-NEXT:  1      1     0.33                        fadd.s	fa2, fa1, fa3
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     1.00    -      -     1.00    -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     1.00    -      -      -      -     fld	fa1, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -     fadd.s	fa2, fa1, fa3
+
+# CHECK:      Timeline view:
+# CHECK-NEXT: Index     01234567
+
+# CHECK:      [0,0]     DeeeeER.   fld	fa1, 0(a0)
+# CHECK-NEXT: [0,1]     D====eER   fadd.s	fa2, fa1, fa3
+
+# CHECK:      Average Wait times (based on the timeline view):
+# CHECK-NEXT: [0]: Executions
+# CHECK-NEXT: [1]: Average time spent waiting in a scheduler's queue
+# CHECK-NEXT: [2]: Average time spent waiting in a scheduler's queue while ready
+# CHECK-NEXT: [3]: Average time elapsed from WB until retire stage
+
+# CHECK:            [0]    [1]    [2]    [3]
+# CHECK-NEXT: 0.     1     1.0    1.0    0.0       fld	fa1, 0(a0)
+# CHECK-NEXT: 1.     1     5.0    0.0    0.0       fadd.s	fa2, fa1, fa3
+# CHECK-NEXT:        2     3.0    0.5    0.0       <total>

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/mul-div-rv32.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/mul-div-rv32.test
new file mode 100644
index 0000000000000..82779e1b94a6d
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/mul-div-rv32.test
@@ -0,0 +1,95 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full  %p/../Inputs/mul-div-rv32.s | FileCheck  %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL C_MUL     mul	a0, a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL MULH      mulh	a0, a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL MULHU     mulhu	a0, a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL MULHSU    mulhsu	a0, a0, a0
+# CHECK-NEXT:  1      19    19.00                        19    XSPipeBJU3[19],XSPipeGroupInt[19],XSPipeIntIQ3[19] DIV                div	a0, a1, a2
+# CHECK-NEXT:  1      19    19.00                        19    XSPipeBJU3[19],XSPipeGroupInt[19],XSPipeIntIQ3[19] DIVU               divu	a0, a1, a2
+# CHECK-NEXT:  1      19    19.00                        19    XSPipeBJU3[19],XSPipeGroupInt[19],XSPipeIntIQ3[19] REM                rem	a0, a1, a2
+# CHECK-NEXT:  1      19    19.00                        19    XSPipeBJU3[19],XSPipeGroupInt[19],XSPipeIntIQ3[19] REMU               remu	a0, a1, a2
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT: 2.00   2.00    -      -      -      -      -     76.00   -      -      -      -      -      -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     mul	a0, a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     mulh	a0, a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     mulhu	a0, a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     mulhsu	a0, a0, a0
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     div	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     divu	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     rem	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     remu	a0, a1, a2

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/mul-div.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/mul-div.test
new file mode 100644
index 0000000000000..613379b7fab39
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/mul-div.test
@@ -0,0 +1,105 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full  %p/../Inputs/mul-div.s | FileCheck  %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL C_MUL     mul	a0, a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL MULH      mulh	a0, a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL MULHU     mulhu	a0, a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL MULHSU    mulhsu	a0, a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL MULW      mulw	a0, a0, a0
+# CHECK-NEXT:  1      19    19.00                        19    XSPipeBJU3[19],XSPipeGroupInt[19],XSPipeIntIQ3[19] DIV                div	a0, a1, a2
+# CHECK-NEXT:  1      19    19.00                        19    XSPipeBJU3[19],XSPipeGroupInt[19],XSPipeIntIQ3[19] DIVU               divu	a0, a1, a2
+# CHECK-NEXT:  1      19    19.00                        19    XSPipeBJU3[19],XSPipeGroupInt[19],XSPipeIntIQ3[19] REM                rem	a0, a1, a2
+# CHECK-NEXT:  1      19    19.00                        19    XSPipeBJU3[19],XSPipeGroupInt[19],XSPipeIntIQ3[19] REMU               remu	a0, a1, a2
+# CHECK-NEXT:  1      11    11.00                        11    XSPipeBJU3[11],XSPipeGroupInt[11],XSPipeIntIQ3[11] DIVW               divw	a0, a1, a2
+# CHECK-NEXT:  1      11    11.00                        11    XSPipeBJU3[11],XSPipeGroupInt[11],XSPipeIntIQ3[11] DIVUW              divuw	a0, a1, a2
+# CHECK-NEXT:  1      11    11.00                        11    XSPipeBJU3[11],XSPipeGroupInt[11],XSPipeIntIQ3[11] REMW               remw	a0, a1, a2
+# CHECK-NEXT:  1      11    11.00                        11    XSPipeBJU3[11],XSPipeGroupInt[11],XSPipeIntIQ3[11] REMUW              remuw	a0, a1, a2
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT: 2.50   2.50    -      -      -      -      -     120.00  -      -      -      -      -      -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     mul	a0, a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     mulh	a0, a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     mulhu	a0, a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     mulhsu	a0, a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     mulw	a0, a0, a0
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     div	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     divu	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     rem	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     19.00   -      -      -      -      -      -      -      -      -      -      -      -     remu	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     11.00   -      -      -      -      -      -      -      -      -      -      -      -     divw	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     11.00   -      -      -      -      -      -      -      -      -      -      -      -     divuw	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     11.00   -      -      -      -      -      -      -      -      -      -      -      -     remw	a0, a1, a2
+# CHECK-NEXT:  -      -      -      -      -      -      -     11.00   -      -      -      -      -      -      -      -      -      -      -      -     remuw	a0, a1, a2

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zba.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zba.test
new file mode 100644
index 0000000000000..ac0cdfc37c9ab
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zba.test
@@ -0,0 +1,95 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full  %p/../Inputs/zba.s | FileCheck  %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              ADD_UW                     add.uw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SLLI_UW                    slli.uw	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SH1ADD_UW                  sh1add.uw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SH2ADD_UW                  sh2add.uw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SH3ADD_UW                  sh3add.uw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SH1ADD                     sh1add	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SH2ADD                     sh2add	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              SH3ADD                     sh3add	a0, a0, a0
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT: 2.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]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     add.uw	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     slli.uw	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sh1add.uw	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sh2add.uw	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sh3add.uw	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sh1add	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sh2add	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sh3add	a0, a0, a0

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbb.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbb.test
new file mode 100644
index 0000000000000..4f81b14d31cc1
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbb.test
@@ -0,0 +1,127 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full  %p/../Inputs/zbb.s | FileCheck  %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              ANDN                       andn	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              ORN                        orn	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              XNOR                       xnor	a0, a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL CLZ       clz	a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL CLZW      clzw	a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL CTZ       ctz	a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL CTZW      ctzw	a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL CPOP      cpop	a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL CPOPW     cpopw	a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              MIN                        min	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              MINU                       minu	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              MAX                        max	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              MAXU                       maxu	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_SEXT_B                   sext.b	a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_SEXT_H                   sext.h	a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              C_ZEXT_H                   zext.h	a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              ROL                        rol	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              ROLW                       rolw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              ROR                        ror	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              RORW                       rorw	a0, a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              RORI                       rori	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              RORIW                      roriw	a0, a0, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              ORC_B                      orc.b	a0, a0
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              REV8_RV64                  rev8	a0, a0
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT: 7.50   7.50   4.50   4.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     andn	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     orn	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     xnor	a0, a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     clz	a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     clzw	a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     ctz	a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     ctzw	a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     cpop	a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     cpopw	a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     min	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     minu	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     max	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     maxu	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sext.b	a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     sext.h	a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     zext.h	a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     rol	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     rolw	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     ror	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     rorw	a0, a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     rori	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     roriw	a0, a0, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     orc.b	a0, a0
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     rev8	a0, a0

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbc.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbc.test
new file mode 100644
index 0000000000000..cf2aa78e15956
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbc.test
@@ -0,0 +1,85 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full  %p/../Inputs/zbc.s | FileCheck  %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL CLMUL     clmul	a0, a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL CLMULR    clmulr	a0, a0, a0
+# CHECK-NEXT:  1      3     0.50                         3     XSPipeGroupALU,XSPipeGroupBKU,XSPipeGroupInt,XSPipeGroupMUL CLMULH    clmulh	a0, a0, a0
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT: 1.50   1.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     clmul	a0, a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     clmulr	a0, a0, a0
+# CHECK-NEXT: 0.50   0.50    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     clmulh	a0, a0, a0

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbs.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbs.test
new file mode 100644
index 0000000000000..342c2bb12e398
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zbs.test
@@ -0,0 +1,95 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full  %p/../Inputs/zbs.s | FileCheck  %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              BCLR                       bclr	a0, a1, a2
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              BCLRI                      bclri	a0, a1, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              BEXT                       bext	a0, a1, a2
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              BEXTI                      bexti	a0, a1, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              BINV                       binv	a0, a1, a2
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              BINVI                      binvi	a0, a1, 1
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              BSET                       bset	a0, a1, a2
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              BSETI                      bseti	a0, a1, 1
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT: 2.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]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     bclr	a0, a1, a2
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     bclri	a0, a1, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     bext	a0, a1, a2
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     bexti	a0, a1, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     binv	a0, a1, a2
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     binvi	a0, a1, 1
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     bset	a0, a1, a2
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     bseti	a0, a1, 1

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zfh.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zfh.test
new file mode 100644
index 0000000000000..d71a6ed69f72f
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zfh.test
@@ -0,0 +1,109 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full %p/../Inputs/zfh.s | FileCheck %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FADD_H                   fadd.h	fs10, fs11, ft8
+# CHECK-NEXT:  1      1     0.33                         1     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FSUB_H                   fsub.h	ft9, ft10, ft11
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMUL_H                   fmul.h	ft0, ft1, ft2
+# CHECK-NEXT:  1      9     4.50                         9     XSPipeGroupFDIV[9],XSPipeGroupFP[9]        FDIV_H                     fdiv.h	ft3, ft4, ft5
+# CHECK-NEXT:  1      10    5.00                         10    XSPipeGroupFDIV[10],XSPipeGroupFP[10]      FSQRT_H                    fsqrt.h	ft6, ft7
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMIN_H                   fmin.h	fa5, fa6, fa7
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMAX_H                   fmax.h	fs2, fs3, fs4
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMADD_H                  fmadd.h	fa0, fa1, fa2, ft11
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMSUB_H                  fmsub.h	fa4, fa5, fa6, fa7
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FNMSUB_H                 fnmsub.h	fs2, fs3, fs4, fs5
+# CHECK-NEXT:  1      4     0.33                         4     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FNMADD_H                 fnmadd.h	fs6, fs7, fs8, fs9
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FEQ_H                    feq.h	a1, fs8, fs9
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FLT_H                    flt.h	a2, fs10, fs11
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FLE_H                    fle.h	a3, ft8, ft9
+# CHECK-NEXT:  1      2     0.33                         2     XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCLASS_H                 fclass.h	a3, ft10
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     4.33   9.50   4.33   9.50   4.33    -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fadd.h	fs10, fs11, ft8
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fsub.h	ft9, ft10, ft11
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmul.h	ft0, ft1, ft2
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -     4.50    -     4.50    -      -      -      -      -      -      -      -     fdiv.h	ft3, ft4, ft5
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -     5.00    -     5.00    -      -      -      -      -      -      -      -     fsqrt.h	ft6, ft7
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmin.h	fa5, fa6, fa7
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmax.h	fs2, fs3, fs4
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmadd.h	fa0, fa1, fa2, ft11
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fmsub.h	fa4, fa5, fa6, fa7
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fnmsub.h	fs2, fs3, fs4, fs5
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fnmadd.h	fs6, fs7, fs8, fs9
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     feq.h	a1, fs8, fs9
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     flt.h	a2, fs10, fs11
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fle.h	a3, ft8, ft9
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     0.33    -     0.33    -     0.33    -      -      -      -      -      -      -     fclass.h	a3, ft10

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zfhmin.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zfhmin.test
new file mode 100644
index 0000000000000..d8bff02a00281
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zfhmin.test
@@ -0,0 +1,99 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full %p/../Inputs/zfhmin.s | FileCheck %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      4     0.33    *                    4     XSPipeLDU,XSPipeMemIQ                      FLH                        flh	ft0, 0(a0)
+# CHECK-NEXT:  1      4     0.50           *             4     XSPipeMemIQ[2],XSPipeSTA,XSPipeSTD         FSH                        fsh	ft0, 0(a0)
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FMV_X_H fmv.x.h	a2, fs7
+# CHECK-NEXT:  1      1     1.00                         1     XSPipeBJU2,XSPipeGroupBRU,XSPipeGroupInt,XSPipeIntIQ2 FMV_H_X         fmv.h.x	ft1, a6
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_S_H fcvt.s.h	fa0, ft0
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_S_H fcvt.s.h	fa0, ft0, rup
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_H_S fcvt.h.s	ft2, fa2
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_D_H fcvt.d.h	fa0, ft0
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_D_H fcvt.d.h	fa0, ft0, rup
+# CHECK-NEXT:  1      3     1.00                         3     XSPipeFEX0,XSPipeFpIQ0,XSPipeGroupFALU,XSPipeGroupFMA,XSPipeGroupFP FCVT_H_D fcvt.h.d	ft2, fa2
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -     7.00    -      -      -      -     0.33   0.33   0.33   0.50   0.50   0.50   0.50
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -     0.33   0.33   0.33    -      -      -      -     flh	ft0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     0.50   0.50   0.50   0.50   fsh	ft0, 0(a0)
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fmv.x.h	a2, fs7
+# CHECK-NEXT:  -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -      -      -     fmv.h.x	ft1, a6
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.s.h	fa0, ft0
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.s.h	fa0, ft0, rup
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.h.s	ft2, fa2
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.d.h	fa0, ft0
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.d.h	fa0, ft0, rup
+# CHECK-NEXT:  -      -      -      -      -      -      -      -     1.00    -      -      -      -      -      -      -      -      -      -      -     fcvt.h.d	ft2, fa2

diff  --git a/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zicond.test b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zicond.test
new file mode 100644
index 0000000000000..adf0920d5e5ea
--- /dev/null
+++ b/llvm/test/tools/llvm-mca/RISCV/XiangShan-Kunminghu/zicond.test
@@ -0,0 +1,87 @@
+# NOTE: Assertions have been autogenerated by utils/update_mca_test_checks.py
+# RUN: llvm-mca -mtriple=riscv64 -mcpu=xiangshan-kunminghu -iterations=1 -instruction-tables=full  %p/../Inputs/zicond.s | FileCheck  %s
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0:1
+# CHECK-NEXT: [1]   - XSPipeALU1:1
+# CHECK-NEXT: [2]   - XSPipeALU2:1
+# CHECK-NEXT: [3]   - XSPipeALU3:1
+# CHECK-NEXT: [4]   - XSPipeBJU0:1
+# CHECK-NEXT: [5]   - XSPipeBJU1:1
+# CHECK-NEXT: [6]   - XSPipeBJU2:1
+# CHECK-NEXT: [7]   - XSPipeBJU3:1
+# CHECK-NEXT: [8]   - XSPipeFEX0:1
+# CHECK-NEXT: [9]   - XSPipeFEX1:1
+# CHECK-NEXT: [10]  - XSPipeFEX2:1
+# CHECK-NEXT: [11]  - XSPipeFEX3:1
+# CHECK-NEXT: [12]  - XSPipeFEX4:1
+# CHECK-NEXT: [13]  - XSPipeFpIQ0:2 XSPipeFEX0, XSPipeFEX1
+# CHECK-NEXT: [14]  - XSPipeFpIQ1:2 XSPipeFEX2, XSPipeFEX3
+# CHECK-NEXT: [15]  - XSPipeFpIQ2:1 XSPipeFEX4
+# CHECK-NEXT: [16]  - XSPipeGroupALU:4 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3
+# CHECK-NEXT: [17]  - XSPipeGroupBKU:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [18]  - XSPipeGroupBRU:3 XSPipeBJU0, XSPipeBJU1, XSPipeBJU2
+# CHECK-NEXT: [19]  - XSPipeGroupFALU:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [20]  - XSPipeGroupFDIV:2 XSPipeFEX1, XSPipeFEX3
+# CHECK-NEXT: [21]  - XSPipeGroupFMA:3 XSPipeFEX0, XSPipeFEX2, XSPipeFEX4
+# CHECK-NEXT: [22]  - XSPipeGroupFP:5 XSPipeFEX0, XSPipeFEX1, XSPipeFEX2, XSPipeFEX3, XSPipeFEX4
+# CHECK-NEXT: [23]  - XSPipeGroupInt:8 XSPipeALU0, XSPipeALU1, XSPipeALU2, XSPipeALU3, XSPipeBJU0, XSPipeBJU1, XSPipeBJU2, XSPipeBJU3
+# CHECK-NEXT: [24]  - XSPipeGroupMUL:2 XSPipeALU0, XSPipeALU1
+# CHECK-NEXT: [25]  - XSPipeIntIQ0:2 XSPipeALU0, XSPipeBJU0
+# CHECK-NEXT: [26]  - XSPipeIntIQ1:2 XSPipeALU1, XSPipeBJU1
+# CHECK-NEXT: [27]  - XSPipeIntIQ2:2 XSPipeALU2, XSPipeBJU2
+# CHECK-NEXT: [28]  - XSPipeIntIQ3:2 XSPipeALU3, XSPipeBJU3
+# CHECK-NEXT: [29]  - XSPipeLDU:3
+# CHECK-NEXT: [30]  - XSPipeMemIQ:7 XSPipeLDU, XSPipeLDU, XSPipeLDU, XSPipeSTA, XSPipeSTA, XSPipeSTD, XSPipeSTD
+# CHECK-NEXT: [31]  - XSPipeSTA:2
+# CHECK-NEXT: [32]  - XSPipeSTD:2
+
+# CHECK:      Instruction Info:
+# CHECK-NEXT: [1]: #uOps
+# CHECK-NEXT: [2]: Latency
+# CHECK-NEXT: [3]: RThroughput
+# CHECK-NEXT: [4]: MayLoad
+# CHECK-NEXT: [5]: MayStore
+# CHECK-NEXT: [6]: HasSideEffects (U)
+# CHECK-NEXT: [7]: Bypass Latency
+# CHECK-NEXT: [8]: Resources (<Name> | <Name>[<ReleaseAtCycle>] | <Name>[<AcquireAtCycle>,<ReleaseAtCycle])
+# CHECK-NEXT: [9]: LLVM Opcode Name
+
+# CHECK:      [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]                                        [9]                        Instructions:
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              CZERO_EQZ                  czero.eqz	a0, a1, a2
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              CZERO_NEZ                  czero.nez	a0, a1, a2
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              CZERO_EQZ                  czero.eqz	a0, a1, a2
+# CHECK-NEXT:  1      1     0.25                         1     XSPipeGroupALU,XSPipeGroupInt              CZERO_NEZ                  czero.nez	a0, a1, a2
+
+# CHECK:      Resources:
+# CHECK-NEXT: [0]   - XSPipeALU0
+# CHECK-NEXT: [1]   - XSPipeALU1
+# CHECK-NEXT: [2]   - XSPipeALU2
+# CHECK-NEXT: [3]   - XSPipeALU3
+# CHECK-NEXT: [4]   - XSPipeBJU0
+# CHECK-NEXT: [5]   - XSPipeBJU1
+# CHECK-NEXT: [6]   - XSPipeBJU2
+# CHECK-NEXT: [7]   - XSPipeBJU3
+# CHECK-NEXT: [8]   - XSPipeFEX0
+# CHECK-NEXT: [9]   - XSPipeFEX1
+# CHECK-NEXT: [10]  - XSPipeFEX2
+# CHECK-NEXT: [11]  - XSPipeFEX3
+# CHECK-NEXT: [12]  - XSPipeFEX4
+# CHECK-NEXT: [13.0] - XSPipeLDU
+# CHECK-NEXT: [13.1] - XSPipeLDU
+# CHECK-NEXT: [13.2] - XSPipeLDU
+# CHECK-NEXT: [14.0] - XSPipeSTA
+# CHECK-NEXT: [14.1] - XSPipeSTA
+# CHECK-NEXT: [15.0] - XSPipeSTD
+# CHECK-NEXT: [15.1] - XSPipeSTD
+
+# CHECK:      Resource pressure per iteration:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1]
+# CHECK-NEXT: 1.00   1.00   1.00   1.00    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -
+
+# CHECK:      Resource pressure by instruction:
+# CHECK-NEXT: [0]    [1]    [2]    [3]    [4]    [5]    [6]    [7]    [8]    [9]    [10]   [11]   [12]   [13.0] [13.1] [13.2] [14.0] [14.1] [15.0] [15.1] Instructions:
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     czero.eqz	a0, a1, a2
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     czero.nez	a0, a1, a2
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     czero.eqz	a0, a1, a2
+# CHECK-NEXT: 0.25   0.25   0.25   0.25    -      -      -      -      -      -      -      -      -      -      -      -      -      -      -      -     czero.nez	a0, a1, a2


        


More information about the llvm-commits mailing list