Skip to content

Commit 8dacf55

Browse files
committed
[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
1 parent 2bf84d5 commit 8dacf55

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

llvm/lib/Target/RISCV/RISCVInstrInfo.td

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,23 +1929,36 @@ def : Pat<(binop_allwusers<add> GPR:$rs1, (AddiPair:$rs2)),
19291929
// Standard extensions
19301930
//===----------------------------------------------------------------------===//
19311931

1932+
// Multiply and Division
19321933
include "RISCVInstrInfoM.td"
1934+
1935+
// Atomic
19331936
include "RISCVInstrInfoA.td"
1937+
1938+
// Scalar FP
19341939
include "RISCVInstrInfoF.td"
19351940
include "RISCVInstrInfoD.td"
1936-
include "RISCVInstrInfoC.td"
1941+
include "RISCVInstrInfoZfh.td"
1942+
include "RISCVInstrInfoZfbfmin.td"
1943+
include "RISCVInstrInfoZfa.td"
1944+
1945+
// Scalar bitmanip and cryptography
19371946
include "RISCVInstrInfoZb.td"
1938-
include "RISCVInstrInfoZc.td"
19391947
include "RISCVInstrInfoZk.td"
1948+
1949+
// Vector
19401950
include "RISCVInstrInfoV.td"
19411951
include "RISCVInstrInfoZvfbf.td"
19421952
include "RISCVInstrInfoZvk.td"
1943-
include "RISCVInstrInfoZfa.td"
1944-
include "RISCVInstrInfoZfbfmin.td"
1945-
include "RISCVInstrInfoZfh.td"
1953+
1954+
// Integer
19461955
include "RISCVInstrInfoZicbo.td"
19471956
include "RISCVInstrInfoZicond.td"
19481957

1958+
// Compressed
1959+
include "RISCVInstrInfoC.td"
1960+
include "RISCVInstrInfoZc.td"
1961+
19491962
//===----------------------------------------------------------------------===//
19501963
// Vendor extensions
19511964
//===----------------------------------------------------------------------===//

0 commit comments

Comments
 (0)