[llvm] 8dacf55 - [RISCV] Order the RISCVInstrInfo*.td includes for standard extensions into logical groups. NFC

[Craig Topper via llvm-commits]

Author: Craig Topper
Date: 2023-07-20T08:13:57-07:00
New Revision: 8dacf55af4fe320befb325ad93dd76c4c50c03e9

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

LOG: [RISCV] Order the RISCVInstrInfo*.td includes for standard extensions into logical groups. NFC

There are some ordering dependency between these files.

-F must be included before D, Zfh, and Zfa. I recently suggested Zfbfmin
should be after Zfh.
-V must be before Zvk.
-Zc must be after Zb since Zbb instructions can be compressed.

So I've grouped all the scalar FP together. The vector together.
And put the compressed instructions at the end.

Reviewed By: asb, wangpc

Differential Revision: https://reviews.llvm.org/D155780

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/RISCV/RISCVInstrInfo.td b/llvm/lib/Target/RISCV/RISCVInstrInfo.td
index a3135814947857..72d4cbce67b476 100644
--- a/llvm/lib/Target/RISCV/RISCVInstrInfo.td
+++ b/llvm/lib/Target/RISCV/RISCVInstrInfo.td
@@ -1929,23 +1929,36 @@ def : Pat<(binop_allwusers<add> GPR:$rs1, (AddiPair:$rs2)),
 // Standard extensions
 //===----------------------------------------------------------------------===//
 
+// Multiply and Division
 include "RISCVInstrInfoM.td"
+
+// Atomic
 include "RISCVInstrInfoA.td"
+
+// Scalar FP
 include "RISCVInstrInfoF.td"
 include "RISCVInstrInfoD.td"
-include "RISCVInstrInfoC.td"
+include "RISCVInstrInfoZfh.td"
+include "RISCVInstrInfoZfbfmin.td"
+include "RISCVInstrInfoZfa.td"
+
+// Scalar bitmanip and cryptography
 include "RISCVInstrInfoZb.td"
-include "RISCVInstrInfoZc.td"
 include "RISCVInstrInfoZk.td"
+
+// Vector
 include "RISCVInstrInfoV.td"
 include "RISCVInstrInfoZvfbf.td"
 include "RISCVInstrInfoZvk.td"
-include "RISCVInstrInfoZfa.td"
-include "RISCVInstrInfoZfbfmin.td"
-include "RISCVInstrInfoZfh.td"
+
+// Integer
 include "RISCVInstrInfoZicbo.td"
 include "RISCVInstrInfoZicond.td"
 
+// Compressed
+include "RISCVInstrInfoC.td"
+include "RISCVInstrInfoZc.td"
+
 //===----------------------------------------------------------------------===//
 // Vendor extensions
 //===----------------------------------------------------------------------===//